Skip to content

Commit

Permalink
Merge pull request #708 from magiclabs/feature/@magic-sdk/na/add-meta…
Browse files Browse the repository at this point in the history 
…-field-to-magic-constructor

[FEAT]: adding meta field to @magic-sdk magic constructor
  • Loading branch information
@bengriffin1
bengriffin1 authored Feb 9, 2024
2 parents eb4374b + b9ffcb5 commit 672a5be
Show file tree
Hide file tree
Showing 3 changed files with 50 additions and 47 deletions.
2 changes: 2 additions & 0 deletions packages/@magic-sdk/provider/src/core/sdk.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,7 @@ export interface MagicSDKAdditionalConfiguration<
testMode?: boolean;
deferPreload?: boolean;
useStorageCache?: boolean;
meta?: any; // Generic field for clients to add metadata
}

export class SDKBase {
Expand Down Expand Up @@ -193,6 +194,7 @@ export class SDKBase {
ext: isEmpty(extConfig) ? undefined : extConfig,
locale: options?.locale || 'en_US',
...(SDKEnvironment.bundleId ? { bundleId: SDKEnvironment.bundleId } : {}),
meta: options?.meta,
});
this.networkHash = getNetworkHash(this.apiKey, options?.network, isEmpty(extConfig) ? undefined : extConfig);
if (!options?.deferPreload) this.preload();
Expand Down
1 change: 1 addition & 0 deletions packages/@magic-sdk/types/src/core/query-types.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,5 @@ export interface QueryParameters {
ext?: any;
locale?: string;
bundleId?: string;
meta?: any;
}
94 changes: 47 additions & 47 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2043,7 +2043,7 @@ __metadata:
version: 0.0.0-use.local
resolution: "@magic-ext/algorand@workspace:packages/@magic-ext/algorand"
dependencies:
"@magic-sdk/commons": ^18.0.0
"@magic-sdk/commons": ^18.0.1
languageName: unknown
linkType: soft

Expand All @@ -2052,8 +2052,8 @@ __metadata:
resolution: "@magic-ext/aptos@workspace:packages/@magic-ext/aptos"
dependencies:
"@aptos-labs/wallet-adapter-core": ^2.2.0
"@magic-sdk/commons": ^18.0.0
"@magic-sdk/provider": ^22.0.0
"@magic-sdk/commons": ^18.0.1
"@magic-sdk/provider": ^22.0.1
aptos: ^1.8.5
peerDependencies:
"@aptos-labs/wallet-adapter-core": ^2.2.0
Expand All @@ -2065,47 +2065,47 @@ __metadata:
version: 0.0.0-use.local
resolution: "@magic-ext/avalanche@workspace:packages/@magic-ext/avalanche"
dependencies:
"@magic-sdk/commons": ^18.0.0
"@magic-sdk/commons": ^18.0.1
languageName: unknown
linkType: soft

"@magic-ext/bitcoin@workspace:packages/@magic-ext/bitcoin":
version: 0.0.0-use.local
resolution: "@magic-ext/bitcoin@workspace:packages/@magic-ext/bitcoin"
dependencies:
"@magic-sdk/commons": ^18.0.0
"@magic-sdk/commons": ^18.0.1
languageName: unknown
linkType: soft

"@magic-ext/conflux@workspace:packages/@magic-ext/conflux":
version: 0.0.0-use.local
resolution: "@magic-ext/conflux@workspace:packages/@magic-ext/conflux"
dependencies:
"@magic-sdk/commons": ^18.0.0
"@magic-sdk/commons": ^18.0.1
languageName: unknown
linkType: soft

"@magic-ext/cosmos@workspace:packages/@magic-ext/cosmos":
version: 0.0.0-use.local
resolution: "@magic-ext/cosmos@workspace:packages/@magic-ext/cosmos"
dependencies:
"@magic-sdk/commons": ^18.0.0
"@magic-sdk/commons": ^18.0.1
languageName: unknown
linkType: soft

"@magic-ext/ed25519@workspace:packages/@magic-ext/ed25519":
version: 0.0.0-use.local
resolution: "@magic-ext/ed25519@workspace:packages/@magic-ext/ed25519"
dependencies:
"@magic-sdk/commons": ^18.0.0
"@magic-sdk/commons": ^18.0.1
languageName: unknown
linkType: soft

