Skip to content

Commit

Permalink
Merge pull request #1625 from Web3Auth/feat/auth-service-v6
Browse files Browse the repository at this point in the history 
Update to v6 of auth service
  • Loading branch information
@chaitanyapotti
chaitanyapotti authored Nov 2, 2023
2 parents 89b638d + e03d21f commit 18f5e98
Show file tree
Hide file tree
Showing 19 changed files with 1,583 additions and 1,052 deletions.
2,497 changes: 1,514 additions & 983 deletions package-lock.json
View file

Large diffs are not rendered by default.

16 changes: 8 additions & 8 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,22 +29,22 @@
"devDependencies": {
"@babel/register": "^7.22.15",
"@toruslabs/config": "^2.0.2",
"@toruslabs/eslint-config-typescript": "^3.0.1",
"@toruslabs/torus-scripts": "^5.0.5",
"@types/chai": "^4.3.6",
"@toruslabs/eslint-config-typescript": "^3.0.2",
"@toruslabs/torus-scripts": "^5.0.6",
"@types/chai": "^4.3.9",
"@types/faker": "^5.5.9",
"@types/jsonwebtoken": "^9.0.3",
"@types/mocha": "^10.0.2",
"@types/jsonwebtoken": "^9.0.4",
"@types/mocha": "^10.0.3",
"@types/node": "^20",
"chai": "^4.3.10",
"cross-env": "^7.0.3",
"dotenv": "^16.3.1",
"eslint": "^8.51.0",
"eslint": "^8.52.0",
"faker": "^5.5.3",
"husky": "^8.0.3",
"jsonwebtoken": "^9.0.2",
"lerna": "^7.3.0",
"lint-staged": "^14.0.1",
"lerna": "^7.4.2",
"lint-staged": "^15.0.2",
"mocha": "^10.2.0",
"prettier": "^3.0.3",
"rimraf": "^5.0.5",
Expand Down
2 changes: 1 addition & 1 deletion packages/adapters/base-solana-adapter/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"@babel/runtime": "^7.x"
},
"devDependencies": {
"@types/bs58": "^4.0.2"
"@types/bs58": "^4.0.3"
},
"lint-staged": {
"!(*d).ts": [
Expand Down
6 changes: 3 additions & 3 deletions packages/adapters/openlogin-adapter/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,11 @@
"@solana/web3.js": "^1.x"
},
"devDependencies": {
"@types/lodash.merge": "^4.6.7"
"@types/lodash.merge": "^4.6.8"
},
"dependencies": {
"@toruslabs/openlogin": "^5.2.0",
"@toruslabs/openlogin-utils": "^5.2.0",
"@toruslabs/openlogin": "^6.0.0",
"@toruslabs/openlogin-utils": "^6.0.0",
"@web3auth/base": "^7.0.4",
"@web3auth/base-provider": "^7.0.4",
"lodash.merge": "^4.6.2"
Expand Down
2 changes: 1 addition & 1 deletion packages/adapters/solflare-adapter/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
"bn.js": "^5.2.1"
},
"devDependencies": {
"@solana/web3.js": "^1.87.0",
"@solana/web3.js": "^1.87.3",
"@solflare-wallet/sdk": "^1.3.2"
},
"lint-staged": {
Expand Down
2 changes: 1 addition & 1 deletion packages/adapters/torus-evm-adapter/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"@babel/runtime": "^7.x"
},
"dependencies": {
"@toruslabs/torus-embed": "^4.0.2",
"@toruslabs/torus-embed": "^4.0.4",
"@web3auth/base": "^7.0.4",
"@web3auth/base-evm-adapter": "^7.0.4"
},
Expand Down
8 changes: 4 additions & 4 deletions packages/adapters/wallet-connect-v2-adapter/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,10 +44,10 @@
"lodash.merge": "^4.6.2"
},
"devDependencies": {
"@types/lodash.merge": "^4.6.7",
"@walletconnect/sign-client": "^2.10.2",
"@walletconnect/types": "^2.10.2",
"@walletconnect/utils": "^2.10.2"
"@types/lodash.merge": "^4.6.8",
"@walletconnect/sign-client": "^2.10.4",
"@walletconnect/types": "^2.10.4",
"@walletconnect/utils": "^2.10.4"
},
"lint-staged": {
"!(*d).ts": [
Expand Down
8 changes: 4 additions & 4 deletions packages/base/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@
},
"dependencies": {
"@toruslabs/http-helpers": "^5.0.0",
"@toruslabs/openlogin": "^5.2.0",
"@toruslabs/openlogin-jrpc": "^5.2.0",
"@toruslabs/openlogin-utils": "^5.2.0",
"jwt-decode": "^3.1.2",
"@toruslabs/openlogin": "^6.0.0",
"@toruslabs/openlogin-jrpc": "^6.0.0",
"@toruslabs/openlogin-utils": "^6.0.0",
"jwt-decode": "^4.0.0",
"loglevel": "^1.8.1",
"ts-custom-error": "^3.3.1"
},
Expand Down
4 changes: 2 additions & 2 deletions packages/base/src/adapter/utils.ts
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
import { post } from "@toruslabs/http-helpers";
import { OPENLOGIN_NETWORK_TYPE } from "@toruslabs/openlogin-utils";
import JwtDecode from "jwt-decode";
import { jwtDecode } from "jwt-decode";

import { ChainNamespaceType } from "../chain/IChainInterface";
import { authServer } from "../constants";
import log from "../loglevel";
import { storageAvailable } from "../utils";

export const checkIfTokenIsExpired = (token: string) => {
const decoded = JwtDecode<{ exp: number }>(token);
const decoded = jwtDecode<{ exp: number }>(token);
if (!decoded.exp) {
return true;
}
Expand Down
4 changes: 2 additions & 2 deletions packages/modal/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@
"devDependencies": {
"@svgr/webpack": "^8.1.0",
"@toruslabs/isomorphic-style-loader": "^5.3.3",
"@toruslabs/openlogin-utils": "^5.2.0",
"@toruslabs/openlogin-utils": "^6.0.0",
"css-loader": "^6.8.1",
"postcss-prefix-selector": "^1.16.0",
"style-loader": "^3.3.3",
"tailwindcss": "^3.3.3",
"tailwindcss": "^3.3.5",
"url-loader": "^4.1.1"
},
"engines": {
Expand Down
6 changes: 3 additions & 3 deletions packages/no-modal/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@
"@babel/runtime": "^7.x"
},
"dependencies": {
"@toruslabs/openlogin": "^5.2.0",
"@toruslabs/openlogin-jrpc": "^5.2.0",
"@toruslabs/openlogin-utils": "^5.2.0",
"@toruslabs/openlogin": "^6.0.0",
"@toruslabs/openlogin-jrpc": "^6.0.0",
"@toruslabs/openlogin-utils": "^6.0.0",
"@web3auth/base": "^7.0.4",
"@web3auth/base-plugin": "^7.0.4",
"@web3auth/base-provider": "^7.0.4"
Expand Down
2 changes: 1 addition & 1 deletion packages/plugins/solana-wallet-connector-plugin/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"src"
],
"devDependencies": {
"@metamask/rpc-errors": "^6.0.0"
"@metamask/rpc-errors": "^6.1.0"
},
"dependencies": {
"@toruslabs/solana-embed": "^2.0.0",
Expand Down
4 changes: 2 additions & 2 deletions packages/plugins/torus-wallet-connector-plugin/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@
"src"
],
"devDependencies": {
"@metamask/rpc-errors": "^6.0.0"
"@metamask/rpc-errors": "^6.1.0"
},
"dependencies": {
"@toruslabs/torus-embed": "^4.0.2",
"@toruslabs/torus-embed": "^4.0.4",
"@web3auth/base": "^7.0.4",
"@web3auth/base-plugin": "^7.0.4",
"@web3auth/no-modal": "^7.0.4",
Expand Down
8 changes: 4 additions & 4 deletions packages/providers/base-provider/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,14 @@
"pre-commit": "lint-staged --cwd ."
},
"dependencies": {
"@metamask/rpc-errors": "^6.0.0",
"@toruslabs/base-controllers": "^4.2.0",
"@toruslabs/openlogin-jrpc": "^5.2.0",
"@metamask/rpc-errors": "^6.1.0",
"@toruslabs/base-controllers": "^4.6.0",
"@toruslabs/openlogin-jrpc": "^6.0.0",
"@web3auth/base": "^7.0.4",
"json-rpc-random-id": "^1.0.1"
},
"devDependencies": {
"@types/json-rpc-random-id": "^1.0.1"
"@types/json-rpc-random-id": "^1.0.2"
},
"peerDependencies": {
"@babel/runtime": "7.x"
Expand Down
15 changes: 7 additions & 8 deletions packages/providers/ethereum-provider/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,11 @@
"@ethereumjs/tx": "^5.0.0",
"@ethereumjs/util": "^9.0.0",
"@metamask/eth-sig-util": "^7.0.0",
"@metamask/rpc-errors": "^6.0.0",
"@toruslabs/base-controllers": "^4.2.0",
"@metamask/rpc-errors": "^6.1.0",
"@toruslabs/base-controllers": "^4.6.0",
"@toruslabs/http-helpers": "^5.0.0",
"@toruslabs/openlogin-jrpc": "^5.2.0",
"@walletconnect/legacy-types": "2.0.0",
"@walletconnect/utils": "^2.10.2",
"@toruslabs/openlogin-jrpc": "^6.0.0",
"@walletconnect/utils": "^2.10.4",
"@web3auth/base": "^7.0.4",
"@web3auth/base-provider": "^7.0.4",
"assert": "^2.1.0",
Expand All @@ -37,9 +36,9 @@
"jsonschema": "^1.4.1"
},
"devDependencies": {
"@types/bn.js": "^5.1.2",
"@types/json-rpc-random-id": "^1.0.1",
"@walletconnect/types": "^2.10.2"
"@types/bn.js": "^5.1.4",
"@types/json-rpc-random-id": "^1.0.2",
"@walletconnect/types": "^2.10.4"
},
"peerDependencies": {
"@babel/runtime": "7.x"
Expand Down
16 changes: 8 additions & 8 deletions packages/providers/solana-provider/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@
"pre-commit": "lint-staged --cwd ."
},
"dependencies": {
"@metamask/rpc-errors": "^6.0.0",
"@toruslabs/base-controllers": "^4.2.0",
"@toruslabs/openlogin-ed25519": "^5.0.0",
"@toruslabs/openlogin-jrpc": "^5.2.0",
"@metamask/rpc-errors": "^6.1.0",
"@toruslabs/base-controllers": "^4.6.0",
"@toruslabs/openlogin-ed25519": "^6.0.0",
"@toruslabs/openlogin-jrpc": "^6.0.0",
"@toruslabs/tweetnacl-js": "^1.0.4",
"@web3auth/base": "^7.0.4",
"@web3auth/base-provider": "^7.0.4",
Expand All @@ -31,11 +31,11 @@
"json-rpc-random-id": "^1.0.1"
},
"devDependencies": {
"@solana/web3.js": "^1.87.0",
"@solana/web3.js": "^1.87.3",
"@solflare-wallet/sdk": "^1.3.2",
"@types/bn.js": "^5.1.2",
"@types/bs58": "^4.0.2",
"@types/json-rpc-random-id": "^1.0.1"
"@types/bn.js": "^5.1.4",
"@types/bs58": "^4.0.3",
"@types/json-rpc-random-id": "^1.0.2"
},
"files": [
"dist",
Expand Down
10 changes: 5 additions & 5 deletions packages/providers/xrpl-provider/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,17 +19,17 @@
"pre-commit": "lint-staged --cwd ."
},
"dependencies": {
"@metamask/rpc-errors": "^6.0.0",
"@toruslabs/base-controllers": "^4.2.0",
"@toruslabs/openlogin-jrpc": "^5.2.0",
"@metamask/rpc-errors": "^6.1.0",
"@toruslabs/base-controllers": "^4.6.0",
"@toruslabs/openlogin-jrpc": "^6.0.0",
"@web3auth/base": "^7.0.4",
"@web3auth/base-provider": "^7.0.4",
"lodash": "^4.17.21",
"ripple-keypairs": "^1.3.1"
},
"devDependencies": {
"@types/elliptic": "6.4.15",
"xrpl": "^2.12.0"
"@types/elliptic": "6.4.16",
"xrpl": "^2.13.0"
},
"peerDependencies": {
"@babel/runtime": "7.x",
Expand Down
22 changes: 11 additions & 11 deletions packages/ui/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,12 @@
"@rollup/plugin-url": "^8.0.2",
"@svgr/rollup": "^8.1.0",
"@svgr/webpack": "^8.1.0",
"@toruslabs/eslint-config-react": "^3.1.1",
"@toruslabs/eslint-config-react": "^3.1.2",
"@toruslabs/isomorphic-style-loader": "^5.3.3",
"@types/lodash.clonedeep": "^4.5.7",
"@types/lodash.merge": "^4.6.7",
"@types/react": "^18.2.25",
"@types/react-dom": "^18.2.11",
"@types/lodash.clonedeep": "^4.5.8",
"@types/lodash.merge": "^4.6.8",
"@types/react": "^18.2.34",
"@types/react-dom": "^18.2.14",
"autoprefixer": "^10.4.16",
"css-loader": "^6.8.1",
"live-server": "^1.2.2",
Expand All @@ -59,22 +59,22 @@
"react-dom": "^18.2.0",
"rollup-plugin-postcss": "^4.0.2",
"style-loader": "^3.3.3",
"tailwindcss": "^3.3.3",
"tailwindcss": "^3.3.5",
"url-loader": "^4.1.1"
},
"dependencies": {
"@toruslabs/http-helpers": "^5.0.0",
"@toruslabs/openlogin": "^5.2.0",
"@toruslabs/openlogin-jrpc": "^5.2.0",
"@toruslabs/openlogin-utils": "^5.2.0",
"@toruslabs/openlogin": "^6.0.0",
"@toruslabs/openlogin-jrpc": "^6.0.0",
"@toruslabs/openlogin-utils": "^6.0.0",
"@web3auth/base": "^7.0.4",
"bowser": "^2.11.0",
"classnames": "^2.3.2",
"copy-to-clipboard": "^3.3.3",
"i18next": "^23.5.1",
"i18next": "^23.6.0",
"lodash.clonedeep": "^4.5.0",
"lodash.merge": "^4.6.2",
"react-i18next": "^13.2.2",
"react-i18next": "^13.3.1",
"react-qrcode-logo": "^2.9.0"
},
"lint-staged": {
Expand Down
3 changes: 2 additions & 1 deletion webpack.config.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ function generateWebpackConfig({ alias, module = {}, ssrModule = null, pkgBaseCo
plugins: [new TsconfigPathsPlugin()],
alias: {
"bn.js": require.resolve("bn.js"),
// lodash$: require.resolve("lodash-es"),
lodash$: require.resolve("lodash-es"),
tweetnacl: require.resolve("@toruslabs/tweetnacl-js"),
...alias,
},
},
Expand Down

0 comments on commit 18f5e98

Please sign in to comment.