Merge pull request #76 from epochtalk/fix-api-key

Fix api key

Author: crod951

data/nginx-vue/conf.d/default.conf

@@ -0,0 +1,44 @@
+server {
+    listen       80;
+    server_name  localhost;
+
+    #access_log  /var/log/nginx/host.access.log  main;
+
+    location / {
+        root   /usr/share/nginx/html;
+        index  index.html index.htm;
+    }
+
+    #error_page  404              /404.html;
+
+    # redirect server error pages to the static page /50x.html
+    #
+    error_page   500 502 503 504  /50x.html;
+    error_page 404 =200 /index.html;
+    location = /50x.html {
+        root   /usr/share/nginx/html;
+    }
+
+    # proxy the PHP scripts to Apache listening on 127.0.0.1:80
+    #
+    #location ~ \.php$ {
+    #    proxy_pass   http://127.0.0.1;
+    #}
+
+    # pass the PHP scripts to FastCGI server listening on 127.0.0.1:9000
+    #
+    #location ~ \.php$ {
+    #    root           html;
+    #    fastcgi_pass   127.0.0.1:9000;
+    #    fastcgi_index  index.php;
+    #    fastcgi_param  SCRIPT_FILENAME  /scripts$fastcgi_script_name;
+    #    include        fastcgi_params;
+    #}
+
+    # deny access to .htaccess files, if Apache's document root
+    # concurs with nginx's one
+    #
+    #location ~ /\.ht {
+    #    deny  all;
+    #}
+}

docker-compose.yml

@@ -4,43 +4,7 @@ services:
     build: .
     ports:
       - "80:80"
-    links:
-      - epochtalk
-    environment:
-      BASE_URL: "http://localhost:8080"
-  epochtalk:
-    image: quay.io/epochtalk/epochtalk:ui-refactor-2020
-    ports:
-      - "8080:8080"
-      - "23958:23958"
-    depends_on:
-      - redis
-      - postgres
-      - epoch
-    links:
-      - redis
-      - postgres
     env_file:
-      - epochtalk-docker.env
-  epoch:
-    image: quay.io/epochtalk/epoch:v1.14.0
-    depends_on:
-      - postgres
-    links:
-      - postgres
-    environment:
-      MIX_ENV: prod
-      DATABASE_USER: docker
-      DATABASE_PASSWORD: docker
-      DATABASE_NAME: epochtalk
-      DATABASE_HOST: postgres
-  redis:
-    image: redis:4.0.1
-    user: redis
-  postgres:
-    image: postgres:11.1
-    environment:
-      POSTGRES_USER: docker
-      POSTGRES_PASSWORD: docker
+      - epochtalk-vue.env
     volumes:
-      - ./db:/var/lib/postgresql/data
+      - ./data/nginx-vue/conf.d:/etc/nginx/conf.d

example.env

@@ -1,3 +1,8 @@
+# When adding a new env variable,
+# make sure to add an entry to:
+# src/config.json (dev)
+# and
+# src/docker-config.json (prod)
 VUE_APP_BACKEND_URL=http://localhost:4000
 VUE_APP_OLD_BACKEND_URL=http://localhost:8080
 VUE_APP_API_KEY=ABC123

src/api/index.js

@@ -18,7 +18,7 @@ export const $axios2 = axios.create({
 const $auth = localStorageCache(0, 'app').get('auth')
 const initUser = $auth ? $auth.data : undefined
 if (initUser) { $axios2.defaults.headers.common['Authorization'] = `BEARER ${initUser.token}` }
-$axios2.defaults.headers.common['api-key'] = 'NB/zpr4xwTT0icF84pp8E0Tu5T+bc+gGkZ6twZT+XGEU3TkX+S7cTJ6GckLJEztx'
+$axios2.defaults.headers.common['api-key'] = process.env.VUE_APP_API_KEY || config.VUE_APP_API_KEY
 
 /* provided methods */
 const $http = (path, opts, handleErrors) => {

src/config.json

@@ -1,4 +1,5 @@
 {
   "VUE_APP_OLD_BACKEND_URL": "http://localhost:8080",
-  "VUE_APP_BACKEND_URL": "http://localhost:4000"
+  "VUE_APP_BACKEND_URL": "http://localhost:4000",
+  "VUE_APP_API_KEY": "1234"
 }

src/docker-config.json

@@ -1,4 +1,5 @@
 {
   "VUE_APP_OLD_BACKEND_URL": "$VUE_APP_OLD_BACKEND_URL",
-  "VUE_APP_BACKEND_URL": "$VUE_APP_BACKEND_URL"
+  "VUE_APP_BACKEND_URL": "$VUE_APP_BACKEND_URL",
+  "VUE_APP_API_KEY": "$VUE_APP_API_KEY"
 }