@wirechunk/cli 0.0.4 → 0.0.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wirechunk/cli",
-  "version": "0.0.4",
+  "version": "0.0.6",
   "private": false,
   "type": "module",
   "scripts": {

package/src/commands/bootstrap.ts

@@ -2,10 +2,7 @@ import { randomUUID } from 'node:crypto';
 import { cleanTinyId } from '@wirechunk/lib/clean-small-id.ts';
 import { normalizeDomain } from '@wirechunk/lib/domains.ts';
 import { normalizeEmailAddress } from '@wirechunk/lib/emails.ts';
-import {
-  defaultFormattedDataTemplate,
-  defaultNotificationEmailBodyTemplate,
-} from '@wirechunk/lib/mixer/form-formatting-templates.ts';
+import { defaultNotificationEmailBodyTemplate } from '@wirechunk/lib/mixer/form-formatting-templates.ts';
 import type { DatabasePool } from 'slonik';
 import { createPool, sql } from 'slonik';
 import type { Env } from '../env.ts';
@@ -65,9 +62,22 @@ export const bootstrap = async (
 
   await db.transaction(async (db) => {
     await db.query(
-      sql.type(
-        voidSelectSchema,
-      )`insert into "Platforms" ("id", "handle", "name", "defaultFormFormattedDataTemplate", "defaultFormNotificationEmailBodyTemplate", "emailSendFromAddress") values (${platformId}, ${handle}, ${name}, ${defaultFormattedDataTemplate}, ${defaultNotificationEmailBodyTemplate}, ${emailSendFrom})`,
+      sql.type(voidSelectSchema)`
+        insert into "Platforms" (
+          "id",
+          "handle",
+          "name",
+          "defaultFormNotificationEmailBodyTemplate",
+          "emailSendFromAddress"
+        )
+        values (
+          ${platformId},
+          ${handle},
+          ${name},
+          ${defaultNotificationEmailBodyTemplate},
+          ${emailSendFrom}
+        )
+      `,
     );
   });
 

package/src/commands/create-user.ts

@@ -1,4 +1,5 @@
 import { hashPassword, validatePasswordComplexity } from '@wirechunk/backend-lib/passwords.ts';
+import { rolesSchema } from '@wirechunk/backend-lib/roles.ts';
 import { cleanSmallId } from '@wirechunk/lib/clean-small-id.ts';
 import { normalizeEmailAddress } from '@wirechunk/lib/emails.ts';
 import { createPool, sql, UniqueIntegrityConstraintViolationError } from 'slonik';
@@ -9,10 +10,6 @@ import { detailedUniqueIntegrityConstraintViolationError } from '../errors.ts';
 import type { WithGlobalOptions } from '../global-options.ts';
 import { voidSelectSchema } from '../util.ts';
 
-const insertUserResult = z.object({
-  id: z.string(),
-});
-
 const findOrgResult = z.object({
   platformId: z.string(),
 });
@@ -20,6 +17,7 @@ const findOrgResult = z.object({
 const findPlatformResult = z.object({
   id: z.string(),
   name: z.string(),
+  roles: rolesSchema.nullable(),
 });
 
 type CreateUserOptions = {
@@ -29,7 +27,7 @@ type CreateUserOptions = {
   lastName: string;
   orgId?: string;
   platformId?: string;
-  role: string;
+  role?: string;
   emailVerified: boolean;
   pending: boolean;
 };
@@ -52,7 +50,7 @@ export const createUser = async (
     process.exit(1);
   }
   const password = await hashPassword(opts.password);
-  const { role } = opts;
+  const inputRole = opts.role || '';
   const status = opts.pending ? 'Pending' : 'Active';
   const firstName = opts.firstName.trim();
   if (!firstName.length) {
@@ -70,7 +68,8 @@ export const createUser = async (
   let orgPrimary = false;
 
   try {
-    const user = await db.transaction(async (db) => {
+    const userId = cleanSmallId();
+    await db.transaction(async (db) => {
       if (!platformId) {
         if (!orgId) {
           throw new Error('Either --org-id or --platform-id must be specified');
@@ -93,17 +92,61 @@ export const createUser = async (
           throw new Error(`Org ID ${orgId} does not belong to platform ID ${platformId}`);
         }
       }
+
       const platform = await db.maybeOne(
         sql.type(
           findPlatformResult,
-        )`select "id", "name" from "Platforms" where "id" = ${platformId}`,
+        )`select "id", "name", "roles" from "Platforms" where "id" = ${platformId}`,
       );
+
       if (!platform) {
         throw new Error(`No platform found with ID ${platformId}`);
       }
       if (opts.verbose) {
         console.log(`Found platform ${platform.name} (ID ${platform.id})`);
       }
+
+      // Determine the role to use.
+      let roleToUse = '';
+      if (platform.roles && platform.roles.length) {
+        if (inputRole) {
+          const roleExists = platform.roles.some((r) => r.name === inputRole);
+          if (roleExists) {
+            roleToUse = inputRole;
+          } else {
+            const validRoles = platform.roles.map((r) => r.name).join(', ');
+            console.error(
+              `Error: Invalid role "${inputRole}". Valid roles for this platform are: ${validRoles}`,
+            );
+            process.exit(1);
+          }
+        } else {
+          const defaultRole = platform.roles.find((r) => r.default);
+          if (defaultRole) {
+            roleToUse = defaultRole.name;
+            if (opts.verbose) {
+              console.log(`No role provided. Using default role: ${roleToUse}`);
+            }
+          } else {
+            // No default role exists and no role was provided.
+            if (opts.verbose) {
+              console.log(
+                'No default role exists and no role was provided. Using empty string for the role.',
+              );
+            }
+          }
+        }
+      } else {
+        // No roles defined for this platform.
+        if (inputRole) {
+          console.error('Error: A role was specified but no roles are defined for this platform.');
+          process.exit(1);
+        }
+        if (opts.verbose) {
+          console.log('No roles defined for this platform. Using empty string for the role.');
+        }
+      }
+
       if (!orgId) {
         orgId = cleanSmallId();
         await db.maybeOne(
@@ -117,23 +160,46 @@ export const createUser = async (
         orgPrimary = true;
       }
 
-      const user = await db.one(
-        sql.type(
-          insertUserResult,
-        )`insert into "Users" ("platformId", "email", "emailVerified", "password", "passwordStatus", "orgId", "role", "status", "firstName", "lastName") values (${platformId}, ${email}, ${opts.emailVerified}, ${password}, 'Ok', ${orgId}, ${role}, ${status}, ${firstName}, ${lastName}) returning "id"`,
+      const user = await db.maybeOne(
+        sql.type(voidSelectSchema)`insert into "Users" (
+          "id",
+          "platformId",
+          "email",
+          "emailVerified",
+          "password",
+          "passwordStatus",
+          "orgId",
+          "role",
+          "status",
+          "firstName",
+          "lastName"
+        )
+        values (
+          ${userId},
+          ${platformId},
+          ${email},
+          ${opts.emailVerified},
+          ${password},
+          'Ok',
+          ${orgId},
+          ${roleToUse},
+          ${status},
+          ${firstName},
+          ${lastName}
+        )`,
       );
 
       if (orgPrimary) {
         await db.maybeOne(
           sql.type(
             voidSelectSchema,
-          )`update "Orgs" set "primaryUserId" = ${user.id} where "id" = ${orgId}`,
+          )`update "Orgs" set "primaryUserId" = ${userId} where "id" = ${orgId}`,
         );
       }
 
       return user;
     });
-    console.log(`Created user (ID ${user.id})`);
+    console.log(`Created user (ID ${userId})`);
   } catch (e) {
     if (e instanceof UniqueIntegrityConstraintViolationError) {
       console.error(detailedUniqueIntegrityConstraintViolationError(e));

package/src/commands/ext-dev/init-db.ts

@@ -43,7 +43,7 @@ const initExtDb = async ({
   `);
   await db.query(sql.unsafe`
     create foreign table if not exists "Users" (
-      "id" uuid not null,
+      "id" text not null,
       "firstName" text not null,
       "lastName" text not null,
       "email" text not null,
@@ -65,7 +65,7 @@ const initExtDb = async ({
   `);
   await db.query(sql.unsafe`
     create foreign table if not exists "Sites" (
-      "id" uuid not null,
+      "id" text not null,
       "domain" text not null,
       "orgId" text,
       "name" text not null,