-
Notifications
You must be signed in to change notification settings - Fork 416
✨ Introduce oauthLogin function #433
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.
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
Changes from all commits
Commits
Show all changes
13 commits
Select commit
Hold shift + click to select a range
65bbab4
✨ Introduce oauthLogin function
coyotte508 4b19a14
🏷️
coyotte508 d542dc5
Merge branch 'main' into oauthLogin
coyotte508 89404fb
✅ Ignore doc-build-test repo
coyotte508 48c458d
🐛 Await createApiError
coyotte508 79200d0
♻️ Do not open new window for static space + use state for redirect url
coyotte508 7bf1885
♻️ Store state in JSON
coyotte508 655403a
🐛 Fix code challenge
coyotte508 dbf0327
📝 Document oauth
coyotte508 98240c4
Update packages/hub/README.md
coyotte508 0f09a44
💡 Comment oauthHandleRedirect and oauthHandleRedirectIfPresent
coyotte508 fb39d95
♻️ Improve API
coyotte508 9fe3416
🐛 Use randomUUID util
coyotte508 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
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
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
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
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 |
---|---|---|
@@ -0,0 +1,214 @@ | ||
import { HUB_URL } from "../consts"; | ||
import { createApiError } from "../error"; | ||
|
||
export interface OAuthResult { | ||
accessToken: string; | ||
accessTokenExpiresAt: Date; | ||
userInfo: { | ||
id: string; | ||
name: string; | ||
fullname: string; | ||
email?: string; | ||
emailVerified?: boolean; | ||
avatarUrl: string; | ||
websiteUrl?: string; | ||
isPro: boolean; | ||
orgs: Array<{ | ||
name: string; | ||
isEnterprise: boolean; | ||
}>; | ||
}; | ||
/** | ||
* State passed to the OAuth provider in the original request to the OAuth provider. | ||
*/ | ||
state?: string; | ||
/** | ||
* Granted scope | ||
*/ | ||
scope: string; | ||
} | ||
|
||
/** | ||
* To call after the OAuth provider redirects back to the app. | ||
* | ||
* There is also a helper function {@link oauthHandleRedirectIfPresent}, which will call `oauthHandleRedirect` if the URL contains an oauth code | ||
* in the query parameters and return `false` otherwise. | ||
*/ | ||
export async function oauthHandleRedirect(opts?: { hubUrl?: string }): Promise<OAuthResult> { | ||
if (typeof window === "undefined") { | ||
throw new Error("oauthHandleRedirect is only available in the browser"); | ||
} | ||
|
||
const searchParams = new URLSearchParams(window.location.search); | ||
|
||
const [error, errorDescription] = [searchParams.get("error"), searchParams.get("error_description")]; | ||
|
||
if (error) { | ||
throw new Error(`${error}: ${errorDescription}`); | ||
} | ||
|
||
const code = searchParams.get("code"); | ||
const nonce = localStorage.getItem("huggingface.co:oauth:nonce"); | ||
|
||
if (!code) { | ||
throw new Error("Missing oauth code from query parameters in redirected URL"); | ||
} | ||
|
||
if (!nonce) { | ||
throw new Error("Missing oauth nonce from localStorage"); | ||
} | ||
|
||
const codeVerifier = localStorage.getItem("huggingface.co:oauth:code_verifier"); | ||
|
||
if (!codeVerifier) { | ||
throw new Error("Missing oauth code_verifier from localStorage"); | ||
} | ||
|
||
const state = searchParams.get("state"); | ||
|
||
if (!state) { | ||
throw new Error("Missing oauth state from query parameters in redirected URL"); | ||
} | ||
|
||
let parsedState: { nonce: string; redirectUri: string; state?: string }; | ||
|
||
try { | ||
parsedState = JSON.parse(state); | ||
} catch { | ||
throw new Error("Invalid oauth state in redirected URL, unable to parse JSON: " + state); | ||
} | ||
|
||
if (parsedState.nonce !== nonce) { | ||
throw new Error("Invalid oauth state in redirected URL"); | ||
} | ||
|
||
const hubUrl = opts?.hubUrl || HUB_URL; | ||
|
||
const openidConfigUrl = `${new URL(hubUrl).origin}/.well-known/openid-configuration`; | ||
const openidConfigRes = await fetch(openidConfigUrl, { | ||
headers: { | ||
Accept: "application/json", | ||
}, | ||
}); | ||
|
||
if (!openidConfigRes.ok) { | ||
throw await createApiError(openidConfigRes); | ||
} | ||
|
||
const opendidConfig: { | ||
authorization_endpoint: string; | ||
token_endpoint: string; | ||
userinfo_endpoint: string; | ||
} = await openidConfigRes.json(); | ||
|
||
const tokenRes = await fetch(opendidConfig.token_endpoint, { | ||
method: "POST", | ||
headers: { | ||
"Content-Type": "application/x-www-form-urlencoded", | ||
}, | ||
body: new URLSearchParams({ | ||
grant_type: "authorization_code", | ||
code, | ||
redirect_uri: parsedState.redirectUri, | ||
code_verifier: codeVerifier, | ||
}).toString(), | ||
}); | ||
|
||
localStorage.removeItem("huggingface.co:oauth:code_verifier"); | ||
localStorage.removeItem("huggingface.co:oauth:nonce"); | ||
|
||
if (!tokenRes.ok) { | ||
throw await createApiError(tokenRes); | ||
} | ||
|
||
const token: { | ||
access_token: string; | ||
expires_in: number; | ||
id_token: string; | ||
// refresh_token: string; | ||
scope: string; | ||
token_type: string; | ||
} = await tokenRes.json(); | ||
|
||
const accessTokenExpiresAt = new Date(Date.now() + token.expires_in * 1000); | ||
|
||
const userInfoRes = await fetch(opendidConfig.userinfo_endpoint, { | ||
headers: { | ||
Authorization: `Bearer ${token.access_token}`, | ||
}, | ||
}); | ||
|
||
if (!userInfoRes.ok) { | ||
throw await createApiError(userInfoRes); | ||
} | ||
|
||
const userInfo: { | ||
sub: string; | ||
name: string; | ||
preferred_username: string; | ||
email_verified?: boolean; | ||
email?: string; | ||
picture: string; | ||
website?: string; | ||
isPro: boolean; | ||
orgs?: Array<{ | ||
name: string; | ||
isEnterprise: boolean; | ||
}>; | ||
} = await userInfoRes.json(); | ||
|
||
return { | ||
accessToken: token.access_token, | ||
accessTokenExpiresAt, | ||
userInfo: { | ||
id: userInfo.sub, | ||
name: userInfo.name, | ||
fullname: userInfo.preferred_username, | ||
email: userInfo.email, | ||
emailVerified: userInfo.email_verified, | ||
avatarUrl: userInfo.picture, | ||
websiteUrl: userInfo.website, | ||
isPro: userInfo.isPro, | ||
orgs: userInfo.orgs || [], | ||
}, | ||
state: parsedState.state, | ||
scope: token.scope, | ||
}; | ||
} | ||
|
||
// if (code && !nonce) { | ||
// console.warn("Missing oauth nonce from localStorage"); | ||
// } | ||
|
||
/** | ||
* To call after the OAuth provider redirects back to the app. | ||
* | ||
* It returns false if the URL does not contain an oauth code in the query parameters, otherwise | ||
* it calls {@link oauthHandleRedirect}. | ||
* | ||
* Depending on your app, you may want to call {@link oauthHandleRedirect} directly instead. | ||
*/ | ||
export async function oauthHandleRedirectIfPresent(opts?: { hubUrl?: string }): Promise<OAuthResult | false> { | ||
if (typeof window === "undefined") { | ||
throw new Error("oauthHandleRedirect is only available in the browser"); | ||
} | ||
|
||
const searchParams = new URLSearchParams(window.location.search); | ||
|
||
if (searchParams.has("error")) { | ||
return oauthHandleRedirect(opts); | ||
} | ||
|
||
if (searchParams.has("code")) { | ||
if (!localStorage.getItem("huggingface.co:oauth:nonce")) { | ||
console.warn( | ||
"Missing oauth nonce from localStorage. This can happen when the user refreshes the page after logging in, without changing the URL." | ||
); | ||
return false; | ||
} | ||
|
||
return oauthHandleRedirect(opts); | ||
} | ||
|
||
return false; | ||
} |
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.