downcity 1.1.405 → 1.1.407
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/bin/city/command/FederationCommand.d.ts.map +1 -1
- package/bin/city/command/FederationCommand.js +5 -6
- package/bin/city/command/FederationCommand.js.map +1 -1
- package/bin/city/env/ProcessEnv.d.ts.map +1 -1
- package/bin/city/env/ProcessEnv.js +0 -2
- package/bin/city/env/ProcessEnv.js.map +1 -1
- package/bin/city/runtime/city-model/CreateRuntimeModel.d.ts +1 -1
- package/bin/city/shared/CityStateStore.d.ts +1 -2
- package/bin/city/shared/CityStateStore.d.ts.map +1 -1
- package/bin/city/shared/CityStateStore.js +9 -11
- package/bin/city/shared/CityStateStore.js.map +1 -1
- package/bin/city/shared/CityUserLogin.d.ts.map +1 -1
- package/bin/city/shared/CityUserLogin.js +12 -1
- package/bin/city/shared/CityUserLogin.js.map +1 -1
- package/bin/city/shared/CityUserManager.d.ts.map +1 -1
- package/bin/city/shared/CityUserManager.js +8 -5
- package/bin/city/shared/CityUserManager.js.map +1 -1
- package/bin/city/shared/FederationConnection.d.ts.map +1 -1
- package/bin/city/shared/FederationConnection.js +7 -9
- package/bin/city/shared/FederationConnection.js.map +1 -1
- package/bin/city/tui/CityDashboard.js +2 -2
- package/bin/city/tui/CityDashboard.js.map +1 -1
- package/bin/city/tui/FederationManagerFormat.d.ts.map +1 -1
- package/bin/city/tui/FederationManagerFormat.js +4 -5
- package/bin/city/tui/FederationManagerFormat.js.map +1 -1
- package/bin/city/tui/FederationManagerState.js +2 -2
- package/bin/city/tui/FederationManagerState.js.map +1 -1
- package/bin/city/types/CitySession.d.ts +2 -2
- package/bin/city/types/CityState.d.ts +0 -8
- package/bin/city/types/CityState.d.ts.map +1 -1
- package/bin/city/types/CityUser.d.ts +5 -5
- package/bin/city/types/CityUser.d.ts.map +1 -1
- package/bin/federation/bureau/InteractiveBureauTokenManager.js +3 -3
- package/bin/federation/bureau/InteractiveBureauTokenManager.js.map +1 -1
- package/bin/federation/bureau/commands/bureau.js +9 -2
- package/bin/federation/bureau/commands/bureau.js.map +1 -1
- package/bin/federation/create/templates/CloudflareWorkersTemplate.js +27 -3
- package/bin/federation/create/templates/CloudflareWorkersTemplate.js.map +1 -1
- package/bin/federation/create/templates/LocalNodeTemplate.js +9 -3
- package/bin/federation/create/templates/LocalNodeTemplate.js.map +1 -1
- package/package.json +2 -2
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FederationCommand.d.ts","sourceRoot":"","sources":["../../../src/city/command/FederationCommand.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"FederationCommand.d.ts","sourceRoot":"","sources":["../../../src/city/command/FederationCommand.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAezC;;GAEG;AACH,wBAAgB,2BAA2B,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAgJlE"}
|
|
@@ -7,7 +7,6 @@
|
|
|
7
7
|
* - `downfed` CLI 负责 Federation 基础设施管理；`city federation` 只负责让本机 City 加入/登录 Federation。
|
|
8
8
|
*/
|
|
9
9
|
import { parseBoolean } from "../../shared/IndexSupport.js";
|
|
10
|
-
import { DEFAULT_BUREAU_ID } from "../shared/CityStateStore.js";
|
|
11
10
|
import { emit_federation_status, emitCityUserWhoami, emit_federation_list, run_federation_join_command, run_federation_leave_command, run_federation_login_command, run_federation_logout_command, run_federation_use_command, run_interactive_federation_manager, } from "../shared/FederationConnection.js";
|
|
12
11
|
import { helpText, t } from "../../shared/CliLocale.js";
|
|
13
12
|
/**
|
|
@@ -105,10 +104,10 @@ export function register_federation_command(program) {
|
|
|
105
104
|
zh: "登录当前或指定 Federation",
|
|
106
105
|
en: "sign in to the current or specified Federation",
|
|
107
106
|
}))
|
|
108
|
-
.option("--
|
|
109
|
-
zh: "
|
|
110
|
-
en: "
|
|
111
|
-
})
|
|
107
|
+
.option("--bureau-id <bureau_id>", t({
|
|
108
|
+
zh: "登录用户所属产品的 Bureau ID",
|
|
109
|
+
en: "Bureau ID of the product being signed in",
|
|
110
|
+
}))
|
|
112
111
|
.option("--json [enabled]", t({
|
|
113
112
|
zh: "以 JSON 输出",
|
|
114
113
|
en: "output as JSON",
|
|
@@ -116,7 +115,7 @@ export function register_federation_command(program) {
|
|
|
116
115
|
.action(async (url, options) => {
|
|
117
116
|
await run_federation_login_command({
|
|
118
117
|
url,
|
|
119
|
-
bureau_id: options.
|
|
118
|
+
bureau_id: options.bureauId,
|
|
120
119
|
as_json: options.json === true,
|
|
121
120
|
});
|
|
122
121
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FederationCommand.js","sourceRoot":"","sources":["../../../src/city/command/FederationCommand.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAGH,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AACxD,OAAO,
|
|
1
|
+
{"version":3,"file":"FederationCommand.js","sourceRoot":"","sources":["../../../src/city/command/FederationCommand.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ProcessEnv.d.ts","sourceRoot":"","sources":["../../../src/city/env/ProcessEnv.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;
|
|
1
|
+
{"version":3,"file":"ProcessEnv.d.ts","sourceRoot":"","sources":["../../../src/city/env/ProcessEnv.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAkBH;;GAEG;AACH,wBAAgB,wBAAwB,IAAI,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAEjE;AAED;;GAEG;AACH,wBAAgB,0BAA0B,CACxC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAC1B,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAOxB;AAED;;;;;;;;GAQG;AACH,wBAAgB,0CAA0C,CACxD,QAAQ,GAAE,MAAM,CAAC,UAAwB,GACxC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAUxB;AAED;;;;GAIG;AACH,wBAAgB,yBAAyB,CACvC,cAAc,EAAE,MAAM,EACtB,WAAW,GAAE,MAAM,CAAC,UAAwB,GAC3C,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAWxB"}
|
|
@@ -14,13 +14,11 @@ import { load_project_dotenv } from "@downcity/agent";
|
|
|
14
14
|
import { get_platform_env_file_path } from "../process/registry/CityPaths.js";
|
|
15
15
|
import { read_env_file_sync } from "./EnvFileStore.js";
|
|
16
16
|
const PLATFORM_SESSION_ENV_KEYS = new Set([
|
|
17
|
-
"CITY_ID",
|
|
18
17
|
"CITY_ADMIN_SECRET_KEY",
|
|
19
18
|
"CITY_URL",
|
|
20
19
|
"CITY_USER_TOKEN",
|
|
21
20
|
"DC_AUTH_TOKEN",
|
|
22
21
|
"DC_AGENT_TOKEN",
|
|
23
|
-
"DOWNCITY_CITY_ID",
|
|
24
22
|
"DOWNCITY_CITY_ADMIN_SECRET_KEY",
|
|
25
23
|
"DOWNCITY_CITY_URL",
|
|
26
24
|
"DOWNCITY_CITY_USER_TOKEN",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ProcessEnv.js","sourceRoot":"","sources":["../../../src/city/env/ProcessEnv.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AACtD,OAAO,EAAE,0BAA0B,EAAE,MAAM,sCAAsC,CAAC;AAClF,OAAO,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AAEhE,MAAM,yBAAyB,GAAG,IAAI,GAAG,CAAC;IACxC,
|
|
1
|
+
{"version":3,"file":"ProcessEnv.js","sourceRoot":"","sources":["../../../src/city/env/ProcessEnv.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,OAAO,IAAI,MAAM,WAAW,CAAC;AAC7B,OAAO,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AACtD,OAAO,EAAE,0BAA0B,EAAE,MAAM,sCAAsC,CAAC;AAClF,OAAO,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AAEhE,MAAM,yBAAyB,GAAG,IAAI,GAAG,CAAC;IACxC,uBAAuB;IACvB,UAAU;IACV,iBAAiB;IACjB,eAAe;IACf,gBAAgB;IAChB,gCAAgC;IAChC,mBAAmB;IACnB,0BAA0B;CAC3B,CAAC,CAAC;AAEH;;GAEG;AACH,MAAM,UAAU,wBAAwB;IACtC,OAAO,kBAAkB,CAAC,0BAA0B,EAAE,CAAC,CAAC;AAC1D,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,0BAA0B,CACxC,GAA2B;IAE3B,MAAM,SAAS,GAA2B,EAAE,CAAC;IAC7C,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;QAC/C,IAAI,yBAAyB,CAAC,GAAG,CAAC,GAAG,CAAC;YAAE,SAAS;QACjD,SAAS,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;IACzB,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAED;;;;;;;;GAQG;AACH,MAAM,UAAU,0CAA0C,CACxD,WAA8B,OAAO,CAAC,GAAG;IAEzC,MAAM,MAAM,GAA2B,EAAE,CAAC;IAC1C,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC;QACpD,IAAI,OAAO,KAAK,KAAK,QAAQ;YAAE,MAAM,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;IACrD,CAAC;IACD,MAAM,YAAY,GAAG,0BAA0B,CAAC,wBAAwB,EAAE,CAAC,CAAC;IAC5E,OAAO;QACL,GAAG,YAAY;QACf,GAAG,MAAM;KACV,CAAC;AACJ,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,yBAAyB,CACvC,cAAsB,EACtB,cAAiC,OAAO,CAAC,GAAG;IAE5C,MAAM,yBAAyB,GAAG,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;IAC/D,MAAM,YAAY,GAA2B,EAAE,CAAC;IAChD,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,CAAC;QACvD,IAAI,OAAO,KAAK,KAAK,QAAQ;YAAE,YAAY,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;IAC3D,CAAC;IACD,OAAO;QACL,GAAG,0BAA0B,CAAC,wBAAwB,EAAE,CAAC;QACzD,GAAG,mBAAmB,CAAC,yBAAyB,CAAC;QACjD,GAAG,YAAY;KAChB,CAAC;AACJ,CAAC"}
|
|
@@ -21,7 +21,7 @@ type RuntimeModelFactoryInput = {
|
|
|
21
21
|
* 宿主显式注入的运行时 env。
|
|
22
22
|
*
|
|
23
23
|
* 关键点（中文）
|
|
24
|
-
* - 用于读取 DOWNCITY_CITY_URL / DOWNCITY_CITY_USER_TOKEN
|
|
24
|
+
* - 用于读取 DOWNCITY_CITY_URL / DOWNCITY_CITY_USER_TOKEN 覆盖项。
|
|
25
25
|
* - 未显式覆盖时回退到 `city city login` 保存的 user session。
|
|
26
26
|
* - 不再读取 provider API Key。
|
|
27
27
|
*/
|
|
@@ -5,7 +5,6 @@
|
|
|
5
5
|
* - 只负责读取/写入 City 自己保存的 Federation 与 user session。
|
|
6
6
|
* - 同时提供只读发现 `downfed` admin Federation 配置的能力。
|
|
7
7
|
* - 不包含交互菜单、输出渲染或用户身份校验逻辑。
|
|
8
|
-
* - 向后兼容旧状态字段 `base_url` / `selected_base_url`，迁移时自动改写为 federation_url。
|
|
9
8
|
*/
|
|
10
9
|
import type { FederationProfile } from "../types/FederationMembership.js";
|
|
11
10
|
import type { CityUserSession } from "../types/CitySession.js";
|
|
@@ -14,7 +13,7 @@ import type { CityLocalState } from "../types/CityState.js";
|
|
|
14
13
|
/** 默认 Federation 地址。 */
|
|
15
14
|
export declare const DEFAULT_FEDERATION_URL = "https://base.downcity.ai";
|
|
16
15
|
/** 默认产品身份；仅作为 CLI 的显式预配置 Bureau。 */
|
|
17
|
-
export declare const DEFAULT_BUREAU_ID = "
|
|
16
|
+
export declare const DEFAULT_BUREAU_ID = "downcity";
|
|
18
17
|
/**
|
|
19
18
|
* 读取字符串字段。
|
|
20
19
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CityStateStore.d.ts","sourceRoot":"","sources":["../../../src/city/shared/CityStateStore.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"CityStateStore.d.ts","sourceRoot":"","sources":["../../../src/city/shared/CityStateStore.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAMH,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,sCAAsC,CAAC;AAC9E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AACnE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AAC7D,OAAO,KAAK,EAGV,cAAc,EACf,MAAM,2BAA2B,CAAC;AAEnC,wBAAwB;AACxB,eAAO,MAAM,sBAAsB,6BAA6B,CAAC;AAEjE,oCAAoC;AACpC,eAAO,MAAM,iBAAiB,aAAa,CAAC;AAK5C;;GAEG;AACH,wBAAgB,cAAc,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,CAErD;AAED;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAatD;AAED;;GAEG;AACH,wBAAgB,aAAa,IAAI,cAAc,CAS9C;AAED;;GAEG;AACH,wBAAgB,cAAc,CAAC,KAAK,EAAE,cAAc,GAAG,IAAI,CAO1D;AAED;;GAEG;AACH,wBAAgB,0BAA0B,IAAI,SAAS,GAAG,SAAS,CAElE;AAED;;GAEG;AACH,wBAAgB,2BAA2B,CAAC,UAAU,EAAE,SAAS,GAAG,IAAI,CAMvE;AAED;;GAEG;AACH,wBAAgB,+BAA+B,CAAC,KAAK,GAAE,cAAgC,GAAG,MAAM,CAE/F;AAED;;GAEG;AACH,wBAAgB,yBAAyB,IAAI,eAAe,GAAG,IAAI,CAIlE;AAED;;GAEG;AACH,wBAAgB,gCAAgC,CAAC,cAAc,EAAE,MAAM,GAAG,eAAe,GAAG,IAAI,CAK/F;AAED;;GAEG;AACH,wBAAgB,yBAAyB,CAAC,KAAK,EAAE,cAAc,EAAE,KAAK,EAAE;IACtE;;OAEG;IACH,cAAc,EAAE,MAAM,CAAC;IAEvB;;OAEG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,GAAG,cAAc,CAgBjB;AAED;;;;;;GAMG;AACH,wBAAgB,gBAAgB,IAAI,iBAAiB,EAAE,CA4CtD;AAED;;GAEG;AACH,wBAAgB,8BAA8B,CAAC,cAAc,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAQzF"}
|
|
@@ -5,13 +5,12 @@
|
|
|
5
5
|
* - 只负责读取/写入 City 自己保存的 Federation 与 user session。
|
|
6
6
|
* - 同时提供只读发现 `downfed` admin Federation 配置的能力。
|
|
7
7
|
* - 不包含交互菜单、输出渲染或用户身份校验逻辑。
|
|
8
|
-
* - 向后兼容旧状态字段 `base_url` / `selected_base_url`，迁移时自动改写为 federation_url。
|
|
9
8
|
*/
|
|
10
9
|
import { createCityPlatformStore, createFederationPlatformStore, } from "../runtime/store/index.js";
|
|
11
10
|
/** 默认 Federation 地址。 */
|
|
12
11
|
export const DEFAULT_FEDERATION_URL = "https://base.downcity.ai";
|
|
13
12
|
/** 默认产品身份；仅作为 CLI 的显式预配置 Bureau。 */
|
|
14
|
-
export const DEFAULT_BUREAU_ID = "
|
|
13
|
+
export const DEFAULT_BUREAU_ID = "downcity";
|
|
15
14
|
const CITY_STATE_KEY = "city.city.state";
|
|
16
15
|
const FEDERATION_CONFIG_KEY = "federation.config";
|
|
17
16
|
/**
|
|
@@ -177,7 +176,7 @@ export function read_city_admin_secret_for_url(federation_url) {
|
|
|
177
176
|
const target_url = normalizeCityUrl(federation_url);
|
|
178
177
|
const raw = readCityAdminConfig();
|
|
179
178
|
const servers = Array.isArray(raw.servers) ? raw.servers : [];
|
|
180
|
-
const matched = servers.find((item) =>
|
|
179
|
+
const matched = servers.find((item) => normalizeCityUrl(readCityString(item.base_url)) === target_url);
|
|
181
180
|
return readCityString(matched?.admin_secret_key) || undefined;
|
|
182
181
|
}
|
|
183
182
|
function defaultProtocol(value) {
|
|
@@ -211,11 +210,6 @@ function readCityAdminConfig() {
|
|
|
211
210
|
store.close();
|
|
212
211
|
}
|
|
213
212
|
}
|
|
214
|
-
function read_admin_federation_url(item) {
|
|
215
|
-
return normalizeCityUrl(readCityString(item.base_url) ||
|
|
216
|
-
readCityString(item.federation_url) ||
|
|
217
|
-
readCityString(item.url));
|
|
218
|
-
}
|
|
219
213
|
function read_city_admin_federations() {
|
|
220
214
|
const raw = readCityAdminConfig();
|
|
221
215
|
const servers = Array.isArray(raw.servers) ? raw.servers : [];
|
|
@@ -224,7 +218,7 @@ function read_city_admin_federations() {
|
|
|
224
218
|
const state = readCityState();
|
|
225
219
|
const selected_url = resolve_selected_federation_url(state);
|
|
226
220
|
for (const item of servers) {
|
|
227
|
-
const federation_url =
|
|
221
|
+
const federation_url = normalizeCityUrl(readCityString(item.base_url));
|
|
228
222
|
if (!federation_url || out.some((server) => server.federation_url === federation_url))
|
|
229
223
|
continue;
|
|
230
224
|
const session = state.sessions?.[federation_url];
|
|
@@ -261,12 +255,16 @@ function normalizeLocalState(value) {
|
|
|
261
255
|
: {};
|
|
262
256
|
for (const [key, session] of Object.entries(input_sessions)) {
|
|
263
257
|
const federation_url = normalizeCityUrl(readCityString(session?.federation_url) || key);
|
|
258
|
+
const bureau_id = session?.bureau_id;
|
|
264
259
|
const user_token = readCityString(session?.user_token);
|
|
265
|
-
if (!federation_url
|
|
260
|
+
if (!federation_url
|
|
261
|
+
|| typeof bureau_id !== "string"
|
|
262
|
+
|| bureau_id.length === 0
|
|
263
|
+
|| !user_token)
|
|
266
264
|
continue;
|
|
267
265
|
sessions[federation_url] = {
|
|
268
266
|
federation_url,
|
|
269
|
-
bureau_id
|
|
267
|
+
bureau_id,
|
|
270
268
|
user_id: readCityString(session?.user_id) || undefined,
|
|
271
269
|
user_label: readCityString(session?.user_label) || undefined,
|
|
272
270
|
user_token,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CityStateStore.js","sourceRoot":"","sources":["../../../src/city/shared/CityStateStore.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"CityStateStore.js","sourceRoot":"","sources":["../../../src/city/shared/CityStateStore.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CityUserLogin.d.ts","sourceRoot":"","sources":["../../../src/city/shared/CityUserLogin.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAMH,OAAO,KAAK,EACV,cAAc,EACd,eAAe,EAChB,MAAM,6BAA6B,CAAC;
|
|
1
|
+
{"version":3,"file":"CityUserLogin.d.ts","sourceRoot":"","sources":["../../../src/city/shared/CityUserLogin.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAMH,OAAO,KAAK,EACV,cAAc,EACd,eAAe,EAChB,MAAM,6BAA6B,CAAC;AA6VrC;;GAEG;AACH,wBAAsB,oBAAoB,CACxC,KAAK,EAAE,cAAc,GACpB,OAAO,CAAC,eAAe,GAAG,IAAI,CAAC,CAgBjC"}
|
|
@@ -257,7 +257,7 @@ async function readLoginResult(city, login_id) {
|
|
|
257
257
|
function buildUserSession(input) {
|
|
258
258
|
return {
|
|
259
259
|
federation_url: input.federation_url,
|
|
260
|
-
bureau_id:
|
|
260
|
+
bureau_id: input.bureau_id,
|
|
261
261
|
user_token: input.user_token,
|
|
262
262
|
user_id: readString(input.user_id) || undefined,
|
|
263
263
|
user_label: readString(input.user_label) || undefined,
|
|
@@ -268,6 +268,7 @@ async function buildVerifiedUserSession(input) {
|
|
|
268
268
|
const verified = await readUserSessionFromToken(input);
|
|
269
269
|
return buildUserSession({
|
|
270
270
|
...input,
|
|
271
|
+
bureau_id: verified.bureau_id,
|
|
271
272
|
user_id: verified.user_id || input.user_id,
|
|
272
273
|
user_label: verified.user_label || input.user_label,
|
|
273
274
|
});
|
|
@@ -278,10 +279,17 @@ async function readUserSessionFromToken(input) {
|
|
|
278
279
|
user_token: input.user_token,
|
|
279
280
|
});
|
|
280
281
|
const result = await city.service("accounts").get("me");
|
|
282
|
+
const bureau_id = typeof result.user?.bureau_id === "string"
|
|
283
|
+
? result.user.bureau_id
|
|
284
|
+
: "";
|
|
281
285
|
const user_id = readString(result.user?.user_id);
|
|
286
|
+
if (!bureau_id) {
|
|
287
|
+
throw new Error("City user token resolved without a bureau_id.");
|
|
288
|
+
}
|
|
282
289
|
const email = readString(result.profile?.email);
|
|
283
290
|
const display_name = readString(result.profile?.display_name);
|
|
284
291
|
return {
|
|
292
|
+
bureau_id,
|
|
285
293
|
user_id: user_id || undefined,
|
|
286
294
|
user_label: email || display_name || user_id || undefined,
|
|
287
295
|
};
|
|
@@ -309,6 +317,9 @@ function formatProviderLabel(provider) {
|
|
|
309
317
|
* 执行 City user 登录。
|
|
310
318
|
*/
|
|
311
319
|
export async function performCityUserLogin(input) {
|
|
320
|
+
if (typeof input.bureau_id !== "string" || input.bureau_id.length === 0) {
|
|
321
|
+
throw new TypeError("bureau_id is required");
|
|
322
|
+
}
|
|
312
323
|
const method = await promptAuthMethod(input.federation_url);
|
|
313
324
|
if (!method)
|
|
314
325
|
return null;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CityUserLogin.js","sourceRoot":"","sources":["../../../src/city/shared/CityUserLogin.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,OAAO,MAAM,uBAAuB,CAAC;AAC5C,OAAO,EAAE,IAAI,EAAE,MAAM,gBAAgB,CAAC;AACtC,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAC;AACvD,OAAO,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AA2ChE,SAAS,UAAU,CAAC,KAAc;IAChC,OAAO,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;AACvD,CAAC;AAED,SAAS,qBAAqB,CAAC,KAA6B;IAC1D,MAAM,OAAO,GAAiB,EAAE,CAAC;IACjC,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,IAAI,CAAC,IAAI,CAAC,OAAO;YAAE,SAAS;QAC5B,IAAI,IAAI,CAAC,EAAE,KAAK,OAAO,IAAI,IAAI,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;YACjD,IAAI,IAAI,CAAC,aAAa,KAAK,KAAK,EAAE,CAAC;gBACjC,OAAO,CAAC,IAAI,CAAC;oBACX,KAAK,EAAE,aAAa;oBACpB,KAAK,EAAE,OAAO;oBACd,WAAW,EAAE,+BAA+B;iBAC7C,CAAC,CAAC;YACL,CAAC;YACD,IAAI,IAAI,CAAC,gBAAgB,KAAK,KAAK,EAAE,CAAC;gBACpC,OAAO,CAAC,IAAI,CAAC;oBACX,KAAK,EAAE,gBAAgB;oBACvB,KAAK,EAAE,UAAU;oBACjB,WAAW,EAAE,2BAA2B;iBACzC,CAAC,CAAC;YACL,CAAC;YACD,SAAS;QACX,CAAC;QACD,IAAI,IAAI,CAAC,IAAI,KAAK,OAAO,IAAI,OAAO,IAAI,CAAC,EAAE,KAAK,QAAQ,IAAI,IAAI,CAAC,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC;YAC3E,MAAM,QAAQ,GAAG,IAAI,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC;YAChC,OAAO,CAAC,IAAI,CAAC;gBACX,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,IAAI,EAAE,IAAI,mBAAmB,CAAC,QAAQ,CAAC;gBAC1D,KAAK,EAAE,SAAS,QAAQ,EAAE;gBAC1B,WAAW,EAAE,gBAAgB,IAAI,CAAC,KAAK,EAAE,IAAI,EAAE,IAAI,mBAAmB,CAAC,QAAQ,CAAC,EAAE;aACnF,CAAC,CAAC;YACH,SAAS;QACX,CAAC;QACD,IAAI,IAAI,CAAC,IAAI,KAAK,OAAO,IAAI,OAAO,IAAI,CAAC,EAAE,KAAK,QAAQ,IAAI,IAAI,CAAC,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC;YAC3E,MAAM,QAAQ,GAAG,IAAI,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC;YAChC,OAAO,CAAC,IAAI,CAAC;gBACX,KAAK,EAAE,mBAAmB,CAAC,QAAQ,CAAC;gBACpC,KAAK,EAAE,SAAS,QAAQ,EAAE;gBAC1B,WAAW,EAAE,gBAAgB,mBAAmB,CAAC,QAAQ,CAAC,QAAQ;aACnE,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IACD,OAAO,OAAO,CAAC;AACjB,CAAC;AAED,KAAK,UAAU,eAAe,CAAC,cAAsB;IACnD,MAAM,IAAI,GAAG,IAAI,IAAI,CAAC,EAAE,cAAc,EAAE,CAAC,CAAC;IAC1C,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;IAC1C,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,GAAG,CAAqC,WAAW,CAAC,CAAC;IACnF,OAAO,qBAAqB,CAAC,MAAM,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC;AACnD,CAAC;AAED,KAAK,UAAU,gBAAgB,CAAC,cAAsB;IACpD,MAAM,YAAY,GAAG,MAAM,eAAe,CAAC,cAAc,CAAC,CAAC;IAC3D,IAAI,YAAY,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC9B,YAAY,CAAC;YACX,IAAI,EAAE,SAAS;YACf,KAAK,EAAE,oBAAoB;YAC3B,IAAI,EAAE,oDAAoD;SAC3D,CAAC,CAAC;QACH,OAAO,IAAI,CAAC;IACd,CAAC;IACD,MAAM,QAAQ,GAAG,CAAC,MAAM,OAAO,CAAC;QAC9B,IAAI,EAAE,QAAQ;QACd,IAAI,EAAE,QAAQ;QACd,OAAO,EAAE,SAAS;QAClB,OAAO,EAAE,YAAY,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;YACnC,KAAK,EAAE,IAAI,CAAC,KAAK;YACjB,WAAW,EAAE,IAAI,CAAC,WAAW;YAC7B,KAAK,EAAE,IAAI,CAAC,KAAK;SAClB,CAAC,CAAC;KACJ,CAAC,CAAgC,CAAC;IACnC,OAAO,QAAQ,CAAC,MAAM,IAAI,IAAI,CAAC;AACjC,CAAC;AAED,KAAK,UAAU,UAAU,CAAC,KAAqB;IAC7C,MAAM,QAAQ,GAAG,CAAC,MAAM,OAAO,CAAC;QAC9B;YACE,IAAI,EAAE,MAAM;YACZ,IAAI,EAAE,OAAO;YACb,OAAO,EAAE,OAAO;SACjB;QACD;YACE,IAAI,EAAE,UAAU;YAChB,IAAI,EAAE,UAAU;YAChB,OAAO,EAAE,UAAU;SACpB;KACF,CAAC,CAA0C,CAAC;IAC7C,MAAM,KAAK,GAAG,UAAU,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IACzC,MAAM,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC;IACjD,IAAI,CAAC,KAAK,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ;QAAE,OAAO,IAAI,CAAC;IAE7D,MAAM,IAAI,GAAG,IAAI,IAAI,CAAC,EAAE,cAAc,EAAE,KAAK,CAAC,cAAc,EAAE,CAAC,CAAC;IAChE,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;IAC1C,MAAM,OAAO,GAAG,MAAM,QAAQ,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,MAAM,CAAkB;QAC3E,QAAQ,EAAE,OAAO;QACjB,SAAS,EAAE,KAAK,CAAC,SAAS;KAC3B,CAAC,CAAC;IACH,IAAI,OAAO,CAAC,KAAK,IAAI,OAAO,CAAC,MAAM,KAAK,gBAAgB,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC;QAC9E,MAAM,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,IAAI,6BAA6B,CAAC,CAAC;IAClE,CAAC;IAED,MAAM,SAAS,GAAG,MAAM,QAAQ,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC,MAAM,CAAqB;QACnF,QAAQ,EAAE,OAAO,CAAC,QAAQ;QAC1B,KAAK,EAAE,EAAE,KAAK,EAAE,QAAQ,EAAE;KAC3B,CAAC,CAAC;IACH,IAAI,SAAS,CAAC,KAAK,IAAI,SAAS,CAAC,MAAM,KAAK,MAAM,EAAE,CAAC;QACnD,MAAM,IAAI,KAAK,CAAC,SAAS,CAAC,KAAK,IAAI,cAAc,CAAC,CAAC;IACrD,CAAC;IAED,MAAM,MAAM,GAAG,MAAM,eAAe,CAAC,IAAI,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC;IAC7D,IAAI,CAAC,MAAM,IAAI,MAAM,CAAC,KAAK,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC;QAClD,MAAM,IAAI,KAAK,CAAC,MAAM,EAAE,KAAK,IAAI,wBAAwB,CAAC,CAAC;IAC7D,CAAC;IACD,OAAO,MAAM,wBAAwB,CAAC;QACpC,GAAG,KAAK;QACR,UAAU,EAAE,MAAM,CAAC,UAAU;QAC7B,OAAO,EAAE,MAAM,CAAC,OAAO;QACvB,UAAU,EAAE,MAAM,CAAC,KAAK,IAAI,KAAK;KAClC,CAAC,CAAC;AACL,CAAC;AAED,KAAK,UAAU,aAAa,CAAC,KAAqB;IAChD,MAAM,QAAQ,GAAG,CAAC,MAAM,OAAO,CAAC;QAC9B;YACE,IAAI,EAAE,MAAM;YACZ,IAAI,EAAE,OAAO;YACb,OAAO,EAAE,OAAO;SACjB;QACD;YACE,IAAI,EAAE,UAAU;YAChB,IAAI,EAAE,UAAU;YAChB,OAAO,EAAE,6BAA6B;SACvC;KACF,CAAC,CAA0C,CAAC;IAC7C,MAAM,KAAK,GAAG,UAAU,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;IACzC,MAAM,QAAQ,GAAG,MAAM,CAAC,QAAQ,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC;IACjD,IAAI,CAAC,KAAK,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC;QAAE,MAAM,IAAI,KAAK,CAAC,eAAe,CAAC,CAAC;IACrE,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC;QAAE,MAAM,IAAI,KAAK,CAAC,wCAAwC,CAAC,CAAC;IAEnF,MAAM,IAAI,GAAG,IAAI,IAAI,CAAC,EAAE,cAAc,EAAE,KAAK,CAAC,cAAc,EAAE,CAAC,CAAC;IAChE,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;IAC1C,MAAM,UAAU,GAAG,MAAM,QAAQ,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,MAAM,CAAiB;QAC1E,KAAK;QACL,QAAQ;KACT,CAAC,CAAC;IACH,IAAI,UAAU,CAAC,KAAK,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC;QAC5C,MAAM,IAAI,KAAK,CAAC,UAAU,CAAC,KAAK,IAAI,qBAAqB,CAAC,CAAC;IAC7D,CAAC;IAED,YAAY,CAAC;QACX,IAAI,EAAE,SAAS;QACf,KAAK,EAAE,wBAAwB;QAC/B,IAAI,EAAE,gFAAgF;KACvF,CAAC,CAAC;IAEH,MAAM,eAAe,GAAG,CAAC,MAAM,OAAO,CAAC;QACrC,IAAI,EAAE,MAAM;QACZ,IAAI,EAAE,oBAAoB;QAC1B,OAAO,EAAE,oBAAoB;KAC9B,CAAC,CAAoC,CAAC;IACvC,MAAM,kBAAkB,GAAG,UAAU,CAAC,eAAe,CAAC,kBAAkB,CAAC,CAAC;IAC1E,IAAI,CAAC,kBAAkB;QAAE,OAAO,IAAI,CAAC;IAErC,MAAM,QAAQ,GAAG,MAAM,QAAQ,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,MAAM,CAAe;QAC1E,KAAK,EAAE,kBAAkB;QACzB,SAAS,EAAE,KAAK,CAAC,SAAS;KAC3B,CAAC,CAAC;IACH,IAAI,QAAQ,CAAC,KAAK,IAAI,CAAC,QAAQ,CAAC,UAAU,EAAE,CAAC;QAC3C,MAAM,IAAI,KAAK,CAAC,QAAQ,CAAC,KAAK,IAAI,+BAA+B,CAAC,CAAC;IACrE,CAAC;IACD,OAAO,MAAM,wBAAwB,CAAC;QACpC,GAAG,KAAK;QACR,UAAU,EAAE,QAAQ,CAAC,UAAU;QAC/B,OAAO,EAAE,QAAQ,CAAC,OAAO,IAAI,UAAU,CAAC,OAAO;QAC/C,UAAU,EAAE,KAAK;KAClB,CAAC,CAAC;AACL,CAAC;AAED,KAAK,UAAU,SAAS,CACtB,KAAqB,EACrB,QAAgB;IAEhB,MAAM,IAAI,GAAG,IAAI,IAAI,CAAC,EAAE,cAAc,EAAE,KAAK,CAAC,cAAc,EAAE,CAAC,CAAC;IAChE,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;IAC1C,MAAM,OAAO,GAAG,MAAM,QAAQ,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,MAAM,CAAkB;QAC3E,QAAQ;QACR,SAAS,EAAE,KAAK,CAAC,SAAS;KAC3B,CAAC,CAAC;IACH,IAAI,OAAO,CAAC,KAAK,IAAI,OAAO,CAAC,MAAM,KAAK,mBAAmB,IAAI,CAAC,OAAO,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC;QACjG,MAAM,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,IAAI,uBAAuB,CAAC,CAAC;IAC5D,CAAC;IAED,MAAM,MAAM,GAAG,mBAAmB,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IAChD,YAAY,CAAC;QACX,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS;QACjC,KAAK,EAAE,UAAU,mBAAmB,CAAC,QAAQ,CAAC,EAAE;QAChD,OAAO,EAAE,MAAM;YACb,CAAC,CAAC,qDAAqD;YACvD,CAAC,CAAC,sDAAsD;QAC1D,KAAK,EAAE;YACL,EAAE,KAAK,EAAE,mBAAmB,EAAE,KAAK,EAAE,OAAO,CAAC,GAAG,EAAE;YAClD,EAAE,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,YAAY,EAAE;SAC9D;QACD,IAAI,EAAE,sCAAsC;KAC7C,CAAC,CAAC;IAEH,MAAM,MAAM,GAAG,MAAM,eAAe,CAAC,IAAI,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC;IAC7D,IAAI,CAAC,MAAM,IAAI,MAAM,CAAC,KAAK,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC;QAClD,MAAM,IAAI,KAAK,CAAC,MAAM,EAAE,KAAK,IAAI,cAAc,CAAC,CAAC;IACnD,CAAC;IACD,OAAO,MAAM,wBAAwB,CAAC;QACpC,GAAG,KAAK;QACR,UAAU,EAAE,MAAM,CAAC,UAAU;QAC7B,OAAO,EAAE,MAAM,CAAC,OAAO;QACvB,UAAU,EAAE,MAAM,CAAC,KAAK,IAAI,GAAG,QAAQ,IAAI,MAAM,CAAC,OAAO,IAAI,EAAE,EAAE;KAClE,CAAC,CAAC;AACL,CAAC;AAED,KAAK,UAAU,SAAS,CACtB,KAAqB,EACrB,QAAgB;IAEhB,MAAM,IAAI,GAAG,IAAI,IAAI,CAAC,EAAE,cAAc,EAAE,KAAK,CAAC,cAAc,EAAE,CAAC,CAAC;IAChE,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,MAAM,CAAkB;QAC3F,QAAQ;QACR,SAAS,EAAE,KAAK,CAAC,SAAS;KAC3B,CAAC,CAAC;IACH,IAAI,OAAO,CAAC,KAAK,IAAI,OAAO,CAAC,MAAM,KAAK,MAAM,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC;QACpE,MAAM,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,IAAI,cAAc,CAAC,CAAC;IACnD,CAAC;IACD,MAAM,MAAM,GAAG,MAAM,eAAe,CAAC,IAAI,EAAE,OAAO,CAAC,QAAQ,CAAC,CAAC;IAC7D,IAAI,CAAC,MAAM,IAAI,MAAM,CAAC,KAAK,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC;QAClD,MAAM,IAAI,KAAK,CAAC,MAAM,EAAE,KAAK,IAAI,wBAAwB,CAAC,CAAC;IAC7D,CAAC;IACD,OAAO,MAAM,wBAAwB,CAAC;QACpC,GAAG,KAAK;QACR,UAAU,EAAE,MAAM,CAAC,UAAU;QAC7B,OAAO,EAAE,MAAM,CAAC,OAAO;QACvB,UAAU,EAAE,MAAM,CAAC,KAAK,IAAI,MAAM,CAAC,OAAO,IAAI,QAAQ;KACvD,CAAC,CAAC;AACL,CAAC;AAED,KAAK,UAAU,eAAe,CAAC,IAAU,EAAE,QAAgB;IACzD,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,GAAG,EAAE,KAAK,IAAI,CAAC,EAAE,CAAC;QAC5C,IAAI,CAAC;YACH,MAAM,MAAM,GAAG,MAAM,eAAe,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;YACrD,IAAI,MAAM,CAAC,KAAK;gBAAE,OAAO,MAAM,CAAC;YAChC,IAAI,MAAM,CAAC,MAAM,KAAK,MAAM;gBAAE,OAAO,MAAM,CAAC;QAC9C,CAAC;QAAC,MAAM,CAAC;YACP,uCAAuC;QACzC,CAAC;QACD,MAAM,KAAK,CAAC,IAAI,CAAC,CAAC;IACpB,CAAC;IACD,OAAO,EAAE,KAAK,EAAE,iBAAiB,EAAE,CAAC;AACtC,CAAC;AAED,KAAK,UAAU,eAAe,CAAC,IAAU,EAAE,QAAgB;IACzD,OAAO,MAAM,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,GAAG,CAAkB,cAAc,EAAE,EAAE,QAAQ,EAAE,CAAC,CAAC;AAC3F,CAAC;AAED,SAAS,gBAAgB,CAAC,KAIzB;IACC,OAAO;QACL,cAAc,EAAE,KAAK,CAAC,cAAc;QACpC,SAAS,EAAE,UAAU,CAAC,KAAK,CAAC,SAAS,CAAC,IAAI,iBAAiB;QAC3D,UAAU,EAAE,KAAK,CAAC,UAAU;QAC5B,OAAO,EAAE,UAAU,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,SAAS;QAC/C,UAAU,EAAE,UAAU,CAAC,KAAK,CAAC,UAAU,CAAC,IAAI,SAAS;QACrD,UAAU,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;KACrC,CAAC;AACJ,CAAC;AAED,KAAK,UAAU,wBAAwB,CAAC,KAIvC;IACC,MAAM,QAAQ,GAAG,MAAM,wBAAwB,CAAC,KAAK,CAAC,CAAC;IACvD,OAAO,gBAAgB,CAAC;QACtB,GAAG,KAAK;QACR,OAAO,EAAE,QAAQ,CAAC,OAAO,IAAI,KAAK,CAAC,OAAO;QAC1C,UAAU,EAAE,QAAQ,CAAC,UAAU,IAAI,KAAK,CAAC,UAAU;KACpD,CAAC,CAAC;AACL,CAAC;AAED,KAAK,UAAU,wBAAwB,CAAC,KAEvC;IAIC,MAAM,IAAI,GAAG,IAAI,IAAI,CAAC;QACpB,cAAc,EAAE,KAAK,CAAC,cAAc;QACpC,UAAU,EAAE,KAAK,CAAC,UAAU;KAC7B,CAAC,CAAC;IACH,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC,GAAG,CAAmB,IAAI,CAAC,CAAC;IAC1E,MAAM,OAAO,GAAG,UAAU,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IACjD,MAAM,KAAK,GAAG,UAAU,CAAC,MAAM,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;IAChD,MAAM,YAAY,GAAG,UAAU,CAAC,MAAM,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;IAC9D,OAAO;QACL,OAAO,EAAE,OAAO,IAAI,SAAS;QAC7B,UAAU,EAAE,KAAK,IAAI,YAAY,IAAI,OAAO,IAAI,SAAS;KAC1D,CAAC;AACJ,CAAC;AAED,SAAS,KAAK,CAAC,EAAU;IACvB,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC;AAC3D,CAAC;AAED,SAAS,mBAAmB,CAAC,QAAgB;IAC3C,MAAM,UAAU,GAAG,QAAQ,CAAC,IAAI,EAAE,CAAC,WAAW,EAAE,CAAC;IACjD,IAAI,CAAC,UAAU;QAAE,OAAO,OAAO,CAAC;IAChC,IAAI,UAAU,KAAK,QAAQ;QAAE,OAAO,QAAQ,CAAC;IAC7C,IAAI,UAAU,KAAK,QAAQ;QAAE,OAAO,QAAQ,CAAC;IAC7C,IAAI,UAAU,KAAK,QAAQ;QAAE,OAAO,QAAQ,CAAC;IAC7C,OAAO,UAAU;SACd,KAAK,CAAC,OAAO,CAAC;SACd,MAAM,CAAC,OAAO,CAAC;SACf,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;SAC7D,IAAI,CAAC,GAAG,CAAC,CAAC;AACf,CAAC;AAED;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,oBAAoB,CACxC,KAAqB;IAErB,MAAM,MAAM,GAAG,MAAM,gBAAgB,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;IAC5D,IAAI,CAAC,MAAM;QAAE,OAAO,IAAI,CAAC;IACzB,IAAI,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC;QAChC,OAAO,MAAM,SAAS,CAAC,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC;IAC/D,CAAC;IACD,IAAI,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC;QAChC,OAAO,MAAM,SAAS,CAAC,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC;IAC/D,CAAC;IACD,IAAI,MAAM,KAAK,UAAU,EAAE,CAAC;QAC1B,OAAO,MAAM,aAAa,CAAC,KAAK,CAAC,CAAC;IACpC,CAAC;IACD,OAAO,MAAM,UAAU,CAAC,KAAK,CAAC,CAAC;AACjC,CAAC"}
|
|
1
|
+
{"version":3,"file":"CityUserLogin.js","sourceRoot":"","sources":["../../../src/city/shared/CityUserLogin.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CityUserManager.d.ts","sourceRoot":"","sources":["../../../src/city/shared/CityUserManager.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,EAAE,IAAI,EAAE,MAAM,gBAAgB,CAAC;AAStC,OAAO,KAAK,EACV,gBAAgB,EAChB,oBAAoB,EAGrB,MAAM,0BAA0B,CAAC;AAElC;;GAEG;AACH,qBAAa,eAAe;IAC1B;;OAEG;IACG,kBAAkB,CAAC,KAAK,GAAE,oBAAyB,GAAG,OAAO,CAAC,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"CityUserManager.d.ts","sourceRoot":"","sources":["../../../src/city/shared/CityUserManager.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,EAAE,IAAI,EAAE,MAAM,gBAAgB,CAAC;AAStC,OAAO,KAAK,EACV,gBAAgB,EAChB,oBAAoB,EAGrB,MAAM,0BAA0B,CAAC;AAElC;;GAEG;AACH,qBAAa,eAAe;IAC1B;;OAEG;IACG,kBAAkB,CAAC,KAAK,GAAE,oBAAyB,GAAG,OAAO,CAAC,gBAAgB,CAAC;IAwDrF;;OAEG;IACG,gBAAgB,CAAC,KAAK,GAAE,oBAAyB,GAAG,OAAO,CAAC;QAChE;;WAEG;QACH,IAAI,EAAE,gBAAgB,CAAC;QAEvB;;WAEG;QACH,IAAI,EAAE,IAAI,CAAC;KACZ,CAAC;IAiBF;;OAEG;IACH,eAAe,CAAC,cAAc,EAAE,MAAM,EAAE,GAAG,GAAE,MAAM,CAAC,UAAU,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAe,GAAG,MAAM,GAAG,SAAS;YAMxH,iBAAiB;CAqChC"}
|
|
@@ -23,9 +23,6 @@ export class CityUserManager {
|
|
|
23
23
|
const env_federation_url = allow_env_override
|
|
24
24
|
? readFirstEnv(env, ["DOWNCITY_CITY_URL", "CITY_URL"])
|
|
25
25
|
: "";
|
|
26
|
-
const env_bureau_id = allow_env_override
|
|
27
|
-
? readFirstEnv(env, ["DOWNCITY_CITY_ID", "CITY_ID"])
|
|
28
|
-
: "";
|
|
29
26
|
const env_user_token = allow_env_override
|
|
30
27
|
? readFirstEnv(env, ["DOWNCITY_CITY_USER_TOKEN", "CITY_USER_TOKEN"])
|
|
31
28
|
: "";
|
|
@@ -36,10 +33,9 @@ export class CityUserManager {
|
|
|
36
33
|
: read_city_session_for_federation(federation_url);
|
|
37
34
|
const env_overrides = {
|
|
38
35
|
federation_url: Boolean(env_federation_url),
|
|
39
|
-
bureau_id: Boolean(env_bureau_id),
|
|
40
36
|
user_token: Boolean(env_user_token),
|
|
41
37
|
};
|
|
42
|
-
const bureau_id =
|
|
38
|
+
const bureau_id = session?.bureau_id ?? DEFAULT_BUREAU_ID;
|
|
43
39
|
const user_token = env_user_token || session?.user_token || "";
|
|
44
40
|
const source = env_user_token ? "env" : "city-session";
|
|
45
41
|
const warnings = [];
|
|
@@ -104,9 +100,15 @@ export class CityUserManager {
|
|
|
104
100
|
});
|
|
105
101
|
const result = await city.service("accounts").get("me");
|
|
106
102
|
const token_user_id = readString(result.user?.user_id);
|
|
103
|
+
const token_bureau_id = typeof result.user?.bureau_id === "string"
|
|
104
|
+
? result.user.bureau_id
|
|
105
|
+
: "";
|
|
107
106
|
if (!token_user_id) {
|
|
108
107
|
throw new Error("City user token resolved without a user_id. Run `city city login` again.");
|
|
109
108
|
}
|
|
109
|
+
if (!token_bureau_id) {
|
|
110
|
+
throw new Error("City user token resolved without a bureau_id. Run `city city login` again.");
|
|
111
|
+
}
|
|
110
112
|
if (session_user_id && !user.env_overrides.user_token && session_user_id !== token_user_id) {
|
|
111
113
|
throw new Error([
|
|
112
114
|
"City session user does not match the authenticated token.",
|
|
@@ -119,6 +121,7 @@ export class CityUserManager {
|
|
|
119
121
|
const display_name = readString(result.profile?.display_name);
|
|
120
122
|
return {
|
|
121
123
|
...user,
|
|
124
|
+
bureau_id: token_bureau_id,
|
|
122
125
|
user_id: token_user_id,
|
|
123
126
|
user_label: email || display_name || token_user_id,
|
|
124
127
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CityUserManager.js","sourceRoot":"","sources":["../../../src/city/shared/CityUserManager.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,EAAE,IAAI,EAAE,MAAM,gBAAgB,CAAC;AACtC,OAAO,EACL,sBAAsB,EACtB,iBAAiB,EACjB,gBAAgB,EAChB,8BAA8B,EAC9B,yBAAyB,EACzB,gCAAgC,GACjC,MAAM,iCAAiC,CAAC;AAQzC;;GAEG;AACH,MAAM,OAAO,eAAe;IAC1B;;OAEG;IACH,KAAK,CAAC,kBAAkB,CAAC,QAA8B,EAAE;QACvD,MAAM,GAAG,GAAG,KAAK,CAAC,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC;QACrC,MAAM,kBAAkB,GAAG,KAAK,CAAC,kBAAkB,KAAK,KAAK,CAAC;QAC9D,MAAM,kBAAkB,GAAG,KAAK,CAAC,kBAAkB,KAAK,KAAK,CAAC;QAC9D,MAAM,WAAW,GAAG,KAAK,CAAC,WAAW,KAAK,KAAK,CAAC;QAChD,MAAM,kBAAkB,GAAG,kBAAkB;YAC3C,CAAC,CAAC,YAAY,CAAC,GAAG,EAAE,CAAC,mBAAmB,EAAE,UAAU,CAAC,CAAC;YACtD,CAAC,CAAC,EAAE,CAAC;QACP,MAAM,
|
|
1
|
+
{"version":3,"file":"CityUserManager.js","sourceRoot":"","sources":["../../../src/city/shared/CityUserManager.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FederationConnection.d.ts","sourceRoot":"","sources":["../../../src/city/shared/FederationConnection.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAQH,OAAO,KAAK,EACV,yBAAyB,EAE1B,MAAM,sCAAsC,CAAC;
|
|
1
|
+
{"version":3,"file":"FederationConnection.d.ts","sourceRoot":"","sources":["../../../src/city/shared/FederationConnection.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAQH,OAAO,KAAK,EACV,yBAAyB,EAE1B,MAAM,sCAAsC,CAAC;AAgB9C,wBAAgB,qCAAqC,CAAC,cAAc,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAEhG;AAcD,wBAAgB,gCAAgC,IAAI,yBAAyB,CA0B5E;AAED,wBAAgB,sBAAsB,CAAC,OAAO,CAAC,EAAE;IAAE,OAAO,CAAC,EAAE,OAAO,CAAA;CAAE,GAAG,IAAI,CA8B5E;AAED,wBAAsB,kBAAkB,CAAC,OAAO,CAAC,EAAE;IAAE,OAAO,CAAC,EAAE,OAAO,CAAA;CAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAsDvF;AAED,wBAAgB,oBAAoB,CAAC,OAAO,CAAC,EAAE;IAAE,OAAO,CAAC,EAAE,OAAO,CAAA;CAAE,GAAG,IAAI,CA+B1E;AAED,wBAAsB,2BAA2B,CAAC,MAAM,EAAE;IACxD,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB,GAAG,OAAO,CAAC,IAAI,CAAC,CA2BhB;AAED,wBAAsB,0BAA0B,CAAC,MAAM,EAAE;IACvD,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB,GAAG,OAAO,CAAC,IAAI,CAAC,CAgChB;AAiBD,wBAAsB,4BAA4B,CAAC,MAAM,EAAE;IACzD,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB,GAAG,OAAO,CAAC,IAAI,CAAC,CAsChB;AAED,wBAAgB,6BAA6B,CAAC,OAAO,CAAC,EAAE;IAAE,OAAO,CAAC,EAAE,OAAO,CAAA;CAAE,GAAG,IAAI,CAiBnF;AAED,wBAAgB,4BAA4B,CAAC,OAAO,CAAC,EAAE;IAAE,OAAO,CAAC,EAAE,OAAO,CAAA;CAAE,GAAG,IAAI,CAqBlF;AAED,wBAAsB,kCAAkC,IAAI,OAAO,CAAC,IAAI,CAAC,CAGxE"}
|
|
@@ -13,11 +13,8 @@ import { performCityUserLogin } from "./CityUserLogin.js";
|
|
|
13
13
|
import { open_city_manager_tui } from "../tui/FederationManagerTui.js";
|
|
14
14
|
import prompts from "../tui/Prompts.js";
|
|
15
15
|
import { CityUserManager } from "./CityUserManager.js";
|
|
16
|
-
import { DEFAULT_FEDERATION_URL, DEFAULT_BUREAU_ID, list_federations, normalizeCityUrl, read_city_admin_secret_for_url,
|
|
16
|
+
import { DEFAULT_FEDERATION_URL, DEFAULT_BUREAU_ID, list_federations, normalizeCityUrl, read_city_admin_secret_for_url, read_current_city_session, readCityState, resolve_selected_federation_url, upsert_federation_profile, writeCityState, } from "./CityStateStore.js";
|
|
17
17
|
const cityUserManager = new CityUserManager();
|
|
18
|
-
function readString(value) {
|
|
19
|
-
return readCityString(value);
|
|
20
|
-
}
|
|
21
18
|
export function read_city_admin_secret_for_federation(federation_url) {
|
|
22
19
|
return read_city_admin_secret_for_url(federation_url);
|
|
23
20
|
}
|
|
@@ -38,7 +35,7 @@ export function read_federation_membership_state() {
|
|
|
38
35
|
if (session?.user_token) {
|
|
39
36
|
return {
|
|
40
37
|
federation_url,
|
|
41
|
-
bureau_id: session.bureau_id
|
|
38
|
+
bureau_id: session.bureau_id,
|
|
42
39
|
has_user_token: true,
|
|
43
40
|
source: "city-session",
|
|
44
41
|
user_id: session.user_id,
|
|
@@ -77,7 +74,7 @@ export function emit_federation_status(options) {
|
|
|
77
74
|
summary: state.has_user_token ? "signed in" : "federation selected",
|
|
78
75
|
facts: [
|
|
79
76
|
{ label: "url", value: state.federation_url },
|
|
80
|
-
{ label: "
|
|
77
|
+
{ label: "Bureau ID", value: state.bureau_id },
|
|
81
78
|
{ label: "user token", value: state.has_user_token ? "configured" : "missing" },
|
|
82
79
|
{ label: "source", value: state.source },
|
|
83
80
|
...(state.user_id ? [{ label: "user", value: state.user_id }] : []),
|
|
@@ -113,12 +110,11 @@ export async function emitCityUserWhoami(options) {
|
|
|
113
110
|
summary: user.source,
|
|
114
111
|
facts: [
|
|
115
112
|
{ label: "url", value: user.federation_url },
|
|
116
|
-
{ label: "
|
|
113
|
+
{ label: "Bureau ID", value: user.bureau_id },
|
|
117
114
|
{ label: "user", value: user.user_id || "unknown" },
|
|
118
115
|
...(user.user_label ? [{ label: "label", value: user.user_label }] : []),
|
|
119
116
|
{ label: "source", value: user.source },
|
|
120
117
|
{ label: "env url", value: user.env_overrides.federation_url ? "yes" : "no" },
|
|
121
|
-
{ label: "env city", value: user.env_overrides.bureau_id ? "yes" : "no" },
|
|
122
118
|
{ label: "env token", value: user.env_overrides.user_token ? "yes" : "no" },
|
|
123
119
|
],
|
|
124
120
|
note: user.warnings.join(" ") || undefined,
|
|
@@ -253,7 +249,9 @@ export async function run_federation_login_command(params) {
|
|
|
253
249
|
}
|
|
254
250
|
const state = readCityState();
|
|
255
251
|
const federation_url = resolve_selected_federation_url(state);
|
|
256
|
-
const bureau_id =
|
|
252
|
+
const bureau_id = params.bureau_id
|
|
253
|
+
?? read_current_city_session()?.bureau_id
|
|
254
|
+
?? DEFAULT_BUREAU_ID;
|
|
257
255
|
const session = await performCityUserLogin({
|
|
258
256
|
federation_url,
|
|
259
257
|
bureau_id,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FederationConnection.js","sourceRoot":"","sources":["../../../src/city/shared/FederationConnection.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"FederationConnection.js","sourceRoot":"","sources":["../../../src/city/shared/FederationConnection.ts"],"names":[],"mappings":"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"}
|
|
@@ -130,7 +130,7 @@ function build_federation_detail(city_state) {
|
|
|
130
130
|
`{bold}当前 City 连接{/bold}`,
|
|
131
131
|
`base：${city_state.federation_url}`,
|
|
132
132
|
`source：${city_state.source}`,
|
|
133
|
-
`
|
|
133
|
+
`Bureau ID：${city_state.bureau_id}`,
|
|
134
134
|
`user token：${configured_state_text(city_state.has_user_token)}`,
|
|
135
135
|
city_state.user_id ? `user id：${city_state.user_id}` : "",
|
|
136
136
|
"",
|
|
@@ -140,7 +140,7 @@ function build_federation_detail(city_state) {
|
|
|
140
140
|
`{bold}Current City connection{/bold}`,
|
|
141
141
|
`base: ${city_state.federation_url}`,
|
|
142
142
|
`source: ${city_state.source}`,
|
|
143
|
-
`
|
|
143
|
+
`Bureau ID: ${city_state.bureau_id}`,
|
|
144
144
|
`user token: ${configured_state_text(city_state.has_user_token)}`,
|
|
145
145
|
city_state.user_id ? `user id: ${city_state.user_id}` : "",
|
|
146
146
|
"",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CityDashboard.js","sourceRoot":"","sources":["../../../src/city/tui/CityDashboard.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"CityDashboard.js","sourceRoot":"","sources":["../../../src/city/tui/CityDashboard.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FederationManagerFormat.d.ts","sourceRoot":"","sources":["../../../src/city/tui/FederationManagerFormat.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAGH,OAAO,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAC;AAEnE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,sCAAsC,CAAC;AAC/E,OAAO,KAAK,EAAE,yBAAyB,EAAE,iBAAiB,EAAE,MAAM,sCAAsC,CAAC;AACzG,OAAO,KAAK,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AAC1F,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAEzD,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,aAAa,GAAG,SAAS,GAAG,OAAO,CAEzE;AAED,wBAAgB,aAAa,CAAC,KAAK,EAAE,kBAAkB,GAAG,MAAM,CAM/D;AAED,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,aAAa,GAAG,MAAM,CAKlE;AAED,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,aAAa,GAAG,SAAS,GAAG,MAAM,CAmB1E;AAED,wBAAgB,aAAa,CAAC,IAAI,EAAE,aAAa,GAAG,SAAS,GAAG,MAAM,CAOrE;AAED,wBAAgB,mBAAmB,CACjC,UAAU,EAAE,yBAAyB,EACrC,OAAO,EAAE,kBAAkB,GAAG,IAAI,GACjC,MAAM,CAWR;AACD,wBAAgB,wBAAwB,CAAC,UAAU,EAAE,yBAAyB,GAAG,MAAM,CAqBtF;AAED,wBAAgB,6BAA6B,CAAC,OAAO,EAAE,iBAAiB,EAAE,GAAG,MAAM,CAYlF;AAED,wBAAgB,mBAAmB,CAAC,UAAU,EAAE,yBAAyB,GAAG,MAAM,CAejF;AAED,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,kBAAkB,GAAG,MAAM,CAWzE;AAED,wBAAgB,0BAA0B,CAAC,IAAI,EAAE,OAAO,CAAC,UAAU,CAAC,eAAe,CAAC,oBAAoB,CAAC,CAAC,CAAC,GAAG,MAAM,
|
|
1
|
+
{"version":3,"file":"FederationManagerFormat.d.ts","sourceRoot":"","sources":["../../../src/city/tui/FederationManagerFormat.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAGH,OAAO,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAC;AAEnE,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,sCAAsC,CAAC;AAC/E,OAAO,KAAK,EAAE,yBAAyB,EAAE,iBAAiB,EAAE,MAAM,sCAAsC,CAAC;AACzG,OAAO,KAAK,EAAE,kBAAkB,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAC;AAC1F,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAC;AAEzD,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,aAAa,GAAG,SAAS,GAAG,OAAO,CAEzE;AAED,wBAAgB,aAAa,CAAC,KAAK,EAAE,kBAAkB,GAAG,MAAM,CAM/D;AAED,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,aAAa,GAAG,MAAM,CAKlE;AAED,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,aAAa,GAAG,SAAS,GAAG,MAAM,CAmB1E;AAED,wBAAgB,aAAa,CAAC,IAAI,EAAE,aAAa,GAAG,SAAS,GAAG,MAAM,CAOrE;AAED,wBAAgB,mBAAmB,CACjC,UAAU,EAAE,yBAAyB,EACrC,OAAO,EAAE,kBAAkB,GAAG,IAAI,GACjC,MAAM,CAWR;AACD,wBAAgB,wBAAwB,CAAC,UAAU,EAAE,yBAAyB,GAAG,MAAM,CAqBtF;AAED,wBAAgB,6BAA6B,CAAC,OAAO,EAAE,iBAAiB,EAAE,GAAG,MAAM,CAYlF;AAED,wBAAgB,mBAAmB,CAAC,UAAU,EAAE,yBAAyB,GAAG,MAAM,CAejF;AAED,wBAAgB,qBAAqB,CAAC,OAAO,EAAE,kBAAkB,GAAG,MAAM,CAWzE;AAED,wBAAgB,0BAA0B,CAAC,IAAI,EAAE,OAAO,CAAC,UAAU,CAAC,eAAe,CAAC,oBAAoB,CAAC,CAAC,CAAC,GAAG,MAAM,CAYnH;AAED,wBAAgB,qBAAqB,CAAC,OAAO,EAAE;IAC7C,cAAc,EAAE,MAAM,CAAC;IACvB,SAAS,EAAE,MAAM,CAAC;IAClB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;CACpB,GAAG,MAAM,CAST;AAED,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,kBAAkB,GAAG,MAAM,CAczE;AAED,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,CAK3E;AAED,wBAAgB,YAAY,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAEpD;AAED,wBAAgB,yBAAyB,CAAC,UAAU,EAAE,IAAI,GAAG,IAAI,GAAG,MAAM,CAYzE"}
|
|
@@ -70,7 +70,7 @@ export function format_membership_detail(membership) {
|
|
|
70
70
|
"{bold}当前 Federation{/bold}",
|
|
71
71
|
`URL：${membership.federation_url}`,
|
|
72
72
|
`source：${membership.source}`,
|
|
73
|
-
`
|
|
73
|
+
`Bureau ID：${membership.bureau_id}`,
|
|
74
74
|
`登录态：${membership.has_user_token ? "已登录" : "未登录"}`,
|
|
75
75
|
membership.user_id ? `账号 ID：${membership.user_id}` : "",
|
|
76
76
|
membership.user_label ? `账号：${membership.user_label}` : "",
|
|
@@ -79,7 +79,7 @@ export function format_membership_detail(membership) {
|
|
|
79
79
|
"{bold}Current Federation{/bold}",
|
|
80
80
|
`URL: ${membership.federation_url}`,
|
|
81
81
|
`source: ${membership.source}`,
|
|
82
|
-
`
|
|
82
|
+
`Bureau ID: ${membership.bureau_id}`,
|
|
83
83
|
`session: ${membership.has_user_token ? "signed in" : "not signed in"}`,
|
|
84
84
|
membership.user_id ? `account ID: ${membership.user_id}` : "",
|
|
85
85
|
membership.user_label ? `account: ${membership.user_label}` : "",
|
|
@@ -131,12 +131,11 @@ export function format_current_user_detail(user) {
|
|
|
131
131
|
return [
|
|
132
132
|
`{bold}${t({ zh: "当前账号", en: "Current account" })}{/bold}`,
|
|
133
133
|
`URL: ${user.federation_url}`,
|
|
134
|
-
`
|
|
134
|
+
`Bureau ID: ${user.bureau_id}`,
|
|
135
135
|
`user: ${user.user_id || "unknown"}`,
|
|
136
136
|
user.user_label ? `label: ${user.user_label}` : "",
|
|
137
137
|
`source: ${user.source}`,
|
|
138
138
|
`env url: ${user.env_overrides.federation_url ? "yes" : "no"}`,
|
|
139
|
-
`env city: ${user.env_overrides.bureau_id ? "yes" : "no"}`,
|
|
140
139
|
`env token: ${user.env_overrides.user_token ? "yes" : "no"}`,
|
|
141
140
|
user.warnings.length > 0 ? `\n${user.warnings.join("\n")}` : "",
|
|
142
141
|
].filter(Boolean).join("\n");
|
|
@@ -145,7 +144,7 @@ export function format_session_detail(session) {
|
|
|
145
144
|
return [
|
|
146
145
|
`{bold}${t({ zh: "登录成功", en: "Signed in" })}{/bold}`,
|
|
147
146
|
`URL: ${session.federation_url}`,
|
|
148
|
-
`
|
|
147
|
+
`Bureau ID: ${session.bureau_id}`,
|
|
149
148
|
`user: ${session.user_id || "unknown"}`,
|
|
150
149
|
session.user_label ? `label: ${session.user_label}` : "",
|
|
151
150
|
`updated: ${session.updated_at}`,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FederationManagerFormat.js","sourceRoot":"","sources":["../../../src/city/tui/FederationManagerFormat.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"FederationManagerFormat.js","sourceRoot":"","sources":["../../../src/city/tui/FederationManagerFormat.ts"],"names":[],"mappings":"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"}
|
|
@@ -21,7 +21,7 @@ export function read_federation_membership_state() {
|
|
|
21
21
|
if (session?.user_token) {
|
|
22
22
|
return {
|
|
23
23
|
federation_url,
|
|
24
|
-
bureau_id: session.bureau_id
|
|
24
|
+
bureau_id: session.bureau_id,
|
|
25
25
|
has_user_token: true,
|
|
26
26
|
source: "city-session",
|
|
27
27
|
user_id: session.user_id,
|
|
@@ -299,7 +299,7 @@ export async function handle_city_prompt_action(action) {
|
|
|
299
299
|
const membership = read_federation_membership_state();
|
|
300
300
|
const session = await performCityUserLogin({
|
|
301
301
|
federation_url: membership.federation_url,
|
|
302
|
-
bureau_id: read_current_city_session()?.bureau_id
|
|
302
|
+
bureau_id: read_current_city_session()?.bureau_id ?? DEFAULT_BUREAU_ID,
|
|
303
303
|
});
|
|
304
304
|
if (!session) {
|
|
305
305
|
return {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FederationManagerState.js","sourceRoot":"","sources":["../../../src/city/tui/FederationManagerState.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"FederationManagerState.js","sourceRoot":"","sources":["../../../src/city/tui/FederationManagerState.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,7 +14,7 @@ export interface CityUserSession {
|
|
|
14
14
|
*/
|
|
15
15
|
federation_url: string;
|
|
16
16
|
/**
|
|
17
|
-
* 当前 user token 绑定的
|
|
17
|
+
* 当前 user token 绑定的 Bureau ID。
|
|
18
18
|
*/
|
|
19
19
|
bureau_id: string;
|
|
20
20
|
/**
|
|
@@ -47,7 +47,7 @@ export interface CityLoginInput {
|
|
|
47
47
|
*/
|
|
48
48
|
federation_url: string;
|
|
49
49
|
/**
|
|
50
|
-
*
|
|
50
|
+
* 登录时选择的 Bureau ID。
|
|
51
51
|
*/
|
|
52
52
|
bureau_id: string;
|
|
53
53
|
}
|
|
@@ -27,14 +27,6 @@ export interface CityAdminConfig {
|
|
|
27
27
|
* `downfed` 当前结构中的 Federation URL 字段。
|
|
28
28
|
*/
|
|
29
29
|
base_url?: unknown;
|
|
30
|
-
/**
|
|
31
|
-
* Federation URL。
|
|
32
|
-
*/
|
|
33
|
-
federation_url?: unknown;
|
|
34
|
-
/**
|
|
35
|
-
* 旧结构中的 Federation URL 字段。
|
|
36
|
-
*/
|
|
37
|
-
url?: unknown;
|
|
38
30
|
/**
|
|
39
31
|
* admin secret key。
|
|
40
32
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CityState.d.ts","sourceRoot":"","sources":["../../../src/city/types/CityState.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AACnE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AAE7D;;GAEG;AACH,MAAM,WAAW,eAAe;IAC9B;;OAEG;IACH,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAE5B;;OAEG;IACH,OAAO,CAAC,EAAE,KAAK,CAAC;QACd;;WAEG;QACH,IAAI,CAAC,EAAE,OAAO,CAAC;QAEf;;WAEG;QACH,QAAQ,CAAC,EAAE,OAAO,CAAC;QAEnB;;WAEG;QACH,
|
|
1
|
+
{"version":3,"file":"CityState.d.ts","sourceRoot":"","sources":["../../../src/city/types/CityState.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,6BAA6B,CAAC;AACnE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AAE7D;;GAEG;AACH,MAAM,WAAW,eAAe;IAC9B;;OAEG;IACH,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAE5B;;OAEG;IACH,OAAO,CAAC,EAAE,KAAK,CAAC;QACd;;WAEG;QACH,IAAI,CAAC,EAAE,OAAO,CAAC;QAEf;;WAEG;QACH,QAAQ,CAAC,EAAE,OAAO,CAAC;QAEnB;;WAEG;QACH,gBAAgB,CAAC,EAAE,OAAO,CAAC;KAC5B,CAAC,CAAC;CACJ;AAED;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC/B;;OAEG;IACH,IAAI,EAAE,MAAM,CAAC;IAEb;;OAEG;IACH,cAAc,EAAE,MAAM,CAAC;CACxB;AAED;;GAEG;AACH,MAAM,WAAW,cAAc;IAC7B;;OAEG;IACH,uBAAuB,CAAC,EAAE,MAAM,CAAC;IAEjC;;OAEG;IACH,UAAU,CAAC,EAAE,SAAS,CAAC;IAEvB;;OAEG;IACH,QAAQ,CAAC,EAAE,gBAAgB,EAAE,CAAC;IAE9B;;OAEG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAAC,CAAC;CAC5C"}
|
|
@@ -17,10 +17,6 @@ export interface CityUserEnvOverrides {
|
|
|
17
17
|
* City base URL 是否来自环境变量。
|
|
18
18
|
*/
|
|
19
19
|
federation_url: boolean;
|
|
20
|
-
/**
|
|
21
|
-
* City city id 是否来自环境变量。
|
|
22
|
-
*/
|
|
23
|
-
bureau_id: boolean;
|
|
24
20
|
/**
|
|
25
21
|
* City user token 是否来自环境变量。
|
|
26
22
|
*/
|
|
@@ -35,7 +31,7 @@ export interface ResolvedCityUser {
|
|
|
35
31
|
*/
|
|
36
32
|
federation_url: string;
|
|
37
33
|
/**
|
|
38
|
-
*
|
|
34
|
+
* 当前产品的 Bureau ID。
|
|
39
35
|
*/
|
|
40
36
|
bureau_id: string;
|
|
41
37
|
/**
|
|
@@ -96,6 +92,10 @@ export interface CityAccountsMeResult {
|
|
|
96
92
|
* City 用户 ID。
|
|
97
93
|
*/
|
|
98
94
|
user_id?: string;
|
|
95
|
+
/**
|
|
96
|
+
* Token 中已经验证的 Bureau ID。
|
|
97
|
+
*/
|
|
98
|
+
bureau_id?: string;
|
|
99
99
|
};
|
|
100
100
|
/**
|
|
101
101
|
* 当前用户资料。
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CityUser.d.ts","sourceRoot":"","sources":["../../../src/city/types/CityUser.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH;;GAEG;AACH,MAAM,MAAM,cAAc,GAAG,cAAc,GAAG,KAAK,CAAC;AAEpD;;GAEG;AACH,MAAM,WAAW,oBAAoB;IACnC;;OAEG;IACH,cAAc,EAAE,OAAO,CAAC;IAExB;;OAEG;IACH,
|
|
1
|
+
{"version":3,"file":"CityUser.d.ts","sourceRoot":"","sources":["../../../src/city/types/CityUser.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH;;GAEG;AACH,MAAM,MAAM,cAAc,GAAG,cAAc,GAAG,KAAK,CAAC;AAEpD;;GAEG;AACH,MAAM,WAAW,oBAAoB;IACnC;;OAEG;IACH,cAAc,EAAE,OAAO,CAAC;IAExB;;OAEG;IACH,UAAU,EAAE,OAAO,CAAC;CACrB;AAED;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC/B;;OAEG;IACH,cAAc,EAAE,MAAM,CAAC;IAEvB;;OAEG;IACH,SAAS,EAAE,MAAM,CAAC;IAElB;;OAEG;IACH,UAAU,EAAE,MAAM,CAAC;IAEnB;;OAEG;IACH,OAAO,CAAC,EAAE,MAAM,CAAC;IAEjB;;OAEG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;IAEpB;;OAEG;IACH,MAAM,EAAE,cAAc,CAAC;IAEvB;;OAEG;IACH,aAAa,EAAE,oBAAoB,CAAC;IAEpC;;OAEG;IACH,QAAQ,EAAE,MAAM,EAAE,CAAC;CACpB;AAED;;GAEG;AACH,MAAM,WAAW,oBAAoB;IACnC;;OAEG;IACH,GAAG,CAAC,EAAE,MAAM,CAAC,UAAU,GAAG,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,CAAC,CAAC;IAE7D;;OAEG;IACH,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAE7B;;OAEG;IACH,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAE7B;;OAEG;IACH,WAAW,CAAC,EAAE,OAAO,CAAC;CACvB;AAED;;GAEG;AACH,MAAM,WAAW,oBAAoB;IACnC;;OAEG;IACH,IAAI,CAAC,EAAE;QACL;;WAEG;QACH,OAAO,CAAC,EAAE,MAAM,CAAC;QAEjB;;WAEG;QACH,SAAS,CAAC,EAAE,MAAM,CAAC;KACpB,CAAC;IAEF;;OAEG;IACH,OAAO,CAAC,EAAE;QACR;;WAEG;QACH,KAAK,CAAC,EAAE,MAAM,CAAC;QAEf;;WAEG;QACH,YAAY,CAAC,EAAE,MAAM,CAAC;KACvB,GAAG,IAAI,CAAC;CACV"}
|
|
@@ -86,12 +86,12 @@ async function create_token_interactively(runtime) {
|
|
|
86
86
|
while (true) {
|
|
87
87
|
const bureau_id_input = await runtime.text({
|
|
88
88
|
title: "Bureau ID",
|
|
89
|
-
placeholder: "
|
|
89
|
+
placeholder: "product-web",
|
|
90
90
|
});
|
|
91
91
|
if (bureau_id_input === undefined)
|
|
92
92
|
return;
|
|
93
|
-
const bureau_id = bureau_id_input
|
|
94
|
-
if (
|
|
93
|
+
const bureau_id = bureau_id_input;
|
|
94
|
+
if (bureau_id.length === 0) {
|
|
95
95
|
await runtime.show_message("error", "bureau_id is required");
|
|
96
96
|
continue;
|
|
97
97
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"InteractiveBureauTokenManager.js","sourceRoot":"","sources":["../../../src/federation/bureau/InteractiveBureauTokenManager.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"InteractiveBureauTokenManager.js","sourceRoot":"","sources":["../../../src/federation/bureau/InteractiveBureauTokenManager.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,7 +13,7 @@ import { emitCliBlock, emitCliList } from "../../../shared/CliReporter.js";
|
|
|
13
13
|
import { t } from "../../../shared/CliLocale.js";
|
|
14
14
|
/** 为当前 active Federation 创建并登记 Bureau Token。 */
|
|
15
15
|
export async function create_federation_bureau_token(bureau_id_input) {
|
|
16
|
-
const bureau_id =
|
|
16
|
+
const bureau_id = require_bureau_id(bureau_id_input);
|
|
17
17
|
const purpose_input = await text({
|
|
18
18
|
message: t({ zh: "Token 用途", en: "Token purpose" }),
|
|
19
19
|
placeholder: t({ zh: "例如：生产环境支付服务", en: "For example: production payments service" }),
|
|
@@ -27,7 +27,7 @@ export async function create_federation_bureau_token(bureau_id_input) {
|
|
|
27
27
|
/** 创建并登记 Bureau Token，返回仅供当前进程展示的一次性明文。 */
|
|
28
28
|
export async function create_federation_bureau_token_record(bureau_id_input, purpose_input) {
|
|
29
29
|
const server = require_active_admin_server();
|
|
30
|
-
const bureau_id =
|
|
30
|
+
const bureau_id = require_bureau_id(bureau_id_input);
|
|
31
31
|
const purpose = require_bureau_token_purpose(purpose_input);
|
|
32
32
|
const credential = create_bureau_deployment_credential();
|
|
33
33
|
const admin = create_federation_admin(server);
|
|
@@ -135,6 +135,13 @@ function require_value(value, name) {
|
|
|
135
135
|
}
|
|
136
136
|
return normalized;
|
|
137
137
|
}
|
|
138
|
+
/** 读取 opaque Bureau ID，不对调用方提供的值做任何改写。 */
|
|
139
|
+
function require_bureau_id(value) {
|
|
140
|
+
if (typeof value !== "string" || value.length === 0) {
|
|
141
|
+
throw new CliError({ title: "bureau_id is required" });
|
|
142
|
+
}
|
|
143
|
+
return value;
|
|
144
|
+
}
|
|
138
145
|
function validate_bureau_token_purpose(value) {
|
|
139
146
|
const purpose = value.trim();
|
|
140
147
|
if (!purpose) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bureau.js","sourceRoot":"","sources":["../../../../src/federation/bureau/commands/bureau.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AAEH,OAAO,EAAE,eAAe,EAA2B,MAAM,gBAAgB,CAAC;AAC1E,OAAO,EAAE,mCAAmC,EAAE,MAAM,yCAAyC,CAAC;AAE9F,OAAO,EAAE,gBAAgB,EAAsB,MAAM,8BAA8B,CAAC;AACpF,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,6BAA6B,CAAC;AAC7D,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAChD,OAAO,EAAE,YAAY,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AACpE,OAAO,EAAE,CAAC,EAAE,MAAM,uBAAuB,CAAC;AAE1C,gDAAgD;AAChD,MAAM,CAAC,KAAK,UAAU,8BAA8B,CAAC,eAAuB;IAC1E,MAAM,SAAS,GAAG,
|
|
1
|
+
{"version":3,"file":"bureau.js","sourceRoot":"","sources":["../../../../src/federation/bureau/commands/bureau.ts"],"names":[],"mappings":"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"}
|
|
@@ -88,7 +88,7 @@ function create_worker_entrypoint() {
|
|
|
88
88
|
* - Federation 实例在 Worker isolate 内复用，第一次请求时完成初始化。
|
|
89
89
|
*/
|
|
90
90
|
|
|
91
|
-
import { Federation, R2Storage } from "@downcity/city";
|
|
91
|
+
import { AIService, Federation, R2Storage, type CityQueueMessage } from "@downcity/city";
|
|
92
92
|
import { Database } from "@downcity/database-d1";
|
|
93
93
|
import {
|
|
94
94
|
AccountsService,
|
|
@@ -104,6 +104,8 @@ export interface Env {
|
|
|
104
104
|
DB: D1Database;
|
|
105
105
|
/** Federation 默认 R2 存储。 */
|
|
106
106
|
DOWNCITY_STORAGE: R2Bucket;
|
|
107
|
+
/** Federation 异步任务 Queue。 */
|
|
108
|
+
DOWNCITY_QUEUE: Queue<CityQueueMessage>;
|
|
107
109
|
/** R2 文件公开 URL 前缀。 */
|
|
108
110
|
DOWNCITY_STORAGE_PUBLIC_URL_PREFIX?: string;
|
|
109
111
|
}
|
|
@@ -114,6 +116,11 @@ let federation_promise: Promise<Federation> | undefined;
|
|
|
114
116
|
async function create_federation(env: Env): Promise<Federation> {
|
|
115
117
|
const database = new Database({ binding: env.DB });
|
|
116
118
|
const federation = new Federation({ database });
|
|
119
|
+
federation.queue.use({
|
|
120
|
+
send: (message) => env.DOWNCITY_QUEUE.send(message, message.delay_ms
|
|
121
|
+
? { delaySeconds: Math.ceil(message.delay_ms / 1000) }
|
|
122
|
+
: undefined),
|
|
123
|
+
});
|
|
117
124
|
const public_url_prefix = env.DOWNCITY_STORAGE_PUBLIC_URL_PREFIX?.trim();
|
|
118
125
|
if (public_url_prefix) {
|
|
119
126
|
federation.storage(R2Storage({
|
|
@@ -128,8 +135,14 @@ async function create_federation(env: Env): Promise<Federation> {
|
|
|
128
135
|
wechatAccountsProvider(),
|
|
129
136
|
],
|
|
130
137
|
}));
|
|
131
|
-
|
|
132
|
-
|
|
138
|
+
const credits_service = new CreditsService();
|
|
139
|
+
const ai_service = new AIService({ credits: credits_service });
|
|
140
|
+
federation.use(credits_service);
|
|
141
|
+
federation.use(ai_service);
|
|
142
|
+
federation.use(new UsageService({
|
|
143
|
+
ai_usage_reader: ai_service,
|
|
144
|
+
credits_usage_reader: credits_service,
|
|
145
|
+
}));
|
|
133
146
|
await federation.health();
|
|
134
147
|
return federation;
|
|
135
148
|
}
|
|
@@ -149,6 +162,17 @@ export default {
|
|
|
149
162
|
}
|
|
150
163
|
return federation.fetch(request);
|
|
151
164
|
},
|
|
165
|
+
async queue(batch: MessageBatch<CityQueueMessage>, env: Env): Promise<void> {
|
|
166
|
+
const federation = await get_federation(env);
|
|
167
|
+
for (const message of batch.messages) {
|
|
168
|
+
try {
|
|
169
|
+
await federation.queue.call(message.body);
|
|
170
|
+
message.ack();
|
|
171
|
+
} catch {
|
|
172
|
+
message.retry();
|
|
173
|
+
}
|
|
174
|
+
}
|
|
175
|
+
},
|
|
152
176
|
};
|
|
153
177
|
`;
|
|
154
178
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CloudflareWorkersTemplate.js","sourceRoot":"","sources":["../../../../src/federation/create/templates/CloudflareWorkersTemplate.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAOH,kCAAkC;AAClC,MAAM,UAAU,wCAAwC,CACtD,KAA8B;IAE9B,MAAM,YAAY,GAAG,sBAAsB,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IACxD,OAAO;QACL;YACE,IAAI,EAAE,iBAAiB;YACvB,OAAO,EAAE,SAAS,CAAC;gBACjB,MAAM,EAAE,CAAC;gBACT,IAAI,EAAE,YAAY;gBAClB,EAAE,EAAE,KAAK,CAAC,MAAM;gBAChB,IAAI,EAAE,KAAK,CAAC,IAAI;gBAChB,KAAK,EAAE,cAAc;gBACrB,UAAU,EAAE;oBACV,MAAM,EAAE,oBAAoB;oBAC5B,SAAS,EAAE;wBACT,EAAE,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,KAAK,CAAC,IAAI,KAAK,EAAE;wBAC3D,KAAK,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,gBAAgB,EAAE,IAAI,EAAE,GAAG,KAAK,CAAC,IAAI,QAAQ,EAAE;wBAChF,OAAO,EAAE;4BACP,IAAI,EAAE,IAAI;4BACV,OAAO,EAAE,kBAAkB;4BAC3B,IAAI,EAAE,GAAG,KAAK,CAAC,IAAI,UAAU;4BAC7B,iBAAiB,EAAE,EAAE;yBACtB;qBACF;iBACF;aACF,CAAC;SACH;QACD;YACE,IAAI,EAAE,cAAc;YACpB,OAAO,EAAE,SAAS,CAAC;gBACjB,IAAI,EAAE,YAAY;gBAClB,OAAO,EAAE,OAAO;gBAChB,OAAO,EAAE,IAAI;gBACb,IAAI,EAAE,QAAQ;gBACd,OAAO,EAAE;oBACP,SAAS,EAAE,+BAA+B;iBAC3C;gBACD,YAAY,EAAE;oBACZ,gBAAgB,EAAE,QAAQ;oBAC1B,uBAAuB,EAAE,QAAQ;oBACjC,oBAAoB,EAAE,QAAQ;iBAC/B;gBACD,eAAe,EAAE;oBACf,2BAA2B,EAAE,QAAQ;oBACrC,UAAU,EAAE,QAAQ;oBACpB,QAAQ,EAAE,QAAQ;iBACnB;aACF,CAAC;SACH;QACD;YACE,IAAI,EAAE,eAAe;YACrB,OAAO,EAAE,SAAS,CAAC;gBACjB,eAAe,EAAE;oBACf,MAAM,EAAE,QAAQ;oBAChB,MAAM,EAAE,UAAU;oBAClB,gBAAgB,EAAE,UAAU;oBAC5B,GAAG,EAAE,CAAC,QAAQ,CAAC;oBACf,MAAM,EAAE,IAAI;oBACZ,MAAM,EAAE,IAAI;oBACZ,YAAY,EAAE,IAAI;oBAClB,KAAK,EAAE,CAAC,2BAA2B,CAAC;iBACrC;gBACD,OAAO,EAAE,CAAC,aAAa,CAAC;aACzB,CAAC;SACH;QACD;YACE,IAAI,EAAE,YAAY;YAClB,OAAO,EAAE,CAAC,eAAe,EAAE,MAAM,EAAE,YAAY,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC;SAChE;QACD;YACE,IAAI,EAAE,cAAc;YACpB,OAAO,EAAE,wBAAwB,EAAE;SACpC;KACF,CAAC;AACJ,CAAC;AAED,+BAA+B;AAC/B,SAAS,wBAAwB;IAC/B,OAAO
|
|
1
|
+
{"version":3,"file":"CloudflareWorkersTemplate.js","sourceRoot":"","sources":["../../../../src/federation/create/templates/CloudflareWorkersTemplate.ts"],"names":[],"mappings":"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"}
|
|
@@ -96,7 +96,7 @@ function create_local_entrypoint() {
|
|
|
96
96
|
*/
|
|
97
97
|
|
|
98
98
|
import { serve } from "@hono/node-server";
|
|
99
|
-
import { Federation } from "@downcity/city";
|
|
99
|
+
import { AIService, Federation } from "@downcity/city";
|
|
100
100
|
import { Database } from "@downcity/database-sqlite";
|
|
101
101
|
import {
|
|
102
102
|
AccountsService,
|
|
@@ -178,8 +178,14 @@ const database = new Database({
|
|
|
178
178
|
const federation = new Federation({ database });
|
|
179
179
|
|
|
180
180
|
federation.use(new AccountsService({ local_login: true }));
|
|
181
|
-
|
|
182
|
-
|
|
181
|
+
const credits_service = new CreditsService();
|
|
182
|
+
const ai_service = new AIService({ credits: credits_service });
|
|
183
|
+
federation.use(credits_service);
|
|
184
|
+
federation.use(ai_service);
|
|
185
|
+
federation.use(new UsageService({
|
|
186
|
+
ai_usage_reader: ai_service,
|
|
187
|
+
credits_usage_reader: credits_service,
|
|
188
|
+
}));
|
|
183
189
|
|
|
184
190
|
await federation.health();
|
|
185
191
|
await sync_deployed_admin_key(federation);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"LocalNodeTemplate.js","sourceRoot":"","sources":["../../../../src/federation/create/templates/LocalNodeTemplate.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAOH,6BAA6B;AAC7B,MAAM,UAAU,gCAAgC,CAC9C,KAA8B;IAE9B,MAAM,YAAY,GAAG,sBAAsB,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IACxD,OAAO;QACL;YACE,IAAI,EAAE,iBAAiB;YACvB,OAAO,EAAE,SAAS,CAAC;gBACjB,MAAM,EAAE,CAAC;gBACT,IAAI,EAAE,YAAY;gBAClB,EAAE,EAAE,KAAK,CAAC,MAAM;gBAChB,IAAI,EAAE,KAAK,CAAC,IAAI;gBAChB,KAAK,EAAE,cAAc;gBACrB,UAAU,EAAE;oBACV,MAAM,EAAE,OAAO;iBAChB;aACF,CAAC;SACH;QACD;YACE,IAAI,EAAE,cAAc;YACpB,OAAO,EAAE,SAAS,CAAC;gBACjB,IAAI,EAAE,YAAY;gBAClB,OAAO,EAAE,OAAO;gBAChB,OAAO,EAAE,IAAI;gBACb,IAAI,EAAE,QAAQ;gBACd,OAAO,EAAE;oBACP,GAAG,EAAE,0DAA0D;oBAC/D,KAAK,EAAE,0DAA0D;oBACjE,SAAS,EAAE,+BAA+B;iBAC3C;gBACD,YAAY,EAAE;oBACZ,gBAAgB,EAAE,QAAQ;oBAC1B,2BAA2B,EAAE,QAAQ;oBACrC,oBAAoB,EAAE,QAAQ;oBAC9B,mBAAmB,EAAE,QAAQ;iBAC9B;gBACD,eAAe,EAAE;oBACf,aAAa,EAAE,QAAQ;oBACvB,GAAG,EAAE,QAAQ;oBACb,UAAU,EAAE,QAAQ;iBACrB;aACF,CAAC;SACH;QACD;YACE,IAAI,EAAE,eAAe;YACrB,OAAO,EAAE,SAAS,CAAC;gBACjB,eAAe,EAAE;oBACf,MAAM,EAAE,QAAQ;oBAChB,MAAM,EAAE,UAAU;oBAClB,gBAAgB,EAAE,UAAU;oBAC5B,GAAG,EAAE,CAAC,QAAQ,CAAC;oBACf,MAAM,EAAE,IAAI;oBACZ,MAAM,EAAE,IAAI;oBACZ,YAAY,EAAE,IAAI;oBAClB,KAAK,EAAE,CAAC,MAAM,CAAC;iBAChB;gBACD,OAAO,EAAE,CAAC,aAAa,CAAC;aACzB,CAAC;SACH;QACD;YACE,IAAI,EAAE,cAAc;YACpB,OAAO,EAAE;gBACP,sCAAsC;gBACtC,qDAAqD;gBACrD,gBAAgB;gBAChB,iDAAiD;gBACjD,EAAE;aACH,CAAC,IAAI,CAAC,IAAI,CAAC;SACb;QACD;YACE,IAAI,EAAE,YAAY;YAClB,OAAO,EAAE,CAAC,eAAe,EAAE,MAAM,EAAE,aAAa,EAAE,eAAe,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC;SAClF;QACD;YACE,IAAI,EAAE,cAAc;YACpB,OAAO,EAAE,uBAAuB,EAAE;SACnC;KACF,CAAC;AACJ,CAAC;AAED,4BAA4B;AAC5B,SAAS,uBAAuB;IAC9B,OAAO
|
|
1
|
+
{"version":3,"file":"LocalNodeTemplate.js","sourceRoot":"","sources":["../../../../src/federation/create/templates/LocalNodeTemplate.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "downcity",
|
|
3
|
-
"version": "1.1.
|
|
3
|
+
"version": "1.1.407",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"description": "Downcity CLI — local City container and Federation Server management",
|
|
6
6
|
"bin": {
|
|
@@ -24,7 +24,7 @@
|
|
|
24
24
|
"@ai-sdk/openai-compatible": "^2.0.48",
|
|
25
25
|
"@ai-sdk/xai": "^3.0.93",
|
|
26
26
|
"@downcity/agent": "^1.1.320",
|
|
27
|
-
"@downcity/city": "^0.2.
|
|
27
|
+
"@downcity/city": "^0.2.255",
|
|
28
28
|
"@downcity/plugins": "^1.0.244",
|
|
29
29
|
"@downcity/server": "^0.1.144",
|
|
30
30
|
"@downcity/shell": "^0.1.167",
|