@arcblock/did-connect-react 3.1.11 → 3.1.12
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/lib/Session/index.js +4 -3
- package/lib/index.js +104 -30
- package/lib/package.json.js +1 -1
- package/package.json +8 -8
- package/src/Session/index.jsx +4 -3
- package/src/index.js +20 -31
package/lib/Session/index.js
CHANGED
|
@@ -30,7 +30,7 @@ import ei from "lodash/noop";
|
|
|
30
30
|
import oi from "lodash/isNil";
|
|
31
31
|
import { useState as ii } from "react";
|
|
32
32
|
import ve from "../Storage/index.js";
|
|
33
|
-
import {
|
|
33
|
+
import { formatCacheTtl as ti, getBrowserLang as ri, debug as u, decodeUrlParams as xe, sleep as L, updateConnectedInfo as Z, getAppId as ee, logger as Le } from "../utils.js";
|
|
34
34
|
import Ee from "./window-focus-aware.js";
|
|
35
35
|
import { OAuthContext as ni, OAuthConsumer as si, OAuthProvider as Oe, useOAuth as ci } from "../OAuth/context.js";
|
|
36
36
|
import { PasskeyContext as ai, PasskeyConsumer as li, PasskeyProvider as _e, usePasskey as di } from "../Passkey/context.js";
|
|
@@ -118,7 +118,7 @@ function Me(q = Fe, X = "ls", oe = {}, k = {}) {
|
|
|
118
118
|
baseUrl: "",
|
|
119
119
|
unReadCount: 0
|
|
120
120
|
// 不可以直接个性 props.autoConnect (readonly)
|
|
121
|
-
}), b = ye(() => r.locale || s.currentLocale ||
|
|
121
|
+
}), b = ye(() => r.locale || s.currentLocale || ri(), [r.locale, s.currentLocale]), { confirmApi: $e, confirmHolder: qe } = qo(), _ = f(() => {
|
|
122
122
|
if (t.open && !T.arcSphere) {
|
|
123
123
|
const e = Be[b] || Be.en;
|
|
124
124
|
throw ce.warning(e), new Error(e);
|
|
@@ -860,7 +860,7 @@ function Et({ storageEngine: q = "cookie" } = {}) {
|
|
|
860
860
|
let v = "/", O = 1;
|
|
861
861
|
if (typeof window < "u") {
|
|
862
862
|
const Q = window.env || {}, H = window.blocklet || {};
|
|
863
|
-
v = Q.groupPathPrefix || H.groupPrefix || H.prefix || "", v = v.replace(/\/+$/, ""), v = v || "/", H.serverVersion && (O =
|
|
863
|
+
v = Q.groupPathPrefix || H.groupPrefix || H.prefix || "", v = v.replace(/\/+$/, ""), v = v || "/", H.serverVersion && (O = ti(window.blocklet?.settings?.session?.cacheTtl, 1 / 24));
|
|
864
864
|
}
|
|
865
865
|
return Me(
|
|
866
866
|
X,
|
|
@@ -886,6 +886,7 @@ export {
|
|
|
886
886
|
ze as SessionContext,
|
|
887
887
|
ki as checkEnableAutoLogin,
|
|
888
888
|
Et as createAuthServiceSessionContext,
|
|
889
|
+
Me as createSessionContext,
|
|
889
890
|
Me as default,
|
|
890
891
|
Re as didSpacesIsRequired,
|
|
891
892
|
Ci as getMobileVisitorId,
|
package/lib/index.js
CHANGED
|
@@ -1,33 +1,107 @@
|
|
|
1
|
-
import { default as t } from "
|
|
2
|
-
import { default as
|
|
3
|
-
import { default as
|
|
4
|
-
import {
|
|
5
|
-
import {
|
|
6
|
-
import {
|
|
7
|
-
import {
|
|
8
|
-
import { default as
|
|
9
|
-
import { default as
|
|
10
|
-
import {
|
|
11
|
-
import {
|
|
12
|
-
import {
|
|
1
|
+
import { default as t, default as r, default as s } from "./Connect/index.js";
|
|
2
|
+
import { default as n, default as d } from "./Button/index.js";
|
|
3
|
+
import { default as E, default as p } from "@arcblock/ux/lib/DIDLogo";
|
|
4
|
+
import { createSessionContext as x, createAuthServiceSessionContext as _, createSessionContext as A } from "./Session/index.js";
|
|
5
|
+
import { OAuthConsumer as C, OAuthContext as i, OAuthProvider as I, useOAuth as l } from "./OAuth/context.js";
|
|
6
|
+
import { PasskeyConsumer as c, PasskeyContext as S, PasskeyProvider as D, usePasskey as O } from "./Passkey/context.js";
|
|
7
|
+
import { default as L } from "./Passkey/actions.js";
|
|
8
|
+
import { default as N } from "./User/use-did.js";
|
|
9
|
+
import { default as F } from "./User/wrap-did.js";
|
|
10
|
+
import { FederatedConsumer as M, FederatedContext as K, FederatedProvider as y, useFederatedContext as h } from "./Federated/context.js";
|
|
11
|
+
import { API_DID_PREFIX as V, BLOCKLET_SERVICE_PATH_PREFIX as v, BUSY_STATUS as B, CHECK_INTERVAL_TIME as W, CHECK_STATUS_INTERVAL as H, DEFAULT_NAME as Y, DEFAULT_TIMEOUT as b, DEFAULT_WINDOW_TIMEOUT as G, DID_CONNECT_URL_PARAMS_NAME as X, DID_SPACES_BASE_URL as w, EXT_DOWNLOAD_URL as q, LANG_COOKIE_NAME as j, REFRESH_TOKEN_STORAGE_KEY as z, RELAY_SOCKET_PREFIX as J, SESSION_TOKEN_STORAGE_KEY as Q, VERIFY_CODE_LENGTH as Z } from "./constant.js";
|
|
12
|
+
import { createAxios as ee, debug as oe, decodeConnectUrl as te, decodeKey as re, decodeUrlParams as se, decrypt as ae, encodeConnectUrl as ne, encodeKey as de, encrypt as fe, formatCacheTtl as Ee, getApiErrorMessage as pe, getAppId as ue, getBrowserLang as xe, getConnectedInfo as _e, getWebAuthnErrorMessage as Ae, logger as me, openPopup as Ce, parseNextWorkflow as ie, parseTokenFromConnectUrl as Ie, runPopup as le, sleep as Te, updateConnectedInfo as ce, version as Se } from "./utils.js";
|
|
13
|
+
import { NotOpenError as Oe } from "./error.js";
|
|
14
|
+
import { default as Le } from "@arcblock/ux/lib/SessionManager";
|
|
15
|
+
import { default as Ne } from "@arcblock/ux/lib/Address";
|
|
16
|
+
import { default as Fe } from "@arcblock/ux/lib/Avatar";
|
|
17
|
+
import { default as Me } from "./Connect/use-connect.js";
|
|
18
|
+
import { EVENTS as ye } from "./Session/libs/constants.js";
|
|
19
|
+
import { didSpacesIsRequired as ke } from "./Session/libs/did-spaces.js";
|
|
20
|
+
import { loginFederatedMaster as ve, mountFederatedIframe as Be } from "./Session/libs/federated.js";
|
|
21
|
+
import { translations as He } from "./Session/libs/locales.js";
|
|
22
|
+
import { checkEnableAutoLogin as be, getMobileVisitorId as Ge, login as Xe } from "./Session/libs/login-mobile.js";
|
|
23
|
+
import { SessionContext as qe } from "./Session/context.js";
|
|
24
|
+
export * from "@arcblock/ux/lib/Util/wallet";
|
|
25
|
+
import { getVisitorId as Je, setVisitorId as Qe } from "@arcblock/ux/lib/Util";
|
|
13
26
|
export {
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
n as
|
|
20
|
-
|
|
27
|
+
V as API_DID_PREFIX,
|
|
28
|
+
Ne as Address,
|
|
29
|
+
Fe as Avatar,
|
|
30
|
+
v as BLOCKLET_SERVICE_PATH_PREFIX,
|
|
31
|
+
B as BUSY_STATUS,
|
|
32
|
+
n as Button,
|
|
33
|
+
W as CHECK_INTERVAL_TIME,
|
|
34
|
+
H as CHECK_STATUS_INTERVAL,
|
|
35
|
+
t as Connect,
|
|
36
|
+
Y as DEFAULT_NAME,
|
|
37
|
+
b as DEFAULT_TIMEOUT,
|
|
38
|
+
G as DEFAULT_WINDOW_TIMEOUT,
|
|
39
|
+
d as DIDButton,
|
|
40
|
+
r as DIDConnect,
|
|
41
|
+
E as DIDLogo,
|
|
42
|
+
X as DID_CONNECT_URL_PARAMS_NAME,
|
|
43
|
+
w as DID_SPACES_BASE_URL,
|
|
44
|
+
s as DidConnect,
|
|
45
|
+
ye as EVENTS,
|
|
46
|
+
q as EXT_DOWNLOAD_URL,
|
|
47
|
+
M as FederatedConsumer,
|
|
48
|
+
K as FederatedContext,
|
|
49
|
+
y as FederatedProvider,
|
|
50
|
+
j as LANG_COOKIE_NAME,
|
|
51
|
+
p as Logo,
|
|
52
|
+
Oe as NotOpenError,
|
|
53
|
+
C as OAuthConsumer,
|
|
21
54
|
i as OAuthContext,
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
55
|
+
I as OAuthProvider,
|
|
56
|
+
L as PasskeyActions,
|
|
57
|
+
c as PasskeyConsumer,
|
|
58
|
+
S as PasskeyContext,
|
|
59
|
+
D as PasskeyProvider,
|
|
60
|
+
z as REFRESH_TOKEN_STORAGE_KEY,
|
|
61
|
+
J as RELAY_SOCKET_PREFIX,
|
|
62
|
+
Q as SESSION_TOKEN_STORAGE_KEY,
|
|
63
|
+
x as Session,
|
|
64
|
+
qe as SessionContext,
|
|
65
|
+
Le as SessionManager,
|
|
66
|
+
Z as VERIFY_CODE_LENGTH,
|
|
67
|
+
F as WrapDid,
|
|
68
|
+
be as checkEnableAutoLogin,
|
|
69
|
+
_ as createAuthServiceSessionContext,
|
|
70
|
+
ee as createAxios,
|
|
71
|
+
A as createSessionContext,
|
|
72
|
+
oe as debug,
|
|
73
|
+
te as decodeConnectUrl,
|
|
74
|
+
re as decodeKey,
|
|
75
|
+
se as decodeUrlParams,
|
|
76
|
+
ae as decrypt,
|
|
77
|
+
ke as didSpacesIsRequired,
|
|
78
|
+
ne as encodeConnectUrl,
|
|
79
|
+
de as encodeKey,
|
|
80
|
+
fe as encrypt,
|
|
81
|
+
Ee as formatCacheTtl,
|
|
82
|
+
pe as getApiErrorMessage,
|
|
83
|
+
ue as getAppId,
|
|
84
|
+
xe as getBrowserLang,
|
|
85
|
+
_e as getConnectedInfo,
|
|
86
|
+
Ge as getMobileVisitorId,
|
|
87
|
+
Je as getVisitorId,
|
|
88
|
+
Ae as getWebAuthnErrorMessage,
|
|
89
|
+
me as logger,
|
|
90
|
+
Xe as login,
|
|
91
|
+
ve as loginFederatedMaster,
|
|
92
|
+
Be as mountFederatedIframe,
|
|
93
|
+
Ce as openPopup,
|
|
94
|
+
ie as parseNextWorkflow,
|
|
95
|
+
Ie as parseTokenFromConnectUrl,
|
|
96
|
+
le as runPopup,
|
|
97
|
+
Qe as setVisitorId,
|
|
98
|
+
Te as sleep,
|
|
99
|
+
He as translations,
|
|
100
|
+
ce as updateConnectedInfo,
|
|
101
|
+
Me as useConnect,
|
|
102
|
+
N as useDid,
|
|
103
|
+
h as useFederatedContext,
|
|
104
|
+
l as useOAuth,
|
|
105
|
+
O as usePasskey,
|
|
106
|
+
Se as version
|
|
33
107
|
};
|
package/lib/package.json.js
CHANGED
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@arcblock/did-connect-react",
|
|
3
|
-
"version": "3.1.
|
|
3
|
+
"version": "3.1.12",
|
|
4
4
|
"description": "Client side library to work with DID Connect by ArcBlock.",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"react",
|
|
@@ -32,16 +32,16 @@
|
|
|
32
32
|
"url": "https://github.com/ArcBlock/ux/issues"
|
|
33
33
|
},
|
|
34
34
|
"dependencies": {
|
|
35
|
-
"@arcblock/bridge": "3.1.
|
|
36
|
-
"@arcblock/did": "^1.21.
|
|
37
|
-
"@arcblock/icons": "3.1.
|
|
38
|
-
"@arcblock/react-hooks": "3.1.
|
|
39
|
-
"@arcblock/ws": "^1.21.
|
|
35
|
+
"@arcblock/bridge": "3.1.12",
|
|
36
|
+
"@arcblock/did": "^1.21.3",
|
|
37
|
+
"@arcblock/icons": "3.1.12",
|
|
38
|
+
"@arcblock/react-hooks": "3.1.12",
|
|
39
|
+
"@arcblock/ws": "^1.21.3",
|
|
40
40
|
"@fontsource/lexend": "^5.2.9",
|
|
41
41
|
"@iconify-icons/logos": "^1.2.36",
|
|
42
42
|
"@iconify-icons/material-symbols": "^1.2.58",
|
|
43
43
|
"@iconify/react": "^5.2.1",
|
|
44
|
-
"@ocap/util": "^1.21.
|
|
44
|
+
"@ocap/util": "^1.21.3",
|
|
45
45
|
"@simplewebauthn/browser": "^13.1.0",
|
|
46
46
|
"ahooks": "^3.8.5",
|
|
47
47
|
"axios": "^1.10.0",
|
|
@@ -80,5 +80,5 @@
|
|
|
80
80
|
"eslint-plugin-react-hooks": "^4.6.2",
|
|
81
81
|
"jest": "^29.7.0"
|
|
82
82
|
},
|
|
83
|
-
"gitHead": "
|
|
83
|
+
"gitHead": "0cb1a641693d3f3c1ac105d8117365f289d9e5c2"
|
|
84
84
|
}
|
package/src/Session/index.jsx
CHANGED
|
@@ -85,7 +85,7 @@ const waitForDidConnect = {
|
|
|
85
85
|
zh: 'DID Connect 已打开,请等待完成',
|
|
86
86
|
};
|
|
87
87
|
|
|
88
|
-
|
|
88
|
+
function createSessionContext(
|
|
89
89
|
storageKey = SESSION_TOKEN_STORAGE_KEY,
|
|
90
90
|
storageEngine = 'ls',
|
|
91
91
|
storageOptions = {},
|
|
@@ -1624,7 +1624,7 @@ export default function createSessionContext(
|
|
|
1624
1624
|
};
|
|
1625
1625
|
}
|
|
1626
1626
|
|
|
1627
|
-
|
|
1627
|
+
function createAuthServiceSessionContext({ storageEngine = 'cookie' } = {}) {
|
|
1628
1628
|
const storageKey = SESSION_TOKEN_STORAGE_KEY;
|
|
1629
1629
|
const refreshTokenStorageKey = REFRESH_TOKEN_STORAGE_KEY;
|
|
1630
1630
|
|
|
@@ -1684,4 +1684,5 @@ export function createAuthServiceSessionContext({ storageEngine = 'cookie' } = {
|
|
|
1684
1684
|
throw new Error('storageEngine must be cookie or localStorage');
|
|
1685
1685
|
}
|
|
1686
1686
|
|
|
1687
|
-
export { SessionContext };
|
|
1687
|
+
export { SessionContext, createSessionContext, createAuthServiceSessionContext };
|
|
1688
|
+
export default createSessionContext;
|
package/src/index.js
CHANGED
|
@@ -1,43 +1,32 @@
|
|
|
1
|
-
import Address from './Address';
|
|
2
|
-
import Avatar from './Avatar';
|
|
3
|
-
import Button from './Button';
|
|
4
1
|
import DidConnect from './Connect';
|
|
2
|
+
import Button from './Button';
|
|
5
3
|
import Logo from './Logo';
|
|
6
|
-
import { OAuthContext, OAuthConsumer, OAuthProvider, useOAuth } from './OAuth';
|
|
7
|
-
import { PasskeyContext, PasskeyConsumer, PasskeyProvider, usePasskey, PasskeyActions } from './Passkey';
|
|
8
4
|
import Session from './Session';
|
|
9
|
-
import SessionManager from './SessionManager';
|
|
10
|
-
import { useDid, WrapDid } from './User';
|
|
11
5
|
|
|
12
|
-
export
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
6
|
+
export * from './OAuth';
|
|
7
|
+
export * from './Passkey';
|
|
8
|
+
export * from './Session';
|
|
9
|
+
export * from './User';
|
|
10
|
+
export * from './Federated';
|
|
11
|
+
export * from './constant';
|
|
12
|
+
export * from './utils';
|
|
13
|
+
export * from './error';
|
|
14
|
+
|
|
15
|
+
export { default as SessionManager } from './SessionManager';
|
|
16
|
+
export { default as Address } from './Address';
|
|
17
|
+
export { default as Avatar } from './Avatar';
|
|
18
|
+
export { default as useConnect } from './Connect/use-connect';
|
|
17
19
|
|
|
20
|
+
export {
|
|
18
21
|
// DID Connect
|
|
19
22
|
DidConnect,
|
|
20
23
|
DidConnect as Connect,
|
|
24
|
+
DidConnect as DIDConnect,
|
|
21
25
|
Logo,
|
|
26
|
+
Logo as DIDLogo,
|
|
27
|
+
Button,
|
|
28
|
+
Button as DIDButton,
|
|
22
29
|
|
|
23
|
-
//
|
|
30
|
+
// DEPRECATED
|
|
24
31
|
Session,
|
|
25
|
-
SessionManager,
|
|
26
|
-
|
|
27
|
-
// OAuth Features
|
|
28
|
-
OAuthContext,
|
|
29
|
-
OAuthConsumer,
|
|
30
|
-
OAuthProvider,
|
|
31
|
-
useOAuth,
|
|
32
|
-
|
|
33
|
-
// Passkey Features
|
|
34
|
-
PasskeyContext,
|
|
35
|
-
PasskeyConsumer,
|
|
36
|
-
PasskeyProvider,
|
|
37
|
-
usePasskey,
|
|
38
|
-
PasskeyActions,
|
|
39
|
-
|
|
40
|
-
// User Management
|
|
41
|
-
useDid,
|
|
42
|
-
WrapDid,
|
|
43
32
|
};
|