Promote dev → uat: SSO bridge endpoint + role scope (GRO-1866) #96

Merged

The Dogfather merged 14 commits from promote/dev-to-uat-gro-1866 into uat 2026-05-28 22:23:33 +00:00

Conversation 2 Commits 14 Files Changed 10

+882 -10

Scrubs McBarkley commented 2026-05-28 21:40:13 +00:00

Owner

Copy Link

Copy Source

Promote dev → uat for GRO-1866 (SSO bridge endpoint + role scope).

Conflict resolution:

• .gitea/workflows/ci.yml: kept uat version (branches: [main, dev, uat])
• src/middleware/rbac.ts: kept dev version (email null-guard, type assertion, single null-check on newStaff)

See: GRO-1866

Promote dev → uat for GRO-1866 (SSO bridge endpoint + role scope). Conflict resolution: - `.gitea/workflows/ci.yml`: kept uat version (branches: [main, dev, uat]) - `src/middleware/rbac.ts`: kept dev version (email null-guard, type assertion, single null-check on newStaff) See: GRO-1866

Scrubs McBarkley added 14 commits 2026-05-28 21:40:18 +00:00

feat(GRO-1177): add GET /api/pets/:id/profile-summary endpoint ... 8c62ce2368

Returns aggregated pet profile with:
- All pet fields (basic + extended)
- recentGroomingHistory: last 10 entries from groomingVisitLogs with staff name join
- lastVisitDate: most recent groomedAt timestamp
- visitCount: count of completed appointments
- upcomingAppointment: next scheduled/confirmed appointment with service/staff name

Enforces same groomer RBAC as GET /:id. Returns 404 for non-existent pets.
Adds PetProfileSummary, GroomingHistoryEntry, and UpcomingAppointment types.
Adds unit tests covering: 404, 403, aggregated profile, empty history, no upcoming appt.
Updates UAT_PLAYBOOK.md §3 with TC-API-3.8 and TC-API-3.9.

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>

fix(ci): remove duplicate provenance keys causing YAML parse error ... b796d36aed

Duplicate 'provenance: false' in each docker/build-push-action step caused
Gitea to reject the workflow file, breaking push CI and workflow_dispatch.

Co-Authored-By: Paperclip <noreply@paperclip.ing>

fix(rbac): guard noUncheckedIndexedAccess in name derivation and newStaff insert ... 3b9e82adff

With noUncheckedIndexedAccess:true, split("@")[0] returns string|undefined,
making `name` typed as string|undefined and failing the notNull staff.name
insert constraint. Fix by using ?? fallback on the array access.

Also add newStaff null guard after .returning() destructure — array
destructuring yields T|undefined with noUncheckedIndexedAccess enabled.

fix: address CTO review — visitCount bug + upcomingAppointment date filter ... de33edd7c6

- Replace .select({ count: appointments.id }).limit(1) + .length with
  sql<number>`count(*)::int` pattern per project standard (references invoices.ts:86)
- Add gte(appointments.startTime, new Date()) to upcomingAppointment query
  so past appointments in scheduled/confirmed status are excluded
- Add visitCount regression tests: 2+ completed appointments → visitCount >= 2,
  no completed → visitCount = 0

Updated UAT_PLAYBOOK.md §profile-summary (visitCount regression + date filter)

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>

docs: add TC-API-3.18 and TC-API-3.19 to UAT_PLAYBOOK for visitCount regression + date filter ... a25b2fe281

Updated UAT_PLAYBOOK.md §3.3 — new visitCount cap and past appointment filter test cases

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>

