This repository was archived by the owner on Jun 15, 2023. It is now read-only.
-
Couldn't load subscription status.
- Fork 55
Configurable auth and token endpoints #9
Closed
Closed
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -10,6 +10,8 @@ export interface AuthServiceProps { | |
| contentType?: string | ||
| location: Location | ||
| provider: string | ||
| authorizeEndpoint: string | ||
| tokenEndpoint: string | ||
| redirectUri?: string | ||
| scopes: string[] | ||
| autoRefresh?: boolean | ||
|
|
@@ -156,7 +158,7 @@ export class AuthService<TIDToken = JWTIDToken> { | |
|
|
||
| // this will do a full page reload and to to the OAuth2 provider's login page and then redirect back to redirectUri | ||
| authorize(): boolean { | ||
| const { clientId, provider, redirectUri, scopes } = this.props | ||
| const { clientId, provider, authorizeEndpoint, redirectUri, scopes } = this.props | ||
|
|
||
| const pkce = createPKCECodes() | ||
| window.localStorage.setItem('pkce', JSON.stringify(pkce)) | ||
|
|
@@ -173,7 +175,7 @@ export class AuthService<TIDToken = JWTIDToken> { | |
| codeChallengeMethod: 'S256' | ||
| } | ||
| // Responds with a 302 redirect | ||
| const url = `${provider}/authorize?${toUrlEncoded(query)}` | ||
| const url = `${authorizeEndpoint || `${provider}/authorize`}?${toUrlEncoded(query)}` | ||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The backticks look odd here. Are you sure this is right? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Ahh, I see it's nested. |
||
| window.location.replace(url) | ||
| return true | ||
| } | ||
|
|
@@ -185,6 +187,7 @@ export class AuthService<TIDToken = JWTIDToken> { | |
| clientSecret, | ||
| contentType, | ||
| provider, | ||
| tokenEndpoint, | ||
| redirectUri, | ||
| autoRefresh = true | ||
| } = this.props | ||
|
|
@@ -212,7 +215,7 @@ export class AuthService<TIDToken = JWTIDToken> { | |
| } | ||
| } | ||
|
|
||
| const response = await fetch(`${provider}/token`, { | ||
| const response = await fetch(`${tokenEndpoint || `${provider}/token`}`, { | ||
| headers: { | ||
| 'Content-Type': contentType || 'application/x-www-form-urlencoded' | ||
| }, | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Would this make them required parameters? That might break existing code out there.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yes, you're right. This should be optional to not break existing usages.