fix OAuth callback path (#377)

use angular-cli proxy feature to proxy to backend on the same localhost port

Author: prydonius

docker-compose.yml

@@ -8,12 +8,10 @@ services:
       - 4200:4200
     volumes:
       - ./src/ui:/app
-    command: "ng serve --host 0.0.0.0"
+    command: "ng serve --host 0.0.0.0 --proxy-config proxy.conf.json"
   api:
     tty: true
     build: ./dev_env/api
-    ports:
-    - 8080:3000
     volumes:
       - ./src/api:/go/src/github.com/kubernetes-helm/monocular/src/api
       # Config example file
@@ -22,11 +20,5 @@ services:
       - $HOME/.kube/:/root/.kube
     environment:
       - ENVIRONMENT=development
-  redis:
-    image: bitnami/redis:4.0
-    environment:
-      - ALLOW_EMPTY_PASSWORD=yes
-    ports:
-      - 6379:6379
   mongodb:
     image: bitnami/mongodb:3

src/api/config/config.go

@@ -99,7 +99,7 @@ func GetOAuthConfig(host string) (*oauth2.Config, error) {
 		ClientID:     clientID,
 		ClientSecret: clientSecret,
 		Endpoint:     oauth2Github.Endpoint,
-		RedirectURL:  "http://" + host + "/auth/github/callback",
+		RedirectURL:  "http://" + host + "/api/auth/github/callback",
 		Scopes:       []string{"repo"},
 	}, nil
 }

src/ui/proxy.conf.json

@@ -0,0 +1,9 @@
+{
+  "/api": {
+    "target": "http://api:3000",
+    "secure": false,
+    "pathRewrite": {
+      "^/api": ""
+    }
+  }
+}

src/ui/src/app/shared/services/config.service.ts

@@ -15,7 +15,7 @@ export class ConfigService {
       overrides = window["monocular"]["overrides"] || {};
     }
 
-    this.backendHostname = overrides.backendHostname || "http://localhost:8080";
+    this.backendHostname = overrides.backendHostname || "/api";
     this.appName = overrides.appName || "Monocular";
     this.releasesEnabled = overrides.releasesEnabled;
   }

src/ui/src/assets/js/overrides.js

@@ -4,6 +4,6 @@ window.monocular = {
     appName: 'Monocular',
     releasesEnabled: true,
     tillerPortForward: true,
-    backendHostname: 'http://localhost:8080'
+    backendHostname: '/api'
   }
 };