@aglyn/tenant-data-admin 1.0.0-beta.199 → 1.0.0-beta.201

package/src/lib/server/organizations.js

@@ -21,6 +21,7 @@ import { _ as _extends } from "@swc/helpers/_/_extends";
  * client-writable (docs/MULTI_TENANT_FIRESTORE.md §8).
  */ import { consentGroupForHost, checkHostCollaboratorQuota, checkSeatQuota, countCollaboratorSeats, countManagerSeatsExcluding, createResourceUid, generateOrgSlug, projectMemberResolvedPermissions, resolveOrgPermissions, isOrgWideMember, isValidOrgSlug, hostPermissionKeys, orgPermissionLabel, pluginOrgPermissionKeys, projectHostMemberPermissions, projectHostMemberRoles, projectMemberScopeTokens, resolveCollaboratorHostPermissions, scopeTokensForHost } from "@aglyn/aglyn/server";
 import { ACCOUNT_ACQUISITION_FIELD, organizationAcquisition } from "@aglyn/aglyn/app-utils/account-acquisition";
+import { activitySearchTokens } from "@aglyn/aglyn/app-utils/activity-search";
 import { nameSearchKey, nameSearchReversed, nameSearchTokens } from "@aglyn/aglyn/app-utils/name-search";
 // LEAF MODULE, NOT THE BARREL (AGL-1289). This file is itself reachable
 // through `@aglyn/aglyn/server`, and the verdict route proved this week that a
@@ -34,6 +35,7 @@ import { findUserByUidAcrossPools } from "./auth-pools.js";
 import firebaseAdmin from "./firebase-admin.js";
 import { enforceFreeWorkspaceCapInTransaction, readFreeWorkspaceCapConfig } from "./free-workspace-cap.js";
 import { deleteMemberHostProjections, syncHostProjectionForMembers, syncMemberHostProjections } from "./host-memberships.js";
+import { ORG_MEMBER_LIST_FIELD_NAMES, orgMemberListFields, orgMemberSearchTokens } from "./org-member-list-fields.js";
 import { updateExisting } from "./update-existing.js";
 import { attachWorkspaceDomain } from "./workspace-domains.js";
 const firestore = ()=>firebaseAdmin.app().firestore();
@@ -252,7 +254,7 @@ reservation, now = Date.now()) {
             createdAt: FieldValue.serverTimestamp(),
             updatedAt: FieldValue.serverTimestamp()
         });
-        tx.set(db.collection('orgs').doc(orgId).collection('members').doc(ownerUid), {
+        tx.set(db.collection('orgs').doc(orgId).collection('members').doc(ownerUid), _extends({
             role: 'owner',
             allHosts: true,
             email: ownerEmail != null ? ownerEmail : null,
@@ -273,7 +275,13 @@ reservation, now = Date.now()) {
          */ scopeTokens: projectMemberScopeTokens({
                 role: 'owner',
                 allHosts: true
-            }),
+            })
+        }, orgMemberListFields({
+            role: 'owner',
+            allHosts: true,
+            email: ownerEmail != null ? ownerEmail : undefined,
+            displayName: ownerDisplayName != null ? ownerDisplayName : undefined
+        }), {
             /*
          * The permission projection, stamped here for the same reason and
          * with the same consequence if it is missed.
@@ -288,7 +296,7 @@ reservation, now = Date.now()) {
                 role: 'owner',
                 allHosts: true
             }, null)
-        });
+        }));
         tx.set(db.collection('users').doc(ownerUid).collection('orgs').doc(orgId), // The owner reaches every site by definition (AGL-1032).
         {
             role: 'owner',
@@ -778,7 +786,8 @@ export async function listOrgMembers(orgId) {
 const MEMBER_PROJECTION_WRITE = {
     mergeFields: [
         'scopeTokens',
-        'resolvedPermissions'
+        'resolvedPermissions',
+        ...ORG_MEMBER_LIST_FIELD_NAMES
     ]
 };
 /**
@@ -847,7 +856,7 @@ const MEMBER_PROJECTION_WRITE = {
             var _customRoles_get;
             return [
                 orgRef.collection('members').doc(member.$id),
-                {
+                _extends({
                     scopeTokens: projectMemberScopeTokens(member),
                     resolvedPermissions: projectMemberResolvedPermissions(member, // `?? null`, never `?? undefined`: a member whose `roleId`
                     // points at a DELETED role must resolve to their role
@@ -856,7 +865,7 @@ const MEMBER_PROJECTION_WRITE = {
                     // dangling id. Leaving it undefined would be the same value,
                     // but the null says the lookup happened and missed.
                     member.roleId ? (_customRoles_get = customRoles.get(member.roleId)) != null ? _customRoles_get : null : null)
-                },
+                }, orgMemberListFields(member)),
                 MEMBER_PROJECTION_WRITE
             ];
         })
@@ -904,6 +913,11 @@ const MEMBER_PROJECTION_WRITE = {
         } : {}, target.versionId ? {
             versionId: target.versionId
         } : {}),
+        // What the log's search box finds the entry by (AGL-3321).
+        searchTokens: activitySearchTokens({
+            actorEmail: actor.email,
+            target
+        }),
         createdAt: FieldValue.serverTimestamp()
     }).catch(()=>undefined);
 }
@@ -945,6 +959,13 @@ const MEMBER_PROJECTION_WRITE = {
         } : {}, target.versionId ? {
             versionId: target.versionId
         } : {}),
+        // What the log's search box finds the entry by (AGL-3321): the key's
+        // name stands in for an address an integration does not have.
+        searchTokens: activitySearchTokens({
+            actorEmail: actor.email,
+            apiKeyName: actor.apiKeyName,
+            target
+        }),
         createdAt: FieldValue.serverTimestamp()
     })).catch(()=>undefined);
 }
@@ -1472,7 +1493,16 @@ const MEMBER_PROJECTION_WRITE = {
         patch['photoURL'] = photoURL;
     }
     if (!Object.keys(patch).length) return [];
-    await ref.set(patch, {
+    // A filled name is a name the roster's search finds (AGL-3321); a photo
+    // alone changes nothing the search reads.
+    const searchTokens = patch['displayName'] ? {
+        searchTokens: orgMemberSearchTokens({
+            displayName: patch['displayName'],
+            email: snapshot.get('email'),
+            title: snapshot.get('title')
+        })
+    } : {};
+    await ref.set(_extends({}, patch, searchTokens), {
         merge: true
     });
     return Object.keys(patch);