Merge remote-tracking branch 'origin/development' into development

# Conflicts:
#	astro/public/img/icons/cross-platform-gaming-accounts.svg
#	astro/public/img/icons/identity-provider-gaming-esports.svg
#	astro/public/img/icons/oauth-authorization-grant.svg
#	astro/public/img/icons/registration-traffic-game-launches.svg
#	astro/public/img/icons/securing-gaming-user-accounts.svg
#	astro/public/img/icons/self-hosting-reduce-latency-gaming.svg
#	astro/src/components/nav/ComposableNav.astro
#	astro/src/components/side-nav/DocsSideNav.astro
#	astro/src/components/side-nav/SideNavCategory.astro
#	astro/src/layouts/Default.astro

.github/knownwords.txt

@@ -1262,10 +1262,8 @@ dtokarz
 duplicateEmail
 duplicateUsername
 durations
-eCommerce
 eb
 ebook
-ecommerce
 eg
 eirikur
 elasticsearch

.github/workflows/cloudfrontfunctioncheck.yml

@@ -3,7 +3,7 @@ name: cloudfront_function_check
 on: 
   pull_request:
     paths:
-      - 'src/cloudfront/fusionauth-website-request-handler.js'
+      - 'src/cloudfront/functions/fusionauth-website-request-handler.js'
       - '.github/workflows/cloudfrontfunctioncheck.yml'
   # Allows you to run this workflow manually from the Actions tab
   workflow_dispatch:
@@ -22,5 +22,5 @@ jobs:
           cache: 'npm'
           cache-dependency-path: 'astro/package-lock.json'
       - name: Check cloudfront function is syntactically correct.
-        run: node --check src/cloudfront/fusionauth-website-request-handler.js
+        run: node --check src/cloudfront/functions/fusionauth-website-request-handler.js
         shell: bash

.github/workflows/dev-astro.yml

@@ -54,7 +54,7 @@ jobs:
         working-directory: .
         run: |
           CLOUDFRONT_FUNCTION_ETAG=$(aws cloudfront describe-function --name fusionauth-website-request-handler --query 'ETag' --output text)
