@arcblock/did-connect-service 4.0.2 → 4.0.4
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/dist/blocklet-service-client.d.ts +3 -1
- package/dist/blocklet-service-client.d.ts.map +1 -1
- package/dist/blocklet-service-client.js +7 -0
- package/dist/blocklet-service-client.js.map +1 -1
- package/dist/blocklet-service-rpc-types.d.ts +26 -2
- package/dist/blocklet-service-rpc-types.d.ts.map +1 -1
- package/dist/blocklet-service-rpc.d.ts +25 -6
- package/dist/blocklet-service-rpc.d.ts.map +1 -1
- package/dist/blocklet-service-rpc.js +93 -4
- package/dist/blocklet-service-rpc.js.map +1 -1
- package/dist/blocklet-service.d.ts +3 -0
- package/dist/blocklet-service.d.ts.map +1 -1
- package/dist/blocklet-service.js +68 -35
- package/dist/blocklet-service.js.map +1 -1
- package/dist/embedded.d.ts.map +1 -1
- package/dist/embedded.js +7 -1
- package/dist/embedded.js.map +1 -1
- package/dist/index.d.ts +2 -2
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js.map +1 -1
- package/package.json +3 -3
|
@@ -13,7 +13,7 @@
|
|
|
13
13
|
* const members = await scoped.listTeamMembers();
|
|
14
14
|
* const user = await scoped.getUserProfile('z1abc...');
|
|
15
15
|
*/
|
|
16
|
-
import type { BlockletServiceRPCInterface, CallerIdentityDTO, MemberWithUserInfoDTO, StoredUserDTO } from "./blocklet-service-rpc-types.js";
|
|
16
|
+
import type { BlockletServiceRPCInterface, CallerIdentityDTO, InstanceAppIdentityDTO, MemberWithUserInfoDTO, StoredUserDTO } from "./blocklet-service-rpc-types.js";
|
|
17
17
|
/** Extract a named cookie value from a Request. */
|
|
18
18
|
export declare function getCookie(request: Request, name: string): string | null;
|
|
19
19
|
export interface BlockletServiceClientOptions {
|
|
@@ -57,6 +57,8 @@ export declare function createBlockletServiceClient(binding: BlockletServiceRPCI
|
|
|
57
57
|
value: string | null;
|
|
58
58
|
updated_at: string;
|
|
59
59
|
}[]>;
|
|
60
|
+
/** Get the current instance's app signing identity for trusted runtime wiring. */
|
|
61
|
+
getInstanceAppIdentity(overrideInstanceDid?: string): Promise<InstanceAppIdentityDTO>;
|
|
60
62
|
/** Query audit logs for the current instance. */
|
|
61
63
|
getAuditLogs(opts: {
|
|
62
64
|
page: number;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"blocklet-service-client.d.ts","sourceRoot":"","sources":["../src/blocklet-service-client.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,KAAK,EACV,2BAA2B,EAC3B,iBAAiB,EACjB,qBAAqB,EACrB,aAAa,EACd,MAAM,iCAAiC,CAAC;AAEzC,mDAAmD;AACnD,wBAAgB,SAAS,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAKvE;AAED,MAAM,WAAW,4BAA4B;IAC3C,6DAA6D;IAC7D,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,yEAAyE;AACzE,wBAAgB,2BAA2B,CACzC,OAAO,EAAE,2BAA2B,EACpC,OAAO,CAAC,EAAE,4BAA4B;oBAOd,OAAO,GAAG,OAAO,CAAC,iBAAiB,GAAG,IAAI,CAAC;wBAKvC,OAAO,GAAG,OAAO,CAAC,iBAAiB,GAAG,IAAI,CAAC;6BAM1D,OAAO,wBACM,MAAM,GAC3B,OAAO,CAAC,iBAAiB,GAAG,IAAI,CAAC;IAMpC,+EAA+E;0BACzD,OAAO,GAAG,QAAQ;IASxC,+BAA+B;wBACL,MAAM,GAAG,OAAO,CAAC,aAAa,GAAG,IAAI,CAAC;IAIhE,uDAAuD;0BAC3B,MAAM,GAAG,OAAO,CAAC,aAAa,GAAG,IAAI,CAAC;IAIlE,kCAAkC;2BACL,MAAM,UAAU;QAAE,QAAQ,CAAC,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE;IAMnG,qEAAqE;uBAC5C,OAAO,CAAC,qBAAqB,EAAE,CAAC;IAKzD,gEAAgE;2BACnC,MAAM;IAKnC,iDAAiD;2BACpB,MAAM,QAAQ,MAAM,cAAc,MAAM;IAKrE,mCAAmC;8BACH,MAAM,QAAQ,MAAM;IAKpD,sDAAsD;8BACtB,MAAM;IAOtC,oDAAoD;oBAC9B,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAKrD,oDAAoD;oBAC9B,MAAM,SAAS,MAAM;IAK3C,kDAAkD;;;;;;
|
|
1
|
+
{"version":3,"file":"blocklet-service-client.d.ts","sourceRoot":"","sources":["../src/blocklet-service-client.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,KAAK,EACV,2BAA2B,EAC3B,iBAAiB,EACjB,sBAAsB,EACtB,qBAAqB,EACrB,aAAa,EACd,MAAM,iCAAiC,CAAC;AAEzC,mDAAmD;AACnD,wBAAgB,SAAS,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAKvE;AAED,MAAM,WAAW,4BAA4B;IAC3C,6DAA6D;IAC7D,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AAED,yEAAyE;AACzE,wBAAgB,2BAA2B,CACzC,OAAO,EAAE,2BAA2B,EACpC,OAAO,CAAC,EAAE,4BAA4B;oBAOd,OAAO,GAAG,OAAO,CAAC,iBAAiB,GAAG,IAAI,CAAC;wBAKvC,OAAO,GAAG,OAAO,CAAC,iBAAiB,GAAG,IAAI,CAAC;6BAM1D,OAAO,wBACM,MAAM,GAC3B,OAAO,CAAC,iBAAiB,GAAG,IAAI,CAAC;IAMpC,+EAA+E;0BACzD,OAAO,GAAG,QAAQ;IASxC,+BAA+B;wBACL,MAAM,GAAG,OAAO,CAAC,aAAa,GAAG,IAAI,CAAC;IAIhE,uDAAuD;0BAC3B,MAAM,GAAG,OAAO,CAAC,aAAa,GAAG,IAAI,CAAC;IAIlE,kCAAkC;2BACL,MAAM,UAAU;QAAE,QAAQ,CAAC,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE;IAMnG,qEAAqE;uBAC5C,OAAO,CAAC,qBAAqB,EAAE,CAAC;IAKzD,gEAAgE;2BACnC,MAAM;IAKnC,iDAAiD;2BACpB,MAAM,QAAQ,MAAM,cAAc,MAAM;IAKrE,mCAAmC;8BACH,MAAM,QAAQ,MAAM;IAKpD,sDAAsD;8BACtB,MAAM;IAOtC,oDAAoD;oBAC9B,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAKrD,oDAAoD;oBAC9B,MAAM,SAAS,MAAM;IAK3C,kDAAkD;;;;;;IAMlD,kFAAkF;iDAC/B,MAAM,GAAG,OAAO,CAAC,sBAAsB,CAAC;IAQ3F,iDAAiD;uBACxB;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE;;;;IAK5E,iCAAiC;0BACL;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,WAAW,EAAE,MAAM,CAAC;QAAC,SAAS,CAAC,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QAAC,EAAE,CAAC,EAAE,MAAM,CAAA;KAAE;IAMxI,oEAAoE;kBACzD,2BAA2B;EAIzC"}
|
|
@@ -109,6 +109,13 @@ export function createBlockletServiceClient(binding, options) {
|
|
|
109
109
|
throw new Error("instanceDid required: pass it via createBlockletServiceClient options");
|
|
110
110
|
return binding.listSettings(instanceDid);
|
|
111
111
|
},
|
|
112
|
+
/** Get the current instance's app signing identity for trusted runtime wiring. */
|
|
113
|
+
async getInstanceAppIdentity(overrideInstanceDid) {
|
|
114
|
+
const did = overrideInstanceDid ?? instanceDid;
|
|
115
|
+
if (!did)
|
|
116
|
+
throw new Error("instanceDid required: pass it via createBlockletServiceClient options");
|
|
117
|
+
return binding.getInstanceAppIdentity(did);
|
|
118
|
+
},
|
|
112
119
|
// ── Audit ───────────────────────────────────────────────────────
|
|
113
120
|
/** Query audit logs for the current instance. */
|
|
114
121
|
async getAuditLogs(opts) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"blocklet-service-client.js","sourceRoot":"","sources":["../src/blocklet-service-client.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;
|
|
1
|
+
{"version":3,"file":"blocklet-service-client.js","sourceRoot":"","sources":["../src/blocklet-service-client.ts"],"names":[],"mappings":"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"}
|
|
@@ -70,6 +70,20 @@ export interface RegisterAppConfig {
|
|
|
70
70
|
/** If provided, this user will be set as the instance owner (idempotent). */
|
|
71
71
|
ownerDid?: string;
|
|
72
72
|
}
|
|
73
|
+
export interface InstanceAppInfoDTO {
|
|
74
|
+
name?: string;
|
|
75
|
+
description?: string;
|
|
76
|
+
icon?: string;
|
|
77
|
+
link?: string;
|
|
78
|
+
}
|
|
79
|
+
export interface InstanceAppIdentityDTO {
|
|
80
|
+
/** Current app signing key for this instance. */
|
|
81
|
+
appSk: string;
|
|
82
|
+
/** Permanent app signing key, present when the instance has rotated keys. */
|
|
83
|
+
appPsk?: string;
|
|
84
|
+
/** Branding/profile data used by DID Connect prompts. */
|
|
85
|
+
appInfo?: InstanceAppInfoDTO;
|
|
86
|
+
}
|
|
73
87
|
export interface CreateAuditLogInput {
|
|
74
88
|
action: string;
|
|
75
89
|
operatorDid: string;
|
|
@@ -92,8 +106,9 @@ export type BindHostResult = {
|
|
|
92
106
|
export interface BlockletServiceRPCInterface {
|
|
93
107
|
/** Lightweight verify: JWT signature check only. */
|
|
94
108
|
verify(jwt: string): Promise<CallerIdentityDTO | null>;
|
|
95
|
-
/** Full verify: JWT + DB user existence + approval status.
|
|
96
|
-
|
|
109
|
+
/** Full verify: JWT + DB user existence + approval status. Role is resolved
|
|
110
|
+
* membership-aware against `instanceDid` (defaults to the app-wallet instance). */
|
|
111
|
+
verifyFull(jwt: string, instanceDid?: string): Promise<CallerIdentityDTO | null>;
|
|
97
112
|
/** Resolve identity: Access Key or JWT. */
|
|
98
113
|
resolveIdentity(jwt: string | null, authorizationHeader: string | null, instanceDid?: string): Promise<CallerIdentityDTO | null>;
|
|
99
114
|
/** Access policy evaluation (path-based access control). */
|
|
@@ -158,6 +173,15 @@ export interface BlockletServiceRPCInterface {
|
|
|
158
173
|
registerApp(config: RegisterAppConfig): Promise<{
|
|
159
174
|
instanceDid: string;
|
|
160
175
|
}>;
|
|
176
|
+
/**
|
|
177
|
+
* Get the app signing identity for an instance.
|
|
178
|
+
*
|
|
179
|
+
* Trusted runtime consumers use this narrow RPC to wire DID Connect and
|
|
180
|
+
* chain-signing slots without reading raw service settings directly.
|
|
181
|
+
* Runtime integrations may provide an explicit root fallback identity; without
|
|
182
|
+
* that fallback, this throws when the instance has no app:sk configured.
|
|
183
|
+
*/
|
|
184
|
+
getInstanceAppIdentity(instanceDid: string): Promise<InstanceAppIdentityDTO>;
|
|
161
185
|
/** Get the app encryption key for an instance (BLOCKLET_APP_EK). Used by consumers to decrypt AES-encrypted data. */
|
|
162
186
|
getAppEk(instanceDid: string): Promise<string | null>;
|
|
163
187
|
/** Migrate instance_did across all D1 tables (fix ROLE_ACCOUNT → ROLE_APPLICATION). */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"blocklet-service-rpc-types.d.ts","sourceRoot":"","sources":["../src/blocklet-service-rpc-types.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"blocklet-service-rpc-types.d.ts","sourceRoot":"","sources":["../src/blocklet-service-rpc-types.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,20 +6,38 @@
|
|
|
6
6
|
* Cloudflare runtime. The actual WorkerEntrypoint subclass (in blocklet-service.ts)
|
|
7
7
|
* delegates to this class.
|
|
8
8
|
*/
|
|
9
|
-
import type { AuditLogDTO, BindHostResult, CallerIdentityDTO, CreateAuditLogInput, MemberWithUserInfoDTO, RegisterAppConfig, RuleWithPolicyDTO, StoredMembershipDTO, StoredUserDTO } from "./blocklet-service-rpc-types.js";
|
|
9
|
+
import type { AuditLogDTO, BindHostResult, CallerIdentityDTO, CreateAuditLogInput, InstanceAppIdentityDTO, MemberWithUserInfoDTO, RegisterAppConfig, RuleWithPolicyDTO, StoredMembershipDTO, StoredUserDTO } from "./blocklet-service-rpc-types.js";
|
|
10
|
+
export interface BlockletServiceRPCOptions {
|
|
11
|
+
readSession?: boolean;
|
|
12
|
+
fallbackAppIdentity?: InstanceAppIdentityDTO;
|
|
13
|
+
}
|
|
10
14
|
export declare class BlockletServiceRPCImpl {
|
|
11
15
|
private readonly db;
|
|
12
16
|
private readonly jwtSecret;
|
|
13
17
|
private _store?;
|
|
14
18
|
private readonly storeOpts?;
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
19
|
+
private readonly fallbackAppIdentity?;
|
|
20
|
+
/** Lazily-derived app-wallet instance DID (single-instance embedded deploys).
|
|
21
|
+
* `undefined` = not yet computed, `null` = no appSk configured. */
|
|
22
|
+
private _appInstanceDid?;
|
|
23
|
+
constructor(db: D1Database, jwtSecret: string, options?: BlockletServiceRPCOptions);
|
|
18
24
|
private store;
|
|
25
|
+
private buildInstanceAppInfo;
|
|
19
26
|
/** Lightweight verify: JWT signature check only, no D1. */
|
|
20
27
|
verify(jwt: string): Promise<CallerIdentityDTO | null>;
|
|
21
|
-
/**
|
|
22
|
-
|
|
28
|
+
/** App-wallet instance DID, mirroring the auth-handler's `defaultInstanceDid`
|
|
29
|
+
* (`options.instanceDid || appSk address`). Single-instance embedded deploys
|
|
30
|
+
* hang every membership off this DID, so it's the right default target when a
|
|
31
|
+
* caller doesn't pass an explicit `instanceDid`. */
|
|
32
|
+
private appInstanceDid;
|
|
33
|
+
/** Full verify: JWT + DB user existence + approval status.
|
|
34
|
+
*
|
|
35
|
+
* Role is resolved **membership-aware** against `instanceDid` (defaulting to
|
|
36
|
+
* the app-wallet instance), matching `passkey.verifyFull` / `resolveIdentity`
|
|
37
|
+
* and the `/api/did/session` endpoint. Reading only the global `users.role`
|
|
38
|
+
* here is what made the WS-upgrade path report `guest` for an instance owner
|
|
39
|
+
* whose role lives in the `memberships` table, not the `users` row. */
|
|
40
|
+
verifyFull(jwt: string, instanceDid?: string): Promise<CallerIdentityDTO | null>;
|
|
23
41
|
/** Resolve identity: Access Key (Bearer) first, then JWT fallback. */
|
|
24
42
|
resolveIdentity(jwt: string | null, authorizationHeader: string | null, instanceDid?: string): Promise<CallerIdentityDTO | null>;
|
|
25
43
|
/** Access policy evaluation — returns serialized decision. */
|
|
@@ -84,6 +102,7 @@ export declare class BlockletServiceRPCImpl {
|
|
|
84
102
|
registerApp(config: RegisterAppConfig): Promise<{
|
|
85
103
|
instanceDid: string;
|
|
86
104
|
}>;
|
|
105
|
+
getInstanceAppIdentity(instanceDid: string): Promise<InstanceAppIdentityDTO>;
|
|
87
106
|
getAppEk(instanceDid: string): Promise<string | null>;
|
|
88
107
|
resolveInstanceDidForHost(host: string): Promise<string | null>;
|
|
89
108
|
bindInstanceHost(instanceDid: string, host: string): Promise<BindHostResult>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"blocklet-service-rpc.d.ts","sourceRoot":"","sources":["../src/blocklet-service-rpc.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AASH,OAAO,KAAK,EACV,WAAW,EACX,cAAc,EACd,iBAAiB,EACjB,mBAAmB,EACnB,qBAAqB,EACrB,iBAAiB,EACjB,iBAAiB,EACjB,mBAAmB,EACnB,aAAa,EACd,MAAM,iCAAiC,CAAC;AAMzC,qBAAa,sBAAsB;
|
|
1
|
+
{"version":3,"file":"blocklet-service-rpc.d.ts","sourceRoot":"","sources":["../src/blocklet-service-rpc.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AASH,OAAO,KAAK,EACV,WAAW,EACX,cAAc,EACd,iBAAiB,EACjB,mBAAmB,EACnB,sBAAsB,EAEtB,qBAAqB,EACrB,iBAAiB,EACjB,iBAAiB,EACjB,mBAAmB,EACnB,aAAa,EACd,MAAM,iCAAiC,CAAC;AAMzC,MAAM,WAAW,yBAAyB;IACxC,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,mBAAmB,CAAC,EAAE,sBAAsB,CAAC;CAC9C;AAED,qBAAa,sBAAsB;IAS/B,OAAO,CAAC,QAAQ,CAAC,EAAE;IACnB,OAAO,CAAC,QAAQ,CAAC,SAAS;IAT5B,OAAO,CAAC,MAAM,CAAC,CAAU;IACzB,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC,CAA4B;IACvD,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAAC,CAAyB;IAC9D;wEACoE;IACpE,OAAO,CAAC,eAAe,CAAC,CAAgB;gBAGrB,EAAE,EAAE,UAAU,EACd,SAAS,EAAE,MAAM,EAClC,OAAO,CAAC,EAAE,yBAAyB;IAQrC,OAAO,CAAC,KAAK;IAKb,OAAO,CAAC,oBAAoB;IAqB5B,2DAA2D;IACrD,MAAM,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,GAAG,IAAI,CAAC;IAU5D;;;yDAGqD;IACrD,OAAO,CAAC,cAAc;IAUtB;;;;;;4EAMwE;IAClE,UAAU,CAAC,GAAG,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,GAAG,IAAI,CAAC;IA4BtF,sEAAsE;IAChE,eAAe,CACnB,GAAG,EAAE,MAAM,GAAG,IAAI,EAClB,mBAAmB,EAAE,MAAM,GAAG,IAAI,EAClC,WAAW,CAAC,EAAE,MAAM,GACnB,OAAO,CAAC,iBAAiB,GAAG,IAAI,CAAC;IAqCpC,8DAA8D;IACxD,aAAa,CACjB,GAAG,EAAE,MAAM,GAAG,IAAI,EAClB,mBAAmB,EAAE,MAAM,GAAG,IAAI,EAClC,QAAQ,EAAE,MAAM,EAChB,WAAW,CAAC,EAAE,MAAM,GACnB,OAAO,CACN;QAAE,OAAO,EAAE,IAAI,CAAC;QAAC,MAAM,EAAE,iBAAiB,GAAG,IAAI,CAAA;KAAE,GACnD;QAAE,OAAO,EAAE,KAAK,CAAC;QAAC,MAAM,EAAE,GAAG,GAAG,GAAG,CAAA;KAAE,CACxC;IA0EK,aAAa,CAAC,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,mBAAmB,GAAG,IAAI,CAAC;IAIxF,eAAe,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,mBAAmB,EAAE,CAAC;IAIpE,2BAA2B,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,qBAAqB,EAAE,CAAC;IAIlF,gBAAgB,CACpB,OAAO,EAAE,MAAM,EACf,WAAW,EAAE,MAAM,EACnB,IAAI,EAAE,MAAM,EACZ,SAAS,CAAC,EAAE,MAAM,GACjB,OAAO,CAAC,IAAI,CAAC;IAIV,oBAAoB,CAAC,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAIvF,gBAAgB,CAAC,OAAO,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAIrE,2BAA2B,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAI/D,UAAU,CAAC,WAAW,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAIpE,UAAU,CAAC,WAAW,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAI1E,YAAY,CAChB,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;QAAC,UAAU,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;IAIjE,aAAa,CAAC,WAAW,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAI9D,uBAAuB,CAC3B,WAAW,EAAE,MAAM,EACnB,IAAI,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE,GACxD,OAAO,CAAC;QAAE,IAAI,EAAE,WAAW,EAAE,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;IAO5C,eAAe,CAAC,EAAE,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,WAAW,GAAG,IAAI,CAAC;IAI7E,cAAc,CAAC,KAAK,EAAE,mBAAmB,GAAG,OAAO,CAAC,IAAI,CAAC;IAIzD,yBAAyB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,iBAAiB,EAAE,CAAC;IAI5E,oBAAoB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAMxD,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,GAAG,IAAI,CAAC;IAcxD,cAAc,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,GAAG,IAAI,CAAC;IAc5D,iBAAiB,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE;QAAE,QAAQ,CAAC,EAAE,MAAM,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,IAAI,CAAC;IAI7G,UAAU,CAAC,MAAM,EAAE;QACvB,GAAG,EAAE,MAAM,CAAC;QACZ,EAAE,EAAE,MAAM,CAAC;QACX,QAAQ,CAAC,EAAE,MAAM,CAAC;QAClB,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,cAAc,EAAE,MAAM,CAAC;QACvB,EAAE,CAAC,EAAE,MAAM,CAAC;QACZ,MAAM,CAAC,EAAE,MAAM,CAAC;KACjB,GAAG,OAAO,CAAC,IAAI,CAAC;IAIX,eAAe,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAIzE,aAAa,CAAC,EAAE,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,YAAY,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAIlF,YAAY,CAChB,EAAE,EAAE,MAAM,GACT,OAAO,CAAC;QAAE,SAAS,EAAE,MAAM,CAAC;QAAC,YAAY,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,GAAG,IAAI,CAAC;IAI/D,eAAe,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAI1C,WAAW,CAAC,MAAM,EAAE,iBAAiB,GAAG,OAAO,CAAC;QAAE,WAAW,EAAE,MAAM,CAAA;KAAE,CAAC;IAiDxE,sBAAsB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,sBAAsB,CAAC;IAmC5E,QAAQ,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAMrD,yBAAyB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC;IAI/D,gBAAgB,CAAC,WAAW,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC;IAI5E,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAI/C,iBAAiB,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAIzD,kBAAkB,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC;QAAE,cAAc,EAAE,MAAM,EAAE,CAAA;KAAE,CAAC;YA6EjF,gBAAgB;CAoC/B"}
|
|
@@ -18,15 +18,40 @@ export class BlockletServiceRPCImpl {
|
|
|
18
18
|
jwtSecret;
|
|
19
19
|
_store;
|
|
20
20
|
storeOpts;
|
|
21
|
+
fallbackAppIdentity;
|
|
22
|
+
/** Lazily-derived app-wallet instance DID (single-instance embedded deploys).
|
|
23
|
+
* `undefined` = not yet computed, `null` = no appSk configured. */
|
|
24
|
+
_appInstanceDid;
|
|
21
25
|
constructor(db, jwtSecret, options) {
|
|
22
26
|
this.db = db;
|
|
23
27
|
this.jwtSecret = jwtSecret;
|
|
24
|
-
this.storeOpts = options
|
|
28
|
+
this.storeOpts = options?.readSession === undefined
|
|
29
|
+
? undefined
|
|
30
|
+
: { readSession: options.readSession };
|
|
31
|
+
this.fallbackAppIdentity = options?.fallbackAppIdentity;
|
|
25
32
|
}
|
|
26
33
|
store() {
|
|
27
34
|
this._store ??= new D1Store(this.db, this.storeOpts);
|
|
28
35
|
return this._store;
|
|
29
36
|
}
|
|
37
|
+
buildInstanceAppInfo(params) {
|
|
38
|
+
let parsed = {};
|
|
39
|
+
if (params.brandingRaw) {
|
|
40
|
+
try {
|
|
41
|
+
parsed = JSON.parse(params.brandingRaw);
|
|
42
|
+
}
|
|
43
|
+
catch {
|
|
44
|
+
parsed = {};
|
|
45
|
+
}
|
|
46
|
+
}
|
|
47
|
+
const instanceInfo = {
|
|
48
|
+
name: typeof parsed.name === "string" && parsed.name ? parsed.name : params.appName ?? undefined,
|
|
49
|
+
description: typeof parsed.description === "string" && parsed.description ? parsed.description : undefined,
|
|
50
|
+
icon: typeof parsed.icon === "string" && parsed.icon ? parsed.icon : undefined,
|
|
51
|
+
link: typeof parsed.link === "string" && parsed.link ? parsed.link : undefined,
|
|
52
|
+
};
|
|
53
|
+
return Object.values(instanceInfo).some(Boolean) ? instanceInfo : undefined;
|
|
54
|
+
}
|
|
30
55
|
// ── Layer 1: Auth Core ─────────────────────────────────────────────
|
|
31
56
|
/** Lightweight verify: JWT signature check only, no D1. */
|
|
32
57
|
async verify(jwt) {
|
|
@@ -39,18 +64,50 @@ export class BlockletServiceRPCImpl {
|
|
|
39
64
|
displayName: (payload.fullName ?? payload.displayName),
|
|
40
65
|
};
|
|
41
66
|
}
|
|
42
|
-
/**
|
|
43
|
-
|
|
67
|
+
/** App-wallet instance DID, mirroring the auth-handler's `defaultInstanceDid`
|
|
68
|
+
* (`options.instanceDid || appSk address`). Single-instance embedded deploys
|
|
69
|
+
* hang every membership off this DID, so it's the right default target when a
|
|
70
|
+
* caller doesn't pass an explicit `instanceDid`. */
|
|
71
|
+
appInstanceDid() {
|
|
72
|
+
if (this._appInstanceDid === undefined) {
|
|
73
|
+
const appSk = this.fallbackAppIdentity?.appSk;
|
|
74
|
+
this._appInstanceDid = appSk
|
|
75
|
+
? fromSecretKey(normalizeSecretKey(appSk), APP_WALLET_TYPE).address
|
|
76
|
+
: null;
|
|
77
|
+
}
|
|
78
|
+
return this._appInstanceDid ?? undefined;
|
|
79
|
+
}
|
|
80
|
+
/** Full verify: JWT + DB user existence + approval status.
|
|
81
|
+
*
|
|
82
|
+
* Role is resolved **membership-aware** against `instanceDid` (defaulting to
|
|
83
|
+
* the app-wallet instance), matching `passkey.verifyFull` / `resolveIdentity`
|
|
84
|
+
* and the `/api/did/session` endpoint. Reading only the global `users.role`
|
|
85
|
+
* here is what made the WS-upgrade path report `guest` for an instance owner
|
|
86
|
+
* whose role lives in the `memberships` table, not the `users` row. */
|
|
87
|
+
async verifyFull(jwt, instanceDid) {
|
|
44
88
|
const caller = await this.verify(jwt);
|
|
45
89
|
if (!caller)
|
|
46
90
|
return null;
|
|
47
91
|
const user = await this.store().getUserByDid(caller.did);
|
|
48
92
|
if (!user?.approved)
|
|
49
93
|
return null;
|
|
94
|
+
const targetInstanceDid = instanceDid ?? this.appInstanceDid();
|
|
95
|
+
let role = user.role ?? "guest";
|
|
96
|
+
if (targetInstanceDid) {
|
|
97
|
+
const membership = await this.store().getMembership(caller.did, targetInstanceDid);
|
|
98
|
+
if (membership?.role) {
|
|
99
|
+
role = membership.role;
|
|
100
|
+
}
|
|
101
|
+
else if (role !== "owner" && role !== "admin") {
|
|
102
|
+
// No membership + not system owner/admin → guest for this instance.
|
|
103
|
+
role = "guest";
|
|
104
|
+
}
|
|
105
|
+
// System owner/admin punch-through: keep global role for platform management.
|
|
106
|
+
}
|
|
50
107
|
return {
|
|
51
108
|
...caller,
|
|
52
109
|
displayName: user.fullName ?? caller.displayName,
|
|
53
|
-
role
|
|
110
|
+
role,
|
|
54
111
|
avatar: `/.well-known/service/user/avatar/${caller.did}`,
|
|
55
112
|
};
|
|
56
113
|
}
|
|
@@ -303,6 +360,38 @@ export class BlockletServiceRPCImpl {
|
|
|
303
360
|
}
|
|
304
361
|
return { instanceDid };
|
|
305
362
|
}
|
|
363
|
+
async getInstanceAppIdentity(instanceDid) {
|
|
364
|
+
const s = this.store();
|
|
365
|
+
const [appSk, appPsk, brandingRaw, appName] = await Promise.all([
|
|
366
|
+
s.getSetting(instanceDid, "app:sk"),
|
|
367
|
+
s.getSetting(instanceDid, "app:psk"),
|
|
368
|
+
s.getSetting(instanceDid, "app:branding"),
|
|
369
|
+
s.getSetting(instanceDid, "app:name"),
|
|
370
|
+
]);
|
|
371
|
+
const fallback = this.fallbackAppIdentity;
|
|
372
|
+
if (!appSk && !fallback?.appSk) {
|
|
373
|
+
throw new Error(`No appSk configured for instance: ${instanceDid}`);
|
|
374
|
+
}
|
|
375
|
+
const instanceAppInfo = this.buildInstanceAppInfo({
|
|
376
|
+
brandingRaw,
|
|
377
|
+
appName,
|
|
378
|
+
});
|
|
379
|
+
if (!appSk) {
|
|
380
|
+
const root = fallback;
|
|
381
|
+
const result = { appSk: root.appSk };
|
|
382
|
+
if (root.appPsk)
|
|
383
|
+
result.appPsk = root.appPsk;
|
|
384
|
+
const appInfo = instanceAppInfo ?? root.appInfo;
|
|
385
|
+
if (appInfo)
|
|
386
|
+
result.appInfo = appInfo;
|
|
387
|
+
return result;
|
|
388
|
+
}
|
|
389
|
+
return {
|
|
390
|
+
appSk,
|
|
391
|
+
...(appPsk ? { appPsk } : {}),
|
|
392
|
+
...(instanceAppInfo ? { appInfo: instanceAppInfo } : {}),
|
|
393
|
+
};
|
|
394
|
+
}
|
|
306
395
|
async getAppEk(instanceDid) {
|
|
307
396
|
return this.store().getSetting(instanceDid, "app:ek");
|
|
308
397
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"blocklet-service-rpc.js","sourceRoot":"","sources":["../src/blocklet-service-rpc.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"blocklet-service-rpc.js","sourceRoot":"","sources":["../src/blocklet-service-rpc.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,6 +8,7 @@
|
|
|
8
8
|
* Supports two modes:
|
|
9
9
|
* - Single-tenant: env.APP_SK set → used directly (playground/dev)
|
|
10
10
|
* - Multi-tenant: X-Instance-Did header → load appSk/appPsk from D1 settings
|
|
11
|
+
* - Arc/root fallback: X-Instance-Did + env.APP_SK → instance appSk first, then env APP_SK
|
|
11
12
|
*/
|
|
12
13
|
import { type AuthHandler } from "./handlers/auth-handler.js";
|
|
13
14
|
import { type AuthEntrypointInterface } from "./identity/auth-entrypoint.js";
|
|
@@ -20,6 +21,8 @@ export interface BlockletServiceEnv {
|
|
|
20
21
|
APP_SK?: string;
|
|
21
22
|
/** Single-tenant mode: permanent secret key from env. */
|
|
22
23
|
APP_PSK?: string;
|
|
24
|
+
/** Runtime/root app name used when instance branding is absent. */
|
|
25
|
+
APP_NAME?: string;
|
|
23
26
|
/** Relying Party name for WebAuthn. */
|
|
24
27
|
RP_NAME?: string;
|
|
25
28
|
/** Optional email login configuration. */
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"blocklet-service.d.ts","sourceRoot":"","sources":["../src/blocklet-service.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"blocklet-service.d.ts","sourceRoot":"","sources":["../src/blocklet-service.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AAGH,OAAO,EAAE,KAAK,WAAW,EAAqB,MAAM,4BAA4B,CAAC;AACjF,OAAO,EAAE,KAAK,uBAAuB,EAAsC,MAAM,+BAA+B,CAAC;AAMjH,MAAM,WAAW,kBAAkB;IACjC,mBAAmB,EAAE,UAAU,CAAC;IAChC,UAAU,EAAE,MAAM,CAAC;IACnB,mDAAmD;IACnD,uBAAuB,CAAC,EAAE,QAAQ,CAAC;IACnC,mDAAmD;IACnD,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,yDAAyD;IACzD,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,mEAAmE;IACnE,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,uCAAuC;IACvC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,0CAA0C;IAC1C,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,sEAAsE;IACtE,WAAW,CAAC,EAAE,uBAAuB,CAAC;IACtC;;;;;;;;OAQG;IACH,oBAAoB,CAAC,EAAE,MAAM,CAAC;CAC/B;AA+GD,gFAAgF;AAChF,wBAAgB,qBAAqB,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI,CAI/D;AAOD,gFAAgF;AAChF,wBAAgB,wBAAwB,CAAC,WAAW,EAAE,MAAM,GAAG,IAAI,CAIlE;AAED,2CAA2C;AAC3C,wBAAgB,2BAA2B,IAAI,IAAI,CAIlD;AAuKD;;;;;;;;GAQG;AACH,wBAAsB,YAAY,CAChC,WAAW,EAAE,MAAM,GAAG,SAAS,EAC/B,GAAG,EAAE,kBAAkB,EACvB,QAAQ,CAAC,EAAE,MAAM,EACjB,OAAO,CAAC,EAAE;IAAE,WAAW,CAAC,EAAE,OAAO,CAAA;CAAE,GAClC,OAAO,CAAC,WAAW,CAAC,CAqEtB;AAkCD,mEAAmE;AACnE,wBAAsB,iBAAiB,CACrC,WAAW,EAAE,MAAM,GAAG,SAAS,EAC/B,GAAG,EAAE,kBAAkB,EACvB,QAAQ,CAAC,EAAE,MAAM,EACjB,OAAO,CAAC,EAAE;IAAE,WAAW,CAAC,EAAE,OAAO,CAAA;CAAE,GAClC,OAAO,CAAC,WAAW,CAAC,CAmBtB;;mBAGsB,OAAO,OAAO,kBAAkB,GAAG,OAAO,CAAC,QAAQ,CAAC;;AAD3E,wBAkBE"}
|
package/dist/blocklet-service.js
CHANGED
|
@@ -8,6 +8,7 @@
|
|
|
8
8
|
* Supports two modes:
|
|
9
9
|
* - Single-tenant: env.APP_SK set → used directly (playground/dev)
|
|
10
10
|
* - Multi-tenant: X-Instance-Did header → load appSk/appPsk from D1 settings
|
|
11
|
+
* - Arc/root fallback: X-Instance-Did + env.APP_SK → instance appSk first, then env APP_SK
|
|
11
12
|
*/
|
|
12
13
|
import { fromSecretKey } from "@ocap/wallet";
|
|
13
14
|
import { createAuthHandler } from "./handlers/auth-handler.js";
|
|
@@ -16,30 +17,69 @@ import { APP_WALLET_TYPE, normalizeSecretKey } from "./identity/wallet-identity.
|
|
|
16
17
|
import { D1Store } from "./store/d1-store.js";
|
|
17
18
|
const _configCache = new Map();
|
|
18
19
|
const CONFIG_TTL = 5 * 60 * 1000; // 5 minutes
|
|
19
|
-
|
|
20
|
-
const
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
if (!
|
|
25
|
-
|
|
26
|
-
const
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
20
|
+
function buildFallbackAppInfo(env) {
|
|
21
|
+
const name = env.APP_NAME ?? env.RP_NAME;
|
|
22
|
+
return name ? { name } : undefined;
|
|
23
|
+
}
|
|
24
|
+
function buildFallbackConfig(env) {
|
|
25
|
+
if (!env.APP_SK)
|
|
26
|
+
return undefined;
|
|
27
|
+
const appInfo = buildFallbackAppInfo(env);
|
|
28
|
+
return {
|
|
29
|
+
appSk: env.APP_SK,
|
|
30
|
+
...(env.APP_PSK ? { appPsk: env.APP_PSK } : {}),
|
|
31
|
+
...(appInfo ? { appInfo } : {}),
|
|
32
|
+
};
|
|
33
|
+
}
|
|
34
|
+
function buildInstanceAppInfo(params) {
|
|
35
|
+
let parsed = {};
|
|
36
|
+
if (params.brandingRaw) {
|
|
31
37
|
try {
|
|
32
|
-
|
|
33
|
-
appInfo = {
|
|
34
|
-
name: typeof b.name === "string" && b.name ? b.name : "App",
|
|
35
|
-
description: typeof b.description === "string" && b.description ? b.description : undefined,
|
|
36
|
-
};
|
|
38
|
+
parsed = JSON.parse(params.brandingRaw);
|
|
37
39
|
}
|
|
38
40
|
catch {
|
|
39
|
-
|
|
41
|
+
parsed = {};
|
|
40
42
|
}
|
|
41
43
|
}
|
|
42
|
-
const
|
|
44
|
+
const name = typeof parsed.name === "string" && parsed.name ? parsed.name : params.appName ?? undefined;
|
|
45
|
+
const description = typeof parsed.description === "string" && parsed.description ? parsed.description : undefined;
|
|
46
|
+
const icon = typeof parsed.icon === "string" && parsed.icon ? parsed.icon : undefined;
|
|
47
|
+
if (!name && !description && !icon)
|
|
48
|
+
return undefined;
|
|
49
|
+
return {
|
|
50
|
+
name: name ?? "App",
|
|
51
|
+
...(description ? { description } : {}),
|
|
52
|
+
...(icon ? { icon } : {}),
|
|
53
|
+
};
|
|
54
|
+
}
|
|
55
|
+
async function resolveConfig(instanceDid, store, fallback) {
|
|
56
|
+
const cached = _configCache.get(instanceDid);
|
|
57
|
+
if (cached && Date.now() - cached.at < CONFIG_TTL)
|
|
58
|
+
return cached.config;
|
|
59
|
+
const [appSk, appPsk, brandingRaw, appName] = await Promise.all([
|
|
60
|
+
store.getSetting(instanceDid, "app:sk"),
|
|
61
|
+
store.getSetting(instanceDid, "app:psk"),
|
|
62
|
+
store.getSetting(instanceDid, "app:branding"),
|
|
63
|
+
store.getSetting(instanceDid, "app:name"),
|
|
64
|
+
]);
|
|
65
|
+
const instanceAppInfo = buildInstanceAppInfo({ brandingRaw, appName });
|
|
66
|
+
if (!appSk) {
|
|
67
|
+
if (!fallback?.appSk)
|
|
68
|
+
throw new Error(`No appSk configured for instance: ${instanceDid}`);
|
|
69
|
+
const appInfo = instanceAppInfo ?? fallback.appInfo;
|
|
70
|
+
const config = {
|
|
71
|
+
appSk: fallback.appSk,
|
|
72
|
+
...(fallback.appPsk ? { appPsk: fallback.appPsk } : {}),
|
|
73
|
+
...(appInfo ? { appInfo } : {}),
|
|
74
|
+
};
|
|
75
|
+
_configCache.set(instanceDid, { config, at: Date.now() });
|
|
76
|
+
return config;
|
|
77
|
+
}
|
|
78
|
+
const config = {
|
|
79
|
+
appSk,
|
|
80
|
+
...(appPsk ? { appPsk } : {}),
|
|
81
|
+
...(instanceAppInfo ? { appInfo: instanceAppInfo } : {}),
|
|
82
|
+
};
|
|
43
83
|
_configCache.set(instanceDid, { config, at: Date.now() });
|
|
44
84
|
return config;
|
|
45
85
|
}
|
|
@@ -252,21 +292,14 @@ export async function buildHandler(instanceDid, env, rpDomain, options) {
|
|
|
252
292
|
// migrate it to the correct ROLE_APPLICATION-derived DID.
|
|
253
293
|
// This handles the service's own data after the wallet type fix.
|
|
254
294
|
await migrateSingleTenantDid(env.APP_SK, derivedDid, store, env.BLOCKLET_SERVICE_DB);
|
|
255
|
-
|
|
256
|
-
|
|
257
|
-
|
|
258
|
-
|
|
259
|
-
|
|
260
|
-
|
|
261
|
-
|
|
262
|
-
|
|
263
|
-
description: typeof b.description === "string" && b.description ? b.description : undefined,
|
|
264
|
-
};
|
|
265
|
-
}
|
|
266
|
-
catch {
|
|
267
|
-
// ignore malformed branding JSON
|
|
268
|
-
}
|
|
269
|
-
}
|
|
295
|
+
const [brandingRaw, appName] = await Promise.all([
|
|
296
|
+
store.getSetting(derivedDid, "app:branding"),
|
|
297
|
+
store.getSetting(derivedDid, "app:name"),
|
|
298
|
+
]);
|
|
299
|
+
const appInfo = buildInstanceAppInfo({
|
|
300
|
+
brandingRaw,
|
|
301
|
+
appName,
|
|
302
|
+
}) ?? buildFallbackAppInfo(env);
|
|
270
303
|
const fed = await resolveFederationConfig(derivedDid, store, env);
|
|
271
304
|
return createAuthHandler({
|
|
272
305
|
db: env.BLOCKLET_SERVICE_DB,
|
|
@@ -286,7 +319,7 @@ export async function buildHandler(instanceDid, env, rpDomain, options) {
|
|
|
286
319
|
// Multi-tenant: instanceDid required
|
|
287
320
|
if (!instanceDid)
|
|
288
321
|
throw new Error("Missing X-Instance-Did header (multi-tenant mode)");
|
|
289
|
-
const { appSk, appPsk, appInfo } = await resolveConfig(instanceDid, store);
|
|
322
|
+
const { appSk, appPsk, appInfo } = await resolveConfig(instanceDid, store, buildFallbackConfig(env));
|
|
290
323
|
const fed = await resolveFederationConfig(instanceDid, store, env);
|
|
291
324
|
return createAuthHandler({
|
|
292
325
|
db: env.BLOCKLET_SERVICE_DB,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"blocklet-service.js","sourceRoot":"","sources":["../src/blocklet-service.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"blocklet-service.js","sourceRoot":"","sources":["../src/blocklet-service.ts"],"names":[],"mappings":"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"}
|
package/dist/embedded.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"embedded.d.ts","sourceRoot":"","sources":["../src/embedded.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,2BAA2B,
|
|
1
|
+
{"version":3,"file":"embedded.d.ts","sourceRoot":"","sources":["../src/embedded.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,2BAA2B,EAA0B,MAAM,iCAAiC,CAAC;AAC3G,OAAO,EAAE,KAAK,WAAW,EAAqB,MAAM,4BAA4B,CAAC;AACjF,OAAO,EAAkB,KAAK,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAG3E,MAAM,WAAW,kBAAkB;IACjC,mFAAmF;IACnF,EAAE,EAAE,cAAc,CAAC;IACnB,qDAAqD;IACrD,SAAS,EAAE,MAAM,CAAC;IAClB,mCAAmC;IACnC,MAAM,EAAE,MAAM,CAAC;IACf,mEAAmE;IACnE,IAAI,CAAC,EAAE,MAAM,GAAG,CAAC,CAAC,OAAO,EAAE,OAAO,KAAK,MAAM,CAAC,CAAC;IAC/C,wEAAwE;IACxE,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,mEAAmE;IACnE,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,wBAAsB,yBAAyB,CAAC,MAAM,EAAE,kBAAkB,GAAG,OAAO,CAAC;IACnF,GAAG,EAAE,2BAA2B,CAAC;IACjC,OAAO,EAAE,WAAW,CAAC;CACtB,CAAC,CAsBD;AAED,YAAY,EAAE,2BAA2B,EAAE,MAAM,iCAAiC,CAAC;AACnF,YAAY,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAC;AAC9D,OAAO,EAAE,cAAc,EAAE,KAAK,cAAc,EAAE,MAAM,sBAAsB,CAAC"}
|
package/dist/embedded.js
CHANGED
|
@@ -6,7 +6,13 @@ export async function createEmbeddedAuthService(config) {
|
|
|
6
6
|
const d1 = createD1Compat(config.db);
|
|
7
7
|
const store = new D1Store(d1);
|
|
8
8
|
await store.ensureSchema();
|
|
9
|
-
|
|
9
|
+
let fallbackAppIdentity;
|
|
10
|
+
if (config.appSk) {
|
|
11
|
+
fallbackAppIdentity = { appSk: config.appSk, appInfo: { name: config.rpName } };
|
|
12
|
+
if (config.appPsk)
|
|
13
|
+
fallbackAppIdentity.appPsk = config.appPsk;
|
|
14
|
+
}
|
|
15
|
+
const rpc = new BlockletServiceRPCImpl(d1, config.jwtSecret, { fallbackAppIdentity });
|
|
10
16
|
const handler = createAuthHandler({
|
|
11
17
|
db: d1,
|
|
12
18
|
jwtSecret: config.jwtSecret,
|
package/dist/embedded.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"embedded.js","sourceRoot":"","sources":["../src/embedded.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAC;AAEnE,OAAO,EAAoB,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AACjF,OAAO,EAAE,cAAc,EAAuB,MAAM,sBAAsB,CAAC;AAC3E,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAiB9C,MAAM,CAAC,KAAK,UAAU,yBAAyB,CAAC,MAA0B;IAIxE,MAAM,EAAE,GAAG,cAAc,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IACrC,MAAM,KAAK,GAAG,IAAI,OAAO,CAAC,EAAE,CAAC,CAAC;IAE9B,MAAM,KAAK,CAAC,YAAY,EAAE,CAAC;IAE3B,MAAM,GAAG,GAAG,IAAI,sBAAsB,CAAC,EAAE,EAAE,MAAM,CAAC,SAAS,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"embedded.js","sourceRoot":"","sources":["../src/embedded.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAC;AAEnE,OAAO,EAAoB,iBAAiB,EAAE,MAAM,4BAA4B,CAAC;AACjF,OAAO,EAAE,cAAc,EAAuB,MAAM,sBAAsB,CAAC;AAC3E,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAiB9C,MAAM,CAAC,KAAK,UAAU,yBAAyB,CAAC,MAA0B;IAIxE,MAAM,EAAE,GAAG,cAAc,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IACrC,MAAM,KAAK,GAAG,IAAI,OAAO,CAAC,EAAE,CAAC,CAAC;IAE9B,MAAM,KAAK,CAAC,YAAY,EAAE,CAAC;IAE3B,IAAI,mBAAuD,CAAC;IAC5D,IAAI,MAAM,CAAC,KAAK,EAAE,CAAC;QACjB,mBAAmB,GAAG,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,EAAE,CAAC;QAChF,IAAI,MAAM,CAAC,MAAM;YAAE,mBAAmB,CAAC,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC;IAChE,CAAC;IACD,MAAM,GAAG,GAAG,IAAI,sBAAsB,CAAC,EAAE,EAAE,MAAM,CAAC,SAAS,EAAE,EAAE,mBAAmB,EAAE,CAAC,CAAC;IACtF,MAAM,OAAO,GAAG,iBAAiB,CAAC;QAChC,EAAE,EAAE,EAAE;QACN,SAAS,EAAE,MAAM,CAAC,SAAS;QAC3B,MAAM,EAAE,MAAM,CAAC,MAAM;QACrB,IAAI,EAAE,MAAM,CAAC,IAAI;QACjB,KAAK,EAAE,MAAM,CAAC,KAAK;QACnB,MAAM,EAAE,MAAM,CAAC,MAAM;KACtB,CAAC,CAAC;IAEH,OAAO,EAAE,GAAG,EAAE,OAAO,EAAE,CAAC;AAC1B,CAAC;AAID,OAAO,EAAE,cAAc,EAAuB,MAAM,sBAAsB,CAAC"}
|
package/dist/index.d.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
export { type BlockletServiceEnv, buildHandler, getOrBuildHandler, invalidateConfigCache } from "./blocklet-service.js";
|
|
2
2
|
export { createBlockletServiceClient, getCookie } from "./blocklet-service-client.js";
|
|
3
|
-
export { BlockletServiceRPCImpl } from "./blocklet-service-rpc.js";
|
|
4
|
-
export type { AuditLogDTO, BlockletServiceRPCInterface, CallerIdentityDTO, CreateAuditLogInput as RpcCreateAuditLogInput, MemberWithUserInfoDTO, RegisterAppConfig, RuleWithPolicyDTO, StoredMembershipDTO, StoredUserDTO, } from "./blocklet-service-rpc-types.js";
|
|
3
|
+
export { BlockletServiceRPCImpl, type BlockletServiceRPCOptions } from "./blocklet-service-rpc.js";
|
|
4
|
+
export type { AuditLogDTO, BlockletServiceRPCInterface, CallerIdentityDTO, CreateAuditLogInput as RpcCreateAuditLogInput, InstanceAppIdentityDTO, InstanceAppInfoDTO, MemberWithUserInfoDTO, RegisterAppConfig, RuleWithPolicyDTO, StoredMembershipDTO, StoredUserDTO, } from "./blocklet-service-rpc-types.js";
|
|
5
5
|
export type { SessionContext } from "./identity/session-context.js";
|
|
6
6
|
export { buildSessionContext, deserializeSessionContext, serializeSessionContext, } from "./identity/session-context.js";
|
|
7
7
|
export type { AuthHandler, AuthHandlerOptions, RuleWithPolicyForInstance, StoredMembership, } from "./handlers/auth-handler.js";
|
package/dist/index.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,kBAAkB,EAAE,YAAY,EAAE,iBAAiB,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AACxH,OAAO,EAAE,2BAA2B,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AACtF,OAAO,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,uEAAuE;AAEvE,OAAO,EAA2B,YAAY,EAAE,iBAAiB,EAAE,qBAAqB,EAAE,MAAM,uBAAuB,CAAC;AACxH,OAAO,EAAE,2BAA2B,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AACtF,OAAO,EAAE,sBAAsB,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.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.0.
|
|
3
|
+
"version": "4.0.4",
|
|
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",
|
|
@@ -43,8 +43,8 @@
|
|
|
43
43
|
"@ocap/util": "^1.30.24",
|
|
44
44
|
"@ocap/wallet": "^1.30.24",
|
|
45
45
|
"hono": "^4.12.23",
|
|
46
|
-
"@arcblock/did-connect-core": "^4.0.
|
|
47
|
-
"@arcblock/did-connect-js": "^4.0.
|
|
46
|
+
"@arcblock/did-connect-core": "^4.0.4",
|
|
47
|
+
"@arcblock/did-connect-js": "^4.0.4"
|
|
48
48
|
},
|
|
49
49
|
"optionalDependencies": {
|
|
50
50
|
"@aigne/afs": "^1.11.0-beta.13"
|