github-mirrors/wekan
1
0
Fork 0
mirror of https://github.com/wekan/wekan.git synced 2025-04-23 13:37:09 -04:00
Code Issues Projects Releases Packages Wiki Activity

Fix Google SSO to access Wekan has not been working

Browse source 
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
This commit is contained in:
Lauri Ojansivu 2021-06-11 13:08:23 +03:00
parent c042d54714
commit 1e837dec11
1 changed files with 13 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

38
packages/wekan-oidc/oidc_client.js
View file

@ -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,
});
};