From 3897cdd184ab194e4ddeaedd35c3568f1fa88c5f Mon Sep 17 00:00:00 2001 From: Benjamin Goering <171782+gobengo@users.noreply.github.com> Date: Thu, 15 Dec 2022 15:44:55 -0800 Subject: [PATCH 1/3] Revert "Revert "website build script writes public/.well-known/did.json"" This reverts commit f7da002524d697fcd4fbf0cbf464aae1af49425d. --- .github/workflows/website.yml | 4 ++++ packages/website/package.json | 4 +++- packages/website/public/.well-known/.gitignore | 1 + packages/website/scripts/did-document.ts | 14 ++++++++++++++ 4 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 packages/website/public/.well-known/.gitignore create mode 100755 packages/website/scripts/did-document.ts diff --git a/.github/workflows/website.yml b/.github/workflows/website.yml index e005988f47..ec78f31da4 100644 --- a/.github/workflows/website.yml +++ b/.github/workflows/website.yml @@ -192,6 +192,8 @@ jobs: NEXT_PUBLIC_COUNTLY_URL: ${{ secrets.COUNTLY_URL }} NEXT_PUBLIC_COUNTLY_KEY: ${{ secrets.COUNTLY_KEY }} NEXT_PUBLIC_STRIPE_PUBLISHABLE_KEY: ${{ secrets.TESTING_STRIPE_PUBLISHABLE_KEY }} + DID_DOCUMENT_ID: ${{ secrets.STAGING_DID_DOCUMENT_ID }} + DID_DOCUMENT_ALSO_KNOWN_AS: ${{ secrets.STAGING_DID_DOCUMENT_ALSO_KNOWN_AS }} - name: Add to web3.storage uses: web3-storage/add-to-web3@v2 id: ipfs @@ -285,6 +287,8 @@ jobs: NEXT_PUBLIC_COUNTLY_URL: ${{ secrets.COUNTLY_URL }} NEXT_PUBLIC_COUNTLY_KEY: ${{ secrets.COUNTLY_KEY }} NEXT_PUBLIC_STRIPE_PUBLISHABLE_KEY: ${{ secrets.STRIPE_PUBLISHABLE_KEY }} + DID_DOCUMENT_ID: ${{ secrets.PRODUCTION_DID_DOCUMENT_ID }} + DID_DOCUMENT_ALSO_KNOWN_AS: ${{ secrets.PRODUCTION_DID_DOCUMENT_ALSO_KNOWN_AS }} - name: Add to web3.storage uses: web3-storage/add-to-web3@v2 id: ipfs diff --git a/packages/website/package.json b/packages/website/package.json index 01522cc4dd..550f95866e 100644 --- a/packages/website/package.json +++ b/packages/website/package.json @@ -6,9 +6,11 @@ "scripts": { "ci:envfile": "ts-node -O '{\"module\": \"commonjs\"}' scripts/envfile.ts ", "dev": "rm -rf .next && next dev -p 4000", + "did-document": "ts-node -O '{\"module\": \"commonjs\"}' scripts/did-document.ts", "start": "env-cmd -f ../../.env next dev -p 4000", "prebuild": "sh ./scripts/prebuild.sh", - "build": "next build && next-sitemap && next export", + "build": "next build && npm run build:did-document && next-sitemap && next export", + "build:did.json": "npm run -s did-document > public/.well-known/did.json", "postbuild": "sh ./scripts/postbuild.sh", "export": "next export", "test": "eslint './**/*.js' && tsc --build", diff --git a/packages/website/public/.well-known/.gitignore b/packages/website/public/.well-known/.gitignore new file mode 100644 index 0000000000..ded8d5d67c --- /dev/null +++ b/packages/website/public/.well-known/.gitignore @@ -0,0 +1 @@ +/did.json diff --git a/packages/website/scripts/did-document.ts b/packages/website/scripts/did-document.ts new file mode 100755 index 0000000000..160127bb31 --- /dev/null +++ b/packages/website/scripts/did-document.ts @@ -0,0 +1,14 @@ +export async function main() { + console.error('generating did document'); + const didDocument = createDidDocument(); + console.log(JSON.stringify(didDocument, null, 2)); +} + +main(); + +function createDidDocument(env=process.env) { + return { + id: env.DID_DOCUMENT_ID, + alsoKnownAs: env.DID_DOCUMENT_ALSO_KNOWN_AS, + }; +} From d0802d943f97cc53720a1b24fe4dcacfd99fb685 Mon Sep 17 00:00:00 2001 From: Benjamin Goering <171782+gobengo@users.noreply.github.com> Date: Thu, 15 Dec 2022 15:54:25 -0800 Subject: [PATCH 2/3] change env var DID_DOCUMENT_PRIMARY_DID_KEY --- .github/workflows/website.yml | 4 ++-- packages/website/scripts/did-document.ts | 14 +++++++++++--- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/.github/workflows/website.yml b/.github/workflows/website.yml index ec78f31da4..00596ee76c 100644 --- a/.github/workflows/website.yml +++ b/.github/workflows/website.yml @@ -193,7 +193,7 @@ jobs: NEXT_PUBLIC_COUNTLY_KEY: ${{ secrets.COUNTLY_KEY }} NEXT_PUBLIC_STRIPE_PUBLISHABLE_KEY: ${{ secrets.TESTING_STRIPE_PUBLISHABLE_KEY }} DID_DOCUMENT_ID: ${{ secrets.STAGING_DID_DOCUMENT_ID }} - DID_DOCUMENT_ALSO_KNOWN_AS: ${{ secrets.STAGING_DID_DOCUMENT_ALSO_KNOWN_AS }} + DID_DOCUMENT_PRIMARY_DID_KEY: ${{ secrets.STAGING_DID_DOCUMENT_PRIMARY_DID_KEY }} - name: Add to web3.storage uses: web3-storage/add-to-web3@v2 id: ipfs @@ -288,7 +288,7 @@ jobs: NEXT_PUBLIC_COUNTLY_KEY: ${{ secrets.COUNTLY_KEY }} NEXT_PUBLIC_STRIPE_PUBLISHABLE_KEY: ${{ secrets.STRIPE_PUBLISHABLE_KEY }} DID_DOCUMENT_ID: ${{ secrets.PRODUCTION_DID_DOCUMENT_ID }} - DID_DOCUMENT_ALSO_KNOWN_AS: ${{ secrets.PRODUCTION_DID_DOCUMENT_ALSO_KNOWN_AS }} + DID_DOCUMENT_PRIMARY_DID_KEY: ${{ secrets.PRODUCTION_DID_DOCUMENT_PRIMARY_DID_KEY }} - name: Add to web3.storage uses: web3-storage/add-to-web3@v2 id: ipfs diff --git a/packages/website/scripts/did-document.ts b/packages/website/scripts/did-document.ts index 160127bb31..013885a144 100755 --- a/packages/website/scripts/did-document.ts +++ b/packages/website/scripts/did-document.ts @@ -6,9 +6,17 @@ export async function main() { main(); -function createDidDocument(env=process.env) { +function createDidDocument(env = process.env) { + const id = env.DID_DOCUMENT_ID; + const context: Array> = ['https://www.w3.org/ns/did/v1']; + if (id) { + context.push({ + '@base': id, + }); + } return { - id: env.DID_DOCUMENT_ID, - alsoKnownAs: env.DID_DOCUMENT_ALSO_KNOWN_AS, + '@context': context, + id, + alsoKnownAs: env.DID_DOCUMENT_PRIMARY_DID_KEY, }; } From 076c955d2372a7b565dac50c66d7e81f64084030 Mon Sep 17 00:00:00 2001 From: Benjamin Goering <171782+gobengo@users.noreply.github.com> Date: Thu, 15 Dec 2022 16:14:10 -0800 Subject: [PATCH 3/3] fix website build script typo --- packages/website/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/website/package.json b/packages/website/package.json index 550f95866e..53dd196b44 100644 --- a/packages/website/package.json +++ b/packages/website/package.json @@ -9,7 +9,7 @@ "did-document": "ts-node -O '{\"module\": \"commonjs\"}' scripts/did-document.ts", "start": "env-cmd -f ../../.env next dev -p 4000", "prebuild": "sh ./scripts/prebuild.sh", - "build": "next build && npm run build:did-document && next-sitemap && next export", + "build": "next build && npm run build:did.json && next-sitemap && next export", "build:did.json": "npm run -s did-document > public/.well-known/did.json", "postbuild": "sh ./scripts/postbuild.sh", "export": "next export",