@flowselections/admin-installatietechniek 1.0.7 → 1.0.8

package/dist-lib/lib/admin.functions.js

@@ -2,6 +2,7 @@ import { createServerFn } from "@tanstack/react-start";
 import { getRequestHost } from "@tanstack/react-start/server";
 import { z } from "zod";
 import { requireSupabaseAuth } from "../integrations/supabase/auth-middleware";
+import { normalizeServerErrors } from "../lib/serverErrors";
 import { requireAdmin, requireUserAdmin } from "../lib/admin.server";
 const featureSchema = z.object({
     id: z.string().trim().min(1).max(200),
@@ -171,7 +172,7 @@ async function resolveEffectiveProfileId(admin, userId, requestedProfileId, isAd
     return { profileId: undefined, locked: true };
 }
 export const getUsersWithRoles = createServerFn({ method: "POST" })
-    .middleware([requireSupabaseAuth])
+    .middleware([normalizeServerErrors, requireSupabaseAuth])
     .inputValidator((data) => profileScopeInput.parse(data))
     .handler(async ({ context, data }) => {
     const { isAdmin } = await requireUserAdmin(context);
@@ -271,7 +272,7 @@ export const getUsersWithRoles = createServerFn({ method: "POST" })
     };
 });
 export const assignRole = createServerFn({ method: "POST" })
-    .middleware([requireSupabaseAuth])
+    .middleware([normalizeServerErrors, requireSupabaseAuth])
     .inputValidator((data) => assignRoleInput.parse(data))
     .handler(async ({ context, data }) => {
     const { isAdmin } = await requireUserAdmin(context);
@@ -307,7 +308,7 @@ export const assignRole = createServerFn({ method: "POST" })
     return { ok: true };
 });
 export const removeRole = createServerFn({ method: "POST" })
-    .middleware([requireSupabaseAuth])
+    .middleware([normalizeServerErrors, requireSupabaseAuth])
     .inputValidator((data) => assignRoleInput.parse(data))
     .handler(async ({ context, data }) => {
     const { isAdmin } = await requireUserAdmin(context);
@@ -326,7 +327,7 @@ export const removeRole = createServerFn({ method: "POST" })
 });
 /** Alle rollen met hun rechten, plus de geregistreerde modules en onderdelen. */
 export const getRoles = createServerFn({ method: "POST" })
-    .middleware([requireSupabaseAuth])
+    .middleware([normalizeServerErrors, requireSupabaseAuth])
     .inputValidator((data) => profileScopeInput.parse(data))
     .handler(async ({ context, data }) => {
     const { isAdmin } = await requireUserAdmin(context);
@@ -407,7 +408,7 @@ async function writeRolePermissions(supabase, roleId, permissions) {
         throw error;
 }
 export const createRole = createServerFn({ method: "POST" })
-    .middleware([requireSupabaseAuth])
+    .middleware([normalizeServerErrors, requireSupabaseAuth])
     .inputValidator((data) => createRoleInput.parse(data))
     .handler(async ({ context, data }) => {
     await requireAdmin(context);
@@ -436,7 +437,7 @@ export const createRole = createServerFn({ method: "POST" })
     return { ok: true, roleId: created.id };
 });
 export const updateRole = createServerFn({ method: "POST" })
-    .middleware([requireSupabaseAuth])
+    .middleware([normalizeServerErrors, requireSupabaseAuth])
     .inputValidator((data) => updateRoleInput.parse(data))
     .handler(async ({ context, data }) => {
     await requireAdmin(context);
@@ -450,7 +451,7 @@ export const updateRole = createServerFn({ method: "POST" })
     return { ok: true };
 });
 export const duplicateRole = createServerFn({ method: "POST" })
-    .middleware([requireSupabaseAuth])
+    .middleware([normalizeServerErrors, requireSupabaseAuth])
     .inputValidator((data) => roleIdInput.parse(data))
     .handler(async ({ context, data }) => {
     await requireAdmin(context);
@@ -487,7 +488,7 @@ export const duplicateRole = createServerFn({ method: "POST" })
     return { ok: true, roleId: created.id };
 });
 export const deleteRole = createServerFn({ method: "POST" })
-    .middleware([requireSupabaseAuth])
+    .middleware([normalizeServerErrors, requireSupabaseAuth])
     .inputValidator((data) => roleIdInput.parse(data))
     .handler(async ({ context, data }) => {
     await requireAdmin(context);
@@ -505,7 +506,7 @@ export const deleteRole = createServerFn({ method: "POST" })
  * Wat niet meer voorkomt blijft bestaan maar wordt op inactief gezet.
  */
 export const syncModuleRegistry = createServerFn({ method: "POST" })
-    .middleware([requireSupabaseAuth])
+    .middleware([normalizeServerErrors, requireSupabaseAuth])
     .inputValidator((data) => syncModulesInput.parse(data))
     .handler(async ({ context, data }) => {
     await requireAdmin(context);
@@ -577,7 +578,7 @@ const setModuleEnforceInput = z.object({
     enforce: z.boolean(),
 });
 export const setModuleEnforce = createServerFn({ method: "POST" })
-    .middleware([requireSupabaseAuth])
+    .middleware([normalizeServerErrors, requireSupabaseAuth])
     .inputValidator((data) => setModuleEnforceInput.parse(data))
     .handler(async ({ context, data }) => {
     await requireAdmin(context);
@@ -590,7 +591,7 @@ export const setModuleEnforce = createServerFn({ method: "POST" })
     return { ok: true };
 });
 export const getUserModulePermissions = createServerFn({ method: "POST" })
-    .middleware([requireSupabaseAuth])
+    .middleware([normalizeServerErrors, requireSupabaseAuth])
     .inputValidator((data) => userPermissionsInput.parse(data))
     .handler(async ({ context, data }) => {
     await requireUserAdmin(context);
@@ -629,7 +630,7 @@ export const getUserModulePermissions = createServerFn({ method: "POST" })
     };
 });
 export const setUserModulePermission = createServerFn({ method: "POST" })
-    .middleware([requireSupabaseAuth])
+    .middleware([normalizeServerErrors, requireSupabaseAuth])
     .inputValidator((data) => setUserPermissionInput.parse(data))
     .handler(async ({ context, data }) => {
     await requireUserAdmin(context);
@@ -657,7 +658,7 @@ export const setUserModulePermission = createServerFn({ method: "POST" })
     return { ok: true };
 });
 export const inviteUser = createServerFn({ method: "POST" })
-    .middleware([requireSupabaseAuth])
+    .middleware([normalizeServerErrors, requireSupabaseAuth])
     .inputValidator((data) => inviteUserInput.parse(data))
     .handler(async ({ context, data }) => {
     const { isAdmin } = await requireUserAdmin(context);
@@ -697,7 +698,7 @@ export const inviteUser = createServerFn({ method: "POST" })
     return { ok: true, userId };
 });
 export const deleteUser = createServerFn({ method: "POST" })
-    .middleware([requireSupabaseAuth])
+    .middleware([normalizeServerErrors, requireSupabaseAuth])
     .inputValidator((data) => deleteUserInput.parse(data))
     .handler(async ({ context, data }) => {
     const { isAdmin } = await requireUserAdmin(context);
@@ -723,7 +724,7 @@ export const deleteUser = createServerFn({ method: "POST" })
     return { ok: true };
 });
 export const updateUserName = createServerFn({ method: "POST" })
-    .middleware([requireSupabaseAuth])
+    .middleware([normalizeServerErrors, requireSupabaseAuth])
     .inputValidator((data) => updateUserNameInput.parse(data))
     .handler(async ({ context, data }) => {
     const { isAdmin } = await requireUserAdmin(context);
@@ -763,7 +764,7 @@ function generatePassword(length = 16) {
     return out;
 }
 export const createTestUser = createServerFn({ method: "POST" })
-    .middleware([requireSupabaseAuth])
+    .middleware([normalizeServerErrors, requireSupabaseAuth])
     .inputValidator((data) => createTestUserInput.parse(data))
     .handler(async ({ context, data }) => {
     const { isAdmin } = await requireUserAdmin(context);
@@ -876,7 +877,7 @@ async function writeProfileLinks(supabase, profileId, roleIds, moduleIds) {
 }
 /** Alle bedrijfsprofielen met hun rollen, modules en tellingen. */
 export const getProfiles = createServerFn({ method: "GET" })
-    .middleware([requireSupabaseAuth])
+    .middleware([normalizeServerErrors, requireSupabaseAuth])
     .handler(async ({ context }) => {
     const { isAdmin } = await requireUserAdmin(context);
     const { supabaseAdmin } = await import("../integrations/supabase/client.server");
@@ -940,7 +941,7 @@ export const getProfiles = createServerFn({ method: "GET" })
     };
 });
 export const createProfile = createServerFn({ method: "POST" })
-    .middleware([requireSupabaseAuth])
+    .middleware([normalizeServerErrors, requireSupabaseAuth])
     .inputValidator((data) => createProfileInput.parse(data))
     .handler(async ({ context, data }) => {
     await requireAdmin(context);
@@ -959,7 +960,7 @@ export const createProfile = createServerFn({ method: "POST" })
     return { ok: true, profileId: created.id };
 });
 export const updateProfile = createServerFn({ method: "POST" })
-    .middleware([requireSupabaseAuth])
+    .middleware([normalizeServerErrors, requireSupabaseAuth])
     .inputValidator((data) => updateProfileInput.parse(data))
     .handler(async ({ context, data }) => {
     await requireAdmin(context);
@@ -975,7 +976,7 @@ export const updateProfile = createServerFn({ method: "POST" })
     return { ok: true };
 });
 export const duplicateProfile = createServerFn({ method: "POST" })
-    .middleware([requireSupabaseAuth])
+    .middleware([normalizeServerErrors, requireSupabaseAuth])
     .inputValidator((data) => profileIdInput.parse(data))
     .handler(async ({ context, data }) => {
     await requireAdmin(context);
@@ -1003,7 +1004,7 @@ export const duplicateProfile = createServerFn({ method: "POST" })
     return { ok: true, profileId: created.id };
 });
 export const deleteProfile = createServerFn({ method: "POST" })
-    .middleware([requireSupabaseAuth])
+    .middleware([normalizeServerErrors, requireSupabaseAuth])
     .inputValidator((data) => profileIdInput.parse(data))
     .handler(async ({ context, data }) => {
     await requireAdmin(context);
@@ -1037,7 +1038,7 @@ export const deleteProfile = createServerFn({ method: "POST" })
 });
 /** Zet precies één profiel als actief (is_default). */
 export const setActiveProfile = createServerFn({ method: "POST" })
-    .middleware([requireSupabaseAuth])
+    .middleware([normalizeServerErrors, requireSupabaseAuth])
     .inputValidator((data) => profileIdInput.parse(data))
     .handler(async ({ context, data }) => {
     await requireAdmin(context);

package/dist-lib/lib/serverErrors.d.ts

@@ -0,0 +1,7 @@
+/**
+ * Zet ruwe `Response`-throws (o.a. uit de auth-middleware) om naar gewone
+ * `Error`s. Anders komt er client-side alleen "Error: [object Response]" aan
+ * en klapt het scherm om zonder leesbare melding.
+ */
+export declare const normalizeServerErrors: import("@tanstack/start-client-core").FunctionMiddlewareAfterServer<{}, unknown, undefined, undefined, undefined, undefined, undefined>;
+//# sourceMappingURL=serverErrors.d.ts.map

package/dist-lib/lib/serverErrors.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"serverErrors.d.ts","sourceRoot":"","sources":["../../src/lib/serverErrors.ts"],"names":[],"mappings":"AAEA;;;;GAIG;AACH,eAAO,MAAM,qBAAqB,yIAsBjC,CAAC"}

package/dist-lib/lib/serverErrors.js

@@ -0,0 +1,29 @@
+import { createMiddleware } from "@tanstack/react-start";
+/**
+ * Zet ruwe `Response`-throws (o.a. uit de auth-middleware) om naar gewone
+ * `Error`s. Anders komt er client-side alleen "Error: [object Response]" aan
+ * en klapt het scherm om zonder leesbare melding.
+ */
+export const normalizeServerErrors = createMiddleware({ type: "function" }).server(async ({ next }) => {
+    try {
+        return await next();
+    }
+    catch (err) {
+        if (err instanceof Response) {
+            let text = "";
+            try {
+                text = await err.clone().text();
+            }
+            catch {
+                /* body niet leesbaar */
+            }
+            const message = err.status === 401
+                ? "Je sessie is verlopen. Log opnieuw in en probeer het nog eens."
+                : text || `Serverfout (${err.status})`;
+            throw new Error(message);
+        }
+        if (err instanceof Error)
+            throw err;
+        throw new Error(typeof err === "string" ? err : "Onbekende serverfout");
+    }
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flowselections/admin-installatietechniek",
-  "version": "1.0.7",
+  "version": "1.0.8",
   "flowselections": {
     "moduleId": "admin-installatietechniek",
     "pages": [
@@ -40,7 +40,7 @@
     "lint": "eslint ."
   },
   "peerDependencies": {
-    "@flowselections/core": ">=1.0.18",
+    "@flowselections/core": "1.0.18",
     "@tanstack/react-query": "^5.0.0",
     "@tanstack/react-router": "^1.0.0",
     "@tanstack/react-start": "^1.0.0",