@reown/appkit-siwe 1.5.0 → 1.5.1
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.
|
@@ -1,11 +1,20 @@
|
|
|
1
1
|
import { ChainController, CoreHelperUtil } from '@reown/appkit-core';
|
|
2
2
|
import { NetworkUtil } from '@reown/appkit-common';
|
|
3
3
|
export function mapToSIWX(siwe) {
|
|
4
|
+
async function getSession() {
|
|
5
|
+
try {
|
|
6
|
+
return await siwe.methods.getSession();
|
|
7
|
+
}
|
|
8
|
+
catch (error) {
|
|
9
|
+
console.warn('AppKit:SIWE:getSession - error:', error);
|
|
10
|
+
return undefined;
|
|
11
|
+
}
|
|
12
|
+
}
|
|
4
13
|
ChainController.subscribeKey('activeCaipNetwork', async (activeCaipNetwork) => {
|
|
5
14
|
if (!siwe.options.signOutOnNetworkChange) {
|
|
6
15
|
return;
|
|
7
16
|
}
|
|
8
|
-
const session = await
|
|
17
|
+
const session = await getSession();
|
|
9
18
|
const isDiffernetNetwork = session &&
|
|
10
19
|
session.chainId !== NetworkUtil.caipNetworkIdToNumber(activeCaipNetwork?.caipNetworkId);
|
|
11
20
|
if (isDiffernetNetwork) {
|
|
@@ -16,7 +25,7 @@ export function mapToSIWX(siwe) {
|
|
|
16
25
|
if (!siwe.options.signOutOnAccountChange) {
|
|
17
26
|
return;
|
|
18
27
|
}
|
|
19
|
-
const session = await
|
|
28
|
+
const session = await getSession();
|
|
20
29
|
const isDifferentAddress = session && session.address !== CoreHelperUtil.getPlainAddress(activeCaipAddress);
|
|
21
30
|
if (isDifferentAddress) {
|
|
22
31
|
await siwe.methods.signOut();
|
|
@@ -69,15 +78,22 @@ export function mapToSIWX(siwe) {
|
|
|
69
78
|
throw new Error('Failed to add session');
|
|
70
79
|
},
|
|
71
80
|
async revokeSession(_chainId, _address) {
|
|
72
|
-
|
|
81
|
+
try {
|
|
82
|
+
await siwe.methods.signOut();
|
|
73
83
|
siwe.methods.onSignOut?.();
|
|
74
|
-
return Promise.resolve();
|
|
75
84
|
}
|
|
76
|
-
|
|
85
|
+
catch (error) {
|
|
86
|
+
console.warn('AppKit:SIWE:revokeSession - signOut error', error);
|
|
87
|
+
}
|
|
77
88
|
},
|
|
78
89
|
async setSessions(sessions) {
|
|
79
90
|
if (sessions.length === 0) {
|
|
80
|
-
|
|
91
|
+
try {
|
|
92
|
+
await siwe.methods.signOut();
|
|
93
|
+
}
|
|
94
|
+
catch (error) {
|
|
95
|
+
console.warn('AppKit:SIWE:setSessions - signOut error', error);
|
|
96
|
+
}
|
|
81
97
|
}
|
|
82
98
|
else {
|
|
83
99
|
const addingSessions = sessions.map(session => this.addSession(session));
|
|
@@ -98,7 +114,7 @@ export function mapToSIWX(siwe) {
|
|
|
98
114
|
}
|
|
99
115
|
];
|
|
100
116
|
}
|
|
101
|
-
const siweSession = await
|
|
117
|
+
const siweSession = await getSession();
|
|
102
118
|
const siweCaipNetworkId = `eip155:${siweSession?.chainId}`;
|
|
103
119
|
if (!siweSession || siweSession.address !== address || siweCaipNetworkId !== chainId) {
|
|
104
120
|
return [];
|
|
@@ -114,7 +130,7 @@ export function mapToSIWX(siwe) {
|
|
|
114
130
|
return [session];
|
|
115
131
|
}
|
|
116
132
|
catch (error) {
|
|
117
|
-
console.
|
|
133
|
+
console.warn('AppKit:SIWE:getSessions - error:', error);
|
|
118
134
|
return [];
|
|
119
135
|
}
|
|
120
136
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mapToSIWX.js","sourceRoot":"","sources":["../../../src/mapToSIWX.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,eAAe,EACf,cAAc,EAIf,MAAM,oBAAoB,CAAA;AAE3B,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAA;AAElD,MAAM,UAAU,SAAS,CAAC,IAAsB;IAC9C,eAAe,CAAC,YAAY,CAAC,mBAAmB,EAAE,KAAK,EAAC,iBAAiB,EAAC,EAAE;QAC1E,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,sBAAsB,EAAE,CAAC;YACzC,OAAM;QACR,CAAC;QAED,MAAM,OAAO,GAAG,MAAM,
|
|
1
|
+
{"version":3,"file":"mapToSIWX.js","sourceRoot":"","sources":["../../../src/mapToSIWX.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,eAAe,EACf,cAAc,EAIf,MAAM,oBAAoB,CAAA;AAE3B,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAA;AAElD,MAAM,UAAU,SAAS,CAAC,IAAsB;IAC9C,KAAK,UAAU,UAAU;QACvB,IAAI,CAAC;YACH,OAAO,MAAM,IAAI,CAAC,OAAO,CAAC,UAAU,EAAE,CAAA;QACxC,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,OAAO,CAAC,IAAI,CAAC,iCAAiC,EAAE,KAAK,CAAC,CAAA;YAEtD,OAAO,SAAS,CAAA;QAClB,CAAC;IACH,CAAC;IAED,eAAe,CAAC,YAAY,CAAC,mBAAmB,EAAE,KAAK,EAAC,iBAAiB,EAAC,EAAE;QAC1E,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,sBAAsB,EAAE,CAAC;YACzC,OAAM;QACR,CAAC;QAED,MAAM,OAAO,GAAG,MAAM,UAAU,EAAE,CAAA;QAClC,MAAM,kBAAkB,GACtB,OAAO;YACP,OAAO,CAAC,OAAO,KAAK,WAAW,CAAC,qBAAqB,CAAC,iBAAiB,EAAE,aAAa,CAAC,CAAA;QAEzF,IAAI,kBAAkB,EAAE,CAAC;YACvB,MAAM,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,CAAA;QAC9B,CAAC;IACH,CAAC,CAAC,CAAA;IAEF,eAAe,CAAC,YAAY,CAAC,mBAAmB,EAAE,KAAK,EAAC,iBAAiB,EAAC,EAAE;QAC1E,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,sBAAsB,EAAE,CAAC;YACzC,OAAM;QACR,CAAC;QAED,MAAM,OAAO,GAAG,MAAM,UAAU,EAAE,CAAA;QAClC,MAAM,kBAAkB,GACtB,OAAO,IAAI,OAAO,CAAC,OAAO,KAAK,cAAc,CAAC,eAAe,CAAC,iBAAiB,CAAC,CAAA;QAElF,IAAI,kBAAkB,EAAE,CAAC;YACvB,MAAM,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,CAAA;QAC9B,CAAC;IACH,CAAC,CAAC,CAAA;IAEF,OAAO;QACL,KAAK,CAAC,aAAa,CAAC,KAAK;YACvB,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,gBAAgB,EAAE,EAAE,CAAA;YAEtD,IAAI,CAAC,MAAM,EAAE,CAAC;gBACZ,MAAM,IAAI,KAAK,CAAC,+BAA+B,CAAC,CAAA;YAClD,CAAC;YAED,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,CAAA;YACvD,MAAM,QAAQ,GAAG,MAAM,CAAC,GAAG,IAAI,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE,CAAA;YACvD,MAAM,OAAO,GAAG,GAAG,CAAA;YAEnB,OAAO;gBACL,KAAK;gBACL,OAAO;gBACP,SAAS,EAAE,MAAM,CAAC,SAAS;gBAC3B,cAAc,EAAE,KAAK,CAAC,cAAc;gBACpC,OAAO,EAAE,KAAK,CAAC,OAAO;gBACtB,MAAM,EAAE,MAAM,CAAC,MAAM;gBACrB,GAAG,EAAE,MAAM,CAAC,GAAG;gBACf,SAAS,EAAE,MAAM,CAAC,GAAG;gBACrB,SAAS,EAAE,MAAM,CAAC,SAAS;gBAC3B,SAAS,EAAE,MAAM,CAAC,SAAS;gBAC3B,cAAc,EAAE,MAAM,CAAC,GAAG;gBAC1B,QAAQ;gBACR,QAAQ,EAAE,GAAG,EAAE,CACb,IAAI,CAAC,aAAa,CAAC;oBACjB,GAAG,MAAM;oBACT,OAAO,EAAE,WAAW,CAAC,qBAAqB,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC;oBAC9D,OAAO,EAAE,WAAW,KAAK,CAAC,OAAO,IAAI,KAAK,CAAC,cAAc,EAAE;oBAC3D,KAAK;oBACL,OAAO;oBACP,GAAG,EAAE,QAAQ;iBACd,CAAC;aACL,CAAA;QACH,CAAC;QAED,KAAK,CAAC,UAAU,CAAC,OAAO;YACtB,MAAM,OAAO,GAAG,WAAW,CAAC,eAAe,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;YAEjE,IAAI,CAAC,OAAO,EAAE,CAAC;gBAEb,OAAO,OAAO,CAAC,OAAO,EAAE,CAAA;YAC1B,CAAC;YAED,IAAI,MAAM,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,OAAO,CAAC,EAAE,CAAC;gBAC9C,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC;oBACtB,OAAO,EAAE,OAAO,CAAC,IAAI,CAAC,cAAc;oBACpC,OAAO,EAAE,WAAW,CAAC,eAAe,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAW;iBACrE,CAAC,CAAA;gBAEF,OAAO,OAAO,CAAC,OAAO,EAAE,CAAA;YAC1B,CAAC;YAED,MAAM,IAAI,KAAK,CAAC,uBAAuB,CAAC,CAAA;QAC1C,CAAC;QAED,KAAK,CAAC,aAAa,CAAC,QAAQ,EAAE,QAAQ;YACpC,IAAI,CAAC;gBACH,MAAM,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,CAAA;gBAC5B,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,CAAA;YAC5B,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBACf,OAAO,CAAC,IAAI,CAAC,2CAA2C,EAAE,KAAK,CAAC,CAAA;YAClE,CAAC;QACH,CAAC;QAED,KAAK,CAAC,WAAW,CAAC,QAAQ;YACxB,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBAC1B,IAAI,CAAC;oBACH,MAAM,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,CAAA;gBAC9B,CAAC;gBAAC,OAAO,KAAK,EAAE,CAAC;oBACf,OAAO,CAAC,IAAI,CAAC,yCAAyC,EAAE,KAAK,CAAC,CAAA;gBAChE,CAAC;YACH,CAAC;iBAAM,CAAC;gBACN,MAAM,cAAc,GAAG,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAA;gBACxE,MAAM,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,CAAA;YACnC,CAAC;QACH,CAAC;QAED,KAAK,CAAC,WAAW,CAAC,OAAO,EAAE,OAAO;YAChC,IAAI,CAAC;gBACH,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,SAAS,CAAC,EAAE,CAAC;oBAEnC,OAAO;wBACL;4BACE,IAAI,EAAE;gCACJ,cAAc,EAAE,OAAO;gCACvB,OAAO;6BACR;4BACD,OAAO,EAAE,EAAE;4BACX,SAAS,EAAE,EAAE;yBACC;qBACjB,CAAA;gBACH,CAAC;gBAED,MAAM,WAAW,GAAG,MAAM,UAAU,EAAE,CAAA;gBAEtC,MAAM,iBAAiB,GAAG,UAAU,WAAW,EAAE,OAAO,EAAE,CAAA;gBAC1D,IAAI,CAAC,WAAW,IAAI,WAAW,CAAC,OAAO,KAAK,OAAO,IAAI,iBAAiB,KAAK,OAAO,EAAE,CAAC;oBACrF,OAAO,EAAE,CAAA;gBACX,CAAC;gBAED,MAAM,OAAO,GAAgB;oBAC3B,IAAI,EAAE;wBACJ,cAAc,EAAE,WAAW,CAAC,OAAO;wBACnC,OAAO,EAAE,iBAAiB;qBACP;oBACrB,OAAO,EAAE,EAAE;oBACX,SAAS,EAAE,EAAE;iBACd,CAAA;gBAED,OAAO,CAAC,OAAO,CAAC,CAAA;YAClB,CAAC;YAAC,OAAO,KAAK,EAAE,CAAC;gBAEf,OAAO,CAAC,IAAI,CAAC,kCAAkC,EAAE,KAAK,CAAC,CAAA;gBAEvD,OAAO,EAAE,CAAA;YACX,CAAC;QACH,CAAC;KACF,CAAA;AACH,CAAC"}
|