Fix Migrations

Readme.md

@@ -10,13 +10,13 @@ Version **26.09.01-alpha.1**
 
 | Module | Version | Pinned at | Path |
 | --- | --- | --- | --- |
-| [`@fairgarden/id`](https://github.com/fairgarden/id) | 0.1.0-alpha.0 | [8370e52](https://github.com/fairgarden/id/commit/8370e52440eb5384dfd4bcc34b58ffc5e61b15c5) — untagged | `apps/id` |
-| [`@fairgarden/members`](https://github.com/fairgarden/members) | 0.1.0-alpha.0 | [a2539d2](https://github.com/fairgarden/members/commit/a2539d20dc238adae873ceeb21801594d65e892a) — untagged | `apps/members` |
-| [`@fairgarden/design`](https://github.com/fairgarden/design)<br>FairGarden Design System | 0.1.0-alpha.2 | [64660c5](https://github.com/fairgarden/design/commit/64660c5904bfa42585b60d5b447bc5a1801a47a2) — unreleased, after v0.1.0-alpha.1 | `packages/design` |
-| [`@fairgarden/distribution`](https://github.com/fairgarden/distribution)<br>Compose versioned modules into a distribution, and extend one distribution from another | 0.1.0-alpha.7 | [271c5ce](https://github.com/fairgarden/distribution/commit/271c5cedab9fcf8698d8f6d43e3afb75defd154d) — unreleased, after v0.1.0-alpha.6 | `packages/distribution` |
-| [`@fairgarden/indicators`](https://github.com/fairgarden/indicators)<br>Put locale, preferences and flags into the path, so every variant of a Next.js page is a static cache key | 0.1.0-alpha.2 | [683bb16](https://github.com/fairgarden/indicators/commit/683bb16133238b24bf7d573933fae1d1b8d27d69) — unreleased, after v0.1.0-alpha.1 | `packages/indicators` |
-| [`@fairgarden/monolith`](https://github.com/fairgarden/monolith)<br>Compose several Next.js apps into a single deployable monolith | 0.1.0-alpha.1 | [4d98122](https://github.com/fairgarden/monolith/commit/4d9812278e0e95fa890870919b86d1f7b80df1a3) — unreleased, after v0.1.0-alpha.0 | `packages/monolith` |
-| [`@fairgarden/policy`](https://github.com/fairgarden/policy)<br>An organization's policy as Open Policy Agent bundles: built in layers from the repository, run in process, disclosed to members, every decision recorded | 0.1.0-alpha.0 | [a8707b7](https://github.com/fairgarden/policy/commit/a8707b7d4524aaca5f78af0993dd501f14e16b41) — untagged | `packages/policy` |
+| [`@fairgarden/id`](https://github.com/fairgarden/id) | 0.1.0-alpha.0 | [0926234](https://github.com/fairgarden/id/commit/09262342d4bcb386006a2e2b8e37b1eb2a24b52b) — untagged | `apps/id` |
+| [`@fairgarden/members`](https://github.com/fairgarden/members) | 0.1.0-alpha.0 | [d08534d](https://github.com/fairgarden/members/commit/d08534dba6a7607f606762cf8b03eaca420e0e10) — untagged | `apps/members` |
+| [`@fairgarden/design`](https://github.com/fairgarden/design)<br>FairGarden Design System | 0.1.0-alpha.3 | [51c001f](https://github.com/fairgarden/design/commit/51c001f1435f3415a6e2a10a7ab71641ca7bef28) — unreleased, after v0.1.0-alpha.2 | `packages/design` |
+| [`@fairgarden/distribution`](https://github.com/fairgarden/distribution)<br>Compose versioned modules into a distribution, and extend one distribution from another | 0.1.0-alpha.8 | [7962a00](https://github.com/fairgarden/distribution/commit/7962a00873961e5d1ecafbe085dcd08dd247c0ac) — unreleased, after v0.1.0-alpha.7 | `packages/distribution` |
+| [`@fairgarden/indicators`](https://github.com/fairgarden/indicators)<br>Put locale, preferences and flags into the path, so every variant of a Next.js page is a static cache key | 0.1.0-alpha.2 | [1b9c3a6](https://github.com/fairgarden/indicators/commit/1b9c3a625688c249df1edfe42e128f3a4c5e8db3) — unreleased, after v0.1.0-alpha.1 | `packages/indicators` |
+| [`@fairgarden/monolith`](https://github.com/fairgarden/monolith)<br>Compose several Next.js apps into a single deployable monolith | 0.1.0-alpha.1 | [44efeb8](https://github.com/fairgarden/monolith/commit/44efeb84cb9a5d6ab595d59d56a49de40cb5eeb8) — unreleased, after v0.1.0-alpha.0 | `packages/monolith` |
+| [`@fairgarden/policy`](https://github.com/fairgarden/policy)<br>An organization's policy as Open Policy Agent bundles: built in layers from the repository, run in process, disclosed to members, every decision recorded | 0.1.0-alpha.0 | [4a51b91](https://github.com/fairgarden/policy/commit/4a51b91ce0c9bcd6fd604a7c8c05942cf6c40fa4) — untagged | `packages/policy` |
 
 A module pinned at a commit rather than a tag is being shipped ahead of
 its last release, so its stated version is not what is deployed.

apps/monolith/.env.development

@@ -10,18 +10,13 @@
 FG_ID_URL=http://localhost:3000
 FG_ID_NAME=Fair Garden
 
-# members signs in with id, and supplies the `membership` scope's claims to
-# any other service a person shares it with.
-FG_ID_SERVICE_MEMBERS_URL=http://localhost:3000/members
-FG_ID_SERVICE_MEMBERS_NAME=Members
+# members signs in with id. Mounted together, they work that out themselves —
+# id enrols members at /members, members finds id at /id — and share the one
+# client secret, which both read from here.
 FG_ID_SERVICE_MEMBERS_SECRET=dev-only-members-secret
-FG_ID_SERVICE_MEMBERS_CLAIMS=membership
 
-# members: likewise before its mount point; the id service is its issuer.
+# members: likewise before its mount point.
 FG_MEMBERS_URL=http://localhost:3000
-FG_MEMBERS_ID_URL=http://localhost:3000/id
-FG_MEMBERS_CLIENT_ID=members
-FG_MEMBERS_CLIENT_SECRET=dev-only-members-secret
 FG_MEMBERS_SECRET=dev-only-members-session-secret
 
 # The embedded databases the apps keep for themselves, so whatever you set up

apps/monolith/package.json

@@ -6,6 +6,8 @@
   "scripts": {
     "dev": "fg-dist policy use && next dev -p 3000",
     "build": "fg-dist policy use && next build",
+    "check-env": "fg-dist env check --build",
+    "migrate": "fg-dist migrate --build",
     "start": "next start -p 3000",
     "lint": "eslint"
   },

package.json

@@ -10,9 +10,9 @@
     "access": "public"
   },
   "scripts": {
-    "build": "turbo run build --filter=./apps/monolith",
+    "build": "pnpm dist env check --build --cwd apps/monolith && turbo run build --filter=./apps/monolith && pnpm --filter=./apps/monolith run --if-present migrate",
     "dev": "turbo run dev --filter=./apps/monolith",
-    "modular:build": "turbo run build --filter='./apps/*' --filter='!./apps/monolith'",
+    "modular:build": "pnpm dist env check --build --cwd apps/id && pnpm dist env check --build --cwd apps/members && turbo run build --filter='./apps/*' --filter='!./apps/monolith' && pnpm --filter='./apps/*' --filter='!./apps/monolith' run --if-present migrate",
     "modular:dev": "turbo run dev --filter='./apps/*' --filter='!./apps/monolith'",
     "docs:build": "turbo run build --filter='./apps/*/docs' --filter='./packages/*/docs'",
     "docs:dev": "turbo run dev --filter='./apps/*/docs' --filter='./packages/*/docs'",