Skip to content
This repository was archived by the owner on Jun 15, 2023. It is now read-only.
Closed
Changes from all commits
Commits
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
9 changes: 6 additions & 3 deletions src/AuthService.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ export interface AuthServiceProps {
contentType?: string
location: Location
provider: string
authorizeEndpoint: string
Copy link
Owner

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.

Copy link
Contributor Author

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.

tokenEndpoint: string
redirectUri?: string
scopes: string[]
autoRefresh?: boolean
Expand Down Expand Up @@ -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))
Expand All @@ -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)}`
Copy link
Owner

Choose a reason for hiding this comment

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

The backticks look odd here. Are you sure this is right?

`${authorizeEndpoint || `${provider}/authorize`}?${toUrlEncoded(query)}`

Copy link
Owner

Choose a reason for hiding this comment

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

Ahh, I see it's nested.

window.location.replace(url)
return true
}
Expand All @@ -185,6 +187,7 @@ export class AuthService<TIDToken = JWTIDToken> {
clientSecret,
contentType,
provider,
tokenEndpoint,
redirectUri,
autoRefresh = true
} = this.props
Expand Down Expand Up @@ -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'
},
Expand Down