From 1e837dec11dc5cb266b83efcff4f462aa02d733d Mon Sep 17 00:00:00 2001
From: Lauri Ojansivu <x@xet7.org>
Date: Fri, 11 Jun 2021 13:08:23 +0300
Subject: [PATCH] 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
---
 packages/wekan-oidc/oidc_client.js | 38 ++++++++++--------------------
 1 file changed, 13 insertions(+), 25 deletions(-)

diff --git a/packages/wekan-oidc/oidc_client.js b/packages/wekan-oidc/oidc_client.js
index 6b859f11e..6da9d9f0e 100644
--- a/packages/wekan-oidc/oidc_client.js
+++ b/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,
+  });
 };