@tenderprompt/accounts 0.3.0 → 0.3.3
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/README.md +1 -1
- package/dist/auth-store.d.ts.map +1 -1
- package/dist/auth-store.js +0 -55
- package/dist/auth-store.js.map +1 -1
- package/dist/main.d.ts +1 -1
- package/dist/main.js +1 -1
- package/dist/oauth.d.ts.map +1 -1
- package/dist/oauth.js +12 -10
- package/dist/oauth.js.map +1 -1
- package/package.json +1 -1
- package/templates/shopify-customer-account/apps/gateway/scripts/pack-tender-artifact.mjs +3 -2
- package/templates/shopify-customer-account/apps/gateway/tender-app.config.json +2 -2
- package/templates/shopify-customer-account/apps/portal/scripts/pack-tender-artifact.mjs +2 -2
- package/templates/shopify-customer-account/apps/portal/tender-app.config.json +1 -1
package/README.md
CHANGED
|
@@ -92,7 +92,7 @@ Open the returned URL, approve the organization and apps, then exchange the same
|
|
|
92
92
|
npx tender-accounts auth status --json
|
|
93
93
|
```
|
|
94
94
|
|
|
95
|
-
|
|
95
|
+
The refreshable login is stored in a private mode-0600 user file outside the repository. Set `TENDER_ACCOUNTS_AUTH_FILE` to choose another private location. Repository links and artifacts never contain credentials. Access tokens last 15 minutes and rotate from a 30-day login; changing the human's project access takes effect on the next refresh or request authorization check.
|
|
96
96
|
|
|
97
97
|
Validate the login, then link the checkout:
|
|
98
98
|
|
package/dist/auth-store.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth-store.d.ts","sourceRoot":"","sources":["../src/auth-store.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"auth-store.d.ts","sourceRoot":"","sources":["../src/auth-store.ts"],"names":[],"mappings":"AAKA,eAAO,MAAM,eAAe,4BAA4B,CAAC;AAEzD,MAAM,WAAW,aAAa;IAC5B,MAAM,EAAE,OAAO,eAAe,CAAC;IAC/B,MAAM,EAAE,MAAM,CAAC;IACf,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,oBAAoB,CAAC,EAAE,MAAM,CAAC;IAC9B,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,aAAa,CAAC,EAAE;QACd,UAAU,EAAE,MAAM,CAAC;QACnB,QAAQ,EAAE,MAAM,CAAC;QACjB,eAAe,EAAE,MAAM,CAAC;QACxB,uBAAuB,EAAE,MAAM,CAAC;QAChC,SAAS,EAAE,MAAM,CAAC;QAClB,eAAe,EAAE,MAAM,CAAC;KACzB,CAAC;CACH;AAED,MAAM,WAAW,YAAY;IAC3B,IAAI,IAAI,OAAO,CAAC,aAAa,GAAG,IAAI,CAAC,CAAC;IACtC,KAAK,CAAC,IAAI,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC1C,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IACvB,WAAW,IAAI,MAAM,CAAC;CACvB;AAED,wBAAgB,sBAAsB,CAAC,WAAW,EAAE,MAAM,CAAC,UAAU,GAAG,YAAY,CAInF;AAED,qBAAa,kBAAmB,YAAW,YAAY;IACrD,KAAK,EAAE,aAAa,GAAG,IAAI,CAAQ;IAE7B,IAAI,IAAI,OAAO,CAAC,aAAa,GAAG,IAAI,CAAC,CAE1C;IAEK,KAAK,CAAC,IAAI,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,CAE9C;IAEK,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAE3B;IAED,WAAW,IAAI,MAAM,CAEpB;CACF"}
|
package/dist/auth-store.js
CHANGED
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
import { spawn } from "node:child_process";
|
|
2
1
|
import { homedir } from "node:os";
|
|
3
2
|
import { chmod, mkdir, readFile, rename, rm, writeFile } from "node:fs/promises";
|
|
4
3
|
import { dirname, resolve } from "node:path";
|
|
@@ -8,8 +7,6 @@ export function createDefaultAuthStore(environment) {
|
|
|
8
7
|
const explicitPath = environment.TENDER_ACCOUNTS_AUTH_FILE;
|
|
9
8
|
if (explicitPath)
|
|
10
9
|
return new FileCliAuthStore(resolve(explicitPath));
|
|
11
|
-
if (process.platform === "darwin")
|
|
12
|
-
return new MacKeychainCliAuthStore();
|
|
13
10
|
return new FileCliAuthStore(resolve(homedir(), ".tender-accounts/auth.json"));
|
|
14
11
|
}
|
|
15
12
|
export class MemoryCliAuthStore {
|
|
@@ -27,38 +24,6 @@ export class MemoryCliAuthStore {
|
|
|
27
24
|
return "memory";
|
|
28
25
|
}
|
|
29
26
|
}
|
|
30
|
-
class MacKeychainCliAuthStore {
|
|
31
|
-
service = "com.tenderprompt.accounts.cli";
|
|
32
|
-
account = "default";
|
|
33
|
-
async read() {
|
|
34
|
-
const result = await runSecurity([
|
|
35
|
-
"find-generic-password", "-s", this.service, "-a", this.account, "-w",
|
|
36
|
-
]);
|
|
37
|
-
if (result.code === 44)
|
|
38
|
-
return null;
|
|
39
|
-
if (result.code !== 0)
|
|
40
|
-
throw credentialStoreError(result.stderr);
|
|
41
|
-
return parseStoredAuth(result.stdout.trim());
|
|
42
|
-
}
|
|
43
|
-
async write(auth) {
|
|
44
|
-
const value = `${JSON.stringify(auth)}\n`;
|
|
45
|
-
const result = await runSecurity([
|
|
46
|
-
"add-generic-password", "-s", this.service, "-a", this.account, "-U", "-w",
|
|
47
|
-
], value);
|
|
48
|
-
if (result.code !== 0)
|
|
49
|
-
throw credentialStoreError(result.stderr);
|
|
50
|
-
}
|
|
51
|
-
async clear() {
|
|
52
|
-
const result = await runSecurity([
|
|
53
|
-
"delete-generic-password", "-s", this.service, "-a", this.account,
|
|
54
|
-
]);
|
|
55
|
-
if (result.code !== 0 && result.code !== 44)
|
|
56
|
-
throw credentialStoreError(result.stderr);
|
|
57
|
-
}
|
|
58
|
-
description() {
|
|
59
|
-
return "macOS Keychain";
|
|
60
|
-
}
|
|
61
|
-
}
|
|
62
27
|
class FileCliAuthStore {
|
|
63
28
|
path;
|
|
64
29
|
constructor(path) {
|
|
@@ -128,26 +93,6 @@ function parseStoredAuth(value) {
|
|
|
128
93
|
}
|
|
129
94
|
return auth;
|
|
130
95
|
}
|
|
131
|
-
async function runSecurity(args, input) {
|
|
132
|
-
return await new Promise((resolvePromise, reject) => {
|
|
133
|
-
const child = spawn("security", args, { stdio: [input === undefined ? "ignore" : "pipe", "pipe", "pipe"] });
|
|
134
|
-
const stdout = [];
|
|
135
|
-
const stderr = [];
|
|
136
|
-
child.stdout?.on("data", (chunk) => stdout.push(Buffer.from(chunk)));
|
|
137
|
-
child.stderr?.on("data", (chunk) => stderr.push(Buffer.from(chunk)));
|
|
138
|
-
child.on("error", reject);
|
|
139
|
-
child.on("exit", (code) => resolvePromise({
|
|
140
|
-
code: code ?? 1,
|
|
141
|
-
stdout: Buffer.concat(stdout).toString("utf8"),
|
|
142
|
-
stderr: Buffer.concat(stderr).toString("utf8"),
|
|
143
|
-
}));
|
|
144
|
-
if (input !== undefined)
|
|
145
|
-
child.stdin?.end(input);
|
|
146
|
-
});
|
|
147
|
-
}
|
|
148
|
-
function credentialStoreError(stderr) {
|
|
149
|
-
return new CliError("auth_store_unavailable", stderr.trim() || "The operating-system credential store is unavailable.", "Set TENDER_ACCOUNTS_AUTH_FILE to a private path and try again.");
|
|
150
|
-
}
|
|
151
96
|
function isMissing(value) {
|
|
152
97
|
return value instanceof Error && "code" in value && value.code === "ENOENT";
|
|
153
98
|
}
|
package/dist/auth-store.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"auth-store.js","sourceRoot":"","sources":["../src/auth-store.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"auth-store.js","sourceRoot":"","sources":["../src/auth-store.ts"],"names":[],"mappings":"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"}
|
package/dist/main.d.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { type CliAuthStore } from "./auth-store.js";
|
|
2
2
|
import { waitForLoopbackAuthorization } from "./oauth.js";
|
|
3
3
|
import { captureCommand, runProjectCommand } from "./processes.js";
|
|
4
|
-
export declare const CLI_VERSION = "0.3.
|
|
4
|
+
export declare const CLI_VERSION = "0.3.3";
|
|
5
5
|
export interface CliRuntime {
|
|
6
6
|
cwd: string;
|
|
7
7
|
environment: NodeJS.ProcessEnv;
|
package/dist/main.js
CHANGED
|
@@ -11,7 +11,7 @@ import { loadProjectContext, normalizeApiUrl, pathExists, readBoundedFile, readO
|
|
|
11
11
|
import { OAuthApiClient, createPkcePair, openSystemBrowser, waitForLoopbackAuthorization, } from "./oauth.js";
|
|
12
12
|
import { captureCommand, runProjectCommand } from "./processes.js";
|
|
13
13
|
import { initializeStarter } from "./starter.js";
|
|
14
|
-
export const CLI_VERSION = "0.3.
|
|
14
|
+
export const CLI_VERSION = "0.3.3";
|
|
15
15
|
const DEFAULT_RUNTIME = {
|
|
16
16
|
cwd: process.cwd(),
|
|
17
17
|
environment: process.env,
|
package/dist/oauth.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oauth.d.ts","sourceRoot":"","sources":["../src/oauth.ts"],"names":[],"mappings":"AAKA,eAAO,MAAM,mBAAmB,wBAAwB,CAAC;AAEzD,MAAM,WAAW,kBAAkB;IACjC,UAAU,EAAE,QAAQ,CAAC;IACrB,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,aAAa,EAAE,MAAM,CAAC;IACtB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,KAAK,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,2BAA2B;IAC1C,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,gBAAgB,EAAE,MAAM,CAAC;IACzB,yBAAyB,EAAE,MAAM,CAAC;IAClC,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,qBAAa,cAAc;IACb,OAAO,CAAC,QAAQ,CAAC,OAAO;IAAU,OAAO,CAAC,QAAQ,CAAC,OAAO;IAAtE,YAA6B,OAAO,EAAE,MAAM,EAAmB,OAAO,GAAE,OAAO,KAAa,EAAI;IAEhG,0BAA0B,CAAC,KAAK,EAAE;QAChC,UAAU,EAAE,MAAM,CAAC;QACnB,WAAW,EAAE,MAAM,CAAC;QACpB,aAAa,EAAE,MAAM,CAAC;QACtB,KAAK,EAAE,MAAM,CAAC;QACd,WAAW,CAAC,EAAE,MAAM,CAAC;KACtB,GAAG,OAAO,CAAC;QAAE,UAAU,EAAE,MAAM,CAAC;QAAC,iBAAiB,EAAE,MAAM,CAAC;QAAC,UAAU,EAAE,MAAM,CAAA;KAAE,CAAC,CAajF;IAED,mBAAmB,CAAC,KAAK,EAAE;QAAE,UAAU,EAAE,MAAM,CAAC;QAAC,WAAW,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,2BAA2B,CAAC,CAM7G;IAED,yBAAyB,CAAC,KAAK,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,YAAY,EAAE,MAAM,CAAC;QAAC,WAAW,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAQzH;IAED,kBAAkB,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAMlE;IAED,OAAO,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAMzD;IAEK,MAAM,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAKhD;IAED,OAAO,CAAC,IAAI;YAQE,IAAI;CAqBnB;AAED,wBAAgB,cAAc,IAAI;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAOvF;AAED,wBAAsB,4BAA4B,CAAC,KAAK,EAAE;IACxD,mBAAmB,EAAE,MAAM,CAAC;IAC5B,KAAK,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC;QAAE,gBAAgB,EAAE,MAAM,CAAC;QAAC,aAAa,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IACzF,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAC3C,MAAM,EAAE,OAAO,CAAC;IAChB,MAAM,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;CAC3B,GAAG,OAAO,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,MAAM,CAAA;CAAE,CAAC,
|
|
1
|
+
{"version":3,"file":"oauth.d.ts","sourceRoot":"","sources":["../src/oauth.ts"],"names":[],"mappings":"AAKA,eAAO,MAAM,mBAAmB,wBAAwB,CAAC;AAEzD,MAAM,WAAW,kBAAkB;IACjC,UAAU,EAAE,QAAQ,CAAC;IACrB,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,aAAa,EAAE,MAAM,CAAC;IACtB,kBAAkB,EAAE,MAAM,CAAC;IAC3B,KAAK,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,2BAA2B;IAC1C,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,EAAE,MAAM,CAAC;IAClB,gBAAgB,EAAE,MAAM,CAAC;IACzB,yBAAyB,EAAE,MAAM,CAAC;IAClC,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,qBAAa,cAAc;IACb,OAAO,CAAC,QAAQ,CAAC,OAAO;IAAU,OAAO,CAAC,QAAQ,CAAC,OAAO;IAAtE,YAA6B,OAAO,EAAE,MAAM,EAAmB,OAAO,GAAE,OAAO,KAAa,EAAI;IAEhG,0BAA0B,CAAC,KAAK,EAAE;QAChC,UAAU,EAAE,MAAM,CAAC;QACnB,WAAW,EAAE,MAAM,CAAC;QACpB,aAAa,EAAE,MAAM,CAAC;QACtB,KAAK,EAAE,MAAM,CAAC;QACd,WAAW,CAAC,EAAE,MAAM,CAAC;KACtB,GAAG,OAAO,CAAC;QAAE,UAAU,EAAE,MAAM,CAAC;QAAC,iBAAiB,EAAE,MAAM,CAAC;QAAC,UAAU,EAAE,MAAM,CAAA;KAAE,CAAC,CAajF;IAED,mBAAmB,CAAC,KAAK,EAAE;QAAE,UAAU,EAAE,MAAM,CAAC;QAAC,WAAW,CAAC,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,2BAA2B,CAAC,CAM7G;IAED,yBAAyB,CAAC,KAAK,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,YAAY,EAAE,MAAM,CAAC;QAAC,WAAW,EAAE,MAAM,CAAA;KAAE,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAQzH;IAED,kBAAkB,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAMlE;IAED,OAAO,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,kBAAkB,CAAC,CAMzD;IAEK,MAAM,CAAC,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAKhD;IAED,OAAO,CAAC,IAAI;YAQE,IAAI;CAqBnB;AAED,wBAAgB,cAAc,IAAI;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,CAOvF;AAED,wBAAsB,4BAA4B,CAAC,KAAK,EAAE;IACxD,mBAAmB,EAAE,MAAM,CAAC;IAC5B,KAAK,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC;QAAE,gBAAgB,EAAE,MAAM,CAAC;QAAC,aAAa,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IACzF,WAAW,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;IAC3C,MAAM,EAAE,OAAO,CAAC;IAChB,MAAM,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;CAC3B,GAAG,OAAO,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,MAAM,CAAA;CAAE,CAAC,CA2DjD;AAED,wBAAsB,iBAAiB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC,CAcrE"}
|
package/dist/oauth.js
CHANGED
|
@@ -110,14 +110,16 @@ export async function waitForLoopbackAuthorization(input) {
|
|
|
110
110
|
}
|
|
111
111
|
if (url.searchParams.get("state") !== expectedState || !url.searchParams.get("code")) {
|
|
112
112
|
response.writeHead(400, securityHeaders("text/plain; charset=utf-8"));
|
|
113
|
-
response.end("Tender CLI authorization could not be verified.")
|
|
114
|
-
|
|
113
|
+
response.end("Tender CLI authorization could not be verified.", () => {
|
|
114
|
+
finish(new CliError("oauth_callback_invalid", "The Tender CLI authorization callback was invalid."));
|
|
115
|
+
});
|
|
115
116
|
return;
|
|
116
117
|
}
|
|
117
118
|
const code = url.searchParams.get("code") ?? "";
|
|
118
119
|
response.writeHead(200, securityHeaders("text/html; charset=utf-8"));
|
|
119
|
-
response.end("<!doctype html><meta charset=utf-8><title>Tender CLI connected</title><p>Tender CLI is connected. You can close this window.</p>")
|
|
120
|
-
|
|
120
|
+
response.end("<!doctype html><meta charset=utf-8><title>Tender CLI connected</title><p>Tender CLI is connected. You can close this window.</p>", () => {
|
|
121
|
+
finish(null, code);
|
|
122
|
+
});
|
|
121
123
|
}
|
|
122
124
|
catch (error) {
|
|
123
125
|
finish(error instanceof Error ? error : new Error("Invalid OAuth callback."));
|
|
@@ -129,12 +131,11 @@ export async function waitForLoopbackAuthorization(input) {
|
|
|
129
131
|
return;
|
|
130
132
|
settled = true;
|
|
131
133
|
clearTimeout(timer);
|
|
132
|
-
server.close(
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
});
|
|
134
|
+
server.close();
|
|
135
|
+
if (error)
|
|
136
|
+
reject(error);
|
|
137
|
+
else
|
|
138
|
+
resolvePromise({ code: code ?? "", redirectUri });
|
|
138
139
|
};
|
|
139
140
|
server.on("error", (error) => finish(error));
|
|
140
141
|
server.listen(0, "127.0.0.1", async () => {
|
|
@@ -173,6 +174,7 @@ export async function openSystemBrowser(url) {
|
|
|
173
174
|
function securityHeaders(contentType) {
|
|
174
175
|
return {
|
|
175
176
|
"cache-control": "private, no-store",
|
|
177
|
+
connection: "close",
|
|
176
178
|
"content-security-policy": "default-src 'none'; frame-ancestors 'none'",
|
|
177
179
|
"content-type": contentType,
|
|
178
180
|
"referrer-policy": "no-referrer",
|
package/dist/oauth.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"oauth.js","sourceRoot":"","sources":["../src/oauth.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"oauth.js","sourceRoot":"","sources":["../src/oauth.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -28,8 +28,9 @@ const publicVars = exactPublicVars(
|
|
|
28
28
|
);
|
|
29
29
|
const resources = exactResourceRequests(config.resources);
|
|
30
30
|
const databaseSchema = exactDatabaseSchema(JSON.parse(await readFile(resolve(appRoot, config.databaseSchema), "utf8")));
|
|
31
|
-
if (
|
|
32
|
-
|| JSON.stringify(
|
|
31
|
+
if (config.app?.slug !== "__APP_SLUG__-gateway"
|
|
32
|
+
|| JSON.stringify(resources) !== JSON.stringify([{ type: "d1", name: "APP_DB" }])
|
|
33
|
+
|| JSON.stringify(config.services) !== JSON.stringify([{ name: "PORTAL_UI", targetProject: "__APP_SLUG__-portal-ui" }])) {
|
|
33
34
|
throw new Error("The gateway binding contract is invalid.");
|
|
34
35
|
}
|
|
35
36
|
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"schema": "tender.account-source/v1",
|
|
3
3
|
"app": {
|
|
4
|
-
"slug": "
|
|
4
|
+
"slug": "__APP_SLUG__-gateway",
|
|
5
5
|
"label": "__APP_NAME__ gateway",
|
|
6
6
|
"fixture": false
|
|
7
7
|
},
|
|
@@ -22,7 +22,7 @@
|
|
|
22
22
|
"services": [
|
|
23
23
|
{
|
|
24
24
|
"name": "PORTAL_UI",
|
|
25
|
-
"targetProject": "portal-ui"
|
|
25
|
+
"targetProject": "__APP_SLUG__-portal-ui"
|
|
26
26
|
}
|
|
27
27
|
],
|
|
28
28
|
"publicVarNames": [
|
|
@@ -8,7 +8,7 @@ const config = JSON.parse(await readFile(join(appRoot, "tender-app.config.json")
|
|
|
8
8
|
const packageJson = JSON.parse(await readFile(join(appRoot, "package.json"), "utf8"));
|
|
9
9
|
const sourceRevision = (argumentValue("--source-revision") || process.env.TENDER_SOURCE_REVISION || "").trim().toLowerCase();
|
|
10
10
|
if (!/^[a-f0-9]{40}$/u.test(sourceRevision)) throw new Error("A committed 40-character source revision is required.");
|
|
11
|
-
if (config.schema !== "tender.account-source/v1" || config.app?.slug !== "portal-ui"
|
|
11
|
+
if (config.schema !== "tender.account-source/v1" || config.app?.slug !== "__APP_SLUG__-portal-ui"
|
|
12
12
|
|| config.runtime?.compatibilityDate !== "2026-08-25" || config.runtime?.mainModule !== "worker.mjs"
|
|
13
13
|
|| JSON.stringify(config.resources) !== "[]" || JSON.stringify(config.services) !== "[]") {
|
|
14
14
|
throw new Error("The portal source contract is invalid.");
|
|
@@ -25,7 +25,7 @@ const files = [];
|
|
|
25
25
|
const digest = bundleDigest(module, files);
|
|
26
26
|
const manifest = {
|
|
27
27
|
schema: "tender.account-artifact/v1",
|
|
28
|
-
app: { slug:
|
|
28
|
+
app: { slug: config.app.slug, version: packageJson.version, label: config.app.label, fixture: false },
|
|
29
29
|
runtime: {
|
|
30
30
|
kind: "worker",
|
|
31
31
|
compatibilityDate: "2026-08-25",
|