Merge branch 'refs/heads/develop' into feat/import-fwdata-project-as-…

…crdt

# Conflicts:
#	backend/LocalWebApp/Program.cs

.github/workflows/develop-api.yaml

@@ -3,15 +3,27 @@ on:
   workflow_dispatch:
   push:
     paths:
-      - 'backend/**'
+      - 'backend/LexBoxApi/**'
+      - 'backend/LexCore/**'
+      - 'backend/LexData/**'
+      - 'backend/LfClassicData/**'
+      - 'backend/MiniLcm/**'
+      - 'backend/SyncReverserProxy/**'
+      - 'backend/Testing/**'
       - '.github/workflows/lexbox-api.yaml'
       - '.github/workflows/deploy.yaml'
       - 'deployment/lexbox-deployment.yaml'
     branches:
       - develop
   pull_request:
     paths:
-      - 'backend/**'
+      - 'backend/LexBoxApi/**'
+      - 'backend/LexCore/**'
+      - 'backend/LexData/**'
+      - 'backend/LfClassicData/**'
+      - 'backend/MiniLcm/**'
+      - 'backend/SyncReverserProxy/**'
+      - 'backend/Testing/**'
       - '.github/workflows/lexbox-api.yaml'
       - '.github/workflows/deploy.yaml'
       - 'deployment/lexbox-deployment.yaml'

.github/workflows/fw-lite.yaml

