Andreas/wekan
1
0
Fork 0
mirror of https://github.com/wekan/wekan.git synced 2026-02-10 18:24:21 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Merge branch 'patch-1' of https://github.com/moserben16/wekan into moserben16-patch-1

Browse source
This commit is contained in:
Lauri Ojansivu 2019-06-11 16:36:14 +03:00
commit c859cd2278
1 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

8
packages/wekan-oidc/oidc_server.js
View file

@ -49,7 +49,12 @@ if (Meteor.release) {
var getToken = function (query) { var getToken = function (query) {
var debug = process.env.DEBUG || false; var debug = process.env.DEBUG || false;
var config = getConfiguration(); var config = getConfiguration();
var serverTokenEndpoint = config.serverUrl + config.tokenEndpoint; if(config.tokenEndpoint.includes('https://')){
var serverTokenEndpoint = config.tokenEndpoint;
}else{
var serverTokenEndpoint = config.serverUrl + config.tokenEndpoint;
}
var requestPermissions = config.requestPermissions;
var response; var response;
try { try {
@ -66,6 +71,7 @@ var getToken = function (query) {
client_secret: OAuth.openSecret(config.secret), client_secret: OAuth.openSecret(config.secret),
redirect_uri: OAuth._redirectUri('oidc', config), redirect_uri: OAuth._redirectUri('oidc', config),
grant_type: 'authorization_code', grant_type: 'authorization_code',
scope: requestPermissions,
state: query.state state: query.state
} }
} }