Merge pull request #24 from gal-digital-gmbh/master

Provide default configs via env

Author: oanhnn

.github/CHANGELOG.md

@@ -9,8 +9,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 ## [Unreleased] - YYYY-MM-DD
 
 ### Added
-- Nothing
-
+- replace env `authHost` in config.json with `LARAVEL_ECHO_AUTH_HOST`
+- add default cors settings
+- replace env allowOrigin in config.json with `LARAVEL_ECHO_ALLOW_ORIGIN`
+- support to create initial app client with `LARAVEL_ECHO_CLIENT_APP_ID` and `LARAVEL_ECHO_CLIENT_APP_KEY`
 ### Changed
 - Nothing
 

.github/README.md

@@ -121,6 +121,8 @@ If some environment variables are existed (allow load `/app/.env` file is found)
 | `LARAVEL_ECHO_SERVER_AUTH_HOST`      | `authHost`                      | This option will fall back to the `LARAVEL_ECHO_SERVER_HOST` option as the default if that is set. |
 | `LARAVEL_ECHO_SERVER_HOST`           | `host`                          | |
 | `LARAVEL_ECHO_SERVER_PORT`           | `port`                          | |
+| `LARAVEL_ECHO_CLIENT_APP_ID`         | `clients.0.appId`               | optional: add first client with key `LARAVEL_ECHO_CLIENT_APP_KEY` |
+| `LARAVEL_ECHO_CLIENT_APP_KEY`        | `clients.0.key`                 | |
 | `LARAVEL_ECHO_SERVER_DEBUG`          | `devMode`                       | |
 | `LARAVEL_ECHO_SERVER_REDIS_HOST`     | `databaseConfig.redis.host`     | |
 | `LARAVEL_ECHO_SERVER_REDIS_PORT`     | `databaseConfig.redis.port`     | |

bin/docker-entrypoint

@@ -22,6 +22,13 @@ if [[ "$1" == 'start' ]] || [[ "$1" == 'client:add' ]] || [[ "$1" == 'client:rem
     elif [[ ! -f /app/laravel-echo-server.json ]]; then
         cp /usr/local/src/laravel-echo-server.json /app/laravel-echo-server.json
         # Replace with environment variables
+        sed -i "s|LARAVEL_ECHO_AUTH_HOST|${LARAVEL_ECHO_AUTH_HOST:-${LARAVEL_ECHO_SERVER_HOST:-localhost}}|i" /app/laravel-echo-server.json
+        sed -i "s|LARAVEL_ECHO_ALLOW_ORIGIN|${LARAVEL_ECHO_ALLOW_ORIGIN:-${LARAVEL_ECHO_AUTH_HOST:-${LARAVEL_ECHO_SERVER_HOST:-localhost}}}|i" /app/laravel-echo-server.json
+        LARAVEL_ECHO_CLIENTS="[]"
+        if [ ! -z "${LARAVEL_ECHO_CLIENT_APP_ID}" ]; then
+            LARAVEL_ECHO_CLIENTS="[{\"appId\": \"${LARAVEL_ECHO_CLIENT_APP_ID}\",\"key\": \"${LARAVEL_ECHO_CLIENT_APP_KEY}\"}]"
+        fi
+        sed -i "s|\"LARAVEL_ECHO_CLIENTS\"|${LARAVEL_ECHO_CLIENTS}|i" /app/laravel-echo-server.json
         sed -i "s|LARAVEL_ECHO_SERVER_DB|${LARAVEL_ECHO_SERVER_DB:-redis}|i" /app/laravel-echo-server.json
         sed -i "s|REDIS_HOST|${REDIS_HOST:-redis}|i" /app/laravel-echo-server.json
         sed -i "s|REDIS_PORT|${REDIS_PORT:-6379}|i" /app/laravel-echo-server.json

src/laravel-echo-server.json

@@ -1,8 +1,13 @@
 {
-  "apiOriginAllow": {},
+  "apiOriginAllow":{
+    "allowCors" : true,
+    "allowOrigin" : "LARAVEL_ECHO_ALLOW_ORIGIN",
+    "allowMethods" : "GET, POST",
+    "allowHeaders" : "Origin, Content-Type, X-Auth-Token, X-Requested-With, Accept, Authorization, X-CSRF-TOKEN, X-Socket-Id"
+  },
   "authEndpoint": "/broadcasting/auth",
-  "authHost": "http://localhost",
-  "clients": [],
+  "authHost": "LARAVEL_ECHO_AUTH_HOST",
+  "clients": "LARAVEL_ECHO_CLIENTS",
   "database": "LARAVEL_ECHO_SERVER_DB",
   "databaseConfig": {
     "redis": {