"@magic-ext/flow@workspace:packages/@magic-ext/flow":
version: 0.0.0-use.local
resolution: "@magic-ext/flow@workspace:packages/@magic-ext/flow"
dependencies:
"@magic-sdk/commons": ^18.0.0
"@magic-sdk/commons": ^18.0.1
"@onflow/fcl": ^1.4.1
"@onflow/types": ^1.1.0
peerDependencies:
Expand All @@ -2118,8 +2118,8 @@ __metadata:
version: 0.0.0-use.local
resolution: "@magic-ext/gdkms@workspace:packages/@magic-ext/gdkms"
dependencies:
"@magic-sdk/commons": ^18.0.0
"@magic-sdk/types": ^18.0.0
"@magic-sdk/commons": ^18.0.1
"@magic-sdk/types": ^18.0.1
"@peculiar/webcrypto": ^1.4.3
languageName: unknown
linkType: soft
Expand All @@ -2128,7 +2128,7 @@ __metadata:
version: 0.0.0-use.local
resolution: "@magic-ext/harmony@workspace:packages/@magic-ext/harmony"
dependencies:
"@magic-sdk/commons": ^18.0.0
"@magic-sdk/commons": ^18.0.1
languageName: unknown
linkType: soft

Expand All @@ -2146,23 +2146,23 @@ __metadata:
version: 0.0.0-use.local
resolution: "@magic-ext/icon@workspace:packages/@magic-ext/icon"
dependencies:
"@magic-sdk/commons": ^18.0.0
"@magic-sdk/commons": ^18.0.1
languageName: unknown
linkType: soft

"@magic-ext/near@workspace:packages/@magic-ext/near":
version: 0.0.0-use.local
resolution: "@magic-ext/near@workspace:packages/@magic-ext/near"
dependencies:
"@magic-sdk/commons": ^18.0.0
"@magic-sdk/commons": ^18.0.1
languageName: unknown
linkType: soft

"@magic-ext/oauth@^16.0.0, @magic-ext/oauth@workspace:packages/@magic-ext/oauth":
"@magic-ext/oauth@^16.0.1, @magic-ext/oauth@workspace:packages/@magic-ext/oauth":
version: 0.0.0-use.local
resolution: "@magic-ext/oauth@workspace:packages/@magic-ext/oauth"
dependencies:
"@magic-sdk/commons": ^18.0.0
"@magic-sdk/commons": ^18.0.1
"@types/crypto-js": ~3.1.47
crypto-js: ^3.3.0
languageName: unknown
Expand All @@ -2172,24 +2172,24 @@ __metadata:
version: 0.0.0-use.local
resolution: "@magic-ext/oidc@workspace:packages/@magic-ext/oidc"
dependencies:
"@magic-sdk/commons": ^18.0.0
"@magic-sdk/commons": ^18.0.1
languageName: unknown
linkType: soft

"@magic-ext/polkadot@workspace:packages/@magic-ext/polkadot":
version: 0.0.0-use.local
resolution: "@magic-ext/polkadot@workspace:packages/@magic-ext/polkadot"
dependencies:
"@magic-sdk/commons": ^18.0.0
"@magic-sdk/commons": ^18.0.1
languageName: unknown
linkType: soft