-          CLOUDFRONT_FUNCTION_ETAG=$(aws cloudfront update-function --name fusionauth-website-request-handler --function-code fileb://src/cloudfront/fusionauth-website-request-handler.js --function-config Comment="Request handler for the FusionAuth website",Runtime="cloudfront-js-1.0" --if-match ${CLOUDFRONT_FUNCTION_ETAG} --query 'ETag' --output text)
+          CLOUDFRONT_FUNCTION_ETAG=$(aws cloudfront update-function --name fusionauth-website-request-handler --function-code fileb://src/cloudfront/functions/fusionauth-website-request-handler.js --function-config Comment="Request handler for the FusionAuth website",Runtime="cloudfront-js-1.0" --if-match ${CLOUDFRONT_FUNCTION_ETAG} --query 'ETag' --output text)
           aws cloudfront publish-function --name fusionauth-website-request-handler --if-match ${CLOUDFRONT_FUNCTION_ETAG}
           aws cloudfront create-invalidation --distribution-id ${{ secrets.DEV_DISTRIBUTION_ID }} --paths "/*"
 

.github/workflows/devlinkcheck.yml

@@ -16,5 +16,5 @@ jobs:
       - uses: actions/checkout@v3
       - uses: filiph/[email protected]
         with:
-          arguments: https://fusionauth.dev/ --skip-file .github/linkcheck-skip.txt
+          arguments: https://fusionauth.dev/docs/ --skip-file .github/linkcheck-skip.txt
         name: linkcheck

.github/workflows/lambda-site-origin-request-handler.yaml

@@ -0,0 +1,60 @@
+---
+name: lambda-site-origin-request-handler
+
+env:
+  AWS_REGION: us-east-1
+
+on:
+  push:
+    branches:
+      - development
+    paths:
+      - 'src/lambdas/site-origin-request-handler/src/index.mjs'
+      - 'src/lambdas/site-origin-request-handler/terraform/**'
+  pull_request:
+    branches:
+      - development
+    paths:
+      - 'src/lambdas/site-origin-request-handler/src/index.mjs'
+      - 'src/lambdas/site-origin-request-handler/terraform/**'
+
+permissions:
+  id-token: write
+  contents: read
+
+jobs:
+  deploy:
+    runs-on: fusionauth-standard
+    container: 752443094709.dkr.ecr.us-west-2.amazonaws.com/gha-runner-ubuntu-22.04:bootstrap-05
+    steps:
+
+      - name: checkout
+        uses: actions/checkout@v4
+        with:
+          sparse-checkout: |
+            src
+
+      - name: set aws credentials
+        uses: aws-actions/configure-aws-credentials@v4
+        with:
+          role-chaining: true
+          role-to-assume: arn:aws:iam::752443094709:role/github-actions
+          role-session-name: github-actions
+          aws-region: ${{ env.AWS_REGION }}
+
+      - name: setup terraform
+        uses: hashicorp/setup-terraform@v2
+        with:
+          terraform_version: 1.6.2
+
+      - name: terraform plan
+        if: github.event_name == 'pull_request'
+        working-directory: src/lambdas/site-origin-request-handler/terraform
+        shell: bash
+        run: terraform init && terraform plan
+
+      - name: terraform apply
+        if: github.event_name == 'push'
+        working-directory: src/lambdas/site-origin-request-handler/terraform
+        shell: bash
+        run: terraform init && terraform apply -auto-approve

.github/workflows/publish-site-redirect-rules.yaml

@@ -0,0 +1,39 @@
+---
+name: publish-site-redirect-rules-to-s3
+
+env:
+  AWS_ACCOUNT_ID: '172023253951'
+  AWS_REGION: us-east-1
+
+on:
+  push:
+    branches:
+      - development
+    paths:
+      - 'src/lambdas/site-origin-request-handler/data/redirects.json'
+
+permissions:
+  id-token: write
+  contents: read
+
+jobs:
+  publish-to-s3:
+    runs-on: fusionauth-standard
+    container: 752443094709.dkr.ecr.us-west-2.amazonaws.com/gha-runner-ubuntu-22.04:bootstrap-05
+    steps:
+
+      - name: checkout
+        uses: actions/checkout@v4
+
+      - name: set aws credentials
+        uses: aws-actions/configure-aws-credentials@v4
+        with:
+          role-chaining: true
+          role-to-assume: arn:aws:iam::${{ env.AWS_ACCOUNT_ID }}:role/github-actions
+          role-session-name: github-actions
+          aws-region: ${{ env.AWS_REGION }}
+
+      - name: upload file to s3
+        working-directory: src/lambdas/site-origin-request-handler/data
+        run: |
+          aws s3 cp ./redirects.json s3://fusionauth-dev-us-east-1-artifacts/lambda/site-origin-request-handler/redirects.json

.gitignore

@@ -1,4 +1,5 @@
 .DS_Store
+.env*
 .jekyll-metadata
 .jekyll-cache
 .sass-cache
@@ -49,3 +50,6 @@ node_modules
 .savant/cache
 
 astro/.astro
+
+# Local .terraform directories
+**/.terraform/*

DocsDevREADME.md

@@ -48,31 +48,16 @@ Here are some guidelines to follow when writing documentation (everything under
 ```
 egrep '^[=]+ ' site/docs/v1/tech/doc.adoc |sed 's/=//' |sed 's/=/*/g'|sed 's/* /* <</'|sed 's/$/>>/'
 ```
-- We currently use [FontAwesome v5](https://fontawesome.com/v5/search?m=free) to render icons, so you can use them to refer to UI buttons, like this:
-  - In Markdown:
-    ```markdown
-    <i/>{:.ui-button .green .fa .fa-plus}
-    <i/>{:.ui-button .green .fa .fa-search}
-    <i/>{:.ui-button .blue .fa .fa-edit}
-    <i/>{:.ui-button .blue .fa .fa-save}
-    <i/>{:.ui-button .purple .fas .fa-user}
-    <i/>{:.ui-button .purple .fa .fa-key}
-    <i/>{:.ui-button .gray .fa .fa-minus-circle}
-    <i/>{:.ui-button .red .fa .fa-trash-alt}
-    ```
-  - In AsciiDoc:
-    ```asciidoc
-    icon:plus[role=ui-button green,type=fas]
-    icon:search[role=ui-button green,type=fas]
-    icon:edit[role=ui-button blue,type=fas]
-    icon:save[role=ui-button blue,type=fas]
-    icon:user[role=ui-button purple,type=fas]
-    icon:key[role=ui-button purple,type=fa]
-    icon:minus-circle[role=ui-button gray,type=fa]
-    icon:trash-alt[role=ui-button red,type=fa]
+- We currently use [FontAwesome v6](https://fontawesome.com/) to render icons, so you can use them to refer to UI buttons, like this:
+    ```jsx
+    <IconButton icon="edit" color="blue" />
+    <IconButton icon="copy" color="purple" />
+    <IconButton icon="search" color="green" />
+    <IconButton icon="minus-circle" color="gray" />
+    <IconButton icon="trash" color="red" />
     ```
 
-    ![icons](https://github.com/FusionAuth/fusionauth-site/assets/1877191/9fd29e3d-c81a-498c-9b82-135f44a7c545)
+    ![icons](https://github.com/FusionAuth/fusionauth-site/assets/1877191/719bffe8-2a54-41a2-a339-b3afeda8d499)
 
 
 ### Including files

astro/astro.config.mjs

@@ -17,14 +17,18 @@ if (!process.env.DEV) {
   console.log('skipping compression');
 }
 
+const siteMapFilter = (page) => !page.startsWith('https://fusionauth.io/landing')
+
 const config = defineConfig({
   build: {
     format: 'file'
   },
   integrations: [
     ...optionalIntegrations,
     mdx(),
-    sitemap(),
+    sitemap({
+      filter: siteMapFilter
+    }),
     indexPages(),
     tailwind({
       config: {

astro/migrate.js

@@ -660,6 +660,7 @@ const convert = (filePath, partial = false, parent = '') => {
 
     if (fs.existsSync(newPath)) {
       console.log(`Looks like ${newPath} already exists! Sweet!`);
+      return [newPath]
     } else {
       const matchingFiles = findMatchingFiles('public/img/docs', imageFile);
 
@@ -687,10 +688,9 @@ const convert = (filePath, partial = false, parent = '') => {
     }).join(' ');
 
     const newFileList = moveImage(imageLocation, imageFile);
-    outLines.push(`<img src="/img/docs/${state.target}/${newFileList[0]}" alt="${title}" ${props} />`);
-
-    if (newFileList.length > 1) {
-      newFileList.map((fname, idx) => idx > 0 && outLines.push(`{/* /img/docs/${state.target}/${newFileList[0]} */}`));
+    if (newFileList) {
+      outLines.push(`<img src="/img/docs/${state.target}/${newFileList[0]}" alt="${title}" ${props} />`);
+      //newFileList.map((fname, idx) => idx > 0 && outLines.push(`{/* /img/docs/${state.target}/${newFileList[0]} */}`));
     }
 
   };
@@ -705,7 +705,7 @@ const convert = (filePath, partial = false, parent = '') => {
       const height = match[4];
 
       if (platform === 'youtube') {
-    outLines.push(`<iframe allowfullscreen="" frameborder="0" width="${width}" height="${height}" src="//www.youtube.com/embed/${id}?rel=0" enablejsapi="true" data-gtm-yt-inspected-8="true"></iframe>`);
+        outLines.push(`<iframe allowfullscreen="" frameborder="0" width="${width}" height="${height}" src="//www.youtube.com/embed/${id}?rel=0" enablejsapi="true" data-gtm-yt-inspected-8="true"></iframe>`);
 
       }
     }

astro/package.json

@@ -23,6 +23,7 @@
 		"astro": "^3.2.4",
 		"astro-compress": "^2.0.8",
 		"astro-index-pages": "src/integrations/astro-index-pages",
+		"jsonpath-plus": "^7.2.0",
 		"marked": "^7.0.1",
 		"mermaid": "^9.1.6",
 		"pagefind": "^0.12.0",