@wirechunk/cli 0.0.1-rc.2 → 0.0.1-rc.3

package/build/main.js

@@ -3892,7 +3892,7 @@ function customAlphabet(alphabet2, size = 21) {
   return customRandom(alphabet2, size, random);
 }
 const alphabet = "123456789abcdefghijkmnopqrstuvwxyzABCDEFGHJKLMNPQRSTUVWXYZ";
-customAlphabet(alphabet, 22);
+const cleanSmallId = customAlphabet(alphabet, 22);
 const tinyAlphabet = "23456789abcdefghijkmnopqrstuvwxyz";
 const startWithLowercaseLetterPattern = /^[a-z]/;
 const startsWithLowercaseLetter = (s) => startWithLowercaseLetterPattern.test(s);
@@ -57347,9 +57347,6 @@ const detailedUniqueIntegrityConstraintViolationError = (error2) => {
   return message;
 };
 const isDuplicateDatabaseError = (error2) => !!error2 && typeof error2 === "object" && "code" in error2 && error2.code === "42P04";
-const insertOrgResult = z.object({
-  id: z.string()
-});
 const insertUserResult = z.object({
   id: z.string()
 });
@@ -57388,7 +57385,6 @@ const createUser = async (opts, env2) => {
   }
   let platformId = opts.platformId;
   let orgId = opts.orgId;