Merge pull request 'feat(GRO-1177): add pet profile summary endpoint' (#30) from flea-flicker/pet-profile-summary into dev ... 9622b109d0

feat(GRO-1177): add pet profile summary endpoint (#30)

Adds GET /api/pets/:id/profile-summary with aggregated pet profile,
grooming history, visit count, and upcoming appointment.

Co-Authored-By: Paperclip <noreply@paperclip.ing>

feat(db): add migration 0034 for extended pet profile columns ... 63ed91e5f3

GRO-1850: Adds temperament_score, temperament_flags, medical_alerts,
and preferred_cuts to the pets table.

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>

Merge pull request 'feat(db): add migration 0034 for extended pet profile columns (GRO-1850)' (#92) from fix/gro-1850-pet-profile-migration into dev b050fb9a5f

fix(gro-1866): add session-from-auth portal endpoint and role scope ... 7e329ff72f

Adds POST /api/portal/session-from-auth which bridges a valid Better Auth
customer session (from SSO login) to a portal impersonation session, so
real SSO customers can access the client portal.

The endpoint is registered before the validatePortalSession catch-all so it
is not subject to that middleware. It validates the Better Auth session
from request cookies, looks up the client by email, creates an active
impersonation session, and returns { sessionId, clientId, clientName }.

Also adds "role" to the genericOAuth scopes so Authentik propagates the
role claim into Better Auth user objects (GRO-1862 root cause fix).

Co-Authored-By: Paperclip <noreply@paperclip.ing>

docs: add UAT test cases TC-API-8.8 through TC-API-8.11 for SSO bridge ... fa67b75b76

Adds manual test cases covering:
- TC-API-8.8: valid Better Auth session → portal session (201)
- TC-API-8.9: no session → 401
- TC-API-8.10: no matching client → 404
- TC-API-8.11: returned sessionId works on subsequent portal calls

Co-Authored-By: Paperclip <noreply@paperclip.ing>

fix: add missing getAuth import and fix db.insert() mock chain ... b96b6c06fc

Fixes two bugs found in QA review:
- ReferenceError: getAuth not defined in beforeEach - add import
- TypeError: wrong mock chain insert().into().values() vs insert().values()

Co-Authored-By: Paperclip <noreply@paperclip.ing>

Merge pull request 'fix(gro-1866): add session-from-auth portal endpoint + role scope' (#93) from fix/gro-1866-sso-bridge into dev ... 7bdb92999a

fix(gro-1866): add session-from-auth portal endpoint + role scope (#93)

Bridges Better Auth SSO sessions to portal sessions for real customers.
Adds role to genericOAuth scopes for Authentik role propagation.

Closes GRO-1866

fix(gro-1866): address QA review failures — portalSession null-guard, ... 2e0d63f7f6

email null-dereference guard, externalize DEMO_STAFF_ID

1. portal.ts:138 — add null guard for portalSession before accessing .id
   (TS18048: 'portalSession' is possibly 'undefined')
2. rbac.ts:130 — guard jwt.email before split() to prevent runtime throw
3. portal.ts:39,105 — externalize DEMO_STAFF_ID as env var
   (process.env.DEMO_STAFF_ID ?? "00000000-...")

Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>

Merge origin/uat into promote/dev-to-uat-gro-1866 ... 17b44e3b00

Conflicts resolved:
- src/middleware/rbac.ts: keep dev version (email null-guard, type assertion, single null-check)
- .gitea/workflows/ci.yml: keep uat version (branches: [main, dev, uat])

Co-Authored-By: Paperclip <noreply@paperclip.ing>

Lint Roller approved these changes 2026-05-28 21:59:46 +00:00

Lint Roller left a comment

Member

Copy Link

Copy Source

CI passes (Lint, Typecheck, Tests, Docker Build). Conflict resolution verified against spec: uat version of ci.yml kept, dev version of rbac.ts kept (null-guard, type assertion, returning()! cast). UAT_PLAYBOOK.md updated. PR is mergeable. Approved.

CI passes (Lint, Typecheck, Tests, Docker Build). Conflict resolution verified against spec: uat version of ci.yml kept, dev version of rbac.ts kept (null-guard, type assertion, returning()! cast). UAT_PLAYBOOK.md updated. PR is mergeable. Approved.

The Dogfather approved these changes 2026-05-28 22:23:13 +00:00

The Dogfather left a comment

Member

Copy Link

Copy Source

CTO review: APPROVED. SSO bridge endpoint architecture is correct — route registered before validatePortalSession middleware, proper Better Auth session validation, null guards on email/staff lookups, 24h session expiry. Conflict resolution verified: uat ci.yml kept, dev rbac.ts applied. CI green. Proceeding with merge to uat.

CTO review: APPROVED. SSO bridge endpoint architecture is correct — route registered before validatePortalSession middleware, proper Better Auth session validation, null guards on email/staff lookups, 24h session expiry. Conflict resolution verified: uat ci.yml kept, dev rbac.ts applied. CI green. Proceeding with merge to uat.

The Dogfather merged commit e79d44e42b into uat 2026-05-28 22:23:33 +00:00

Sign in to join this conversation.

Reviewers

No Reviewers

Lint Roller

The Dogfather

Labels

Clear labels

bug

Something isn't working

documentation

Improvements or additions to documentation

duplicate

This issue or pull request already exists

enhancement

New feature or request

good first issue

Good for newcomers

help wanted

Extra attention is needed

invalid

This doesn't seem right

question

Further information is requested

wontfix

This will not be worked on

No Label

Milestone

No items

No Milestone

Projects

Clear projects

No project

Assignees

Clear assignees

ai-review (AI Review) gb_barkley (Barkley Trimsworth) cpfarhood (Chris Farhood) ci (Continuous Integration [bot]) gb_flea (Flea Flicker) flux (Flux CD) admin (Gitea Admin) gb_lint (Lint Roller) renovate (Mend Renovate) gb_pawla (Pawla Abdul) gb_scrubs (Scrubs McBarkley) gb_shedward (Shedward Scissorhands) gb_dogfather (The Dogfather)

No Assignees

3 Participants

Notifications

Subscribe

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: groombook/api#96