浏览代码

Try to fix OAUTH2_LOGIN_STYLE=redirect Has No Effect.

Thanks to xet7 !

Fixes #3845
Lauri Ojansivu 4 年之前
父节点
当前提交
78324263c1
共有 1 个文件被更改,包括 25 次插入13 次删除
  1. 25 13
      packages/wekan-oidc/oidc_client.js

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

@@ -32,6 +32,8 @@ 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;
@@ -50,18 +52,28 @@ Oidc.requestCredential = function (options, credentialRequestCompleteCallback) {
 
   //console.log('XXX: loginURL: ' + loginUrl)
 
-  options.popupOptions = options.popupOptions || {};
-  var popupOptions = {
-    width:  options.popupOptions.width || 320,
-    height: options.popupOptions.height || 450
-  };
+  if (config.loginStyle && config.loginStyle == 'popup') {
+    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,
-  });
+    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,
+    });
+  }
 };