@@ -0,0 +1,77 @@
+name: FieldWorks Lite
+on:
+  workflow_dispatch:
+  push:
+    paths:
+      - 'backend/FwDataMiniLcmBridge/**'
+      - 'backend/harmony/**'
+      - 'backend/LcmCrdt/**'
+      - 'backend/LocalWebApp/**'
+      - 'backend/MiniLcm/**'
+      - 'frontend/viewer/**'
+      - '.github/workflows/fw-lite.yaml'
+    branches:
+      - develop
+  pull_request:
+    paths:
+      - 'backend/FwDataMiniLcmBridge/**'
+      - 'backend/harmony/**'
+      - 'backend/LcmCrdt/**'
+      - 'backend/LocalWebApp/**'
+      - 'backend/MiniLcm/**'
+      - 'frontend/viewer/**'
+      - '.github/workflows/fw-lite.yaml'
+    branches:
+      - develop
+
+jobs:
+  build-app:
+    name: Build FW Lite
+    timeout-minutes: 20
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          submodules: true
+      - uses: actions/setup-dotnet@v4
+        with:
+          dotnet-version: '8.x'
+      - uses: actions/setup-node@v4
+        with:
+          node-version-file: './frontend/package.json'
+      - name: Dotnet build
+        working-directory: backend/LocalWebApp
+        run: dotnet build --configuration Release
+      - name: Dotnet test
+        working-directory: backend/LcmCrdt.Tests
+        run: dotnet test --configuration Release --logger:"xunit;LogFileName={assembly}.results.xml" --results-directory ./test-results
+      - name: Publish test results
+        uses: EnricoMi/publish-unit-test-result-action@8885e273a4343cd7b48eaa72428dea0c3067ea98 # v2.14.0
+        if: always()
+        with:
+          check_name: FW Lite Unit Tests
+          files: ./backend/LcmCrdt.Tests/test-results/*.xml
+      - name: Build viewer
+        working-directory: frontend/viewer
+        run: |
+          corepack enable
+          pnpm install
+          pnpm run build-app
+
+      - name: Publish linux
+        working-directory: backend/LocalWebApp
+        run: dotnet publish -r linux-x64 -o ./publish/linux
+      - name: Publish osx
+        working-directory: backend/LocalWebApp
+        run: dotnet publish -r osx-x64 -o ./publish/osx
+      - name: Publish win
+        working-directory: backend/LocalWebApp
+        run: dotnet publish -r win-x64 -o ./publish/win
+      - name: Upload artifacts
+        # uploading in one artifact as there's a lot of duplication between builds so compression goes far
+        uses: actions/upload-artifact@v4
+        with:
+          name: fw-lite
+          if-no-files-found: error
+          path: backend/LocalWebApp/publish/*

.github/workflows/lexbox-api.yaml

@@ -53,13 +53,14 @@ jobs:
       - name: Dotnet build
         run: dotnet build
       - name: Unit tests
+        working-directory: backend/Testing
         run: dotnet test --logger:"xunit;LogFileName={assembly}.results.xml" --results-directory ./test-results --filter "Category!=Integration" --blame-hang-timeout 10m
       - name: Publish unit test results
         uses: EnricoMi/publish-unit-test-result-action@8885e273a4343cd7b48eaa72428dea0c3067ea98 # v2.14.0
         if: always()
         with:
           check_name: C# Unit Tests
-          files: ./test-results/*.xml
+          files: ./backend/Testing/test-results/*.xml
       - name: Upload test results
         if: always()
         uses: actions/upload-artifact@v4

backend/LexData/SeedingData.cs

@@ -233,7 +233,7 @@ async ValueTask UpdateApp(object dbApp, OpenIddictApplicationDescriptor seedApp,
                 OpenIddictConstants.Permissions.Scopes.Profile
             },
             // port is dynamic due to the nature of the native app
-            RedirectUris = { new Uri("http://localhost:5173/api/auth/oauth-callback") }
+            RedirectUris = { new Uri("http://localhost:5173/api/auth/oauth-callback"), new Uri("http://127.0.0.1:5173/api/auth/oauth-callback") }
         }
     ], a => a.ClientId ?? throw new InvalidOperationException("ClientId is null"));
 

backend/LocalWebApp/LocalAppKernel.cs

@@ -55,7 +55,7 @@ private static void AddAuthHelpers(this IServiceCollection services, IHostEnviro
         services.AddTransient<AuthHelpers>(sp => sp.GetRequiredService<AuthHelpersFactory>().GetCurrentHelper());
         services.AddSingleton<OAuthService>();
         services.AddSingleton<IHostedService>(sp => sp.GetRequiredService<OAuthService>());
-        services.AddOptionsWithValidateOnStart<AuthConfig>().ValidateDataAnnotations();
+        services.AddOptionsWithValidateOnStart<AuthConfig>().BindConfiguration("Auth").ValidateDataAnnotations();
         services.AddSingleton<LoggerAdapter>();
         var httpClientBuilder = services.AddHttpClient(AuthHelpers.AuthHttpClientName);
         if (environment.IsDevelopment())

backend/Taskfile.yml

@@ -95,6 +95,12 @@ tasks:
     label: dotnet
     dir: ./LocalWebApp
     cmd: dotnet watch --no-hot-reload
+  local-web-app-with-local-lexbox:
+    label: Run LocalWebApp with Local LexBox
+    env:
+      Auth__DefaultAuthority: "https://localhost:3000"
+    dir: ./LocalWebApp
+    cmd: dotnet watch --no-hot-reload
 
   publish-local-all:
     cmds:

deployment/base/app-config.yaml

@@ -6,4 +6,5 @@ data:
   environment-name: "Development"
   hg-otel-disabled: "false" # "true" to disable OpenTelemetry
   hg-domain: "hg.localhost"
+  enable-oauth: "false"
 

deployment/base/lexbox-deployment.yaml

@@ -180,6 +180,11 @@ spec:
               secretKeyRef:
                 key: SMTP_PASSWORD
                 name: email
+          - name: Authentication__OpenId__Enable
+            valueFrom:
+              configMapKeyRef:
+                name: app-config
+                key: enable-oauth
           - name: Authentication__Google__ClientId
             valueFrom:
               secretKeyRef:
@@ -275,6 +280,11 @@ spec:
               configMapKeyRef:
                 name: app-config
                 key: environment-name
+          - name: Authentication__OpenId__Enable
+            valueFrom:
+              configMapKeyRef:
+                name: app-config
+                key: enable-oauth
       - name: set-repo-structure-owner-to-www-data
         securityContext:
           # Make sure we're authorized to set ownership

deployment/develop/app-config.yaml

@@ -5,4 +5,5 @@ metadata:
 data:
   environment-name: "Development"
   hg-domain: "hg-develop.lexbox.org"
+  enable-oauth: "true"
 

deployment/develop/lexbox-deployment.patch.yaml

@@ -16,8 +16,6 @@ spec:
             - name: ASPNETCORE_ENVIRONMENT
               value: "Staging" #we don't want to act like dev as that's for local development
               valueFrom:
-            - name: Authentication__OpenId__Enable
-              value: "true"
             - name: Email__SmtpHost
               value: email-smtp.us-east-1.amazonaws.com
             - name: Email__SmtpPort

frontend/viewer/package.json

@@ -1,6 +1,10 @@
 {
   "name": "viewer",
   "private": true,
+  "packageManager": "[email protected]",
+  "engines": {
+    "node": ">=20"
+  },
   "version": "1.0.0",
   "type": "module",
   "main": "dist-web-component/viewer.js",