zksync-sso 0.3.3 → 0.4.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +2 -1
- package/dist/_cjs/abi/GuardianRecoveryModule.js +767 -0
- package/dist/_cjs/abi/GuardianRecoveryModule.js.map +1 -0
- package/dist/_cjs/abi/OidcKeyRegistry.js +492 -0
- package/dist/_cjs/abi/OidcKeyRegistry.js.map +1 -0
- package/dist/_cjs/abi/OidcRecoveryValidator.js +528 -0
- package/dist/_cjs/abi/OidcRecoveryValidator.js.map +1 -0
- package/dist/_cjs/abi/WebAuthModule.js +301 -0
- package/dist/_cjs/abi/WebAuthModule.js.map +1 -0
- package/dist/_cjs/abi/index.js +9 -1
- package/dist/_cjs/abi/index.js.map +1 -1
- package/dist/_cjs/client/oidc/account.js +43 -0
- package/dist/_cjs/client/oidc/account.js.map +1 -0
- package/dist/_cjs/client/oidc/actions/addNewPasskeyViaOidc.js +28 -0
- package/dist/_cjs/client/oidc/actions/addNewPasskeyViaOidc.js.map +1 -0
- package/dist/_cjs/client/oidc/actions/index.js +12 -0
- package/dist/_cjs/client/oidc/actions/index.js.map +1 -0
- package/dist/_cjs/client/oidc/client.js +46 -0
- package/dist/_cjs/client/oidc/client.js.map +1 -0
- package/dist/_cjs/client/oidc/decorators/actions.js +3 -0
- package/dist/_cjs/client/oidc/decorators/actions.js.map +1 -0
- package/dist/_cjs/client/oidc/index.js +20 -0
- package/dist/_cjs/client/oidc/index.js.map +1 -0
- package/dist/_cjs/client/oidc/serialize.js +3 -0
- package/dist/_cjs/client/oidc/serialize.js.map +1 -0
- package/dist/_cjs/client/passkey/actions/account.js +5 -1
- package/dist/_cjs/client/passkey/actions/account.js.map +1 -1
- package/dist/_cjs/client/passkey/decorators/passkey.js +12 -0
- package/dist/_cjs/client/passkey/decorators/passkey.js.map +1 -1
- package/dist/_cjs/client/recovery/actions/oidc.js +55 -0
- package/dist/_cjs/client/recovery/actions/oidc.js.map +1 -0
- package/dist/_cjs/client-auth-server/Signer.js +4 -2
- package/dist/_cjs/client-auth-server/Signer.js.map +1 -1
- package/dist/_cjs/client-auth-server/WalletProvider.js +3 -2
- package/dist/_cjs/client-auth-server/WalletProvider.js.map +1 -1
- package/dist/_cjs/communicator/PopupCommunicator.js +30 -5
- package/dist/_cjs/communicator/PopupCommunicator.js.map +1 -1
- package/dist/_cjs/connector/index.js +1 -0
- package/dist/_cjs/connector/index.js.map +1 -1
- package/dist/_esm/abi/GuardianRecoveryModule.js +764 -0
- package/dist/_esm/abi/GuardianRecoveryModule.js.map +1 -0
- package/dist/_esm/abi/OidcKeyRegistry.js +489 -0
- package/dist/_esm/abi/OidcKeyRegistry.js.map +1 -0
- package/dist/_esm/abi/OidcRecoveryValidator.js +525 -0
- package/dist/_esm/abi/OidcRecoveryValidator.js.map +1 -0
- package/dist/_esm/abi/WebAuthModule.js +298 -0
- package/dist/_esm/abi/WebAuthModule.js.map +1 -0
- package/dist/_esm/abi/index.js +4 -0
- package/dist/_esm/abi/index.js.map +1 -1
- package/dist/_esm/client/oidc/account.js +40 -0
- package/dist/_esm/client/oidc/account.js.map +1 -0
- package/dist/_esm/client/oidc/actions/addNewPasskeyViaOidc.js +26 -0
- package/dist/_esm/client/oidc/actions/addNewPasskeyViaOidc.js.map +1 -0
- package/dist/_esm/client/oidc/actions/index.js +9 -0
- package/dist/_esm/client/oidc/actions/index.js.map +1 -0
- package/dist/_esm/client/oidc/client.js +41 -0
- package/dist/_esm/client/oidc/client.js.map +1 -0
- package/dist/_esm/client/oidc/decorators/actions.js +2 -0
- package/dist/_esm/client/oidc/decorators/actions.js.map +1 -0
- package/dist/_esm/client/oidc/index.js +4 -0
- package/dist/_esm/client/oidc/index.js.map +1 -0
- package/dist/_esm/client/oidc/serialize.js +2 -0
- package/dist/_esm/client/oidc/serialize.js.map +1 -0
- package/dist/_esm/client/passkey/actions/account.js +5 -1
- package/dist/_esm/client/passkey/actions/account.js.map +1 -1
- package/dist/_esm/client/passkey/decorators/passkey.js +12 -0
- package/dist/_esm/client/passkey/decorators/passkey.js.map +1 -1
- package/dist/_esm/client/recovery/actions/oidc.js +52 -0
- package/dist/_esm/client/recovery/actions/oidc.js.map +1 -0
- package/dist/_esm/client-auth-server/Signer.js +4 -2
- package/dist/_esm/client-auth-server/Signer.js.map +1 -1
- package/dist/_esm/client-auth-server/WalletProvider.js +3 -2
- package/dist/_esm/client-auth-server/WalletProvider.js.map +1 -1
- package/dist/_esm/communicator/PopupCommunicator.js +30 -5
- package/dist/_esm/communicator/PopupCommunicator.js.map +1 -1
- package/dist/_esm/connector/index.js +1 -0
- package/dist/_esm/connector/index.js.map +1 -1
- package/dist/_types/abi/GuardianRecoveryModule.d.ts +590 -0
- package/dist/_types/abi/GuardianRecoveryModule.d.ts.map +1 -0
- package/dist/_types/abi/OidcKeyRegistry.d.ts +375 -0
- package/dist/_types/abi/OidcKeyRegistry.d.ts.map +1 -0
- package/dist/_types/abi/OidcRecoveryValidator.d.ts +404 -0
- package/dist/_types/abi/OidcRecoveryValidator.d.ts.map +1 -0
- package/dist/_types/abi/WebAuthModule.d.ts +228 -0
- package/dist/_types/abi/WebAuthModule.d.ts.map +1 -0
- package/dist/_types/abi/index.d.ts +4 -0
- package/dist/_types/abi/index.d.ts.map +1 -1
- package/dist/_types/client/oidc/account.d.ts +13 -0
- package/dist/_types/client/oidc/account.d.ts.map +1 -0
- package/dist/_types/client/oidc/actions/addNewPasskeyViaOidc.d.ts +12 -0
- package/dist/_types/client/oidc/actions/addNewPasskeyViaOidc.d.ts.map +1 -0
- package/dist/_types/client/oidc/actions/index.d.ts +5 -0
- package/dist/_types/client/oidc/actions/index.d.ts.map +1 -0
- package/dist/_types/client/oidc/client.d.ts +24 -0
- package/dist/_types/client/oidc/client.d.ts.map +1 -0
- package/dist/_types/client/oidc/decorators/actions.d.ts +5 -0
- package/dist/_types/client/oidc/decorators/actions.d.ts.map +1 -0
- package/dist/_types/client/oidc/index.d.ts +4 -0
- package/dist/_types/client/oidc/index.d.ts.map +1 -0
- package/dist/_types/client/oidc/serialize.d.ts +10 -0
- package/dist/_types/client/oidc/serialize.d.ts.map +1 -0
- package/dist/_types/client/passkey/actions/account.d.ts +1 -0
- package/dist/_types/client/passkey/actions/account.d.ts.map +1 -1
- package/dist/_types/client/passkey/client.d.ts +2 -0
- package/dist/_types/client/passkey/client.d.ts.map +1 -1
- package/dist/_types/client/passkey/decorators/passkey.d.ts +4 -1
- package/dist/_types/client/passkey/decorators/passkey.d.ts.map +1 -1
- package/dist/_types/client/recovery/actions/oidc.d.ts +24 -0
- package/dist/_types/client/recovery/actions/oidc.d.ts.map +1 -0
- package/dist/_types/client-auth-server/Signer.d.ts +3 -1
- package/dist/_types/client-auth-server/Signer.d.ts.map +1 -1
- package/dist/_types/client-auth-server/WalletProvider.d.ts +5 -1
- package/dist/_types/client-auth-server/WalletProvider.d.ts.map +1 -1
- package/dist/_types/communicator/PopupCommunicator.d.ts +13 -1
- package/dist/_types/communicator/PopupCommunicator.d.ts.map +1 -1
- package/dist/_types/connector/index.d.ts +2 -0
- package/dist/_types/connector/index.d.ts.map +1 -1
- package/dist/_types/utils/storage.d.ts +1 -1
- package/dist/_types/utils/storage.d.ts.map +1 -1
- package/package.json +8 -2
- package/project.json +3 -0
- package/src/abi/GuardianRecoveryModule.ts +763 -0
- package/src/abi/OidcKeyRegistry.ts +488 -0
- package/src/abi/OidcRecoveryValidator.ts +524 -0
- package/src/abi/WebAuthModule.ts +297 -0
- package/src/abi/index.ts +4 -0
- package/src/client/oidc/account.ts +65 -0
- package/src/client/oidc/actions/addNewPasskeyViaOidc.ts +54 -0
- package/src/client/oidc/actions/index.ts +16 -0
- package/src/client/oidc/client.ts +122 -0
- package/src/client/oidc/decorators/actions.ts +5 -0
- package/src/client/oidc/index.ts +3 -0
- package/src/client/oidc/serialize.ts +10 -0
- package/src/client/passkey/actions/account.ts +7 -1
- package/src/client/passkey/client.ts +2 -0
- package/src/client/passkey/decorators/passkey.ts +20 -1
- package/src/client/recovery/actions/oidc.ts +103 -0
- package/src/client-auth-server/Signer.ts +6 -3
- package/src/client-auth-server/WalletProvider.ts +7 -2
- package/src/communicator/PopupCommunicator.ts +24 -5
- package/src/connector/index.ts +3 -0
- package/src/utils/storage.ts +1 -1
|
@@ -0,0 +1,55 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.removeOidcAccount = exports.addOidcAccount = void 0;
|
|
4
|
+
const viem_1 = require("viem");
|
|
5
|
+
const actions_1 = require("viem/actions");
|
|
6
|
+
const zksync_1 = require("viem/zksync");
|
|
7
|
+
const index_js_1 = require("../../../abi/index.js");
|
|
8
|
+
const helpers_js_1 = require("../../../utils/helpers.js");
|
|
9
|
+
const addOidcAccount = async (client, args) => {
|
|
10
|
+
const callData = (0, viem_1.encodeFunctionData)({
|
|
11
|
+
abi: index_js_1.OidcRecoveryValidatorAbi,
|
|
12
|
+
functionName: "addOidcAccount",
|
|
13
|
+
args: [args.oidcDigest, args.iss],
|
|
14
|
+
});
|
|
15
|
+
const sendTransactionArgs = {
|
|
16
|
+
account: client.account,
|
|
17
|
+
to: args.contracts.recoveryOidc,
|
|
18
|
+
paymaster: args.paymaster?.address,
|
|
19
|
+
paymasterInput: args.paymaster?.address ? (args.paymaster?.paymasterInput || (0, zksync_1.getGeneralPaymasterInput)({ innerInput: "0x" })) : undefined,
|
|
20
|
+
data: callData,
|
|
21
|
+
gas: 10000000n,
|
|
22
|
+
};
|
|
23
|
+
const transactionHash = await (0, zksync_1.sendTransaction)(client, sendTransactionArgs);
|
|
24
|
+
if (args.onTransactionSent) {
|
|
25
|
+
(0, helpers_js_1.noThrow)(() => args.onTransactionSent?.(transactionHash));
|
|
26
|
+
}
|
|
27
|
+
const transactionReceipt = await (0, actions_1.waitForTransactionReceipt)(client, { hash: transactionHash });
|
|
28
|
+
if (transactionReceipt.status !== "success")
|
|
29
|
+
throw new Error("addOidcAccount transaction reverted");
|
|
30
|
+
return {
|
|
31
|
+
transactionReceipt,
|
|
32
|
+
};
|
|
33
|
+
};
|
|
34
|
+
exports.addOidcAccount = addOidcAccount;
|
|
35
|
+
const removeOidcAccount = async (client, args) => {
|
|
36
|
+
const callData = (0, viem_1.encodeFunctionData)({
|
|
37
|
+
abi: index_js_1.OidcRecoveryValidatorAbi,
|
|
38
|
+
functionName: "deleteOidcAccount",
|
|
39
|
+
args: [],
|
|
40
|
+
});
|
|
41
|
+
const sendTransactionArgs = {
|
|
42
|
+
account: client.account,
|
|
43
|
+
to: args.contracts.recoveryOidc,
|
|
44
|
+
data: callData,
|
|
45
|
+
gas: 10000000n,
|
|
46
|
+
type: "eip712",
|
|
47
|
+
};
|
|
48
|
+
const transactionHash = await (0, zksync_1.sendTransaction)(client, sendTransactionArgs);
|
|
49
|
+
const transactionReceipt = await (0, actions_1.waitForTransactionReceipt)(client, { hash: transactionHash });
|
|
50
|
+
if (transactionReceipt.status !== "success")
|
|
51
|
+
throw new Error("removeOidcAccount transaction reverted");
|
|
52
|
+
return transactionReceipt;
|
|
53
|
+
};
|
|
54
|
+
exports.removeOidcAccount = removeOidcAccount;
|
|
55
|
+
//# sourceMappingURL=oidc.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"oidc.js","sourceRoot":"","sources":["../../../../../src/client/recovery/actions/oidc.ts"],"names":[],"mappings":";;;AAAA,+BAWc;AACd,0CAAyD;AACzD,wCAGqB;AAErB,oDAAiE;AACjE,0DAAoD;AAiB7C,MAAM,cAAc,GAAG,KAAK,EAIjC,MAAyC,EAAE,IAAkC,EAA+C,EAAE;IAC9H,MAAM,QAAQ,GAAG,IAAA,yBAAkB,EAAC;QAClC,GAAG,EAAE,mCAAwB;QAC7B,YAAY,EAAE,gBAAgB;QAC9B,IAAI,EAAE,CAAC,IAAI,CAAC,UAAU,EAAE,IAAI,CAAC,GAAG,CAAC;KAClC,CAAC,CAAC;IAEH,MAAM,mBAAmB,GAAG;QAC1B,OAAO,EAAE,MAAM,CAAC,OAAO;QACvB,EAAE,EAAE,IAAI,CAAC,SAAS,CAAC,YAAY;QAC/B,SAAS,EAAE,IAAI,CAAC,SAAS,EAAE,OAAO;QAClC,cAAc,EAAE,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,EAAE,cAAc,IAAI,IAAA,iCAAwB,EAAC,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS;QACxI,IAAI,EAAE,QAAQ;QACd,GAAG,EAAE,SAAW;KAEV,CAAC;IAET,MAAM,eAAe,GAAG,MAAM,IAAA,wBAAe,EAAC,MAAM,EAAE,mBAAmB,CAAC,CAAC;IAC3E,IAAI,IAAI,CAAC,iBAAiB,EAAE,CAAC;QAC3B,IAAA,oBAAO,EAAC,GAAG,EAAE,CAAC,IAAI,CAAC,iBAAiB,EAAE,CAAC,eAAe,CAAC,CAAC,CAAC;IAC3D,CAAC;IAED,MAAM,kBAAkB,GAAG,MAAM,IAAA,mCAAyB,EAAC,MAAM,EAAE,EAAE,IAAI,EAAE,eAAe,EAAE,CAAC,CAAC;IAC9F,IAAI,kBAAkB,CAAC,MAAM,KAAK,SAAS;QAAE,MAAM,IAAI,KAAK,CAAC,qCAAqC,CAAC,CAAC;IAEpG,OAAO;QACL,kBAAkB;KACnB,CAAC;AACJ,CAAC,CAAC;AAhCW,QAAA,cAAc,kBAgCzB;AAQK,MAAM,iBAAiB,GAAG,KAAK,EAIpC,MAAyC,EAAE,IAAqC,EAA+B,EAAE;IACjH,MAAM,QAAQ,GAAG,IAAA,yBAAkB,EAAC;QAClC,GAAG,EAAE,mCAAwB;QAC7B,YAAY,EAAE,mBAAmB;QACjC,IAAI,EAAE,EAAE;KACT,CAAC,CAAC;IAEH,MAAM,mBAAmB,GAAG;QAC1B,OAAO,EAAE,MAAM,CAAC,OAAO;QACvB,EAAE,EAAE,IAAI,CAAC,SAAS,CAAC,YAAY;QAC/B,IAAI,EAAE,QAAQ;QACd,GAAG,EAAE,SAAW;QAChB,IAAI,EAAE,QAAQ;KAER,CAAC;IAET,MAAM,eAAe,GAAG,MAAM,IAAA,wBAAe,EAAC,MAAM,EAAE,mBAAmB,CAAC,CAAC;IAE3E,MAAM,kBAAkB,GAAG,MAAM,IAAA,mCAAyB,EAAC,MAAM,EAAE,EAAE,IAAI,EAAE,eAAe,EAAE,CAAC,CAAC;IAC9F,IAAI,kBAAkB,CAAC,MAAM,KAAK,SAAS;QAAE,MAAM,IAAI,KAAK,CAAC,wCAAwC,CAAC,CAAC;IAEvG,OAAO,kBAAkB,CAAC;AAC5B,CAAC,CAAC;AA1BW,QAAA,iBAAiB,qBA0B5B"}
|
|
@@ -7,7 +7,7 @@ const index_js_2 = require("../paymaster/index.js");
|
|
|
7
7
|
const storage_js_1 = require("../utils/storage.js");
|
|
8
8
|
const utils_js_1 = require("./session/utils.js");
|
|
9
9
|
class Signer {
|
|
10
|
-
constructor({ metadata, communicator, updateListener, session, chains, transports, paymasterHandler, onSessionStateChange, skipPreTransactionStateValidation }) {
|
|
10
|
+
constructor({ metadata, communicator, updateListener, session, chains, transports, paymasterHandler, onSessionStateChange, skipPreTransactionStateValidation, storage }) {
|
|
11
11
|
Object.defineProperty(this, "getMetadata", {
|
|
12
12
|
enumerable: true,
|
|
13
13
|
configurable: true,
|
|
@@ -72,7 +72,7 @@ class Signer {
|
|
|
72
72
|
enumerable: true,
|
|
73
73
|
configurable: true,
|
|
74
74
|
writable: true,
|
|
75
|
-
value:
|
|
75
|
+
value: void 0
|
|
76
76
|
});
|
|
77
77
|
Object.defineProperty(this, "client", {
|
|
78
78
|
enumerable: true,
|
|
@@ -100,6 +100,7 @@ class Signer {
|
|
|
100
100
|
this.paymasterHandler = paymasterHandler;
|
|
101
101
|
this.onSessionStateChange = onSessionStateChange;
|
|
102
102
|
this.skipPreTransactionStateValidation = skipPreTransactionStateValidation;
|
|
103
|
+
this._chainsInfo = new storage_js_1.StorageItem(storage_js_1.StorageItem.scopedStorageKey("chainsInfo"), [], { storage });
|
|
103
104
|
this._account = new storage_js_1.StorageItem(storage_js_1.StorageItem.scopedStorageKey("account"), null, {
|
|
104
105
|
onChange: (newValue) => {
|
|
105
106
|
if (newValue) {
|
|
@@ -111,6 +112,7 @@ class Signer {
|
|
|
111
112
|
this.updateListener.onAccountsUpdate([]);
|
|
112
113
|
}
|
|
113
114
|
},
|
|
115
|
+
storage,
|
|
114
116
|
});
|
|
115
117
|
try {
|
|
116
118
|
if (this.account)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Signer.js","sourceRoot":"","sources":["../../../src/client-auth-server/Signer.ts"],"names":[],"mappings":";;;AAAA,+BAAoM;AAGpM,iDAA4F;AAE5F,oDAAqG;AAErG,
|
|
1
|
+
{"version":3,"file":"Signer.js","sourceRoot":"","sources":["../../../src/client-auth-server/Signer.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,7 +9,7 @@ const helpers_js_1 = require("../utils/helpers.js");
|
|
|
9
9
|
const Signer_js_1 = require("./Signer.js");
|
|
10
10
|
const DEFAULT_AUTH_SERVER_URL = "https://auth-test.zksync.dev/confirm";
|
|
11
11
|
class WalletProvider extends eventemitter3_1.EventEmitter {
|
|
12
|
-
constructor({ metadata, chains, transports, session, authServerUrl, paymasterHandler, onSessionStateChange, skipPreTransactionStateValidation }) {
|
|
12
|
+
constructor({ metadata, chains, transports, session, authServerUrl, paymasterHandler, onSessionStateChange, skipPreTransactionStateValidation, customCommunicator, storage }) {
|
|
13
13
|
super();
|
|
14
14
|
Object.defineProperty(this, "isZksyncSso", {
|
|
15
15
|
enumerable: true,
|
|
@@ -36,7 +36,7 @@ class WalletProvider extends eventemitter3_1.EventEmitter {
|
|
|
36
36
|
},
|
|
37
37
|
}
|
|
38
38
|
});
|
|
39
|
-
const communicator = new PopupCommunicator_js_1.PopupCommunicator(authServerUrl || DEFAULT_AUTH_SERVER_URL);
|
|
39
|
+
const communicator = customCommunicator ?? new PopupCommunicator_js_1.PopupCommunicator(authServerUrl || DEFAULT_AUTH_SERVER_URL);
|
|
40
40
|
this.signer = new Signer_js_1.Signer({
|
|
41
41
|
metadata: () => ({
|
|
42
42
|
name: metadata?.name || (0, helpers_js_1.getWebsiteName)() || "Unknown DApp",
|
|
@@ -51,6 +51,7 @@ class WalletProvider extends eventemitter3_1.EventEmitter {
|
|
|
51
51
|
paymasterHandler,
|
|
52
52
|
onSessionStateChange,
|
|
53
53
|
skipPreTransactionStateValidation,
|
|
54
|
+
storage,
|
|
54
55
|
});
|
|
55
56
|
}
|
|
56
57
|
get chain() {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WalletProvider.js","sourceRoot":"","sources":["../../../src/client-auth-server/WalletProvider.ts"],"names":[],"mappings":";;;AAAA,iDAA6C;AAE7C,+BAA6B;
|
|
1
|
+
{"version":3,"file":"WalletProvider.js","sourceRoot":"","sources":["../../../src/client-auth-server/WalletProvider.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.PopupCommunicator = void 0;
|
|
4
4
|
const index_js_1 = require("../errors/index.js");
|
|
5
5
|
class PopupCommunicator {
|
|
6
|
-
constructor(url) {
|
|
6
|
+
constructor(url, options) {
|
|
7
7
|
Object.defineProperty(this, "url", {
|
|
8
8
|
enumerable: true,
|
|
9
9
|
configurable: true,
|
|
@@ -22,6 +22,24 @@ class PopupCommunicator {
|
|
|
22
22
|
writable: true,
|
|
23
23
|
value: new Map()
|
|
24
24
|
});
|
|
25
|
+
Object.defineProperty(this, "width", {
|
|
26
|
+
enumerable: true,
|
|
27
|
+
configurable: true,
|
|
28
|
+
writable: true,
|
|
29
|
+
value: void 0
|
|
30
|
+
});
|
|
31
|
+
Object.defineProperty(this, "height", {
|
|
32
|
+
enumerable: true,
|
|
33
|
+
configurable: true,
|
|
34
|
+
writable: true,
|
|
35
|
+
value: void 0
|
|
36
|
+
});
|
|
37
|
+
Object.defineProperty(this, "calculatePosition", {
|
|
38
|
+
enumerable: true,
|
|
39
|
+
configurable: true,
|
|
40
|
+
writable: true,
|
|
41
|
+
value: void 0
|
|
42
|
+
});
|
|
25
43
|
Object.defineProperty(this, "postMessage", {
|
|
26
44
|
enumerable: true,
|
|
27
45
|
configurable: true,
|
|
@@ -88,12 +106,16 @@ class PopupCommunicator {
|
|
|
88
106
|
configurable: true,
|
|
89
107
|
writable: true,
|
|
90
108
|
value: () => {
|
|
91
|
-
const width =
|
|
92
|
-
const height =
|
|
109
|
+
const width = this.width;
|
|
110
|
+
const height = this.height;
|
|
93
111
|
const url = new URL(this.url.toString());
|
|
94
112
|
url.searchParams.set("origin", window.location.origin);
|
|
95
|
-
const left
|
|
96
|
-
|
|
113
|
+
const { left, top } = this.calculatePosition
|
|
114
|
+
? this.calculatePosition(width, height)
|
|
115
|
+
: {
|
|
116
|
+
left: (window.innerWidth - width) / 2 + window.screenX,
|
|
117
|
+
top: (window.innerHeight - height) / 2 + window.screenY,
|
|
118
|
+
};
|
|
97
119
|
const popup = window.open(url, "ZKsync SSO", `width=${width}, height=${height}, left=${left}, top=${top}`);
|
|
98
120
|
if (!popup) {
|
|
99
121
|
throw index_js_1.standardErrors.rpc.internal("Pop up window failed to open");
|
|
@@ -132,6 +154,9 @@ class PopupCommunicator {
|
|
|
132
154
|
}
|
|
133
155
|
});
|
|
134
156
|
this.url = new URL(url);
|
|
157
|
+
this.width = options?.width ?? 420;
|
|
158
|
+
this.height = options?.height ?? 600;
|
|
159
|
+
this.calculatePosition = options?.calculatePosition;
|
|
135
160
|
}
|
|
136
161
|
}
|
|
137
162
|
exports.PopupCommunicator = PopupCommunicator;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PopupCommunicator.js","sourceRoot":"","sources":["../../../src/communicator/PopupCommunicator.ts"],"names":[],"mappings":";;;AAAA,iDAAoD;
|
|
1
|
+
{"version":3,"file":"PopupCommunicator.js","sourceRoot":"","sources":["../../../src/communicator/PopupCommunicator.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/connector/index.ts"],"names":[],"mappings":";;;AAAA,sCAOqB;AAErB,+BAOc;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/connector/index.ts"],"names":[],"mappings":"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"}
|