-  let orgPrimary = false;
   try {
     const user = await db.transaction(async (db2) => {
       if (!platformId) {
@@ -57396,14 +57392,14 @@ const createUser = async (opts, env2) => {
           throw new Error("Either --org-id or --platform-id must be specified");
         }
         platformId = await db2.maybeOneFirst(
-          distExports$1.sql.type(findOrgResult)`select "platformId" from "Organizations" where "id" = ${orgId}`
+          distExports$1.sql.type(findOrgResult)`select "platformId" from "Orgs" where "id" = ${orgId}`
         );
         if (!platformId) {
           throw new Error(`No org found with ID ${orgId}`);
         }
       } else if (orgId) {
         const orgPlatformId = await db2.maybeOneFirst(
-          distExports$1.sql.type(findOrgResult)`select "platformId" from "Organizations" where "id" = ${orgId}`
+          distExports$1.sql.type(findOrgResult)`select "platformId" from "Orgs" where "id" = ${orgId}`
         );
         if (!orgPlatformId) {
           throw new Error(`No org found with ID ${orgId}`);
@@ -57424,20 +57420,20 @@ const createUser = async (opts, env2) => {
         console.log(`Found platform ${platform.name} (ID ${platform.id})`);
       }
       if (!orgId) {
-        orgId = await db2.oneFirst(
+        orgId = cleanSmallId();
+        await db2.maybeOne(
           distExports$1.sql.type(
-            insertOrgResult
-          )`insert into "Organizations" ("platformId") values (${platform.id}) returning "id"`
+            voidSelectSchema
+          )`insert into "Orgs" ("id", "platformId") values (${orgId}, ${platform.id})`
         );
         if (opts.verbose) {
           console.log(`Created org ID ${orgId}`);
         }
-        orgPrimary = true;
       }
       const user2 = await db2.one(
         distExports$1.sql.type(
           insertUserResult
-        )`insert into "Users" ("platformId", "email", "emailVerified", "password", "passwordStatus", "orgId", "orgPrimary", "role", "status", "firstName", "lastName") values (${platformId}, ${email}, ${opts.emailVerified}, ${password}, 'Ok', ${orgId}, ${orgPrimary}, ${role}, ${status}, ${firstName}, ${lastName}) returning "id"`
+        )`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"`
       );
       return user2;
     });
@@ -57654,6 +57650,9 @@ const initDb = async (opts, env2) => {
       end if;
     end; $$
   `);
+  await db.query(distExports$1.sql.unsafe`
+    grant ${extRoleIdent} to ${distExports$1.sql.identifier([coreDbUrlObject.username])}
+  `);
   await db.query(distExports$1.sql.unsafe`
     grant connect, create, temporary on database ${distExports$1.sql.identifier([extDb.dbName])} to ${extRoleIdent}
   `);
@@ -57730,7 +57729,9 @@ extDev.command("db-connect-info").description(
   "--extension-id <string>",
   "the ID of the extension, can be set with an EXTENSION_ID environment variable instead"
 ).action(withOptionsAndEnv(dbConnectInfo));
-extDev.command("init-db").description("initialize a development database for an extension, useful for testing").option(
+extDev.command("init-db").description(
+  "initialize a development database for an extension, useful for testing, assumes the extension role exists"
+).option(
   "--extension-id <string>",
   "the ID of the extension, can be set with an EXTENSION_ID environment variable instead"
 ).option("--db-name <string>", "a custom name for the database, applicable only for testing").action(withOptionsAndEnv(initDb));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wirechunk/cli",
-  "version": "0.0.1-rc.2",
+  "version": "0.0.1-rc.3",
   "private": false,
   "type": "module",
   "scripts": {

package/src/commands/create-user.ts

@@ -1,4 +1,5 @@
 import { hashPassword, validatePasswordComplexity } from '@wirechunk/backend-lib/passwords.ts';
+import { cleanSmallId } from '@wirechunk/lib/clean-small-id.ts';
 import { normalizeEmailAddress } from '@wirechunk/lib/emails.ts';
 import { createPool, sql, UniqueIntegrityConstraintViolationError } from 'slonik';
 import { z } from 'zod';
@@ -6,10 +7,7 @@ import type { Env } from '../env.ts';
 import { requireCoreDbUrl } from '../env.ts';
 import { detailedUniqueIntegrityConstraintViolationError } from '../errors.ts';
 import type { WithGlobalOptions } from '../global-options.ts';
-
-const insertOrgResult = z.object({
-  id: z.string(),
-});
+import { voidSelectSchema } from '../util.ts';
 
 const insertUserResult = z.object({
   id: z.string(),
@@ -69,7 +67,8 @@ export const createUser = async (
 
   let platformId: string | null | undefined = opts.platformId;
   let orgId: string | null | undefined = opts.orgId;
-  let orgPrimary = false;
+  // TODO
+  // let orgPrimary = false;
 
   try {
     const user = await db.transaction(async (db) => {
@@ -78,7 +77,7 @@ export const createUser = async (
           throw new Error('Either --org-id or --platform-id must be specified');
         }
         platformId = await db.maybeOneFirst(
-          sql.type(findOrgResult)`select "platformId" from "Organizations" where "id" = ${orgId}`,
+          sql.type(findOrgResult)`select "platformId" from "Orgs" where "id" = ${orgId}`,
         );
         if (!platformId) {
           throw new Error(`No org found with ID ${orgId}`);
@@ -86,7 +85,7 @@ export const createUser = async (
       } else if (orgId) {
         // Verify that the specified org belongs to the specified platform.
         const orgPlatformId = await db.maybeOneFirst(
-          sql.type(findOrgResult)`select "platformId" from "Organizations" where "id" = ${orgId}`,
+          sql.type(findOrgResult)`select "platformId" from "Orgs" where "id" = ${orgId}`,
         );
         if (!orgPlatformId) {
           throw new Error(`No org found with ID ${orgId}`);
@@ -107,21 +106,22 @@ export const createUser = async (
         console.log(`Found platform ${platform.name} (ID ${platform.id})`);
       }
       if (!orgId) {
-        orgId = await db.oneFirst(
+        orgId = cleanSmallId();
+        await db.maybeOne(
           sql.type(
-            insertOrgResult,
-          )`insert into "Organizations" ("platformId") values (${platform.id}) returning "id"`,
+            voidSelectSchema,
+          )`insert into "Orgs" ("id", "platformId") values (${orgId}, ${platform.id})`,
         );
         if (opts.verbose) {
           console.log(`Created org ID ${orgId}`);
         }
-        orgPrimary = true;
+        // orgPrimary = true;
       }
 
       const user = await db.one(
         sql.type(
           insertUserResult,
-        )`insert into "Users" ("platformId", "email", "emailVerified", "password", "passwordStatus", "orgId", "orgPrimary", "role", "status", "firstName", "lastName") values (${platformId}, ${email}, ${opts.emailVerified}, ${password}, 'Ok', ${orgId}, ${orgPrimary}, ${role}, ${status}, ${firstName}, ${lastName}) returning "id"`,
+        )`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"`,
       );
 
       // if (opts.admin) {

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

@@ -190,6 +190,9 @@ export const initDb = async (
       end if;
     end; $$
   `);
+  await db.query(sql.unsafe`
+    grant ${extRoleIdent} to ${sql.identifier([coreDbUrlObject.username])}
+  `);
 
   await db.query(sql.unsafe`
     grant connect, create, temporary on database ${sql.identifier([extDb.dbName])} to ${extRoleIdent}

package/src/main.ts

@@ -106,7 +106,9 @@ extDev
 
 extDev
   .command('init-db')
-  .description('initialize a development database for an extension, useful for testing')
+  .description(
+    'initialize a development database for an extension, useful for testing, assumes the extension role exists',
+  )
   .option(
     '--extension-id <string>',
     'the ID of the extension, can be set with an EXTENSION_ID environment variable instead',