Skip to content

Fixes additionalState in Internet Explorer 11 #391

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

Fixes additionalState in Internet Explorer 11 #391

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e0c0e51
Setting the serve port to 8080
Jul 31, 2018
63bd4f3
Removing additionalState from oauth state property
Jul 31, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion angular.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,8 @@
"serve": {
"builder": "@angular-devkit/build-angular:dev-server",
"options": {
"browserTarget": "sample:build"
"browserTarget": "sample:build",
"port": 8080
},
"configurations": {
"production": {
Expand Down
41 changes: 21 additions & 20 deletions projects/lib/src/oauth-service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -843,9 +843,9 @@ export class OAuthService extends AuthConfig {
this.setupSilentRefreshEventListener();

const redirectUri = this.silentRefreshRedirectUri || this.redirectUri;
this.createLoginUrl(null, null, redirectUri, noPrompt, params).then(url => {
this.createLoginUrl(null, redirectUri, noPrompt, params).then(url => {
iframe.setAttribute('src', url);

if (!this.silentRefreshShowIFrame) {
iframe.style['display'] = 'none';
}
Expand Down Expand Up @@ -1054,7 +1054,6 @@ export class OAuthService extends AuthConfig {
}

private createLoginUrl(
state = '',
loginHint = '',
customRedirectUri = '',
noPrompt = false,
Expand All @@ -1071,12 +1070,6 @@ export class OAuthService extends AuthConfig {
}

return this.createAndSaveNonce().then((nonce: any) => {
if (state) {
state = nonce + this.config.nonceStateSeparator + state;
} else {
state = nonce;
}

if (!this.requestAccessToken && !this.oidc) {
throw new Error(
'Either requestAccessToken or oidc or both must be true'
Expand Down Expand Up @@ -1107,7 +1100,7 @@ export class OAuthService extends AuthConfig {
'&client_id=' +
encodeURIComponent(that.clientId) +
'&state=' +
encodeURIComponent(state) +
encodeURIComponent(nonce) +
'&redirect_uri=' +
encodeURIComponent(redirectUri) +
'&scope=' +
Expand Down Expand Up @@ -1170,7 +1163,11 @@ export class OAuthService extends AuthConfig {
addParams = params;
}

this.createLoginUrl(additionalState, loginHint, null, false, addParams)
if (additionalState) {
this.storeAdditionalState(additionalState);
}

this.createLoginUrl(loginHint, null, false, addParams)
.then(function (url) {
location.href = url;
})
Expand All @@ -1181,6 +1178,10 @@ export class OAuthService extends AuthConfig {
});
}

private storeAdditionalState(additionalState: string) {
localStorage.setItem('additionalState', additionalState);
}

/**
* Starts the implicit flow and redirects to user to
* the auth servers login url.
Expand Down Expand Up @@ -1261,16 +1262,9 @@ export class OAuthService extends AuthConfig {
this.debug('parsed url', parts);

const state = parts['state'];
let nonceInState = state;

if (state) {
const idx = state.indexOf(this.config.nonceStateSeparator);
const nonceInState = state;

if (idx > -1) {
nonceInState = state.substr(0, idx);
this.state = state.substr(idx + this.config.nonceStateSeparator.length);
}
}
this.updateStateWithStoredAdditionalStateIfExists();

if (parts['error']) {
this.debug('error trying to login');
Expand Down Expand Up @@ -1372,6 +1366,13 @@ export class OAuthService extends AuthConfig {
});
}

private updateStateWithStoredAdditionalStateIfExists() {
const additionalState = localStorage.getItem('additionalState');
if (additionalState) {
this.state = additionalState;
}
}

private validateNonceForAccessToken(
accessToken: string,
nonceInState: string
Expand Down