@rebasepro/server-core 0.2.4 → 0.2.5

package/dist/common/src/collections/default-collections.d.ts

@@ -1,12 +1,9 @@
-import { PostgresCollection } from "@rebasepro/types";
+import type { PostgresCollection } from "@rebasepro/types";
 /**
- * Default users collection definition.
+ * Default users collection.
  *
- * Shared between the admin UI (for navigation/display) and the backend
- * (for schema generation). Both consumers prepend this to the developer's
- * collections array and rely on generic slug-based deduplication
- * (Map keyed by slug, last-write-wins) so that developer-defined
- * collections with the same slug override this default — no hardcoded
- * string checks required.
+ * Prepended to the developer's collections array by the admin and server.
+ * Slug-based dedup (Map keyed by slug, last-write-wins) lets developers
+ * override by defining their own collection with `slug: "users"`.
  */
 export declare const defaultUsersCollection: PostgresCollection;

package/dist/index.es.js

@@ -2547,6 +2547,142 @@ class CollectionRegistry {
     };
   }
 }
+const defaultUsersCollection = {
+  name: "Users",
+  singularName: "User",
+  slug: "users",
+  table: "users",
+  schema: "rebase",
+  icon: "Users",
+  group: "Settings",
+  openEntityMode: "dialog",
+  disableDefaultActions: ["copy"],
+  sort: ["createdAt", "desc"],
+  properties: {
+    id: {
+      name: "ID",
+      type: "string",
+      isId: "uuid",
+      ui: {
+        readOnly: true
+      }
+    },
+    email: {
+      name: "Email",
+      type: "string",
+      validation: {
+        required: true,
+        unique: true
+      }
+    },
+    displayName: {
+      name: "Name",
+      type: "string",
+      columnName: "display_name",
+      validation: {
+        required: true
+      }
+    },
+    photoURL: {
+      name: "Photo URL",
+      type: "string",
+      columnName: "photo_url",
+      url: "image"
+    },
+    roles: {
+      name: "Roles",
+      type: "array",
+      columnType: "text[]",
+      of: {
+        name: "Role",
+        type: "string",
+        enum: {
+          admin: "Admin",
+          editor: "Editor",
+          viewer: "Viewer"
+        }
+      }
+    },
+    passwordHash: {
+      name: "Password Hash",
+      type: "string",
+      columnName: "password_hash",
+      ui: {
+        hideFromCollection: true,
+        disabled: {
+          hidden: true
+        }
+      }
+    },
+    emailVerified: {
+      name: "Email Verified",
+      type: "boolean",
+      columnName: "email_verified",
+      defaultValue: false,
+      ui: {
+        hideFromCollection: true,
+        disabled: {
+          hidden: true
+        }
+      }
+    },
+    emailVerificationToken: {
+      name: "Email Verification Token",
+      type: "string",
+      columnName: "email_verification_token",
+      ui: {
+        hideFromCollection: true,
+        disabled: {
+          hidden: true
+        }
+      }
+    },
+    emailVerificationSentAt: {
+      name: "Email Verification Sent At",
+      type: "date",
+      columnName: "email_verification_sent_at",
+      ui: {
+        hideFromCollection: true,
+        disabled: {
+          hidden: true
+        }
+      }
+    },
+    metadata: {
+      name: "Metadata",
+      type: "map",
+      defaultValue: {},
+      ui: {
+        hideFromCollection: true,
+        disabled: {
+          hidden: true
+        }
+      }
+    },
+    createdAt: {
+      name: "Created At",
+      type: "date",
+      columnName: "created_at",
+      ui: {
+        readOnly: true
+      }
+    },
+    updatedAt: {
+      name: "Updated At",
+      type: "date",
+      columnName: "updated_at",
+      autoValue: "on_update",
+      ui: {
+        hideFromCollection: true,
+        disabled: {
+          hidden: true
+        }
+      }
+    }
+  },
+  listProperties: ["displayName", "email", "roles", "createdAt"],
+  propertiesOrder: ["id", "email", "displayName", "roles", "createdAt"]
+};
 function mapOperator$1(op) {
   switch (op) {
     case "==":
@@ -13035,11 +13171,6 @@ function createAdminRoutes(config) {
     const results = await Promise.all(users.map((u) => applyUserAfterRead(u, ctx)));
     return results.filter((u) => u !== null);
   }
-  async function applyRoleAfterReadBatch(roles, ctx) {
-    if (!hooks?.roles?.afterRead) return roles;
-    const results = await Promise.all(roles.map((r) => hooks.roles.afterRead(r, ctx)));
-    return results.filter((r) => r !== null);
-  }
   function toAdminUser(u, roles) {
     return {
       uid: u.id,
@@ -13398,90 +13529,6 @@ function createAdminRoutes(config) {
       success: true
     });
   });
-  router.get("/roles", requireAdmin, async (c) => {
-    const roles = await authRepo.listRoles();
-    const hookCtx = buildHookContext(c, "GET");
-    let adminRoles = roles.map((r) => ({
-      id: r.id,
-      name: r.name,
-      isAdmin: r.isAdmin,
-      defaultPermissions: r.defaultPermissions
-    }));
-    adminRoles = await applyRoleAfterReadBatch(adminRoles, hookCtx);
-    return c.json({
-      roles: adminRoles
-    });
-  });
-  router.get("/roles/:roleId", requireAdmin, async (c) => {
-    const roleId = c.req.param("roleId");
-    const role = await authRepo.getRoleById(roleId);
-    if (!role) {
-      throw ApiError.notFound("Role not found");
-    }
-    return c.json({
-      role
-    });
-  });
-  router.post("/roles", requireAdmin, async (c) => {
-    const body = await c.req.json();
-    const {
-      id,
-      name: name2,
-      isAdmin,
-      defaultPermissions
-    } = body;
-    if (!id || !name2) {
-      throw ApiError.badRequest("Role ID and name are required", "INVALID_INPUT");
-    }
-    const existing = await authRepo.getRoleById(id);
-    if (existing) {
-      throw ApiError.conflict("Role already exists", "ROLE_EXISTS");
-    }
-    const role = await authRepo.createRole({
-      id,
-      name: name2,
-      isAdmin: isAdmin ?? false,
-      defaultPermissions: defaultPermissions ?? null
-    });
-    return c.json({
-      role
-    }, 201);
-  });
-  router.put("/roles/:roleId", requireAdmin, async (c) => {
-    const roleId = c.req.param("roleId");
-    const body = await c.req.json();
-    const {
-      name: name2,
-      isAdmin,
-      defaultPermissions
-    } = body;
-    const existing = await authRepo.getRoleById(roleId);
-    if (!existing) {
-      throw ApiError.notFound("Role not found");
-    }
-    const role = await authRepo.updateRole(roleId, {
-      name: name2,
-      isAdmin,
-      defaultPermissions
-    });
-    return c.json({
-      role
-    });
-  });
-  router.delete("/roles/:roleId", requireAdmin, async (c) => {
-    const roleId = c.req.param("roleId");
-    if (["admin", "editor", "viewer"].includes(roleId)) {
-      throw ApiError.badRequest("Cannot delete built-in roles", "BUILTIN_ROLE");
-    }
-    const existing = await authRepo.getRoleById(roleId);
-    if (!existing) {
-      throw ApiError.notFound("Role not found");
-    }
-    await authRepo.deleteRole(roleId);
-    return c.json({
-      success: true
-    });
-  });
   return router;
 }
 function createBuiltinAuthAdapter(config) {
@@ -13525,8 +13572,7 @@ function createBuiltinAuthAdapter(config) {
       const extendedPayload = payload;
       let roles = payload.roles || [];
       try {
-        const userRoles = await authRepository.getUserRoles(payload.userId);
-        roles = userRoles.map((r) => r.id);
+        roles = await authRepository.getUserRoleIds(payload.userId);
       } catch {
       }
       const isAdmin = roles.some((r) => r === "admin" || r === "schema-admin");
@@ -13556,8 +13602,7 @@ function createBuiltinAuthAdapter(config) {
       const extendedPayload = payload;
       let roles = payload.roles || [];
       try {
-        const userRoles = await authRepository.getUserRoles(payload.userId);
-        roles = userRoles.map((r) => r.id);
+        roles = await authRepository.getUserRoleIds(payload.userId);
       } catch {
       }
       const isAdmin = roles.some((r) => r === "admin" || r === "schema-admin");
@@ -13571,7 +13616,6 @@ function createBuiltinAuthAdapter(config) {
       };
     },
     userManagement: createUserManagementFromRepo(authRepository, resolvedOps, authHooks),
-    roleManagement: createRoleManagementFromRepo(authRepository),
     createAuthRoutes() {
       return createAuthRoutes({
         authRepo: authRepository,
@@ -13687,43 +13731,13 @@ function createUserManagementFromRepo(repo, resolvedOps, authHooks) {
       }
     },
     async getUserRoles(userId) {
-      const roles = await repo.getUserRoles(userId);
-      return roles.map(toAuthRoleData);
+      return repo.getUserRoleIds(userId);
     },
     async setUserRoles(userId, roleIds) {
       await repo.setUserRoles(userId, roleIds);
     }
   };
 }
-function createRoleManagementFromRepo(repo) {
-  return {
-    async listRoles() {
-      const roles = await repo.listRoles();
-      return roles.map(toAuthRoleData);
-    },
-    async getRoleById(id) {
-      const role = await repo.getRoleById(id);
-      return role ? toAuthRoleData(role) : null;
-    },
-    async createRole(data) {
-      const role = await repo.createRole({
-        id: data.id,
-        name: data.name,
-        isAdmin: data.isAdmin,
-        defaultPermissions: data.defaultPermissions,
-        collectionPermissions: data.collectionPermissions
-      });
-      return toAuthRoleData(role);
-    },
-    async updateRole(id, data) {
-      const role = await repo.updateRole(id, data);
-      return role ? toAuthRoleData(role) : null;
-    },
-    async deleteRole(id) {
-      await repo.deleteRole(id);
-    }
-  };
-}
 function toAuthUserData(user) {
   return {
     id: user.id,
@@ -13736,15 +13750,6 @@ function toAuthUserData(user) {
     updatedAt: user.updatedAt
   };
 }
-function toAuthRoleData(role) {
-  return {
-    id: role.id,
-    name: role.name,
-    isAdmin: role.isAdmin,
-    defaultPermissions: role.defaultPermissions,
-    collectionPermissions: role.collectionPermissions
-  };
-}
 function configureLogLevel(logLevel) {
   const LOG_LEVEL = logLevel || process.env.LOG_LEVEL || "info";
   const logLevels = {
@@ -24927,7 +24932,6 @@ function createCustomAuthAdapter(options2) {
     verifyRequest: options2.verifyRequest,
     verifyToken: resolvedVerifyToken,
     userManagement: options2.userManagement,
-    roleManagement: options2.roleManagement,
     getCapabilities() {
       return defaultCapabilities;
     }
@@ -26927,33 +26931,6 @@ function createAdmin(transport, options2) {
       method: "DELETE"
     });
   }
-  async function listRoles() {
-    return transport.request(adminPath + "/roles", {
-      method: "GET"
-    });
-  }
-  async function getRole(roleId) {
-    return transport.request(adminPath + "/roles/" + encodeURIComponent(roleId), {
-      method: "GET"
-    });
-  }
-  async function createRole(data) {
-    return transport.request(adminPath + "/roles", {
-      method: "POST",
-      body: JSON.stringify(data)
-    });
-  }
-  async function updateRole(roleId, data) {
-    return transport.request(adminPath + "/roles/" + encodeURIComponent(roleId), {
-      method: "PUT",
-      body: JSON.stringify(data)
-    });
-  }
-  async function deleteRole(roleId) {
-    return transport.request(adminPath + "/roles/" + encodeURIComponent(roleId), {
-      method: "DELETE"
-    });
-  }
   async function bootstrap() {
     return transport.request(adminPath + "/bootstrap", {
       method: "POST"
@@ -26966,11 +26943,6 @@ function createAdmin(transport, options2) {
     createUser,
     updateUser,
     deleteUser,
-    listRoles,
-    getRole,
-    createRole,
-    updateRole,
-    deleteRole,
     bootstrap
   };
 }
@@ -38515,6 +38487,9 @@ async function _initializeRebaseBackend(config) {
       dir: config.collectionsDir
     });
   }
+  if (config.auth) {
+    activeCollections = Array.from(new Map([defaultUsersCollection, ...activeCollections].map((c) => [c.slug, c])).values());
+  }
   const realtimeServices = {};
   const delegates = {};
   let bootstrappers = config.bootstrappers || [];
@@ -38583,8 +38558,7 @@ async function _initializeRebaseBackend(config) {
         id: authAdapter.id
       });
       authConfigResult = {
-        userService: authAdapter.userManagement ?? {},
-        roleService: authAdapter.roleManagement ?? {}
+        userService: authAdapter.userManagement ?? {}
       };
     } else {
       const safeAuthConfig = config.auth;
@@ -38930,6 +38904,13 @@ async function _initializeRebaseBackend(config) {
       configured: emailService.isConfigured()
     });
   }
+  const driverAdmin = defaultBootstrapper.getAdmin?.(defaultDriverResult);
+  if (isSQLAdmin(driverAdmin)) {
+    Object.assign(serverClient, {
+      sql: (query, options2) => driverAdmin.executeSql(query, options2)
+    });
+    logger.info("SQL capability attached to singleton");
+  }
   _initRebase(serverClient);
   logger.info("Rebase singleton initialized");
   if (defaultDriverResult.internals) {