Skip to content

Use responseType parameter #397

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

Merged
merged 1 commit into from
Sep 19, 2018
Merged

Use responseType parameter #397

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 13 additions & 9 deletions projects/lib/src/oauth-service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -331,14 +331,14 @@ export class OAuthService extends AuthConfig {

/**
* DEPRECATED. Use a provider for OAuthStorage instead:
*
*
* { provide: OAuthStorage, useValue: localStorage }
*
*
* Sets a custom storage used to store the received
* tokens on client side. By default, the browser's
* sessionStorage is used.
* @ignore
*
*
* @param storage
*/
public setStorage(storage: OAuthStorage): void {
Expand Down Expand Up @@ -845,7 +845,7 @@ export class OAuthService extends AuthConfig {
const redirectUri = this.silentRefreshRedirectUri || this.redirectUri;
this.createLoginUrl(null, null, redirectUri, noPrompt, params).then(url => {
iframe.setAttribute('src', url);

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

if (this.oidc && this.requestAccessToken) {
this.responseType = 'id_token token';
} else if (this.oidc && !this.requestAccessToken) {
this.responseType = 'id_token';
if (this.config.responseType) {
this.responseType = this.config.responseType;
} else {
this.responseType = 'token';
if (this.oidc && this.requestAccessToken) {
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

could be else if, too, right? That would simplify this if/else/else if complexity, I think :)

this.responseType = 'id_token token';
} else if (this.oidc && !this.requestAccessToken) {
this.responseType = 'id_token';
} else {
this.responseType = 'token';
}
}

const seperationChar = that.loginUrl.indexOf('?') > -1 ? '&' : '?';
Expand Down