@aeolus-fleet/core 0.28.3 → 0.29.0
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 +8 -6
- package/dist/adapters/cli/fleet-init.d.ts +8 -4
- package/dist/adapters/cli/fleet-init.js +19 -35
- package/dist/adapters/cli/fleet-init.js.map +1 -1
- package/dist/adapters/cli/run.d.ts +1 -0
- package/dist/adapters/cli/run.js +1 -1
- package/dist/adapters/cli/run.js.map +1 -1
- package/dist/adapters/cli/sign-in-link.d.ts +4 -0
- package/dist/adapters/cli/sign-in-link.js +9 -0
- package/dist/adapters/cli/sign-in-link.js.map +1 -0
- package/dist/adapters/cli/sign-in.d.ts +14 -0
- package/dist/adapters/cli/sign-in.js +36 -0
- package/dist/adapters/cli/sign-in.js.map +1 -0
- package/dist/adapters/http/request-credentials.d.ts +18 -0
- package/dist/adapters/http/request-credentials.js +28 -3
- package/dist/adapters/http/request-credentials.js.map +1 -1
- package/dist/adapters/http/server.js +10 -3
- package/dist/adapters/http/server.js.map +1 -1
- package/dist/adapters/prisma/generated/browser.d.ts +16 -8
- package/dist/adapters/prisma/generated/client.d.ts +16 -8
- package/dist/adapters/prisma/generated/enums.d.ts +2 -0
- package/dist/adapters/prisma/generated/enums.js +4 -2
- package/dist/adapters/prisma/generated/enums.js.map +1 -1
- package/dist/adapters/prisma/generated/internal/class.d.ts +22 -11
- package/dist/adapters/prisma/generated/internal/class.js +4 -4
- package/dist/adapters/prisma/generated/internal/class.js.map +1 -1
- package/dist/adapters/prisma/generated/internal/prismaNamespace.d.ts +168 -83
- package/dist/adapters/prisma/generated/internal/prismaNamespace.js +15 -6
- package/dist/adapters/prisma/generated/internal/prismaNamespace.js.map +1 -1
- package/dist/adapters/prisma/generated/internal/prismaNamespaceBrowser.d.ts +17 -7
- package/dist/adapters/prisma/generated/internal/prismaNamespaceBrowser.js +15 -6
- package/dist/adapters/prisma/generated/internal/prismaNamespaceBrowser.js.map +1 -1
- package/dist/adapters/prisma/generated/models/AccountGuideProgress.d.ts +1220 -0
- package/dist/adapters/prisma/generated/models/AccountGuideProgress.js +2 -0
- package/dist/adapters/prisma/generated/models/AccountGuideProgress.js.map +1 -0
- package/dist/adapters/prisma/generated/models/AccountNoticeDismissal.d.ts +1148 -0
- package/dist/adapters/prisma/generated/models/AccountNoticeDismissal.js +2 -0
- package/dist/adapters/prisma/generated/models/AccountNoticeDismissal.js.map +1 -0
- package/dist/adapters/prisma/generated/models/Fleet.d.ts +622 -307
- package/dist/adapters/prisma/generated/models/Operator.d.ts +20 -19
- package/dist/adapters/prisma/generated/models/Ship.d.ts +0 -310
- package/dist/adapters/prisma/generated/models.d.ts +2 -1
- package/dist/adapters/prisma/identity.d.ts +1 -0
- package/dist/adapters/prisma/identity.js +48 -5
- package/dist/adapters/prisma/identity.js.map +1 -1
- package/dist/adapters/prisma/messaging.js +8 -0
- package/dist/adapters/prisma/messaging.js.map +1 -1
- package/dist/adapters/prisma/registry.js +13 -1
- package/dist/adapters/prisma/registry.js.map +1 -1
- package/dist/adapters/prisma/rows.js +1 -1
- package/dist/adapters/prisma/rows.js.map +1 -1
- package/dist/adapters/prisma/unit-of-work.d.ts +1 -2
- package/dist/adapters/prisma/unit-of-work.js +0 -2
- package/dist/adapters/prisma/unit-of-work.js.map +1 -1
- package/dist/adapters/trpc/console.d.ts +54 -14
- package/dist/adapters/trpc/console.js +69 -17
- package/dist/adapters/trpc/console.js.map +1 -1
- package/dist/adapters/trpc/context.d.ts +15 -2
- package/dist/adapters/trpc/fleet.d.ts +35 -16
- package/dist/adapters/trpc/fleet.js +23 -31
- package/dist/adapters/trpc/fleet.js.map +1 -1
- package/dist/adapters/trpc/installation.d.ts +14 -6
- package/dist/adapters/trpc/installation.js +7 -1
- package/dist/adapters/trpc/installation.js.map +1 -1
- package/dist/adapters/trpc/router.d.ts +113 -26
- package/dist/adapters/trpc/ship-protocol.js +1 -0
- package/dist/adapters/trpc/ship-protocol.js.map +1 -1
- package/dist/adapters/trpc/ship.d.ts +35 -2
- package/dist/adapters/trpc/ship.js +21 -1
- package/dist/adapters/trpc/ship.js.map +1 -1
- package/dist/adapters/trpc/trpc.d.ts +19 -2
- package/dist/adapters/trpc/trpc.js +37 -5
- package/dist/adapters/trpc/trpc.js.map +1 -1
- package/dist/bin/aeolus-core.js +6 -2
- package/dist/bin/aeolus-core.js.map +1 -1
- package/dist/domain/identity/authenticate-account.js +2 -0
- package/dist/domain/identity/authenticate-account.js.map +1 -1
- package/dist/domain/identity/dismiss-notice.d.ts +2 -2
- package/dist/domain/identity/dismiss-notice.js +5 -5
- package/dist/domain/identity/dismiss-notice.js.map +1 -1
- package/dist/domain/identity/issue-sign-in-link.d.ts +35 -0
- package/dist/domain/identity/issue-sign-in-link.js +27 -0
- package/dist/domain/identity/issue-sign-in-link.js.map +1 -0
- package/dist/domain/identity/notice.d.ts +18 -3
- package/dist/domain/identity/notice.js +19 -1
- package/dist/domain/identity/notice.js.map +1 -1
- package/dist/domain/identity/operator-account.d.ts +5 -3
- package/dist/domain/identity/operator-account.js.map +1 -1
- package/dist/domain/identity/ports.d.ts +18 -8
- package/dist/domain/identity/read-account.d.ts +6 -4
- package/dist/domain/identity/read-account.js +4 -2
- package/dist/domain/identity/read-account.js.map +1 -1
- package/dist/domain/identity/read-argo-sign-in.d.ts +30 -0
- package/dist/domain/identity/read-argo-sign-in.js +22 -0
- package/dist/domain/identity/read-argo-sign-in.js.map +1 -0
- package/dist/domain/identity/read-guide.d.ts +2 -2
- package/dist/domain/identity/read-guide.js +4 -4
- package/dist/domain/identity/read-guide.js.map +1 -1
- package/dist/domain/identity/read-notices.d.ts +4 -3
- package/dist/domain/identity/read-notices.js +7 -6
- package/dist/domain/identity/read-notices.js.map +1 -1
- package/dist/domain/identity/record-guide-progress.d.ts +2 -2
- package/dist/domain/identity/record-guide-progress.js +4 -4
- package/dist/domain/identity/record-guide-progress.js.map +1 -1
- package/dist/domain/identity/reset-operator-password.js +4 -0
- package/dist/domain/identity/reset-operator-password.js.map +1 -1
- package/dist/domain/identity/set-operator-login.d.ts +44 -0
- package/dist/domain/identity/set-operator-login.js +70 -0
- package/dist/domain/identity/set-operator-login.js.map +1 -0
- package/dist/domain/identity/sign-in-ticket.d.ts +2 -0
- package/dist/domain/identity/sign-in-ticket.js +2 -0
- package/dist/domain/identity/sign-in-ticket.js.map +1 -1
- package/dist/domain/identity/sign-out-account.d.ts +24 -0
- package/dist/domain/identity/sign-out-account.js +25 -0
- package/dist/domain/identity/sign-out-account.js.map +1 -0
- package/dist/domain/messaging/delivery.d.ts +16 -4
- package/dist/domain/messaging/delivery.js +18 -1
- package/dist/domain/messaging/delivery.js.map +1 -1
- package/dist/domain/messaging/dismiss-delivery.d.ts +2 -2
- package/dist/domain/messaging/dismiss-delivery.js +2 -1
- package/dist/domain/messaging/dismiss-delivery.js.map +1 -1
- package/dist/domain/messaging/message.d.ts +7 -7
- package/dist/domain/messaging/message.js +4 -4
- package/dist/domain/messaging/message.js.map +1 -1
- package/dist/domain/messaging/ping-ship.d.ts +8 -6
- package/dist/domain/messaging/ping-ship.js +17 -3
- package/dist/domain/messaging/ping-ship.js.map +1 -1
- package/dist/domain/messaging/ports.d.ts +2 -0
- package/dist/domain/messaging/read-delivery.d.ts +33 -0
- package/dist/domain/messaging/read-delivery.js +38 -0
- package/dist/domain/messaging/read-delivery.js.map +1 -0
- package/dist/domain/messaging/resend-delivery.d.ts +2 -2
- package/dist/domain/messaging/resend-delivery.js +5 -3
- package/dist/domain/messaging/resend-delivery.js.map +1 -1
- package/dist/domain/messaging/send-message.d.ts +2 -1
- package/dist/domain/messaging/send-message.js +1 -0
- package/dist/domain/messaging/send-message.js.map +1 -1
- package/dist/domain/registry/assign-crew.d.ts +2 -2
- package/dist/domain/registry/assign-crew.js.map +1 -1
- package/dist/domain/registry/check-reach.d.ts +2 -7
- package/dist/domain/registry/check-reach.js +3 -4
- package/dist/domain/registry/check-reach.js.map +1 -1
- package/dist/domain/registry/crew-request.d.ts +2 -2
- package/dist/domain/registry/crew-request.js +2 -2
- package/dist/domain/registry/crew-request.js.map +1 -1
- package/dist/domain/registry/discover.d.ts +0 -1
- package/dist/domain/registry/discover.js.map +1 -1
- package/dist/domain/registry/explain-crew-request.d.ts +2 -2
- package/dist/domain/registry/explain-crew-request.js.map +1 -1
- package/dist/domain/registry/explain-reach.d.ts +0 -1
- package/dist/domain/registry/explain-reach.js.map +1 -1
- package/dist/domain/registry/found-fleet.d.ts +2 -2
- package/dist/domain/registry/found-fleet.js +1 -1
- package/dist/domain/registry/found-fleet.js.map +1 -1
- package/dist/domain/registry/get-ship.d.ts +5 -3
- package/dist/domain/registry/get-ship.js +6 -2
- package/dist/domain/registry/get-ship.js.map +1 -1
- package/dist/domain/registry/initialise-fleet.d.ts +7 -10
- package/dist/domain/registry/initialise-fleet.js +7 -17
- package/dist/domain/registry/initialise-fleet.js.map +1 -1
- package/dist/domain/registry/network-settings.d.ts +2 -4
- package/dist/domain/registry/network-settings.js +2 -2
- package/dist/domain/registry/network-settings.js.map +1 -1
- package/dist/domain/registry/ports.d.ts +4 -10
- package/dist/domain/registry/read-fleet-name.d.ts +15 -0
- package/dist/domain/registry/read-fleet-name.js +10 -0
- package/dist/domain/registry/read-fleet-name.js.map +1 -0
- package/dist/domain/registry/read-reach.d.ts +2 -3
- package/dist/domain/registry/read-reach.js +3 -4
- package/dist/domain/registry/read-reach.js.map +1 -1
- package/dist/domain/registry/recrew-ship.d.ts +2 -2
- package/dist/domain/registry/recrew-ship.js +0 -2
- package/dist/domain/registry/recrew-ship.js.map +1 -1
- package/dist/domain/registry/release-ship.d.ts +3 -4
- package/dist/domain/registry/release-ship.js +2 -4
- package/dist/domain/registry/release-ship.js.map +1 -1
- package/dist/domain/registry/remove-crew-request.d.ts +2 -2
- package/dist/domain/registry/remove-crew-request.js.map +1 -1
- package/dist/domain/registry/request-crew.d.ts +2 -2
- package/dist/domain/registry/request-crew.js.map +1 -1
- package/dist/domain/registry/request-worktree-clear.d.ts +6 -5
- package/dist/domain/registry/request-worktree-clear.js +13 -3
- package/dist/domain/registry/request-worktree-clear.js.map +1 -1
- package/dist/domain/registry/retire-ship.d.ts +2 -2
- package/dist/domain/registry/retire-ship.js +5 -2
- package/dist/domain/registry/retire-ship.js.map +1 -1
- package/dist/domain/registry/ship.d.ts +2 -1
- package/dist/domain/registry/ship.js +12 -4
- package/dist/domain/registry/ship.js.map +1 -1
- package/dist/domain/registry/verified-facts.js +1 -0
- package/dist/domain/registry/verified-facts.js.map +1 -1
- package/dist/domain/shared/caller.d.ts +4 -0
- package/dist/domain/shared/caller.js +1 -0
- package/dist/domain/shared/caller.js.map +1 -1
- package/dist/domain/shared/errors.d.ts +1 -1
- package/dist/domain/shared/errors.js.map +1 -1
- package/dist/domain/shared/read-fleet-limits.d.ts +2 -2
- package/dist/domain/shared/read-health.d.ts +2 -2
- package/dist/domain/shared/read-inbox.d.ts +5 -4
- package/dist/domain/shared/read-inbox.js +5 -3
- package/dist/domain/shared/read-inbox.js.map +1 -1
- package/dist/domain/shared/read-message.d.ts +2 -2
- package/dist/domain/shared/read-needs-attention.d.ts +2 -2
- package/dist/domain/shared/read-ship-messages.d.ts +2 -2
- package/dist/domain/shared/read-ship-timeline.d.ts +2 -2
- package/dist/domain/shared/read-ship-way.d.ts +2 -2
- package/dist/domain/shared/read-ship-way.js +2 -1
- package/dist/domain/shared/read-ship-way.js.map +1 -1
- package/dist/wiring.d.ts +12 -2
- package/dist/wiring.js +14 -3
- package/dist/wiring.js.map +1 -1
- package/package.json +3 -2
- package/src/adapters/prisma/migrations/20261021120000_operator_email_optional/migration.sql +4 -0
- package/src/adapters/prisma/migrations/20261021160000_ship_kind_plugin/migration.sql +2 -0
- package/src/adapters/prisma/migrations/20261021160100_plugin_ships/migration.sql +46 -0
- package/src/adapters/prisma/migrations/20261021180000_account_notices_and_guide/migration.sql +28 -0
- package/src/adapters/prisma/schema.prisma +38 -19
- package/dist/adapters/prisma/generated/models/PluginConnection.d.ts +0 -1180
- package/dist/adapters/prisma/generated/models/PluginConnection.js +0 -2
- package/dist/adapters/prisma/generated/models/PluginConnection.js.map +0 -1
- package/dist/adapters/prisma/plugin-connections.d.ts +0 -4
- package/dist/adapters/prisma/plugin-connections.js +0 -20
- package/dist/adapters/prisma/plugin-connections.js.map +0 -1
- package/dist/domain/registry/connect-plugin.d.ts +0 -31
- package/dist/domain/registry/connect-plugin.js +0 -34
- package/dist/domain/registry/connect-plugin.js.map +0 -1
- package/dist/domain/registry/plugin-connection.d.ts +0 -48
- package/dist/domain/registry/plugin-connection.js +0 -35
- package/dist/domain/registry/plugin-connection.js.map +0 -1
package/README.md
CHANGED
|
@@ -10,7 +10,7 @@ Pre-v1: the API changes without notice until the v1 acceptance test passes.
|
|
|
10
10
|
npm install @aeolus-fleet/core @aeolus-fleet/console
|
|
11
11
|
export DATABASE_URL=postgresql://... PUBLIC_URL=https://fleet.example.com
|
|
12
12
|
npx aeolus-core migrate
|
|
13
|
-
npx aeolus-core fleet:init --name "my fleet" # once:
|
|
13
|
+
npx aeolus-core fleet:init --name "my fleet" # once: prints a link that signs you in as argo
|
|
14
14
|
npx aeolus-core start
|
|
15
15
|
```
|
|
16
16
|
|
|
@@ -19,6 +19,7 @@ npx aeolus-core start
|
|
|
19
19
|
| `aeolus-core start` | Migrates the database, then serves the fleet until `SIGINT` or `SIGTERM` |
|
|
20
20
|
| `aeolus-core migrate` | Applies the migrations the package ships, with Prisma Migrate, and nothing else. Needs `DATABASE_URL` alone |
|
|
21
21
|
| `aeolus-core fleet:init --name "<fleet name>"` | See Server commands below |
|
|
22
|
+
| `aeolus-core sign-in` | See Server commands below |
|
|
22
23
|
| `aeolus-core operator:reset-password` | See Server commands below |
|
|
23
24
|
|
|
24
25
|
Prisma Migrate holds a Postgres advisory lock while it migrates, so two processes starting at once never migrate at once: the second waits, then finds nothing left to apply. It never asks Prisma's servers for a newer version.
|
|
@@ -48,7 +49,7 @@ The browser calls the server's `/trpc` itself, at the address the web app runs w
|
|
|
48
49
|
On localhost, plain http works: browsers treat it as a secure context. On any other host the console session cookie is `Secure`, so over plain http the browser drops it and sign-in fails, and passwords and crew tokens travel in clear text. The server and the console warn at startup when an address they are given is plain http beyond localhost, and the sign-in page says so too. To reach the fleet from other machines:
|
|
49
50
|
|
|
50
51
|
1. Put a TLS proxy in front. Set `HOST` (here and on the console) only when the proxy runs on another machine or container, such as `HOST=0.0.0.0`; beside it, the default `127.0.0.1` keeps both off the network.
|
|
51
|
-
2. Set `PUBLIC_URL` to the https address, `TRUST_PROXY=true`, and `CONSOLE_ORIGIN` to the console's https origin when it is not `PUBLIC_URL`'s. Give the console `AEOLUS_SERVER_URL` with the same https address.
|
|
52
|
+
2. Set `PUBLIC_URL` to the https address, `TRUST_PROXY=true`, and `CONSOLE_ORIGIN` to the console's https origin when it is not `PUBLIC_URL`'s. Give the console `AEOLUS_SERVER_URL` with the same https address, and `AEOLUS_CONSOLE_URL` with its own (see the console README).
|
|
52
53
|
|
|
53
54
|
Caddy gets a certificate by itself and passes the console's WebSocket on. With the server and the console behind one host:
|
|
54
55
|
|
|
@@ -66,12 +67,13 @@ Run on the server, against the configured database, once it is migrated:
|
|
|
66
67
|
|
|
67
68
|
| Command | Does |
|
|
68
69
|
| --- | --- |
|
|
69
|
-
| `aeolus-core fleet:init --name "<fleet name>"` |
|
|
70
|
-
| `aeolus-core
|
|
70
|
+
| `aeolus-core fleet:init --name "<fleet name>"` | Creates the fleet, its operator ship `argo` and argo's own sign-in, with no email and no password, asking nothing. Prints a console link (`CONSOLE_ORIGIN/sign-in/ticket?ticket=...`) that signs in as argo: one use, valid 15 minutes. Refuses when a fleet already exists |
|
|
71
|
+
| `aeolus-core sign-in` | Prints a fresh sign-in link as `fleet:init` does, for another browser or once the first one expired. Signing in with it ends any other sign-in as argo |
|
|
72
|
+
| `aeolus-core operator:reset-password` | Asks for a new operator password (twice, not shown, at least 12 characters) and sets it. The old one stops working and every console session ends. Refused while argo has no password yet (sign in with a link and set one in Settings), and for an operator a hosting installation created, who signs in only through the hosting service |
|
|
71
73
|
|
|
72
|
-
|
|
74
|
+
`operator:reset-password` reads its answers a line at a time from standard input, so a script can pipe them in. Like the API, the commands refuse any answer or name holding the character U+0000, naming what holds it, and change nothing. In this repository they run as `npm run fleet:init -w @aeolus-fleet/core -- --name "<fleet name>"`, `npm run sign-in -w @aeolus-fleet/core` and `npm run operator:reset-password -w @aeolus-fleet/core`, and `npm run db:migrate -w @aeolus-fleet/core` migrates.
|
|
73
75
|
|
|
74
|
-
|
|
76
|
+
argo signs in to the console with the link; in Settings it can then set an email and password (at least 12 characters) to sign in with instead. Either way the session crews `argo`, which has no secret. The password is stored as an Argon2id hash. The console keeps only a session cookie (httpOnly, Secure, SameSite=Strict), valid 30 days after its last use. A wrong email and a wrong password get the same answer.
|
|
75
77
|
|
|
76
78
|
## Ships
|
|
77
79
|
|
|
@@ -1,14 +1,18 @@
|
|
|
1
|
+
import type { IssueSignInLink } from '../../domain/identity/issue-sign-in-link.js';
|
|
1
2
|
import type { InitialiseFleet } from '../../domain/registry/initialise-fleet.js';
|
|
2
3
|
import type { ListFleets } from '../../domain/registry/list-fleets.js';
|
|
3
4
|
import { type CommandIo, type ExitCode } from './io.js';
|
|
4
5
|
/**
|
|
5
|
-
* `fleet:init --name <name>`:
|
|
6
|
-
*
|
|
7
|
-
*
|
|
8
|
-
*
|
|
6
|
+
* `fleet:init --name <name>`: creates the fleet, its operator ship argo and
|
|
7
|
+
* argo's own sign-in, asking nothing, and prints a one-use console link that
|
|
8
|
+
* signs in as argo (accounts design, A1). An email and password come later,
|
|
9
|
+
* from Settings. Refuses when a fleet already exists; the use case checks
|
|
10
|
+
* again under its lock, for two runs at once.
|
|
9
11
|
*/
|
|
10
12
|
export declare function fleetInit(args: string[], deps: {
|
|
11
13
|
initialiseFleet: InitialiseFleet;
|
|
14
|
+
issueSignInLink: IssueSignInLink;
|
|
12
15
|
listFleets: ListFleets;
|
|
16
|
+
consoleOrigin: string;
|
|
13
17
|
io: CommandIo;
|
|
14
18
|
}): Promise<ExitCode>;
|
|
@@ -1,13 +1,14 @@
|
|
|
1
1
|
import { parseArgs } from 'node:util';
|
|
2
|
-
import {
|
|
3
|
-
import {
|
|
2
|
+
import { nulRefusal } from './io.js';
|
|
3
|
+
import { SIGN_IN_LINK_NOTE, signInLinkOf } from './sign-in-link.js';
|
|
4
4
|
const NOTHING_CREATED = 'Nothing was created.';
|
|
5
5
|
const USAGE = 'Usage: aeolus-core fleet:init --name "<fleet name>"';
|
|
6
6
|
/**
|
|
7
|
-
* `fleet:init --name <name>`:
|
|
8
|
-
*
|
|
9
|
-
*
|
|
10
|
-
*
|
|
7
|
+
* `fleet:init --name <name>`: creates the fleet, its operator ship argo and
|
|
8
|
+
* argo's own sign-in, asking nothing, and prints a one-use console link that
|
|
9
|
+
* signs in as argo (accounts design, A1). An email and password come later,
|
|
10
|
+
* from Settings. Refuses when a fleet already exists; the use case checks
|
|
11
|
+
* again under its lock, for two runs at once.
|
|
11
12
|
*/
|
|
12
13
|
export async function fleetInit(args, deps) {
|
|
13
14
|
const { io } = deps;
|
|
@@ -32,42 +33,25 @@ export async function fleetInit(args, deps) {
|
|
|
32
33
|
io.err(`A fleet already exists: a fleet is initialised only once. ${NOTHING_CREATED}`);
|
|
33
34
|
return 1;
|
|
34
35
|
}
|
|
35
|
-
const
|
|
36
|
-
const password = email === undefined ? { kind: 'ended' } : await askNewPassword(io, 'Operator password: ');
|
|
37
|
-
if (email === undefined || password.kind === 'ended') {
|
|
38
|
-
io.err('fleet:init needs the operator email and the password twice. Nothing was created.');
|
|
39
|
-
return 2;
|
|
40
|
-
}
|
|
41
|
-
if (password.kind === 'differ') {
|
|
42
|
-
io.err('The two passwords differ. Nothing was created.');
|
|
43
|
-
return 1;
|
|
44
|
-
}
|
|
45
|
-
const answerRefusal = nulRefusal([
|
|
46
|
-
{ name: 'operator email', text: email },
|
|
47
|
-
{ name: 'operator password', text: password.password },
|
|
48
|
-
], NOTHING_CREATED);
|
|
49
|
-
if (answerRefusal !== undefined) {
|
|
50
|
-
io.err(answerRefusal);
|
|
51
|
-
return 1;
|
|
52
|
-
}
|
|
53
|
-
const passwordProblem = newOperatorPasswordProblem(password.password);
|
|
54
|
-
if (passwordProblem !== undefined) {
|
|
55
|
-
io.err(`${passwordProblem}. ${NOTHING_CREATED}`);
|
|
56
|
-
return 1;
|
|
57
|
-
}
|
|
58
|
-
const initialised = await deps.initialiseFleet({ name, email, password: password.password });
|
|
36
|
+
const initialised = await deps.initialiseFleet({ name });
|
|
59
37
|
if (!initialised.isOk) {
|
|
60
38
|
io.err(initialised.error.message);
|
|
61
39
|
return 1;
|
|
62
40
|
}
|
|
63
41
|
const { fleetId, operatorShipId, operatorId } = initialised.value;
|
|
42
|
+
const created = [`Fleet initialised: ${fleetId}`, `Operator ship argo: ${operatorShipId}`, `Operator account: ${operatorId}`];
|
|
43
|
+
const link = await deps.issueSignInLink({ fleetId });
|
|
44
|
+
if (!link.isOk) {
|
|
45
|
+
io.out(created.join('\n'));
|
|
46
|
+
io.err(`No sign-in link was issued: ${link.error.message}. Run npx aeolus-core sign-in for one.`);
|
|
47
|
+
return 1;
|
|
48
|
+
}
|
|
64
49
|
io.out([
|
|
65
|
-
|
|
66
|
-
`Operator ship argo: ${operatorShipId}`,
|
|
67
|
-
`Operator account: ${operatorId}`,
|
|
50
|
+
...created,
|
|
68
51
|
'',
|
|
69
|
-
|
|
70
|
-
|
|
52
|
+
`Open ${signInLinkOf(deps.consoleOrigin, link.value.ticket)} to sign in to the console as argo.`,
|
|
53
|
+
SIGN_IN_LINK_NOTE,
|
|
54
|
+
'To sign in with an email and password instead, set them in Settings once you are in.',
|
|
71
55
|
].join('\n'));
|
|
72
56
|
return 0;
|
|
73
57
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fleet-init.js","sourceRoot":"","sources":["../../../src/adapters/cli/fleet-init.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"fleet-init.js","sourceRoot":"","sources":["../../../src/adapters/cli/fleet-init.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,5 +10,6 @@ export declare function runAtTerminal(command: (io: CommandIo) => Promise<ExitCo
|
|
|
10
10
|
export declare function runCommand(args: string[], command: (run: {
|
|
11
11
|
args: string[];
|
|
12
12
|
useCases: UseCases;
|
|
13
|
+
consoleOrigin: string;
|
|
13
14
|
io: CommandIo;
|
|
14
15
|
}) => Promise<ExitCode>): Promise<never>;
|
package/dist/adapters/cli/run.js
CHANGED
|
@@ -30,7 +30,7 @@ export function runCommand(args, command) {
|
|
|
30
30
|
const config = loadConfig(process.env);
|
|
31
31
|
const prisma = createPrismaClient(config.databaseUrl);
|
|
32
32
|
try {
|
|
33
|
-
return await command({ args, useCases: createUseCases({ prisma }), io });
|
|
33
|
+
return await command({ args, useCases: createUseCases({ prisma }), consoleOrigin: config.consoleOrigin, io });
|
|
34
34
|
}
|
|
35
35
|
finally {
|
|
36
36
|
await prisma.$disconnect();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"run.js","sourceRoot":"","sources":["../../../src/adapters/cli/run.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC1D,OAAO,EAAE,cAAc,EAAiB,MAAM,iBAAiB,CAAC;AAChE,OAAO,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAC3D,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAEtD,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAE3C;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,aAAa,CAAC,OAA6C;IAC/E,MAAM,EAAE,GAAG,UAAU,CAAC,EAAE,KAAK,EAAE,OAAO,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;IAChG,IAAI,IAAY,CAAC;IACjB,IAAI,CAAC;QACH,IAAI,GAAG,MAAM,OAAO,CAAC,EAAE,CAAC,CAAC;IAC3B,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,EAAE,CAAC,GAAG,CAAC,KAAK,YAAY,WAAW,IAAI,KAAK,YAAY,cAAc,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC,CAAC;QACjH,IAAI,GAAG,CAAC,CAAC;IACX,CAAC;YAAS,CAAC;QACT,EAAE,CAAC,KAAK,EAAE,CAAC;IACb,CAAC;IACD,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AACrB,CAAC;AAED,qFAAqF;AACrF,MAAM,UAAU,UAAU,CACxB,IAAc,EACd,
|
|
1
|
+
{"version":3,"file":"run.js","sourceRoot":"","sources":["../../../src/adapters/cli/run.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAC1D,OAAO,EAAE,cAAc,EAAiB,MAAM,iBAAiB,CAAC;AAChE,OAAO,EAAE,kBAAkB,EAAE,MAAM,qBAAqB,CAAC;AACzD,OAAO,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AAC3D,OAAO,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAEtD,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAE3C;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,aAAa,CAAC,OAA6C;IAC/E,MAAM,EAAE,GAAG,UAAU,CAAC,EAAE,KAAK,EAAE,OAAO,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;IAChG,IAAI,IAAY,CAAC;IACjB,IAAI,CAAC;QACH,IAAI,GAAG,MAAM,OAAO,CAAC,EAAE,CAAC,CAAC;IAC3B,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,EAAE,CAAC,GAAG,CAAC,KAAK,YAAY,WAAW,IAAI,KAAK,YAAY,cAAc,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC,CAAC;QACjH,IAAI,GAAG,CAAC,CAAC;IACX,CAAC;YAAS,CAAC;QACT,EAAE,CAAC,KAAK,EAAE,CAAC;IACb,CAAC;IACD,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AACrB,CAAC;AAED,qFAAqF;AACrF,MAAM,UAAU,UAAU,CACxB,IAAc,EACd,OAAiH;IAEjH,OAAO,aAAa,CAAC,KAAK,EAAE,EAAE,EAAE,EAAE;QAChC,MAAM,MAAM,GAAG,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QACvC,MAAM,MAAM,GAAG,kBAAkB,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;QACtD,IAAI,CAAC;YACH,OAAO,MAAM,OAAO,CAAC,EAAE,IAAI,EAAE,QAAQ,EAAE,cAAc,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,aAAa,EAAE,MAAM,CAAC,aAAa,EAAE,EAAE,EAAE,CAAC,CAAC;QAChH,CAAC;gBAAS,CAAC;YACT,MAAM,MAAM,CAAC,WAAW,EAAE,CAAC;QAC7B,CAAC;IACH,CAAC,CAAC,CAAC;AACL,CAAC"}
|
|
@@ -0,0 +1,4 @@
|
|
|
1
|
+
/** The console address that redeems a sign-in ticket: the console's own hand-off page. */
|
|
2
|
+
export declare function signInLinkOf(consoleOrigin: string, ticket: string): string;
|
|
3
|
+
/** What the terminal says with a link: how long it works and how to get another. */
|
|
4
|
+
export declare const SIGN_IN_LINK_NOTE = "The link works once, for 15 minutes. For a new one, run npx aeolus-core sign-in.";
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
/** The console address that redeems a sign-in ticket: the console's own hand-off page. */
|
|
2
|
+
export function signInLinkOf(consoleOrigin, ticket) {
|
|
3
|
+
const link = new URL('/sign-in/ticket', consoleOrigin);
|
|
4
|
+
link.search = new URLSearchParams({ ticket }).toString();
|
|
5
|
+
return link.toString();
|
|
6
|
+
}
|
|
7
|
+
/** What the terminal says with a link: how long it works and how to get another. */
|
|
8
|
+
export const SIGN_IN_LINK_NOTE = 'The link works once, for 15 minutes. For a new one, run npx aeolus-core sign-in.';
|
|
9
|
+
//# sourceMappingURL=sign-in-link.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"sign-in-link.js","sourceRoot":"","sources":["../../../src/adapters/cli/sign-in-link.ts"],"names":[],"mappings":"AAAA,0FAA0F;AAC1F,MAAM,UAAU,YAAY,CAAC,aAAqB,EAAE,MAAc;IAChE,MAAM,IAAI,GAAG,IAAI,GAAG,CAAC,iBAAiB,EAAE,aAAa,CAAC,CAAC;IACvD,IAAI,CAAC,MAAM,GAAG,IAAI,eAAe,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,QAAQ,EAAE,CAAC;IACzD,OAAO,IAAI,CAAC,QAAQ,EAAE,CAAC;AACzB,CAAC;AAED,oFAAoF;AACpF,MAAM,CAAC,MAAM,iBAAiB,GAAG,kFAAkF,CAAC"}
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
import type { IssueSignInLink } from '../../domain/identity/issue-sign-in-link.js';
|
|
2
|
+
import type { ListFleets } from '../../domain/registry/list-fleets.js';
|
|
3
|
+
import type { CommandIo, ExitCode } from './io.js';
|
|
4
|
+
/**
|
|
5
|
+
* `sign-in`: prints a fresh one-use console link that signs in as argo
|
|
6
|
+
* (accounts design, A1), for another browser or once the first expired.
|
|
7
|
+
* Asks nothing. v1 hosts one fleet, so it acts on that one.
|
|
8
|
+
*/
|
|
9
|
+
export declare function signIn(args: string[], deps: {
|
|
10
|
+
listFleets: ListFleets;
|
|
11
|
+
issueSignInLink: IssueSignInLink;
|
|
12
|
+
consoleOrigin: string;
|
|
13
|
+
io: CommandIo;
|
|
14
|
+
}): Promise<ExitCode>;
|
|
@@ -0,0 +1,36 @@
|
|
|
1
|
+
import { parseArgs } from 'node:util';
|
|
2
|
+
import { SIGN_IN_LINK_NOTE, signInLinkOf } from './sign-in-link.js';
|
|
3
|
+
const USAGE = 'Usage: aeolus-core sign-in';
|
|
4
|
+
/**
|
|
5
|
+
* `sign-in`: prints a fresh one-use console link that signs in as argo
|
|
6
|
+
* (accounts design, A1), for another browser or once the first expired.
|
|
7
|
+
* Asks nothing. v1 hosts one fleet, so it acts on that one.
|
|
8
|
+
*/
|
|
9
|
+
export async function signIn(args, deps) {
|
|
10
|
+
const { io } = deps;
|
|
11
|
+
try {
|
|
12
|
+
parseArgs({ args, options: {}, strict: true });
|
|
13
|
+
}
|
|
14
|
+
catch (error) {
|
|
15
|
+
io.err(`${error instanceof Error ? error.message : String(error)}\n${USAGE}`);
|
|
16
|
+
return 2;
|
|
17
|
+
}
|
|
18
|
+
const fleets = await deps.listFleets();
|
|
19
|
+
const [fleet] = fleets;
|
|
20
|
+
if (!fleet) {
|
|
21
|
+
io.err('There is no fleet yet. Run fleet:init first.');
|
|
22
|
+
return 1;
|
|
23
|
+
}
|
|
24
|
+
if (fleets.length > 1) {
|
|
25
|
+
io.err(`This installation hosts ${String(fleets.length)} fleets; sign-in handles one.`);
|
|
26
|
+
return 1;
|
|
27
|
+
}
|
|
28
|
+
const link = await deps.issueSignInLink({ fleetId: fleet.id });
|
|
29
|
+
if (!link.isOk) {
|
|
30
|
+
io.err(link.error.message);
|
|
31
|
+
return 1;
|
|
32
|
+
}
|
|
33
|
+
io.out(`Open ${signInLinkOf(deps.consoleOrigin, link.value.ticket)} to sign in to the console as argo.\n${SIGN_IN_LINK_NOTE}`);
|
|
34
|
+
return 0;
|
|
35
|
+
}
|
|
36
|
+
//# sourceMappingURL=sign-in.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"sign-in.js","sourceRoot":"","sources":["../../../src/adapters/cli/sign-in.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,WAAW,CAAC;AAKtC,OAAO,EAAE,iBAAiB,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAEpE,MAAM,KAAK,GAAG,4BAA4B,CAAC;AAE3C;;;;GAIG;AACH,MAAM,CAAC,KAAK,UAAU,MAAM,CAC1B,IAAc,EACd,IAAwG;IAExG,MAAM,EAAE,EAAE,EAAE,GAAG,IAAI,CAAC;IAEpB,IAAI,CAAC;QACH,SAAS,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;IACjD,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,EAAE,CAAC,GAAG,CAAC,GAAG,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,KAAK,EAAE,CAAC,CAAC;QAC9E,OAAO,CAAC,CAAC;IACX,CAAC;IAED,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,UAAU,EAAE,CAAC;IACvC,MAAM,CAAC,KAAK,CAAC,GAAG,MAAM,CAAC;IACvB,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,EAAE,CAAC,GAAG,CAAC,8CAA8C,CAAC,CAAC;QACvD,OAAO,CAAC,CAAC;IACX,CAAC;IACD,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACtB,EAAE,CAAC,GAAG,CAAC,2BAA2B,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,+BAA+B,CAAC,CAAC;QACxF,OAAO,CAAC,CAAC;IACX,CAAC;IAED,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,eAAe,CAAC,EAAE,OAAO,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC;IAC/D,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;QACf,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QAC3B,OAAO,CAAC,CAAC;IACX,CAAC;IACD,EAAE,CAAC,GAAG,CAAC,QAAQ,YAAY,CAAC,IAAI,CAAC,aAAa,EAAE,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,wCAAwC,iBAAiB,EAAE,CAAC,CAAC;IAC/H,OAAO,CAAC,CAAC;AACX,CAAC"}
|
|
@@ -10,6 +10,24 @@ export declare function sessionCookie(cookie: {
|
|
|
10
10
|
}): string;
|
|
11
11
|
/** A Set-Cookie value that removes the cookie, for the same domain it was set for. */
|
|
12
12
|
export declare function clearedSessionCookie(domain?: string): string;
|
|
13
|
+
/**
|
|
14
|
+
* The cookie of an account's console sign-in: the account token pagasae
|
|
15
|
+
* signed (decision 0058), which core checks on every call as it does the
|
|
16
|
+
* header. Core sets it when the console's server presents the token, with
|
|
17
|
+
* the session cookie's attributes, for as long as the token lasts.
|
|
18
|
+
*/
|
|
19
|
+
export declare const ACCOUNT_TOKEN_COOKIE_NAME = "aeolus_account_token";
|
|
20
|
+
/** The account token from a Cookie request header, if there is one. */
|
|
21
|
+
export declare function readAccountTokenCookie(cookieHeader: string | undefined): string | undefined;
|
|
22
|
+
/** A Set-Cookie value that keeps the account token until it ends. */
|
|
23
|
+
export declare function accountTokenCookie(cookie: {
|
|
24
|
+
token: string;
|
|
25
|
+
endsAt: Date;
|
|
26
|
+
now: Date;
|
|
27
|
+
domain?: string;
|
|
28
|
+
}): string;
|
|
29
|
+
/** A Set-Cookie value that removes the account token's cookie, for the same domain it was set for. */
|
|
30
|
+
export declare function clearedAccountTokenCookie(domain?: string): string;
|
|
13
31
|
type Headers = Readonly<Record<string, string | string[] | undefined>>;
|
|
14
32
|
/** The ship a plugin reads on behalf of, from the `Aeolus-On-Behalf-Of` header, if there is one (decision 0034). */
|
|
15
33
|
export declare function readOnBehalfOf(headers: Headers): string | undefined;
|
|
@@ -20,17 +20,21 @@ const ATTRIBUTES = 'Path=/; HttpOnly; Secure; SameSite=Strict';
|
|
|
20
20
|
function scope(domain) {
|
|
21
21
|
return domain === undefined ? ATTRIBUTES : `Domain=${domain}; ${ATTRIBUTES}`;
|
|
22
22
|
}
|
|
23
|
-
/** The
|
|
24
|
-
|
|
23
|
+
/** The value of the named cookie in a Cookie request header, if it holds one. */
|
|
24
|
+
function cookieOf(cookieHeader, name) {
|
|
25
25
|
for (const pair of cookieHeader?.split(';') ?? []) {
|
|
26
26
|
const separator = pair.indexOf('=');
|
|
27
|
-
if (separator !== -1 && pair.slice(0, separator).trim() ===
|
|
27
|
+
if (separator !== -1 && pair.slice(0, separator).trim() === name) {
|
|
28
28
|
const value = pair.slice(separator + 1).trim();
|
|
29
29
|
return value === '' ? undefined : value;
|
|
30
30
|
}
|
|
31
31
|
}
|
|
32
32
|
return undefined;
|
|
33
33
|
}
|
|
34
|
+
/** The session token from a Cookie request header, if there is one. */
|
|
35
|
+
export function readSessionToken(cookieHeader) {
|
|
36
|
+
return cookieOf(cookieHeader, SESSION_COOKIE_NAME);
|
|
37
|
+
}
|
|
34
38
|
/** A Set-Cookie value that keeps the token until the session expires. */
|
|
35
39
|
export function sessionCookie(cookie) {
|
|
36
40
|
const { token, expiresAt, now, domain } = cookie;
|
|
@@ -41,6 +45,27 @@ export function sessionCookie(cookie) {
|
|
|
41
45
|
export function clearedSessionCookie(domain) {
|
|
42
46
|
return `${SESSION_COOKIE_NAME}=; Max-Age=0; ${scope(domain)}`;
|
|
43
47
|
}
|
|
48
|
+
/**
|
|
49
|
+
* The cookie of an account's console sign-in: the account token pagasae
|
|
50
|
+
* signed (decision 0058), which core checks on every call as it does the
|
|
51
|
+
* header. Core sets it when the console's server presents the token, with
|
|
52
|
+
* the session cookie's attributes, for as long as the token lasts.
|
|
53
|
+
*/
|
|
54
|
+
export const ACCOUNT_TOKEN_COOKIE_NAME = 'aeolus_account_token';
|
|
55
|
+
/** The account token from a Cookie request header, if there is one. */
|
|
56
|
+
export function readAccountTokenCookie(cookieHeader) {
|
|
57
|
+
return cookieOf(cookieHeader, ACCOUNT_TOKEN_COOKIE_NAME);
|
|
58
|
+
}
|
|
59
|
+
/** A Set-Cookie value that keeps the account token until it ends. */
|
|
60
|
+
export function accountTokenCookie(cookie) {
|
|
61
|
+
const { token, endsAt, now, domain } = cookie;
|
|
62
|
+
const maxAgeSeconds = Math.max(0, Math.floor((endsAt.getTime() - now.getTime()) / 1000));
|
|
63
|
+
return `${ACCOUNT_TOKEN_COOKIE_NAME}=${token}; Max-Age=${maxAgeSeconds}; ${scope(domain)}`;
|
|
64
|
+
}
|
|
65
|
+
/** A Set-Cookie value that removes the account token's cookie, for the same domain it was set for. */
|
|
66
|
+
export function clearedAccountTokenCookie(domain) {
|
|
67
|
+
return `${ACCOUNT_TOKEN_COOKIE_NAME}=; Max-Age=0; ${scope(domain)}`;
|
|
68
|
+
}
|
|
44
69
|
function readHeader(headers, name) {
|
|
45
70
|
const header = headers[name];
|
|
46
71
|
return Array.isArray(header) ? header.join(',') : header;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"request-credentials.js","sourceRoot":"","sources":["../../../src/adapters/http/request-credentials.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;GAWG;AACH,OAAO,EAAE,oBAAoB,EAAE,YAAY,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAE/F,MAAM,CAAC,MAAM,mBAAmB,GAAG,gBAAgB,CAAC;AAEpD,MAAM,UAAU,GAAG,2CAA2C,CAAC;AAE/D;;;GAGG;AACH,SAAS,KAAK,CAAC,MAA0B;IACvC,OAAO,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,UAAU,MAAM,KAAK,UAAU,EAAE,CAAC;AAC/E,CAAC;AAED,
|
|
1
|
+
{"version":3,"file":"request-credentials.js","sourceRoot":"","sources":["../../../src/adapters/http/request-credentials.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,7 +10,7 @@ import { registerRestApi } from '../rest/rest-api.js';
|
|
|
10
10
|
import { appRouter } from '../trpc/router.js';
|
|
11
11
|
import { refusalBody, unexpectedFailure } from '../trpc/ship-contract.js';
|
|
12
12
|
import { createRateLimiter } from './rate-limiter.js';
|
|
13
|
-
import { clearedSessionCookie, readAccountToken, readBearer, readFleet, readOnBehalfOf, readSessionToken, sessionCookie } from './request-credentials.js';
|
|
13
|
+
import { accountTokenCookie, clearedAccountTokenCookie, clearedSessionCookie, readAccountToken, readAccountTokenCookie, readBearer, readFleet, readOnBehalfOf, readSessionToken, sessionCookie, } from './request-credentials.js';
|
|
14
14
|
import { runningVersions } from './version.js';
|
|
15
15
|
import { INSTALLATION_TOKEN_HEADER } from '../trpc/installation-token.js';
|
|
16
16
|
/** A header's one value: a header sent twice counts as not sent. */
|
|
@@ -51,7 +51,7 @@ const PREFLIGHT_MAX_AGE_S = 600;
|
|
|
51
51
|
* The session cookie at a door for ships: REST and MCP never read the console
|
|
52
52
|
* session, so they never set or clear its cookie either.
|
|
53
53
|
*/
|
|
54
|
-
const NO_SESSION_COOKIE = { set: () => undefined, clear: () => undefined };
|
|
54
|
+
const NO_SESSION_COOKIE = { set: () => undefined, clear: () => undefined, setAccountToken: () => undefined, clearAccountToken: () => undefined };
|
|
55
55
|
/**
|
|
56
56
|
* The HTTP host: `/trpc` for the API (its subscriptions over a WebSocket on
|
|
57
57
|
* the same path), `/api/v1` (REST) and `/mcp` for ships, and `/health` for
|
|
@@ -159,6 +159,7 @@ export function buildHttpServer(options) {
|
|
|
159
159
|
sessionToken: readSessionToken(req.headers.cookie),
|
|
160
160
|
onBehalfOf: readOnBehalfOf(req.headers),
|
|
161
161
|
accountToken: readAccountToken(req.headers),
|
|
162
|
+
accountTokenCookie: readAccountTokenCookie(req.headers.cookie),
|
|
162
163
|
fleet: readFleet(req.headers),
|
|
163
164
|
},
|
|
164
165
|
canUseConsoleSession: true,
|
|
@@ -169,6 +170,12 @@ export function buildHttpServer(options) {
|
|
|
169
170
|
clear: () => {
|
|
170
171
|
void res.header('set-cookie', clearedSessionCookie(cookieDomain));
|
|
171
172
|
},
|
|
173
|
+
setAccountToken: (token, endsAt) => {
|
|
174
|
+
void res.header('set-cookie', accountTokenCookie({ token, endsAt, now: options.clock.now(), domain: cookieDomain }));
|
|
175
|
+
},
|
|
176
|
+
clearAccountToken: () => {
|
|
177
|
+
void res.header('set-cookie', clearedAccountTokenCookie(cookieDomain));
|
|
178
|
+
},
|
|
172
179
|
},
|
|
173
180
|
}),
|
|
174
181
|
// The whole failure goes to the log only, under the request's id (the
|
|
@@ -196,7 +203,7 @@ export function buildHttpServer(options) {
|
|
|
196
203
|
id: randomUUID(),
|
|
197
204
|
log: server.log,
|
|
198
205
|
}, {
|
|
199
|
-
credentials: { sessionToken: readSessionToken(req.headers.cookie) },
|
|
206
|
+
credentials: { sessionToken: readSessionToken(req.headers.cookie), accountTokenCookie: readAccountTokenCookie(req.headers.cookie) },
|
|
200
207
|
canUseConsoleSession: true,
|
|
201
208
|
sessionCookie: NO_SESSION_COOKIE,
|
|
202
209
|
}),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"server.js","sourceRoot":"","sources":["../../../src/adapters/http/server.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAEzC,OAAO,gBAAgB,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,iBAAiB,EAAiC,MAAM,+BAA+B,CAAC;AACjG,OAAO,EAAE,sBAAsB,EAAE,eAAe,EAAE,MAAM,0BAA0B,CAAC;AACnF,OAAO,OAAO,EAAE,EAA2F,MAAM,SAAS,CAAC;AAG3H,OAAO,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAC7D,OAAO,EAAE,uBAAuB,EAAE,MAAM,kCAAkC,CAAC;AAC3E,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AACzD,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAEtD,OAAO,EAAE,SAAS,EAAkB,MAAM,mBAAmB,CAAC;AAC9D,OAAO,EAAE,WAAW,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAC1E,OAAO,EAAE,iBAAiB,EAAkB,MAAM,mBAAmB,CAAC;AACtE,OAAO,
|
|
1
|
+
{"version":3,"file":"server.js","sourceRoot":"","sources":["../../../src/adapters/http/server.ts"],"names":[],"mappings":"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"}
|
|
@@ -96,12 +96,6 @@ export type InstallationDeclaredNetworkRules = Prisma.InstallationDeclaredNetwor
|
|
|
96
96
|
* retires.
|
|
97
97
|
*/
|
|
98
98
|
export type ScopeNamespace = Prisma.ScopeNamespaceModel;
|
|
99
|
-
/**
|
|
100
|
-
* Model PluginConnection
|
|
101
|
-
* A plugin argo connected (decision 0034): its ship reads every ship of the
|
|
102
|
-
* fleet, whatever the rules, until a release or a retire of the ship ends it.
|
|
103
|
-
*/
|
|
104
|
-
export type PluginConnection = Prisma.PluginConnectionModel;
|
|
105
99
|
/**
|
|
106
100
|
* Model VerifiedFacts
|
|
107
101
|
* One writer's verified facts about a ship (decision 0059): what it checked,
|
|
@@ -164,8 +158,9 @@ export type OverdueDelivery = Prisma.OverdueDeliveryModel;
|
|
|
164
158
|
export type Event = Prisma.EventModel;
|
|
165
159
|
/**
|
|
166
160
|
* Model Operator
|
|
167
|
-
*
|
|
168
|
-
*
|
|
161
|
+
* argo's own sign-in: email and Argon2id password hash. fleet:init creates it
|
|
162
|
+
* with neither, until argo sets both in Settings; a hosting installation
|
|
163
|
+
* creates it with an email and no password. Ids start with opr_.
|
|
169
164
|
* The email is unique across all fleets: finding the account by email is the one
|
|
170
165
|
* lookup not scoped by fleet (ADR 0007). One account per fleet in v1.
|
|
171
166
|
*/
|
|
@@ -214,6 +209,13 @@ export type Notice = Prisma.NoticeModel;
|
|
|
214
209
|
* with its session and its fleet.
|
|
215
210
|
*/
|
|
216
211
|
export type NoticeDismissal = Prisma.NoticeDismissalModel;
|
|
212
|
+
/**
|
|
213
|
+
* Model AccountNoticeDismissal
|
|
214
|
+
* A notice an account signed in to the console as itself dismissed, for
|
|
215
|
+
* itself, kept by its account id in each fleet (accounts design, A9). Core
|
|
216
|
+
* stores no account: the id is pagasae's. It goes with its fleet.
|
|
217
|
+
*/
|
|
218
|
+
export type AccountNoticeDismissal = Prisma.AccountNoticeDismissalModel;
|
|
217
219
|
/**
|
|
218
220
|
* Model Guide
|
|
219
221
|
* The installation's guide (decision 0024): steps for the console sessions of
|
|
@@ -226,6 +228,12 @@ export type Guide = Prisma.GuideModel;
|
|
|
226
228
|
* goes with its session and its fleet.
|
|
227
229
|
*/
|
|
228
230
|
export type GuideProgress = Prisma.GuideProgressModel;
|
|
231
|
+
/**
|
|
232
|
+
* Model AccountGuideProgress
|
|
233
|
+
* Where an account signed in to the console as itself is in the guide, kept
|
|
234
|
+
* by its account id in each fleet (accounts design, A9). It goes with its fleet.
|
|
235
|
+
*/
|
|
236
|
+
export type AccountGuideProgress = Prisma.AccountGuideProgressModel;
|
|
229
237
|
/**
|
|
230
238
|
* Model AccountCutOff
|
|
231
239
|
* An account pagasae cut off (decision 0058): its tokens issued before
|
|
@@ -115,12 +115,6 @@ export type InstallationDeclaredNetworkRules = Prisma.InstallationDeclaredNetwor
|
|
|
115
115
|
* retires.
|
|
116
116
|
*/
|
|
117
117
|
export type ScopeNamespace = Prisma.ScopeNamespaceModel;
|
|
118
|
-
/**
|
|
119
|
-
* Model PluginConnection
|
|
120
|
-
* A plugin argo connected (decision 0034): its ship reads every ship of the
|
|
121
|
-
* fleet, whatever the rules, until a release or a retire of the ship ends it.
|
|
122
|
-
*/
|
|
123
|
-
export type PluginConnection = Prisma.PluginConnectionModel;
|
|
124
118
|
/**
|
|
125
119
|
* Model VerifiedFacts
|
|
126
120
|
* One writer's verified facts about a ship (decision 0059): what it checked,
|
|
@@ -183,8 +177,9 @@ export type OverdueDelivery = Prisma.OverdueDeliveryModel;
|
|
|
183
177
|
export type Event = Prisma.EventModel;
|
|
184
178
|
/**
|
|
185
179
|
* Model Operator
|
|
186
|
-
*
|
|
187
|
-
*
|
|
180
|
+
* argo's own sign-in: email and Argon2id password hash. fleet:init creates it
|
|
181
|
+
* with neither, until argo sets both in Settings; a hosting installation
|
|
182
|
+
* creates it with an email and no password. Ids start with opr_.
|
|
188
183
|
* The email is unique across all fleets: finding the account by email is the one
|
|
189
184
|
* lookup not scoped by fleet (ADR 0007). One account per fleet in v1.
|
|
190
185
|
*/
|
|
@@ -233,6 +228,13 @@ export type Notice = Prisma.NoticeModel;
|
|
|
233
228
|
* with its session and its fleet.
|
|
234
229
|
*/
|
|
235
230
|
export type NoticeDismissal = Prisma.NoticeDismissalModel;
|
|
231
|
+
/**
|
|
232
|
+
* Model AccountNoticeDismissal
|
|
233
|
+
* A notice an account signed in to the console as itself dismissed, for
|
|
234
|
+
* itself, kept by its account id in each fleet (accounts design, A9). Core
|
|
235
|
+
* stores no account: the id is pagasae's. It goes with its fleet.
|
|
236
|
+
*/
|
|
237
|
+
export type AccountNoticeDismissal = Prisma.AccountNoticeDismissalModel;
|
|
236
238
|
/**
|
|
237
239
|
* Model Guide
|
|
238
240
|
* The installation's guide (decision 0024): steps for the console sessions of
|
|
@@ -245,6 +247,12 @@ export type Guide = Prisma.GuideModel;
|
|
|
245
247
|
* goes with its session and its fleet.
|
|
246
248
|
*/
|
|
247
249
|
export type GuideProgress = Prisma.GuideProgressModel;
|
|
250
|
+
/**
|
|
251
|
+
* Model AccountGuideProgress
|
|
252
|
+
* Where an account signed in to the console as itself is in the guide, kept
|
|
253
|
+
* by its account id in each fleet (accounts design, A9). It goes with its fleet.
|
|
254
|
+
*/
|
|
255
|
+
export type AccountGuideProgress = Prisma.AccountGuideProgressModel;
|
|
248
256
|
/**
|
|
249
257
|
* Model AccountCutOff
|
|
250
258
|
* An account pagasae cut off (decision 0058): its tokens issued before
|
|
@@ -4,6 +4,7 @@ export declare const ShipKind: {
|
|
|
4
4
|
readonly viewer: "viewer";
|
|
5
5
|
readonly person: "person";
|
|
6
6
|
readonly app: "app";
|
|
7
|
+
readonly plugin: "plugin";
|
|
7
8
|
};
|
|
8
9
|
export type ShipKind = (typeof ShipKind)[keyof typeof ShipKind];
|
|
9
10
|
export declare const ReportState: {
|
|
@@ -90,6 +91,7 @@ export declare const NoticeAudience: {
|
|
|
90
91
|
readonly everyone: "everyone";
|
|
91
92
|
readonly operators: "operators";
|
|
92
93
|
readonly viewers: "viewers";
|
|
94
|
+
readonly accounts: "accounts";
|
|
93
95
|
};
|
|
94
96
|
export type NoticeAudience = (typeof NoticeAudience)[keyof typeof NoticeAudience];
|
|
95
97
|
export declare const GuideProgressState: {
|
|
@@ -12,7 +12,8 @@ export const ShipKind = {
|
|
|
12
12
|
agent: 'agent',
|
|
13
13
|
viewer: 'viewer',
|
|
14
14
|
person: 'person',
|
|
15
|
-
app: 'app'
|
|
15
|
+
app: 'app',
|
|
16
|
+
plugin: 'plugin'
|
|
16
17
|
};
|
|
17
18
|
export const ReportState = {
|
|
18
19
|
working: 'working',
|
|
@@ -85,7 +86,8 @@ export const InstallationRequestKind = {
|
|
|
85
86
|
export const NoticeAudience = {
|
|
86
87
|
everyone: 'everyone',
|
|
87
88
|
operators: 'operators',
|
|
88
|
-
viewers: 'viewers'
|
|
89
|
+
viewers: 'viewers',
|
|
90
|
+
accounts: 'accounts'
|
|
89
91
|
};
|
|
90
92
|
export const GuideProgressState = {
|
|
91
93
|
open: 'open',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"enums.js","sourceRoot":"","sources":["../../../../src/adapters/prisma/generated/enums.ts"],"names":[],"mappings":"AACA,qEAAqE;AACrE,oBAAoB;AACpB,wCAAwC;AACxC,eAAe;AACf;;;;EAIE;AAEF,MAAM,CAAC,MAAM,QAAQ,GAAG;IACtB,QAAQ,EAAE,UAAU;IACpB,KAAK,EAAE,OAAO;IACd,MAAM,EAAE,QAAQ;IAChB,MAAM,EAAE,QAAQ;IAChB,GAAG,EAAE,KAAK;
|
|
1
|
+
{"version":3,"file":"enums.js","sourceRoot":"","sources":["../../../../src/adapters/prisma/generated/enums.ts"],"names":[],"mappings":"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"}
|