Skip to content

Commit

Permalink
Merge pull request #562 from magiclabs/jerryliu-sc-80770-remove-clear…
Browse files Browse the repository at this point in the history 
…keys-in-sdk

remove ClearKeys()
  • Loading branch information
@Ethella
Ethella authored Jul 7, 2023
2 parents 40e9e4e + bb4560a commit 85c7ead
Show file tree
Hide file tree
Showing 3 changed files with 40 additions and 44 deletions.
2 changes: 0 additions & 2 deletions packages/@magic-sdk/provider/src/modules/user.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ import {
import { getItem, removeItem } from '../util/storage';
import { BaseModule } from './base-module';
import { createJsonRpcRequestPayload } from '../core/json-rpc';
import { clearKeys } from '../util/web-crypto';
import { createDeprecationWarning } from '../core/sdk-exceptions';
import { ProductConsolidationMethodRemovalVersions } from './auth';

Expand Down Expand Up @@ -54,7 +53,6 @@ export class UserModule extends BaseModule {
}

public logout() {
clearKeys();
removeItem(this.localForageKey);
const requestPayload = createJsonRpcRequestPayload(
this.sdk.testMode ? MagicPayloadMethod.LogoutTestMode : MagicPayloadMethod.Logout,
Expand Down
2 changes: 0 additions & 2 deletions packages/@magic-sdk/provider/src/modules/wallet.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import {
} from '@magic-sdk/types';
import { BaseModule } from './base-module';
import { createJsonRpcRequestPayload } from '../core/json-rpc';
import { clearKeys } from '../util/web-crypto';
import { createDeprecationWarning } from '../core/sdk-exceptions';
import { setItem, getItem, removeItem } from '../util/storage';
import { ProductConsolidationMethodRemovalVersions } from './auth';
Expand Down Expand Up @@ -76,7 +75,6 @@ export class WalletModule extends BaseModule {
removalVersions: ProductConsolidationMethodRemovalVersions,
useInstead: 'user.logout()',
}).log();
clearKeys();
removeItem(this.localForageKey);
const requestPayload = createJsonRpcRequestPayload(MagicPayloadMethod.Disconnect);
return this.request<boolean>(requestPayload);
Expand Down
80 changes: 40 additions & 40 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2817,7 +2817,7 @@ __metadata:
version: 0.0.0-use.local
resolution: "@magic-ext/algorand@workspace:packages/@magic-ext/algorand"
dependencies:
"@magic-sdk/commons": ^14.2.1
"@magic-sdk/commons": ^14.3.0
languageName: unknown
linkType: soft

Expand All @@ -2826,8 +2826,8 @@ __metadata:
resolution: "@magic-ext/aptos@workspace:packages/@magic-ext/aptos"
dependencies:
"@aptos-labs/wallet-adapter-core": ^2.2.0
"@magic-sdk/commons": ^14.2.1
"@magic-sdk/provider": ^18.2.1
"@magic-sdk/commons": ^14.3.0
"@magic-sdk/provider": ^18.3.0
aptos: ^1.8.5
peerDependencies:
"@aptos-labs/wallet-adapter-core": ^2.2.0
Expand All @@ -2839,55 +2839,55 @@ __metadata:
version: 0.0.0-use.local
resolution: "@magic-ext/auth@workspace:packages/@magic-ext/auth"
dependencies:
"@magic-sdk/commons": ^14.2.1
"@magic-sdk/commons": ^14.3.0
languageName: unknown
linkType: soft

"@magic-ext/avalanche@workspace:packages/@magic-ext/avalanche":
version: 0.0.0-use.local
resolution: "@magic-ext/avalanche@workspace:packages/@magic-ext/avalanche"
dependencies:
"@magic-sdk/commons": ^14.2.1
"@magic-sdk/commons": ^14.3.0
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": ^14.2.1
"@magic-sdk/commons": ^14.3.0
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": ^14.2.1
"@magic-sdk/commons": ^14.3.0
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": ^14.2.1
"@magic-sdk/commons": ^14.3.0
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": ^14.2.1
"@magic-sdk/commons": ^14.3.0
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": ^14.2.1
"@magic-sdk/commons": ^14.3.0
"@onflow/fcl": 1.4.1
"@onflow/types": 0.0.3
peerDependencies:
Expand All @@ -2900,66 +2900,66 @@ __metadata:
version: 0.0.0-use.local
resolution: "@magic-ext/gdkms@workspace:packages/@magic-ext/gdkms"
dependencies:
"@magic-sdk/commons": ^14.2.1
"@magic-sdk/commons": ^14.3.0
languageName: unknown
linkType: soft

"@magic-ext/harmony@workspace:packages/@magic-ext/harmony":
version: 0.0.0-use.local
resolution: "@magic-ext/harmony@workspace:packages/@magic-ext/harmony"
dependencies:
"@magic-sdk/commons": ^14.2.1
"@magic-sdk/commons": ^14.3.0
languageName: unknown
linkType: soft

"@magic-ext/icon@workspace:packages/@magic-ext/icon":
version: 0.0.0-use.local
resolution: "@magic-ext/icon@workspace:packages/@magic-ext/icon"
dependencies:
"@magic-sdk/commons": ^14.2.1
"@magic-sdk/commons": ^14.3.0
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": ^14.2.1
"@magic-sdk/commons": ^14.3.0
languageName: unknown
linkType: soft

"@magic-ext/oauth@^12.2.1, @magic-ext/oauth@workspace:packages/@magic-ext/oauth":
"@magic-ext/oauth@^12.3.0, @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/types": ^15.6.0
"@types/crypto-js": ~3.1.47
crypto-js: ^3.3.0
magic-sdk: ^18.2.1
magic-sdk: ^18.3.0
languageName: unknown
linkType: soft

"@magic-ext/oidc@workspace:packages/@magic-ext/oidc":
version: 0.0.0-use.local
resolution: "@magic-ext/oidc@workspace:packages/@magic-ext/oidc"
dependencies:
"@magic-sdk/commons": ^14.2.1
"@magic-sdk/commons": ^14.3.0
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": ^14.2.1
"@magic-sdk/commons": ^14.3.0
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": ^19.2.1
"@magic-sdk/react-native-bare": ^19.3.0
"@magic-sdk/types": ^10.0.1
"@types/crypto-js": ~3.1.47
crypto-js: ^3.3.0
Expand All @@ -2975,7 +2975,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": ^19.2.1
"@magic-sdk/react-native-expo": ^19.3.0
"@magic-sdk/types": ^10.0.0
"@types/crypto-js": ~3.1.47
crypto-js: ^3.3.0
Expand All @@ -2990,55 +2990,55 @@ __metadata:
version: 0.0.0-use.local
resolution: "@magic-ext/solana@workspace:packages/@magic-ext/solana"
dependencies:
"@magic-sdk/commons": ^14.2.1
"@magic-sdk/commons": ^14.3.0
languageName: unknown
linkType: soft

"@magic-ext/taquito@workspace:packages/@magic-ext/taquito":
version: 0.0.0-use.local
resolution: "@magic-ext/taquito@workspace:packages/@magic-ext/taquito"
dependencies:
"@magic-sdk/commons": ^14.2.1
"@magic-sdk/commons": ^14.3.0
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": ^14.2.1
"@magic-sdk/commons": ^14.3.0
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": ^14.2.1
"@magic-sdk/commons": ^14.3.0
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": ^14.2.1
"@magic-sdk/commons": ^14.3.0
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": ^14.2.1
"@magic-sdk/commons": ^14.3.0
languageName: unknown
linkType: soft

"@magic-sdk/commons@^14.2.1, @magic-sdk/commons@workspace:packages/@magic-sdk/commons":
"@magic-sdk/commons@^14.3.0, @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": ^18.2.1
"@magic-sdk/provider": ^18.3.0
"@magic-sdk/types": ^15.6.0
peerDependencies:
"@magic-sdk/provider": ">=4.3.0"
Expand All @@ -3053,12 +3053,12 @@ __metadata:
"@babel/core": ^7.9.6
"@babel/plugin-proposal-optional-chaining": ^7.9.0
"@babel/runtime": ^7.9.6
"@magic-ext/oauth": ^12.2.1
magic-sdk: ^18.2.1
"@magic-ext/oauth": ^12.3.0
magic-sdk: ^18.3.0
languageName: unknown
linkType: soft

"@magic-sdk/provider@^18.2.1, @magic-sdk/provider@workspace:packages/@magic-sdk/provider":
"@magic-sdk/provider@^18.3.0, @magic-sdk/provider@workspace:packages/@magic-sdk/provider":
version: 0.0.0-use.local
resolution: "@magic-sdk/provider@workspace:packages/@magic-sdk/provider"
dependencies:
Expand All @@ -3075,16 +3075,16 @@ __metadata:
languageName: unknown
linkType: soft

"@magic-sdk/react-native-bare@^19.2.1, @magic-sdk/react-native-bare@workspace:packages/@magic-sdk/react-native-bare":
"@magic-sdk/react-native-bare@^19.3.0, @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": ^14.2.1
"@magic-sdk/provider": ^18.2.1
"@magic-sdk/commons": ^14.3.0
"@magic-sdk/provider": ^18.3.0
"@magic-sdk/types": ^15.6.0
"@react-native-async-storage/async-storage": ^1.15.5
"@types/lodash": ^4.14.158
Expand All @@ -3111,16 +3111,16 @@ __metadata:
languageName: unknown
linkType: soft

"@magic-sdk/react-native-expo@^19.2.1, @magic-sdk/react-native-expo@workspace:packages/@magic-sdk/react-native-expo":
"@magic-sdk/react-native-expo@^19.3.0, @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": ^14.2.1
"@magic-sdk/provider": ^18.2.1
"@magic-sdk/commons": ^14.3.0
"@magic-sdk/provider": ^18.3.0
"@magic-sdk/types": ^15.6.0
"@react-native-async-storage/async-storage": ^1.15.5
"@types/lodash": ^4.14.158
Expand Down Expand Up @@ -12780,15 +12780,15 @@ fsevents@^2.3.2:
languageName: unknown
linkType: soft

"magic-sdk@^18.2.1, magic-sdk@workspace:packages/magic-sdk":
"magic-sdk@^18.3.0, 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": ^14.2.1
"@magic-sdk/provider": ^18.2.1
"@magic-sdk/commons": ^14.3.0
"@magic-sdk/provider": ^18.3.0
"@magic-sdk/types": ^15.6.0
localforage: ^1.7.4
localforage-driver-memory: ^1.0.5
Expand Down

0 comments on commit 85c7ead

Please sign in to comment.