@arcblock/did-connect-service 4.1.62 → 4.1.63
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.
|
@@ -72,6 +72,15 @@ export declare const OAUTH_CALLBACK_COPY: {
|
|
|
72
72
|
};
|
|
73
73
|
};
|
|
74
74
|
export declare function oauthCallbackCopy(locale?: string): OAuthCallbackCopy;
|
|
75
|
+
/**
|
|
76
|
+
* `window.name` of the popup `LoginPage` / connect-bridge open for OAuth.
|
|
77
|
+
* The callback postMessages and closes only that window. A bookmarklet clip
|
|
78
|
+
* window is also `window.open`'d (name `aside-clip`) and its `window.opener`
|
|
79
|
+
* is the third-party page. Treating every opener as the login host posts the
|
|
80
|
+
* code at the article, then `window.close()` destroys the clip window before
|
|
81
|
+
* the exchange fallback can send the user back to `returnUrl` (aside#80).
|
|
82
|
+
*/
|
|
83
|
+
export declare const OAUTH_POPUP_WINDOW_NAME = "oauth-login:popup";
|
|
75
84
|
export declare function renderOAuthCallbackPage(origin: string, params?: {
|
|
76
85
|
code?: string | null;
|
|
77
86
|
state?: string | null;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oauth-callback-page.d.ts","sourceRoot":"","sources":["../../src/pages/oauth-callback-page.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAIH,KAAK,iBAAiB,GAAG;IACvB,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,MAAM,CAAC;IACrB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,YAAY,EAAE,MAAM,CAAC;IACrB,gBAAgB,EAAE,MAAM,CAAC;IACzB,aAAa,EAAE,MAAM,CAAC;IACtB,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,EAAE,MAAM,CAAC;CACtB,CAAC;AAEF,eAAO,MAAM,mBAAmB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAiD+B,CAAC;AAEhE,wBAAgB,iBAAiB,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,iBAAiB,CAEpE;
|
|
1
|
+
{"version":3,"file":"oauth-callback-page.d.ts","sourceRoot":"","sources":["../../src/pages/oauth-callback-page.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAIH,KAAK,iBAAiB,GAAG;IACvB,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,YAAY,EAAE,MAAM,CAAC;IACrB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,YAAY,EAAE,MAAM,CAAC;IACrB,gBAAgB,EAAE,MAAM,CAAC;IACzB,aAAa,EAAE,MAAM,CAAC;IACtB,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE,MAAM,CAAC;IACf,YAAY,EAAE,MAAM,CAAC;CACtB,CAAC;AAEF,eAAO,MAAM,mBAAmB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAiD+B,CAAC;AAEhE,wBAAgB,iBAAiB,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,iBAAiB,CAEpE;AAeD;;;;;;;GAOG;AACH,eAAO,MAAM,uBAAuB,sBAAsB,CAAC;AAQ3D,wBAAgB,uBAAuB,CACrC,MAAM,EAAE,MAAM,EACd,MAAM,CAAC,EAAE;IAAE,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,EACxD,MAAM,CAAC,EAAE,MAAM,GACd,MAAM,CA2ER;AAED;;;GAGG;AACH,wBAAgB,+BAA+B,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,CAcxG;AAED,gFAAgF;AAChF,kGAAkG;AAClG,wBAAgB,4BAA4B,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,EAAE,QAAQ,SAAM,GAAG,MAAM,CA+BnH"}
|
|
@@ -73,6 +73,15 @@ function escapeHtml(s) {
|
|
|
73
73
|
function jsString(value) {
|
|
74
74
|
return escapeForScript(JSON.stringify(value));
|
|
75
75
|
}
|
|
76
|
+
/**
|
|
77
|
+
* `window.name` of the popup `LoginPage` / connect-bridge open for OAuth.
|
|
78
|
+
* The callback postMessages and closes only that window. A bookmarklet clip
|
|
79
|
+
* window is also `window.open`'d (name `aside-clip`) and its `window.opener`
|
|
80
|
+
* is the third-party page. Treating every opener as the login host posts the
|
|
81
|
+
* code at the article, then `window.close()` destroys the clip window before
|
|
82
|
+
* the exchange fallback can send the user back to `returnUrl` (aside#80).
|
|
83
|
+
*/
|
|
84
|
+
export const OAUTH_POPUP_WINDOW_NAME = "oauth-login:popup";
|
|
76
85
|
const CALLBACK_STYLES = "body{margin:0;min-height:100vh;display:flex;align-items:center;justify-content:center;background:#0a0a0b;color:#9394a1;font-family:-apple-system,BlinkMacSystemFont,'Segoe UI',Roboto,sans-serif;font-size:14px}" +
|
|
77
86
|
".wrap{text-align:center;max-width:420px;padding:24px;overflow-wrap:anywhere}a{color:inherit;display:inline-block;padding:12px;margin-top:12px}" +
|
|
78
87
|
"@keyframes spin{to{transform:rotate(360deg)}}" +
|
|
@@ -93,9 +102,12 @@ export function renderOAuthCallbackPage(origin, params, locale) {
|
|
|
93
102
|
var urlParams = new URLSearchParams(location.search);
|
|
94
103
|
var code = urlParams.get('code') || ${embeddedCode};
|
|
95
104
|
var state = urlParams.get('state') || ${embeddedState};
|
|
105
|
+
var oauthPopupName = ${jsString(OAUTH_POPUP_WINDOW_NAME)};
|
|
96
106
|
|
|
97
|
-
|
|
98
|
-
|
|
107
|
+
// postMessage only from the OAuth popup itself. Any other window that
|
|
108
|
+
// landed here (bookmarklet clip window, full-page login) keeps itself
|
|
109
|
+
// open and finishes through the exchange redirect, which honors returnUrl.
|
|
110
|
+
if (code && state && window.name === oauthPopupName && window.opener) {
|
|
99
111
|
// Use server-known origin as safe default; override with state.returnUrl for federation cross-domain
|
|
100
112
|
var targetOrigin = ${escapeForScript(JSON.stringify(origin))};
|
|
101
113
|
try {
|
|
@@ -123,7 +135,8 @@ export function renderOAuthCallbackPage(origin, params, locale) {
|
|
|
123
135
|
}
|
|
124
136
|
|
|
125
137
|
// Server-side code exchange fallback.
|
|
126
|
-
// Used when:
|
|
138
|
+
// Used when: this window is not the OAuth popup (bookmarklet / full-page),
|
|
139
|
+
// opener lost (COOP headers), or WKWebView (window.close no-op).
|
|
127
140
|
var _exchanged = false;
|
|
128
141
|
function doFallbackExchange() {
|
|
129
142
|
if (_exchanged || !code || !state) return;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oauth-callback-page.js","sourceRoot":"","sources":["../../src/pages/oauth-callback-page.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"oauth-callback-page.js","sourceRoot":"","sources":["../../src/pages/oauth-callback-page.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@arcblock/did-connect-service",
|
|
3
|
-
"version": "4.1.
|
|
3
|
+
"version": "4.1.63",
|
|
4
4
|
"description": "Multi-runtime authentication service framework — Passkey, DID Connect, OAuth, Email, Team, RBAC",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "./dist/index.js",
|
|
@@ -61,8 +61,8 @@
|
|
|
61
61
|
"sharp": "^0.35.5",
|
|
62
62
|
"ufo": "^1.6.4",
|
|
63
63
|
"valibot": "^1.4.2",
|
|
64
|
-
"@arcblock/did-connect-core": "^4.1.
|
|
65
|
-
"@arcblock/did-connect-js": "^4.1.
|
|
64
|
+
"@arcblock/did-connect-core": "^4.1.63",
|
|
65
|
+
"@arcblock/did-connect-js": "^4.1.63"
|
|
66
66
|
},
|
|
67
67
|
"optionalDependencies": {
|
|
68
68
|
"@aigne/afs": "^1.11.0-beta.13"
|