@7365admin1/core 3.58.1-staging.269 → 3.58.1-staging.270

package/dist/index.d.ts

@@ -382,6 +382,15 @@ type TMember = {
     siteName?: string;
     status?: string;
     dateInvited?: string;
+    /**
+     * Who wrote this membership, when it was not the member themselves.
+     *
+     * Optional and additive: every existing caller omits it and gets `""`, the
+     * same as the other unset references here. `MMember` validates with Joi and
+     * REJECTS UNKNOWN KEYS, so a field cannot simply be passed in - it has to be
+     * declared here first.
+     */
+    createdBy?: string | ObjectId | null;
     onboardingRequired?: boolean;
     onboardingCompleted?: boolean;
     onboardingCompletedAt?: string;

package/dist/index.js

@@ -9830,6 +9830,7 @@ function MMember(value) {
     siteName: import_joi7.default.string().optional().allow("", null),
     status: import_joi7.default.string().optional().allow("", null),
     dateInvited: import_joi7.default.string().optional().allow("", null),
+    createdBy: import_joi7.default.string().hex().optional().allow("", null),
     onboardingRequired: import_joi7.default.boolean().optional(),
     onboardingCompleted: import_joi7.default.boolean().optional(),
     onboardingCompletedAt: import_joi7.default.string().optional().allow("", null),
@@ -9869,6 +9870,13 @@ function MMember(value) {
       throw new import_node_server_utils13.BadRequestError("Invalid site ID format.");
     }
   }
+  if (value.createdBy) {
+    try {
+      value.createdBy = new import_mongodb12.ObjectId(value.createdBy);
+    } catch (error2) {
+      throw new import_node_server_utils13.BadRequestError("Invalid createdBy ID format.");
+    }
+  }
   return {
     _id: value._id,
     name: value.name,
@@ -9882,6 +9890,7 @@ function MMember(value) {
     siteName: value.siteName ?? "",
     status: value.status || "active",
     dateInvited: value.dateInvited ?? value.createdAt ?? (/* @__PURE__ */ new Date()).toISOString(),
+    createdBy: value.createdBy ?? "",
     onboardingRequired: value.onboardingRequired ?? false,
     onboardingCompleted: value.onboardingCompleted ?? !value.onboardingRequired,
     onboardingCompletedAt: value.onboardingCompletedAt ?? "",
@@ -29334,9 +29343,12 @@ function defaultOwnerRoles(org, nature) {
   return roles;
 }
 async function seedDefaultOrgRoles(addRole, org, nature) {
+  const seeded = [];
   try {
     for (const role of defaultOwnerRoles(org, nature)) {
-      await addRole(role);
+      const id = await addRole(role);
+      if (id)
+        seeded.push({ type: String(role.type), id: String(id) });
     }
   } catch (error) {
     import_node_server_utils65.logger.log({
@@ -29344,11 +29356,12 @@ async function seedDefaultOrgRoles(addRole, org, nature) {
       message: `Failed to seed default roles for organization ${org}: ${error?.message}`
     });
   }
+  return seeded;
 }
 
 // src/controllers/organization.controller.ts
 function useOrgController() {
-  const { getOrgsByMembership } = useMemberRepo();
+  const { getOrgsByMembership, add: _addMember } = useMemberRepo();
   const { getUserById: _getUserById } = useUserRepo();
   const {
     getByName: _getByName,
@@ -29462,11 +29475,13 @@ function useOrgController() {
       const { inviteId, ...body } = req.body ?? {};
       let invitedFrom = null;
       let invitedRole = null;
+      let self = null;
       if (inviteId) {
-        const [invite, self] = await Promise.all([
+        const [invite, caller] = await Promise.all([
           useVerificationRepoV2().getVerificationByIdFresh(inviteId).catch(() => null),
           _getUserById(createdBy).catch(() => null)
         ]);
+        self = caller;
         const samePerson = invite?.email && self?.email && invite.email.toLowerCase() === self.email.toLowerCase();
         if (samePerson) {
           invitedFrom = String(invite._id);
@@ -29479,7 +29494,32 @@ function useOrgController() {
         }
       }
       const _id = await _add({ ...body, createdBy, invitedFrom, invitedRole });
-      await seedDefaultRoles(_id, body.nature);
+      const seededRoles = await seedDefaultRoles(_id, body.nature);
+      try {
+        const ownerRole = invitedRole || seededRoles.find((role) => role.type === "organization")?.id || "";
+        const owner = self ?? await _getUserById(createdBy).catch(() => null);
+        const ownerUserId = owner?._id ? String(owner._id) : createdBy;
+        await _addMember({
+          org: String(_id),
+          orgName: body.name,
+          user: ownerUserId,
+          name: owner?.name || owner?.email || "",
+          email: owner?.email || "",
+          createdBy,
+          role: ownerRole,
+          type: "organization",
+          // Deliberately no site: the owner is not a one-site person, and a
+          // `siteId` here would narrow them to it everywhere in the product.
+          siteId: "",
+          siteName: "",
+          onboardingRequired: true
+        });
+      } catch (error2) {
+        import_node_server_utils66.logger.log({
+          level: "error",
+          message: `[organizations/onboarding] could not create the owner membership for ${_id}: ${error2?.message}`
+        });
+      }
       const data = await _getById(_id);
       res.status(201).json({
         message: "Successfully created organization.",