Skip to content
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

feat: implement OAuth login with Popup #828

Merged
merged 11 commits into from
Nov 16, 2024
Merged
13 changes: 13 additions & 0 deletions packages/@magic-ext/oauth2/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import {
OAuthRedirectConfiguration,
OAuthPayloadMethods,
OAuthRedirectStartResult,
OAuthPopupConfiguration,
} from './types';

export class OAuthExtension extends Extension.Internal<'oauth2'> {
Expand Down Expand Up @@ -64,6 +65,18 @@ export class OAuthExtension extends Extension.Internal<'oauth2'> {

return getResult.call(this, queryString, lifespan);
}

public loginWithPopup(configuration: OAuthPopupConfiguration) {
const requestPayload = this.utils.createJsonRpcRequestPayload(OAuthPayloadMethods.Popup, [
{
...configuration,
apiKey: this.sdk.apiKey,
platform: 'web',
},
]);

return this.request<OAuthRedirectResult | OAuthRedirectError>(requestPayload);
}
}

function getResult(this: OAuthExtension, queryString: string, lifespan?: number) {
Expand Down
7 changes: 7 additions & 0 deletions packages/@magic-ext/oauth2/src/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import { MagicUserMetadata } from '@magic-sdk/types';
export enum OAuthPayloadMethods {
Start = 'magic_oauth_login_with_redirect_start',
Verify = 'magic_oauth_login_with_redirect_verify',
Popup = 'magic_oauth_login_with_popup',
}

export type OAuthProvider =
Expand Down Expand Up @@ -98,6 +99,12 @@ export interface OAuthRedirectConfiguration {
loginHint?: string;
}

export interface OAuthPopupConfiguration {
provider: OAuthProvider;
scope?: string[];
loginHint?: string;
}

export enum OAuthErrorCode {
InvalidRequest = 'invalid_request',
InvalidClient = 'invalid_client',
Expand Down
2 changes: 2 additions & 0 deletions packages/@magic-sdk/types/src/core/message-types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ export enum MagicIncomingWindowMessage {
MAGIC_MG_BOX_SEND_RECEIPT = 'MAGIC_MG_BOX_SEND_RECEIPT',
MAGIC_SEND_PRODUCT_ANNOUNCEMENT = 'MAGIC_SEND_PRODUCT_ANNOUNCEMENT',
MAGIC_PONG = 'MAGIC_PONG',
MAGIC_POPUP_RESPONSE = 'MAGIC_POPUP_RESPONSE',
MAGIC_POPUP_OAUTH_VERIFY_RESPONSE = 'MAGIC_POPUP_OAUTH_VERIFY_RESPONSE',
}

export enum MagicOutgoingWindowMessage {
Expand Down
Loading