Frontend injects wsprotocols only when not using oidc authn (#1241)

vmware-tanzu · Oct 21, 2019 · d74a768 · d74a768
1 parent 2985f4d
commit d74a768
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/chart/kubeapps/templates/kubeapps-frontend-deployment.yaml b/chart/kubeapps/templates/kubeapps-frontend-deployment.yaml
@@ -44,7 +44,6 @@ spec:
         - -client-id={{ required "You must fill \".Values.authProxy.clientID\" with the Client ID of the provider" .Values.authProxy.clientID }}
         - -client-secret={{ required "You must fill \".Values.authProxy.clientSecret\" with the Client Secret of the provider" .Values.authProxy.clientSecret }}
         - -cookie-secret={{ required "You must fill \".Values.authProxy.cookieSecret\" with a 16, 24 or 32 byte base64 encoded seed string for secure cookies" .Values.authProxy.cookieSecret }}
-        - -cookie-name=kc-access
         - -upstream=http://localhost:8080/
         - -http-address=0.0.0.0:3000
         - -email-domain={{ .Values.authProxy.emailDomain }}

diff --git a/dashboard/src/shared/Auth.ts b/dashboard/src/shared/Auth.ts
@@ -26,7 +26,9 @@ export class Auth {
 
   public static wsProtocols() {
     const token = this.getAuthToken();
-    if (!token) {
+    // If we're using OIDC for auth, then let the auth proxy handle
+    // injecting the ws creds.
+    if (!token || this.usingOIDCToken()) {
       return [];
     }
     return [

diff --git a/docs/user/using-an-OIDC-provider.md b/docs/user/using-an-OIDC-provider.md
@@ -162,7 +162,6 @@ spec:
         - -client-secret=$AUTH_PROXY_CLIENT_SECRET
         - -oidc-issuer-url=$AUTH_PROXY_DISCOVERY_URL
         - -cookie-secret=$AUTH_PROXY_COOKIE_SECRET
-        - -cookie-name=kc-access
         - -upstream=http://localhost:8080/
         - -http-address=0.0.0.0:3000
         - -email-domain="*"