"@magic-ext/react-native-bare-oauth@workspace:packages/@magic-ext/react-native-bare-oauth":
version: 0.0.0-use.local
resolution: "@magic-ext/react-native-bare-oauth@workspace:packages/@magic-ext/react-native-bare-oauth"
dependencies:
"@magic-sdk/react-native-bare": ^23.0.0
"@magic-sdk/types": ^18.0.0
"@magic-sdk/react-native-bare": ^23.0.1
"@magic-sdk/types": ^18.0.1
"@types/crypto-js": ~3.1.47
crypto-js: ^3.3.0
react-native-device-info: ^10.3.0
Expand All @@ -2204,7 +2204,7 @@ __metadata:
version: 0.0.0-use.local
resolution: "@magic-ext/react-native-expo-oauth@workspace:packages/@magic-ext/react-native-expo-oauth"
dependencies:
"@magic-sdk/react-native-expo": ^23.0.0
"@magic-sdk/react-native-expo": ^23.0.1
"@magic-sdk/types": ^10.0.0
"@types/crypto-js": ~3.1.47
crypto-js: ^3.3.0
Expand All @@ -2219,7 +2219,7 @@ __metadata:
version: 0.0.0-use.local
resolution: "@magic-ext/solana@workspace:packages/@magic-ext/solana"
dependencies:
"@magic-sdk/commons": ^18.0.0
"@magic-sdk/commons": ^18.0.1
"@solana/web3.js": ^1.87.2
peerDependencies:
"@solana/web3.js": ^1.87.2
Expand All @@ -2230,48 +2230,48 @@ __metadata:
version: 0.0.0-use.local
resolution: "@magic-ext/taquito@workspace:packages/@magic-ext/taquito"
dependencies:
"@magic-sdk/commons": ^18.0.0
"@magic-sdk/commons": ^18.0.1
languageName: unknown
linkType: soft

"@magic-ext/terra@workspace:packages/@magic-ext/terra":
version: 0.0.0-use.local
resolution: "@magic-ext/terra@workspace:packages/@magic-ext/terra"
dependencies:
"@magic-sdk/commons": ^18.0.0
"@magic-sdk/commons": ^18.0.1
languageName: unknown
linkType: soft

"@magic-ext/tezos@workspace:packages/@magic-ext/tezos":
version: 0.0.0-use.local
resolution: "@magic-ext/tezos@workspace:packages/@magic-ext/tezos"
dependencies:
"@magic-sdk/commons": ^18.0.0
"@magic-sdk/commons": ^18.0.1
languageName: unknown
linkType: soft

"@magic-ext/webauthn@workspace:packages/@magic-ext/webauthn":
version: 0.0.0-use.local
resolution: "@magic-ext/webauthn@workspace:packages/@magic-ext/webauthn"
dependencies:
"@magic-sdk/commons": ^18.0.0
"@magic-sdk/commons": ^18.0.1
languageName: unknown
linkType: soft

"@magic-ext/zilliqa@workspace:packages/@magic-ext/zilliqa":
version: 0.0.0-use.local
resolution: "@magic-ext/zilliqa@workspace:packages/@magic-ext/zilliqa"
dependencies:
"@magic-sdk/commons": ^18.0.0
"@magic-sdk/commons": ^18.0.1
languageName: unknown
linkType: soft

"@magic-sdk/commons@^18.0.0, @magic-sdk/commons@workspace:packages/@magic-sdk/commons":
"@magic-sdk/commons@^18.0.1, @magic-sdk/commons@workspace:packages/@magic-sdk/commons":
version: 0.0.0-use.local
resolution: "@magic-sdk/commons@workspace:packages/@magic-sdk/commons"
dependencies:
"@magic-sdk/provider": ^22.0.0
"@magic-sdk/types": ^18.0.0
"@magic-sdk/provider": ^22.0.1
"@magic-sdk/types": ^18.0.1
peerDependencies:
"@magic-sdk/provider": ">=18.6.0"
"@magic-sdk/types": ">=15.8.0"
Expand All @@ -2295,17 +2295,17 @@ __metadata:
"@babel/core": ^7.9.6
"@babel/plugin-proposal-optional-chaining": ^7.9.0
"@babel/runtime": ^7.9.6
"@magic-ext/oauth": ^16.0.0
magic-sdk: ^22.0.0
"@magic-ext/oauth": ^16.0.1
magic-sdk: ^22.0.1
languageName: unknown
linkType: soft

"@magic-sdk/provider@^22.0.0, @magic-sdk/provider@workspace:packages/@magic-sdk/provider":
"@magic-sdk/provider@^22.0.1, @magic-sdk/provider@workspace:packages/@magic-sdk/provider":
version: 0.0.0-use.local
resolution: "@magic-sdk/provider@workspace:packages/@magic-sdk/provider"
dependencies:
"@babel/plugin-transform-modules-commonjs": ^7.9.6
"@magic-sdk/types": ^18.0.0
"@magic-sdk/types": ^18.0.1
"@peculiar/webcrypto": ^1.1.7
eventemitter3: ^4.0.4
localforage: ^1.7.4
Expand All @@ -2317,17 +2317,17 @@ __metadata:
languageName: unknown
linkType: soft

