Skip to content

Commit d3d0911

Browse files
devin-ai-integration[bot]Ethella
devin-ai-integration[bot]
and
Ethella
authored
Remove Extension class and rename InternalExtension to MagicExtension (#881)
* Remove Extension class and rename InternalExtension to MagicExtension Co-Authored-By: jerry@magic.link <jerry@magic.link> * remove static field * fix test * fix tests --------- Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com> Co-authored-by: jerry@magic.link <jerry@magic.link>
1 parent 170fc9b commit d3d0911

File tree

44 files changed

+592
-950
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+592
-950
lines changed

‎packages/@magic-ext/algorand/src/index.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import { Extension } from '@magic-sdk/commons';
1+
import { MagicExtension } from '@magic-sdk/commons';
22
import { AlgorandConfig, AlgorandPayloadMethod } from './types';
33

4-
export class AlgorandExtension extends Extension.Internal<'algod', any> {
4+
export class AlgorandExtension extends MagicExtension<'algod', any> {
55
name = 'algod' as const;
66
config: any = {};
77

‎packages/@magic-ext/aptos/src/index.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Extension } from '@magic-sdk/commons';
1+
import { MagicExtension } from '@magic-sdk/commons';
22

33
// @ts-ignore
44
import { AptosClient, BCS, TxnBuilderTypes, Types, getAddressFromAccountOrAddress } from 'aptos';
@@ -7,7 +7,7 @@ import { AptosConfig, AptosPayloadMethod } from './type';
77
import { APTOS_PAYLOAD_TYPE } from './constants';
88

99
export { MagicAptosWallet } from './MagicAptosWallet';
10-
export class AptosExtension extends Extension.Internal<'aptos', any> {
10+
export class AptosExtension extends MagicExtension<'aptos', any> {
1111
name = 'aptos' as const;
1212
config: any = {};
1313

‎packages/@magic-ext/avalanche/src/index.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import { Extension } from '@magic-sdk/commons';
1+
import { MagicExtension } from '@magic-sdk/commons';
22
import { AvaxConfig } from './types';
33

4-
export class AvalancheExtension extends Extension.Internal<'avax', any> {
4+
export class AvalancheExtension extends MagicExtension<'avax', any> {
55
name = 'avax' as const;
66
config: any = {};
77

‎packages/@magic-ext/bitcoin/src/index.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import { Extension } from '@magic-sdk/commons';
1+
import { MagicExtension } from '@magic-sdk/commons';
22
import { BitcoinConfig, BitcoinPayloadMethod } from './types';
33

4-
export class BitcoinExtension extends Extension.Internal<'bitcoin', any> {
4+
export class BitcoinExtension extends MagicExtension<'bitcoin', any> {
55
name = 'bitcoin' as const;
66
config: any = {};
77

‎packages/@magic-ext/conflux/src/index.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import { Extension } from '@magic-sdk/commons';
1+
import { MagicExtension } from '@magic-sdk/commons';
22
import { ConfluxPayloadMethod, ConfluxConfig } from './types';
33

4-
export class ConfluxExtension extends Extension.Internal<'conflux', any> {
4+
export class ConfluxExtension extends MagicExtension<'conflux', any> {
55
name = 'conflux' as const;
66
config: any = {};
77

‎packages/@magic-ext/cosmos/src/index.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import { Extension } from '@magic-sdk/commons';
1+
import { MagicExtension } from '@magic-sdk/commons';
22
import { CosmosConfig, CosmosPayloadMethod } from './type';
33

4-
export class CosmosExtension extends Extension.Internal<'cosmos', any> {
4+
export class CosmosExtension extends MagicExtension<'cosmos', any> {
55
name = 'cosmos' as const;
66
config: any = {};
77

‎packages/@magic-ext/ed25519/src/index.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import { Extension } from '@magic-sdk/commons';
1+
import { MagicExtension } from '@magic-sdk/commons';
22
import { Ed25519PayloadMethod } from './types';
33

4-
export class Ed25519Extension extends Extension.Internal<'ed', any> {
4+
export class Ed25519Extension extends MagicExtension<'ed', any> {
55
name = 'ed' as const;
66
config: any = {};
77

‎packages/@magic-ext/farcaster/src/index.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import {Extension, FarcasterLoginEventEmit} from '@magic-sdk/commons';
1+
import {MagicExtension, FarcasterLoginEventEmit} from '@magic-sdk/commons';
22
import { FarcasterPayloadMethod } from './types';
33
import { isMainFrame, isMobile } from './utils';
44

@@ -71,7 +71,7 @@ type FarcasterLoginEventHandlers = {
7171
[FarcasterLoginEventEmit.Cancel]: () => void;
7272
};
7373

74-
export class FarcasterExtension extends Extension.Internal<'farcaster'> {
74+
export class FarcasterExtension extends MagicExtension<'farcaster'> {
7575
name = 'farcaster' as const;
7676
config = {};
7777

‎packages/@magic-ext/flow/src/index.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
import { Extension } from '@magic-sdk/commons';
1+
import { MagicExtension } from '@magic-sdk/commons';
22

33
// @ts-ignore
44
import * as fcl from '@onflow/fcl';
55
import { FlowConfig, FlowPayloadMethod } from './type';
66

7-
export class FlowExtension extends Extension.Internal<'flow', any> {
7+
export class FlowExtension extends MagicExtension<'flow', any> {
88
name = 'flow' as const;
99
config: any = {};
1010

‎packages/@magic-ext/gdkms/src/index.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import { Extension, MagicPayloadMethod } from '@magic-sdk/commons';
1+
import { MagicExtension, MagicPayloadMethod } from '@magic-sdk/commons';
22

3-
export class GDKMSExtension extends Extension.Internal<'gdkms', any> {
3+
export class GDKMSExtension extends MagicExtension<'gdkms', any> {
44
name = 'gdkms' as const;
55
config: any = {};
66

‎packages/@magic-ext/harmony/src/index.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import { Extension } from '@magic-sdk/commons';
1+
import { MagicExtension } from '@magic-sdk/commons';
22
import { HarmonyPayloadMethod, HarmonyConfig } from './types';
33

4-
export class HarmonyExtension extends Extension.Internal<'harmony', any> {
4+
export class HarmonyExtension extends MagicExtension<'harmony', any> {
55
name = 'harmony' as const;
66
config: any = {};
77

‎packages/@magic-ext/hedera/src/index.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
import { Extension } from '@magic-sdk/commons';
1+
import { MagicExtension } from '@magic-sdk/commons';
22
import { HederaConfig, HederaPayloadMethod } from './types';
33

44
export * from './utils';
55

6-
export class HederaExtension extends Extension.Internal<'hedera', any> {
6+
export class HederaExtension extends MagicExtension<'hedera', any> {
77
name = 'hedera' as const;
88
config: any = {};
99
network: string;

‎packages/@magic-ext/icon/src/index.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import { Extension } from '@magic-sdk/commons';
1+
import { MagicExtension } from '@magic-sdk/commons';
22
import { IconConfig, ConfigType } from './type';
33

4-
export class IconExtension extends Extension.Internal<'icon', IconConfig> {
4+
export class IconExtension extends MagicExtension<'icon', IconConfig> {
55
name = 'icon' as const;
66

77
config: ConfigType;

‎packages/@magic-ext/kadena/src/index.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Extension } from '@magic-sdk/commons';
1+
import { MagicExtension } from '@magic-sdk/commons';
22
import {
33
UnsignedCommand,
44
KadenaConfig,
@@ -10,7 +10,7 @@ import {
1010
OptimalTransactionsAccount,
1111
} from './types';
1212

13-
export class KadenaExtension extends Extension.Internal<'kadena'> {
13+
export class KadenaExtension extends MagicExtension<'kadena'> {
1414
name = 'kadena' as const;
1515
config = {};
1616

‎packages/@magic-ext/near/src/index.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import { Extension } from '@magic-sdk/commons';
1+
import { MagicExtension } from '@magic-sdk/commons';
22
import { NearPayloadMethod, NearConfig } from './types';
33

4-
export class NearExtension extends Extension.Internal<'near', any> {
4+
export class NearExtension extends MagicExtension<'near', any> {
55
name = 'near' as const;
66
config: any = {};
77

‎packages/@magic-ext/oauth/src/index.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Extension } from '@magic-sdk/commons';
1+
import { MagicExtension } from '@magic-sdk/commons';
22
import {
33
OAuthErrorData,
44
OAuthPayloadMethods,
@@ -8,7 +8,7 @@ import {
88
} from './types';
99
import { createCryptoChallenge } from './crypto';
1010

11-
export class OAuthExtension extends Extension.Internal<'oauth'> {
11+
export class OAuthExtension extends MagicExtension<'oauth'> {
1212
name = 'oauth' as const;
1313
config = {};
1414
compat = {

‎packages/@magic-ext/oauth2/src/index.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Extension } from '@magic-sdk/commons';
1+
import { MagicExtension } from '@magic-sdk/commons';
22
import {
33
OAuthErrorData,
44
OAuthRedirectError,
@@ -20,7 +20,7 @@ declare global {
2020
}
2121
}
2222

23-
export class OAuthExtension extends Extension.Internal<'oauth2'> {
23+
export class OAuthExtension extends MagicExtension<'oauth2'> {
2424
name = 'oauth2' as const;
2525
config = {};
2626
compat = {

‎packages/@magic-ext/oidc/src/index.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import { Extension } from '@magic-sdk/commons';
1+
import { MagicExtension } from '@magic-sdk/commons';
22
import { MagicOpenIdConnectPayloadMethod, LoginWithOpenIdParams } from './types';
33

4-
export class OpenIdExtension extends Extension.Internal<'openid', any> {
4+
export class OpenIdExtension extends MagicExtension<'openid', any> {
55
name = 'openid' as const;
66
config: any = {};
77

‎packages/@magic-ext/polkadot/src/index.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import { Extension } from '@magic-sdk/commons';
1+
import { MagicExtension } from '@magic-sdk/commons';
22
import { PolkadotConfig, ConfigType } from './type';
33

4-
export class PolkadotExtension extends Extension.Internal<'polkadot', PolkadotConfig> {
4+
export class PolkadotExtension extends MagicExtension<'polkadot', PolkadotConfig> {
55
name = 'polkadot' as const;
66

77
config: ConfigType;

‎packages/@magic-ext/react-native-bare-oauth/src/index.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { InAppBrowser } from 'react-native-inappbrowser-reborn';
2-
import { Extension } from '@magic-sdk/react-native-bare';
2+
import { MagicExtension } from '@magic-sdk/react-native-bare';
33
import { getBundleId } from 'react-native-device-info';
44
import { createCryptoChallenge } from './crypto';
55
import {
@@ -10,7 +10,7 @@ import {
1010
OAuthRedirectResult,
1111
} from './types';
1212

13-
export class OAuthExtension extends Extension.Internal<'oauth'> {
13+
export class OAuthExtension extends MagicExtension<'oauth'> {
1414
name = 'oauth' as const;
1515
config = {};
1616
compat = {

‎packages/@magic-ext/react-native-expo-oauth/src/index.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import * as WebBrowser from 'expo-web-browser';
2-
import { Extension } from '@magic-sdk/react-native-expo';
2+
import { MagicExtension } from '@magic-sdk/react-native-expo';
33
import * as Application from 'expo-application';
44
import { createCryptoChallenge } from './crypto';
55
import {
@@ -10,7 +10,7 @@ import {
1010
OAuthRedirectResult,
1111
} from './types';
1212

13-
export class OAuthExtension extends Extension.Internal<'oauth'> {
13+
export class OAuthExtension extends MagicExtension<'oauth'> {
1414
name = 'oauth' as const;
1515
config = {};
1616
compat = {

‎packages/@magic-ext/solana/src/index.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
import { Extension } from '@magic-sdk/commons';
1+
import { MagicExtension } from '@magic-sdk/commons';
22

33
import { SerializeConfig, Transaction, VersionedTransaction } from '@solana/web3.js';
44
import { SolanaConfig } from './type';
55
import { SOLANA_PAYLOAD_METHODS } from './constants';
66

7-
export class SolanaExtension extends Extension.Internal<'solana', any> {
7+
export class SolanaExtension extends MagicExtension<'solana', any> {
88
name = 'solana' as const;
99
config: any = {};
1010

‎packages/@magic-ext/sui/src/index.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import { Extension } from '@magic-sdk/commons';
1+
import { MagicExtension } from '@magic-sdk/commons';
22
import { SuiConfig, SuiPayloadMethod } from './types';
33

4-
export class SuiExtension extends Extension.Internal<'sui', any> {
4+
export class SuiExtension extends MagicExtension<'sui', any> {
55
name = 'sui' as const;
66
config: any = {};
77

‎packages/@magic-ext/taquito/src/index.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
import { Extension } from '@magic-sdk/commons';
1+
import { MagicExtension } from '@magic-sdk/commons';
22
import { TaquitoConfig, TaquitoPayloadMethod } from './type';
33
import { MagicSigner } from './MagicSinger';
44

5-
export class TaquitoExtension extends Extension.Internal<'taquito', any> {
5+
export class TaquitoExtension extends MagicExtension<'taquito', any> {
66
name = 'taquito' as const;
77
config: any = {};
88

‎packages/@magic-ext/terra/src/index.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import { Extension } from '@magic-sdk/commons';
1+
import { MagicExtension } from '@magic-sdk/commons';
22
import { TerraPayloadMethod, TerraConfig } from './types';
33

4-
export class TerraExtension extends Extension.Internal<'terra', any> {
4+
export class TerraExtension extends MagicExtension<'terra', any> {
55
name = 'terra' as const;
66
config: any = {};
77

‎packages/@magic-ext/tezos/src/index.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import { Extension } from '@magic-sdk/commons';
1+
import { MagicExtension } from '@magic-sdk/commons';
22
import { TezosConfig, ConfigType } from './type';
33

4-
export class TezosExtension extends Extension.Internal<'tezos', TezosConfig> {
4+
export class TezosExtension extends MagicExtension<'tezos', TezosConfig> {
55
name = 'tezos' as const;
66

77
config: ConfigType;

‎packages/@magic-ext/web3modal-ethers5/src/index.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
import { Extension } from '@magic-sdk/commons';
1+
import { MagicExtension } from '@magic-sdk/commons';
22
import { Web3Modal, createWeb3Modal, defaultConfig } from '@web3modal/ethers5';
33
import { LocalStorageKeys, ThirdPartyWalletEvents } from '@magic-sdk/types';
44
import { Web3ModalExtensionOptions } from './types';
55

6-
export class Web3ModalExtension extends Extension.Internal<'web3modal'> {
6+
export class Web3ModalExtension extends MagicExtension<'web3modal'> {
77
name = 'web3modal' as const;
88
config = {};
99
modal: Web3Modal;

‎packages/@magic-ext/webauthn/src/index.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Extension } from '@magic-sdk/commons';
1+
import { MagicExtension } from '@magic-sdk/commons';
22
import {
33
RegisterNewUserConfiguration,
44
LoginWithWebAuthnConfiguration,
@@ -8,7 +8,7 @@ import {
88
} from './types';
99
import { transformAssertionForServer, transformNewAssertionForServer } from './utils/webauthn.js';
1010

11-
export class WebAuthnExtension extends Extension.Internal<'webauthn', any> {
11+
export class WebAuthnExtension extends MagicExtension<'webauthn', any> {
1212
name = 'webauthn' as const;
1313
config: any = {};
1414

‎packages/@magic-ext/zilliqa/src/index.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import { Extension } from '@magic-sdk/commons';
1+
import { MagicExtension } from '@magic-sdk/commons';
22
import { ZilliqaConfig, ConfigType } from './type';
33

4-
export class ZilliqaExtension extends Extension.Internal<'zilliqa', ZilliqaConfig> {
4+
export class ZilliqaExtension extends MagicExtension<'zilliqa', ZilliqaConfig> {
55
name = 'zilliqa' as const;
66

77
config: ConfigType;

‎packages/@magic-sdk/commons/src/index.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// for the public API from this file.
33

44
export {
5-
Extension,
5+
MagicExtension,
66
MagicSDKError as SDKError,
77
MagicExtensionError as ExtensionError,
88
MagicExtensionWarning as ExtensionWarning,

‎packages/@magic-sdk/pnp/src/pnp-extension.ts

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import type { MagicUserMetadata } from '@magic-sdk/types';
2+
import { MagicExtension } from '@magic-sdk/commons';
23

3-
export class PlugNPlayExtension extends window.Magic.Extension.Internal<'pnp', { isPnP: boolean }> {
4+
export class PlugNPlayExtension extends MagicExtension<'pnp', { isPnP: boolean }> {
45
config = { isPnP: true };
56
name = 'pnp' as const;
67

@@ -9,7 +10,7 @@ export class PlugNPlayExtension extends window.Magic.Extension.Internal<'pnp', {
910
};
1011

1112
public getLoginMethod(options: { debug?: boolean; termsOfServiceURI?: string; privacyPolicyURI?: string }) {
12-
return this.utils.createPromiEvent<[string, string | undefined]>(async (resolve) => {
13+
return this.utils.createPromiEvent<[string, string | undefined]>(async resolve => {
1314
const lastUsedProvider = await this.utils.storage.getItem<string | undefined>(
1415
PlugNPlayExtension.storageKeys.lastUsedProvider,
1516
);

0 commit comments

Comments
 (0)