Ozone: pass through unknown account details (bluesky-social#2794)

* ozone: pass through account info details that may not be known yet * tidy, build
ascalon-team · Sep 6, 2024 · 71785d3 · 71785d3
1 parent c5b765d
commit 71785d3
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 8 deletions.
diff --git a/.github/workflows/build-and-push-ozone-aws.yaml b/.github/workflows/build-and-push-ozone-aws.yaml
@@ -3,7 +3,7 @@ on:
   push:
     branches:
       - main
-      - service-auth-scopes
+      - divy/ozone-passthru
 env:
   REGISTRY: ${{ secrets.AWS_ECR_REGISTRY_USEAST2_PACKAGES_REGISTRY }}
   USERNAME: ${{ secrets.AWS_ECR_REGISTRY_USEAST2_PACKAGES_USERNAME }}

diff --git a/packages/ozone/src/api/util.ts b/packages/ozone/src/api/util.ts
@@ -50,15 +50,31 @@ export const addAccountInfoToRepoViewDetail = (
   includeEmail = false,
 ): RepoViewDetail => {
   if (!accountInfo) return repoView
+  const {
+    email,
+    deactivatedAt,
+    emailConfirmedAt,
+    inviteNote,
+    invitedBy,
+    invites,
+    invitesDisabled,
+    // pick some duplicate/unwanted details out
+    did: _did,
+    handle: _handle,
+    indexedAt: _indexedAt,
+    relatedRecords: _relatedRecords,
+    ...otherAccountInfo
+  } = accountInfo
   return {
+    ...otherAccountInfo,
     ...repoView,
-    email: includeEmail ? accountInfo.email : undefined,
-    invitedBy: accountInfo.invitedBy,
-    invitesDisabled: accountInfo.invitesDisabled,
-    inviteNote: accountInfo.inviteNote,
-    invites: accountInfo.invites,
-    emailConfirmedAt: accountInfo.emailConfirmedAt,
-    deactivatedAt: accountInfo.deactivatedAt,
+    email: includeEmail ? email : undefined,
+    invitedBy,
+    invitesDisabled,
+    inviteNote,
+    invites,
+    emailConfirmedAt,
+    deactivatedAt,
   }
 }