Merge branch 'develop' of github.com:UserOfficeProject/user-office-core into SWAP-5022-uo-co-proposer-email-lookup-fails-when-input-cont

Author: yoganandaness

.github/workflows/rebase-prs-with-develop.yml

@@ -0,0 +1,49 @@
+name: Update PRs with develop
+
+on:
+  push:
+    branches:
+      - develop
+
+jobs:
+  sync-prs:
+    # Disabled until we can push with a PAT that has workflow scope; otherwise CI stays in "Waiting".
+    if: ${{ false }}
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Configure git user
+        run: |
+          git config --global user.name "github-actions[bot]"
+          git config --global user.email "github-actions[bot]@users.noreply.github.com"
+
+      - name: Merge develop into all open non-Dependabot PRs
+        # TODO: Re-enable once we replace the default GITHUB_TOKEN with a PAT that has repo+workflow scopes
+        # so that downstream PR checks trigger automatically after the bot pushes merge commits.
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          # Get all open PRs targeting develop, excluding Dependabot
+          prs=$(gh pr list --state open --base develop --limit 100 --json number,author --jq '.[] | select(.author.is_bot != true) | .number')
+
+          for pr in $prs; do
+            echo "Processing PR #$pr"
+            gh pr checkout $pr
+            git fetch origin develop
+
+            # Attempt merge
+            if git merge --no-edit origin/develop; then
+              echo "PR #$pr merged successfully. Pushing changes..."
+              git push
+            else
+              echo "Conflict in PR #$pr. Merge aborted."
+              git merge --abort
+              # Optional: Notify author
+              gh pr comment $pr --body "⚠️ Automatic merge of \`develop\` into this PR failed due to conflicts. Please resolve the conflicts and update your branch."
+            fi
+          done

.github/workflows/update-prs-with-develop.yml

@@ -6,3 +6,5 @@ apps/backend/node_modules
 apps/frontend/src/generated
 apps/backend/generated
 .DS_Store
+documentation/.venv
+documentation/site/

.gitignore

@@ -0,0 +1,65 @@
+
+DO
+$$
+DECLARE
+    duplicate_count INTEGER;
+    duplicate_details TEXT;
+BEGIN
+    IF register_patch('AddUniqueConstraintToOidcSub.sql', 'yoganandanpandiyan', 'Unique constraint', '2025-10-13') THEN
+        BEGIN
+            -- Clean up empty string values in oidc_sub column by setting them to NULL
+            -- This prevents empty strings from conflicting with the unique constraint
+            UPDATE users
+            SET oidc_sub = NULL
+            WHERE oidc_sub = '';
+
+            -- Check for duplicate oidc_sub values and throw error if any are found
+            SELECT COUNT(*)
+            INTO duplicate_count
+            FROM (
+                SELECT oidc_sub
+                FROM users
+                WHERE oidc_sub IS NOT NULL
+                GROUP BY oidc_sub
+                HAVING COUNT(*) > 1
+            ) duplicates;
+
+            IF duplicate_count > 0 THEN
+                WITH duplicate_groups AS (
+                    SELECT 
+                        oidc_sub,
+                        STRING_AGG(user_id::TEXT, ', ' ORDER BY user_id) AS user_ids
+                    FROM users
+                    WHERE oidc_sub IS NOT NULL
+                      AND oidc_sub IN (
+                          SELECT oidc_sub
+                          FROM users
+                          WHERE oidc_sub IS NOT NULL
+                          GROUP BY oidc_sub
+                          HAVING COUNT(*) > 1
+                      )
+                    GROUP BY oidc_sub
+                )
+                SELECT STRING_AGG(
+                    FORMAT('oidc_sub: "%s" (user_ids: %s)', oidc_sub, user_ids), 
+                    E'\n'
+                )
+                INTO duplicate_details
+                FROM duplicate_groups;
+
+                RAISE EXCEPTION 'Cannot add unique constraint to oidc_sub column. Found % duplicate oidc_sub value(s) that must be manually resolved:
+%
+
+Please manually fix these duplicate values before running this migration again. 
+OIDC subject identifiers should be unique as they come from identity providers.',
+                    duplicate_count, duplicate_details;
+            END IF;
+
+            -- Add unique constraint to prevent duplicate oidc_sub values in the future
+            ALTER TABLE users 
+            ADD CONSTRAINT unique_oidc_sub UNIQUE (oidc_sub);
+        END;
+    END IF;
+END;
+$$
+LANGUAGE plpgsql;

