rancher
/
dashboard
mirror of https://github.com/rancher/dashboard.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2564 from mantis-toboggan-md/bugfix-auth-azure 

Fix azuread auth route
This commit is contained in:
Nancy 2021-03-18 11:23:22 -07:00 committed by GitHub
parent 32f770f9e2 986de53ffe
commit c1741c6430
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
edit/auth/azuread.vue
View File

@ -72,7 +72,7 @@ export default {
}, },
replyUrl() { replyUrl() {
return `${ window.location.origin }/verify-auth`; return `${ window.location.origin }/verify-auth-azure`;
}, },
tenantId() { tenantId() {

3
store/auth.js
View File

@ -126,7 +126,7 @@ export const actions = {
const params = { response_type: 'code', response_mode: 'query' }; const params = { response_type: 'code', response_mode: 'query' };
redirectUrl = addParams(redirectUrl, params ); redirectUrl = addParams(redirectUrl, params );
returnToUrl = `${ window.location.origin }/verify-auth`; returnToUrl = `${ window.location.origin }/verify-auth-azure`;
} }
const nonce = await dispatch('setNonce', opt); const nonce = await dispatch('setNonce', opt);
@ -143,6 +143,7 @@ export const actions = {
} }
let url = removeParam(redirectUrl, GITHUB_SCOPE); let url = removeParam(redirectUrl, GITHUB_SCOPE);
const params = { const params = {
[GITHUB_SCOPE]: scopes.join(','), [GITHUB_SCOPE]: scopes.join(','),
[GITHUB_NONCE]: base64Encode(nonce, 'url') [GITHUB_NONCE]: base64Encode(nonce, 'url')