Ver Fonte

Fix Google SSO to access Wekan has not been working
by reverting Wekan v5.31 not-working fixes to OAUTH2_LOGIN_STYLE=redirect Has No Effect.

Thanks to unpokitodxfavor and xet7 !

Fixes #3854,
opens #3845

Lauri Ojansivu há 4 anos atrás
pai
commit
1e837dec11
1 ficheiros alterados com 13 adições e 25 exclusões
  1. 13 25
      packages/wekan-oidc/oidc_client.js

+ 13 - 25
packages/wekan-oidc/oidc_client.js

@@ -32,8 +32,6 @@ Oidc.requestCredential = function (options, credentialRequestCompleteCallback) {
 
   if (config.loginStyle && config.loginStyle == 'popup') {
     options.display = 'popup';
-  } else if (config.loginStyle && config.loginStyle == 'redirect') {
-    options.display = 'redirect';
   }
 
   var loginUrl = config.serverUrl + config.authorizationEndpoint;
@@ -52,28 +50,18 @@ Oidc.requestCredential = function (options, credentialRequestCompleteCallback) {
 
   //console.log('XXX: loginURL: ' + loginUrl)
 
-  if (config.loginStyle && config.loginStyle == 'popup') {
-    options.popupOptions = options.popupOptions || {};
-    var popupOptions = {
-      width:  options.popupOptions.width || 320,
-      height: options.popupOptions.height || 450
-    };
+  options.popupOptions = options.popupOptions || {};
+  var popupOptions = {
+    width:  options.popupOptions.width || 320,
+    height: options.popupOptions.height || 450
+  };
 
-    OAuth.launchLogin({
-      loginService: 'oidc',
-      loginStyle: loginStyle,
-      loginUrl: loginUrl,
-      credentialRequestCompleteCallback: credentialRequestCompleteCallback,
-      credentialToken: credentialToken,
-      popupOptions: popupOptions,
-    });
-  } else if (config.loginStyle && config.loginStyle == 'redirect') {
-    OAuth.launchLogin({
-      loginService: 'oidc',
-      loginStyle: loginStyle,
-      loginUrl: loginUrl,
-      credentialRequestCompleteCallback: credentialRequestCompleteCallback,
-      credentialToken: credentialToken,
-    });
-  }
+  OAuth.launchLogin({
+    loginService: 'oidc',
+    loginStyle: loginStyle,
+    loginUrl: loginUrl,
+    credentialRequestCompleteCallback: credentialRequestCompleteCallback,
+    credentialToken: credentialToken,
+    popupOptions: popupOptions,
+  });
 };