diff --git a/packages/@magic-ext/oauth2/package.json b/packages/@magic-ext/oauth2/package.json index d6f6a4e77..0835a5fe3 100644 --- a/packages/@magic-ext/oauth2/package.json +++ b/packages/@magic-ext/oauth2/package.json @@ -12,7 +12,7 @@ "dist" ], "target": "browser", - "cdnGlobalName": "MagicOAuth2Extension", + "cdnGlobalName": "MagicOAuthExtension", "main": "./dist/cjs/index.js", "module": "./dist/es/index.js", "types": "./dist/types/index.d.ts", diff --git a/packages/@magic-ext/oauth2/src/index.ts b/packages/@magic-ext/oauth2/src/index.ts index 604b3a269..841c5c27f 100644 --- a/packages/@magic-ext/oauth2/src/index.ts +++ b/packages/@magic-ext/oauth2/src/index.ts @@ -74,8 +74,8 @@ export class OAuthExtension extends Extension.Internal<'oauth2'> { }); } - public getRedirectResult(configuration: OAuthVerificationConfiguration) { - const queryString = configuration.optionalQueryString || window.location.search; + public getRedirectResult(configuration: OAuthVerificationConfiguration = {}) { + const queryString = configuration?.optionalQueryString || window.location.search; // Remove the query from the redirect callback as a precaution to prevent // malicious parties from parsing it before we have a chance to use it. diff --git a/packages/@magic-sdk/pnp/package.json b/packages/@magic-sdk/pnp/package.json index 8030842dc..35d81d75b 100644 --- a/packages/@magic-sdk/pnp/package.json +++ b/packages/@magic-sdk/pnp/package.json @@ -17,7 +17,7 @@ "jsdelivr": "./dist/magic-pnp.js", "devDependencies": { "@babel/plugin-proposal-optional-chaining": "^7.9.0", - "@magic-ext/oauth": "^24.0.0", + "@magic-ext/oauth2": "^12.0.0", "magic-sdk": "^30.0.0" }, "gitHead": "1ef062ea699d48d5e9a9375a93b7c147632b05ca" diff --git a/packages/@magic-sdk/pnp/src/context/callback.ts b/packages/@magic-sdk/pnp/src/context/callback.ts index 2d5d65b79..e60500814 100644 --- a/packages/@magic-sdk/pnp/src/context/callback.ts +++ b/packages/@magic-sdk/pnp/src/context/callback.ts @@ -17,7 +17,7 @@ export async function callback(): Promise { } async function handleOAuthCallback() { - const res = await magic.oauth.getRedirectResult(); + const res = await magic.oauth2.getRedirectResult(); dispatchReadyEvent(magic, { idToken: res.magic.idToken, userMetadata: res.magic.userMetadata, diff --git a/packages/@magic-sdk/pnp/src/context/login.ts b/packages/@magic-sdk/pnp/src/context/login.ts index 385b53ce2..3d64e6af4 100644 --- a/packages/@magic-sdk/pnp/src/context/login.ts +++ b/packages/@magic-sdk/pnp/src/context/login.ts @@ -16,7 +16,7 @@ export async function login(): Promise { async function handleOAuthLogin(provider: any) { await magic.pnp.saveLastUsedProvider(provider); - await magic.oauth.loginWithRedirect({ provider, redirectURI }); + await magic.oauth2.loginWithRedirect({ provider, redirectURI }); } async function handleEmailLinkLogin(email: any) { diff --git a/packages/@magic-sdk/pnp/src/types.ts b/packages/@magic-sdk/pnp/src/types.ts index 410c2c587..845342484 100644 --- a/packages/@magic-sdk/pnp/src/types.ts +++ b/packages/@magic-sdk/pnp/src/types.ts @@ -1,5 +1,5 @@ import type { Magic } from 'magic-sdk/dist/types/index'; -import type OAuthExtension from '@magic-ext/oauth/dist/types/index.cdn'; +import type OAuthExtension from '@magic-ext/oauth2/dist/types/index.cdn'; import type CDNMagic from 'magic-sdk/dist/types/index.cdn'; declare global { diff --git a/yarn.lock b/yarn.lock index f69a3f68f..1e3fcd794 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3165,7 +3165,7 @@ __metadata: languageName: unknown linkType: soft -"@magic-ext/oauth2@workspace:packages/@magic-ext/oauth2": +"@magic-ext/oauth2@^12.0.0, @magic-ext/oauth2@workspace:packages/@magic-ext/oauth2": version: 0.0.0-use.local resolution: "@magic-ext/oauth2@workspace:packages/@magic-ext/oauth2" dependencies: @@ -3175,15 +3175,6 @@ __metadata: languageName: unknown linkType: soft -"@magic-ext/oauth@npm:^24.0.0": - version: 24.0.0 - resolution: "@magic-ext/oauth@npm:24.0.0" - dependencies: - crypto-js: ^4.2.0 - checksum: e7092f1f2e7142820d12e76dd7b1117ef391ca33741c8983766492b8ccda7d3c46acb318adde55ae92872639e9f396f79a4af1dbc9fba47486f87c9cd9def4b8 - languageName: node - linkType: hard - "@magic-ext/oidc@workspace:packages/@magic-ext/oidc": version: 0.0.0-use.local resolution: "@magic-ext/oidc@workspace:packages/@magic-ext/oidc" @@ -3326,7 +3317,7 @@ __metadata: resolution: "@magic-sdk/pnp@workspace:packages/@magic-sdk/pnp" dependencies: "@babel/plugin-proposal-optional-chaining": ^7.9.0 - "@magic-ext/oauth": ^24.0.0 + "@magic-ext/oauth2": ^12.0.0 magic-sdk: ^30.0.0 languageName: unknown linkType: soft