Skip to content

remove oauth package from mono-repo #940

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.

Sign up for GitHub

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 8 commits into from
Oct 3, 2025
Merged

remove oauth package from mono-repo #940

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
388c979
remove oauth package from mono-repo
Ethella Sep 3, 2025
61559c2
Merge remote-tracking branch 'origin/master' into remove-magic-js-oauth
Ethella Sep 3, 2025
b64bae3
bump yarn.lock
Ethella Sep 3, 2025
4b14bde
update dependencies in pnp
Ethella Sep 3, 2025
4372fba
fix index.cdn
Ethella Sep 3, 2025
1775098
migrate to oauth2
Ethella Sep 3, 2025
f6688dc
Merge remote-tracking branch 'origin/master' into remove-magic-js-oauth
Ethella Oct 2, 2025
2c77210
update yarn.lock
Ethella Oct 2, 2025
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
2 changes: 1 addition & 1 deletion packages/@magic-ext/oauth2/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
4 changes: 2 additions & 2 deletions packages/@magic-ext/oauth2/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion packages/@magic-sdk/pnp/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion packages/@magic-sdk/pnp/src/context/callback.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ export async function callback(): Promise<void> {
}

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,
Expand Down
2 changes: 1 addition & 1 deletion packages/@magic-sdk/pnp/src/context/login.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ export async function login(): Promise<void> {

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) {
Expand Down
2 changes: 1 addition & 1 deletion packages/@magic-sdk/pnp/src/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
13 changes: 2 additions & 11 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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"
Expand Down Expand Up @@ -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
Expand Down