"@magic-sdk/react-native-bare@^23.0.0, @magic-sdk/react-native-bare@workspace:packages/@magic-sdk/react-native-bare":
"@magic-sdk/react-native-bare@^23.0.1, @magic-sdk/react-native-bare@workspace:packages/@magic-sdk/react-native-bare":
version: 0.0.0-use.local
resolution: "@magic-sdk/react-native-bare@workspace:packages/@magic-sdk/react-native-bare"
dependencies:
"@aveq-research/localforage-asyncstorage-driver": ^3.0.1
"@babel/core": ^7.15.0
"@babel/plugin-transform-flow-strip-types": ^7.14.5
"@babel/runtime": ~7.10.4
"@magic-sdk/commons": ^18.0.0
"@magic-sdk/provider": ^22.0.0
"@magic-sdk/types": ^18.0.0
"@magic-sdk/commons": ^18.0.1
"@magic-sdk/provider": ^22.0.1
"@magic-sdk/types": ^18.0.1
"@react-native-async-storage/async-storage": ^1.15.5
"@react-native-community/netinfo": ">11.0.0"
"@testing-library/react-native": ^12.4.0
Expand Down Expand Up @@ -2357,17 +2357,17 @@ __metadata:
languageName: unknown
linkType: soft

"@magic-sdk/react-native-expo@^23.0.0, @magic-sdk/react-native-expo@workspace:packages/@magic-sdk/react-native-expo":
"@magic-sdk/react-native-expo@^23.0.1, @magic-sdk/react-native-expo@workspace:packages/@magic-sdk/react-native-expo":
version: 0.0.0-use.local
resolution: "@magic-sdk/react-native-expo@workspace:packages/@magic-sdk/react-native-expo"
dependencies:
"@aveq-research/localforage-asyncstorage-driver": ^3.0.1
"@babel/core": ^7.15.0
"@babel/plugin-transform-flow-strip-types": ^7.14.5
"@babel/runtime": ~7.10.4
"@magic-sdk/commons": ^18.0.0
"@magic-sdk/provider": ^22.0.0
"@magic-sdk/types": ^18.0.0
"@magic-sdk/commons": ^18.0.1
"@magic-sdk/provider": ^22.0.1
"@magic-sdk/types": ^18.0.1
"@react-native-async-storage/async-storage": ^1.15.5
"@react-native-community/netinfo": ">11.0.0"
"@testing-library/react-native": ^12.4.0
Expand Down Expand Up @@ -2397,7 +2397,7 @@ __metadata:
languageName: unknown
linkType: soft

"@magic-sdk/types@^18.0.0, @magic-sdk/types@workspace:packages/@magic-sdk/types":
"@magic-sdk/types@^18.0.1, @magic-sdk/types@workspace:packages/@magic-sdk/types":
version: 0.0.0-use.local
resolution: "@magic-sdk/types@workspace:packages/@magic-sdk/types"
languageName: unknown
Expand Down Expand Up @@ -12742,16 +12742,16 @@ fsevents@^2.3.2:
languageName: unknown
linkType: soft

"magic-sdk@^22.0.0, magic-sdk@workspace:packages/magic-sdk":
"magic-sdk@^22.0.1, magic-sdk@workspace:packages/magic-sdk":
version: 0.0.0-use.local
resolution: "magic-sdk@workspace:packages/magic-sdk"
dependencies:
"@babel/core": ^7.9.6
"@babel/plugin-proposal-optional-chaining": ^7.9.0
"@babel/runtime": ^7.9.6
"@magic-sdk/commons": ^18.0.0
"@magic-sdk/provider": ^22.0.0
"@magic-sdk/types": ^18.0.0
"@magic-sdk/commons": ^18.0.1
"@magic-sdk/provider": ^22.0.1
"@magic-sdk/types": ^18.0.1
localforage: ^1.7.4
localforage-driver-memory: ^1.0.5
languageName: unknown
Expand Down

0 comments on commit 672a5be

Please sign in to comment.