apps/backend/db_patches/0201_AddUniqueConstraintToOidcSub.sql

@@ -0,0 +1,11 @@
+DO
+$$
+BEGIN
+    IF register_patch('DropUsersUsernameKey.sql', 'jekabskarklins', 'Deprecate username constraint. This fix is needed for the broken integration that is underway', '2025-12-11') THEN
+        BEGIN
+            ALTER TABLE IF EXISTS public.users
+            DROP CONSTRAINT users_username_key;
+        END;
+    END IF;
+END;
+$$

apps/backend/db_patches/0202_DropUsersUsernameKey.sql

@@ -0,0 +1,50 @@
+DO
+$DO$
+DECLARE  
+  invite_id_var1 int;
+  invite_id_var2 int;
+  invite_id_var3 int;
+  invite_id_var4 int;
+BEGIN
+
+  INSERT INTO invites (code, email, created_by, created_at, claimed_by, claimed_at, is_email_sent, expires_at, template_id) 
+  VALUES ('DAVE001', 'david@teleworm.us', 1, NOW(), NULL, NULL, false, NULL, 'user-office-registration-invitation-co-proposer');
+
+  SELECT invite_id
+  INTO invite_id_var1
+  FROM invites
+  WHERE email = 'david@teleworm.us' AND code = 'DAVE001';
+
+  INSERT INTO invites (code, email, created_by, created_at, claimed_by, claimed_at, is_email_sent, expires_at, template_id) 
+  VALUES ('BEN001', 'ben@inbox.com', 1, NOW(), NULL, NULL, false, NULL, 'user-office-registration-invitation-co-proposer');
+
+  SELECT invite_id
+  INTO invite_id_var2
+  FROM invites
+  WHERE email = 'ben@inbox.com' AND code = 'BEN001';
+
+  INSERT INTO co_proposer_claims (invite_id, proposal_pk) VALUES (invite_id_var1, 1);
+  INSERT INTO co_proposer_claims (invite_id, proposal_pk) VALUES (invite_id_var2, 1);
+
+  INSERT INTO invites (code, email, created_by, created_at, claimed_by, claimed_at, is_email_sent, expires_at, template_id) 
+  VALUES ('DAVE002', 'david@teleworm.us', 1, NOW(), NULL, NULL, false, NULL, '');
+
+  SELECT invite_id
+  INTO invite_id_var3
+  FROM invites
+  WHERE email = 'david@teleworm.us' AND code = 'DAVE002';
+
+  INSERT INTO invites (code, email, created_by, created_at, claimed_by, claimed_at, is_email_sent, expires_at, template_id) 
+  VALUES ('BEN002', 'ben@inbox.com', 1, NOW(), NULL, NULL, false, NULL, '');
+
+  SELECT invite_id
+  INTO invite_id_var4
+  FROM invites
+  WHERE email = 'ben@inbox.com' AND code = 'BEN002';
+
+  INSERT INTO co_proposer_claims (invite_id, proposal_pk) VALUES (invite_id_var3, 2);
+  INSERT INTO co_proposer_claims (invite_id, proposal_pk) VALUES (invite_id_var4, 2);
+
+END;
+$DO$
+LANGUAGE plpgsql;

apps/backend/db_patches/db_seeds/0007_CoProposersInvite.sql

@@ -1,6 +1,6 @@
 services:
   clam-antivirus:
-    image: clamav/clamav:0.104
+    image: clamav/clamav:1.5.1
     ports:
       - "3310:3310"
 
@@ -40,13 +40,13 @@ services:
       - "4500:4500"
     cap_add:
       - SYS_ADMIN
- 
+
   mockServer:
     image: mockserver/mockserver:5.13.0
     command: -logLevel ERROR -serverPort 1080
     ports:
       - 1080:1080
-  
+
   mockserver-client:
     image: "ghcr.io/userofficeproject/stfc-mockserver-client:master"
     command: sh -c "sleep 5 && node src/mockserver.js"

apps/backend/docker-compose-stfc.e2e.yml

@@ -10,7 +10,9 @@ EAM_API_URL=*******
 EAM_AUTH_USER=*******
 EAM_AUTH_PASSWORD=*******
 EAM_AUTH_TENANT=*******
-EAM_AUTH_ORGANIZATION=*******
+EAM_ORGANIZATION_CODE=*******
+EAM_ORGANIZATION_NAME=*******
+EAM_LOCATION_CODE=*******
 EAM_EQUIPMENT_PART_CODE=*******
 
 # Graylog (Uncomment the variables to enable logging locally)