Skip to content

Commit a37df97

Browse files
EthellaEthella
committed
bump crypto-js
1 parent 0dadb20 commit a37df97

File tree

7 files changed

+27
-11
lines changed

7 files changed

+27
-11
lines changed

‎packages/@magic-ext/oauth/package.json

+1
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
"crypto-js": "^4.2.0"
3333
},
3434
"devDependencies": {
35+
"@magic-sdk/commons": "latest",
3536
"@types/crypto-js": "~4.2.0"
3637
}
3738
}

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,17 @@ function bytesToVerifierString(bytes: Uint8Array) {
1717
* Stringifies argument (as CryptoJS `WordArray` or EcmaScript `ArrayBuffer`)
1818
* and encodes to URL-safe Base64.
1919
*/
20-
function base64URLEncodeFromByteArray(wordArray: Crypto.WordArray): string;
20+
function base64URLEncodeFromByteArray(wordArray: Crypto.lib.WordArray): string;
2121
function base64URLEncodeFromByteArray(arrayBuffer: ArrayBuffer): string;
22-
function base64URLEncodeFromByteArray(arg: Crypto.WordArray | ArrayBuffer): string {
22+
function base64URLEncodeFromByteArray(arg: Crypto.lib.WordArray | ArrayBuffer): string {
2323
const makeURLSafe = (base64: string) => {
2424
return base64.replace(/\+/g, '-').replace(/\//g, '_').replace(/=/g, '');
2525
};
2626

2727
if (arg instanceof ArrayBuffer) {
2828
const bytes = new Uint8Array(arg);
2929
const utf8Binary = Array.from(bytes)
30-
.map((value) => String.fromCharCode(value))
30+
.map(value => String.fromCharCode(value))
3131
.join('');
3232

3333
const base64 = btoa(utf8Binary);

‎packages/@magic-ext/oauth2/package.json

+1
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
"crypto-js": "^4.2.0"
3333
},
3434
"devDependencies": {
35+
"@magic-sdk/commons": "latest",
3536
"@types/crypto-js": "4.2.0"
3637
}
3738
}

‎packages/@magic-ext/react-native-bare-oauth/package.json

+1
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
"react-native-device-info": "^10.3.0"
3131
},
3232
"devDependencies": {
33+
"@magic-sdk/commons": "latest",
3334
"@magic-sdk/react-native-bare": "^30.0.1",
3435
"@magic-sdk/types": "^24.18.0",
3536
"@types/crypto-js": "~4.2.0",

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { WordArray } from 'crypto-js';
1+
import Crypto from 'crypto-js';
22
import sha256Fallback from 'crypto-js/sha256';
33
import Base64 from 'crypto-js/enc-base64';
44

@@ -19,17 +19,17 @@ function bytesToVerifierString(bytes: Uint8Array) {
1919
* Stringifies argument (as CryptoJS `WordArray` or EcmaScript `ArrayBuffer`)
2020
* and encodes to URL-safe Base64.
2121
*/
22-
function base64URLEncodeFromByteArray(wordArray: WordArray): string;
22+
function base64URLEncodeFromByteArray(wordArray: Crypto.lib.WordArray): string;
2323
function base64URLEncodeFromByteArray(arrayBuffer: ArrayBuffer): string;
24-
function base64URLEncodeFromByteArray(arg: WordArray | ArrayBuffer): string {
24+
function base64URLEncodeFromByteArray(arg: Crypto.lib.WordArray | ArrayBuffer): string {
2525
const makeURLSafe = (base64: string) => {
2626
return base64.replace(/\+/g, '-').replace(/\//g, '_').replace(/=/g, '');
2727
};
2828

2929
if (arg instanceof ArrayBuffer) {
3030
const bytes = new Uint8Array(arg);
3131
const utf8Binary = Array.from(bytes)
32-
.map((value) => String.fromCharCode(value))
32+
.map(value => String.fromCharCode(value))
3333
.join('');
3434

3535
const base64 = btoa(utf8Binary);

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { WordArray } from 'crypto-js';
1+
import Crypto from 'crypto-js';
22
import sha256Fallback from 'crypto-js/sha256';
33
import Base64 from 'crypto-js/enc-base64';
44

@@ -19,17 +19,17 @@ function bytesToVerifierString(bytes: Uint8Array) {
1919
* Stringifies argument (as CryptoJS `WordArray` or EcmaScript `ArrayBuffer`)
2020
* and encodes to URL-safe Base64.
2121
*/
22-
function base64URLEncodeFromByteArray(wordArray: WordArray): string;
22+
function base64URLEncodeFromByteArray(wordArray: Crypto.lib.WordArray): string;
2323
function base64URLEncodeFromByteArray(arrayBuffer: ArrayBuffer): string;
24-
function base64URLEncodeFromByteArray(arg: WordArray | ArrayBuffer): string {
24+
function base64URLEncodeFromByteArray(arg: Crypto.lib.WordArray | ArrayBuffer): string {
2525
const makeURLSafe = (base64: string) => {
2626
return base64.replace(/\+/g, '-').replace(/\//g, '_').replace(/=/g, '');
2727
};
2828

2929
if (arg instanceof ArrayBuffer) {
3030
const bytes = new Uint8Array(arg);
3131
const utf8Binary = Array.from(bytes)
32-
.map((value) => String.fromCharCode(value))
32+
.map(value => String.fromCharCode(value))
3333
.join('');
3434

3535
const base64 = btoa(utf8Binary);

‎yarn.lock

+13
Original file line numberDiff line numberDiff line change
@@ -2542,6 +2542,7 @@ __metadata:
25422542
version: 0.0.0-use.local
25432543
resolution: "@magic-ext/oauth2@workspace:packages/@magic-ext/oauth2"
25442544
dependencies:
2545+
"@magic-sdk/commons": latest
25452546
"@types/crypto-js": 4.2.0
25462547
crypto-js: ^4.2.0
25472548
languageName: unknown
@@ -2551,6 +2552,7 @@ __metadata:
25512552
version: 0.0.0-use.local
25522553
resolution: "@magic-ext/oauth@workspace:packages/@magic-ext/oauth"
25532554
dependencies:
2555+
"@magic-sdk/commons": latest
25542556
"@types/crypto-js": ~4.2.0
25552557
crypto-js: ^4.2.0
25562558
languageName: unknown
@@ -2576,6 +2578,7 @@ __metadata:
25762578
version: 0.0.0-use.local
25772579
resolution: "@magic-ext/react-native-bare-oauth@workspace:packages/@magic-ext/react-native-bare-oauth"
25782580
dependencies:
2581+
"@magic-sdk/commons": latest
25792582
"@magic-sdk/react-native-bare": ^30.0.1
25802583
"@magic-sdk/types": ^24.18.0
25812584
"@types/crypto-js": ~4.2.0
@@ -2695,6 +2698,16 @@ __metadata:
26952698
languageName: node
26962699
linkType: hard
26972700

2701+
"@magic-sdk/commons@npm:latest":
2702+
version: 25.0.2
2703+
resolution: "@magic-sdk/commons@npm:25.0.2"
2704+
peerDependencies:
2705+
"@magic-sdk/provider": ">=18.6.0"
2706+
"@magic-sdk/types": ">=15.8.0"
2707+
checksum: 0d1fcf38d0d19493a1baae23d328e11135fc4c36b53600313b96ce229c86c988321ef47568a462ed7e2f3e3e1f0108a660ce3a54ac028e3a9778b8eeb0938b05
2708+
languageName: node
2709+
linkType: hard
2710+
26982711
"@magic-sdk/pnp@workspace:packages/@magic-sdk/pnp":
26992712
version: 0.0.0-use.local
27002713
resolution: "@magic-sdk/pnp@workspace:packages/@magic-sdk/pnp"

0 commit comments

Comments
 (0)