@flowselections/floriday-authenticatie-module 1.0.54 → 1.0.56

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

@@ -7,27 +7,8 @@
 import { createServerFn } from "@tanstack/react-start";
 import { requireSupabaseAuth } from "../integrations/supabase/auth-middleware.js";
 import { FLORYDAY_CLOCK_SUPPLY_PERMISSION_MESSAGE, FLORYDAY_CONTRACT_PERMISSION_MESSAGE, FLORYDAY_SALES_STRATEGY_PERMISSION_MESSAGE, FLORYDAY_STANDARD_SCOPE, getFlorydayScopeForPath, isClockSupplyScope, isContractScope, isSalesStrategyScope, } from "./floriday-scopes.js";
-/**
- * Valideert een GS1 GLN: exact 13 cijfers met geldige check digit.
- * Retourneert null als geldig, anders een nl-foutmelding.
- */
-export function validateGln(input) {
-    const v = input.trim();
-    if (!v)
-        return "GLN-code is verplicht";
-    if (!/^\d{13}$/.test(v))
-        return "GLN-code moet uit precies 13 cijfers bestaan";
-    const digits = v.split("").map(Number);
-    // GS1 mod-10: positie 1 (meest links) ×3, positie 2 ×1, … t/m positie 12.
-    let sum = 0;
-    for (let i = 0; i < 12; i++) {
-        sum += digits[i] * (i % 2 === 0 ? 3 : 1);
-    }
-    const check = (10 - (sum % 10)) % 10;
-    if (check !== digits[12])
-        return "GLN-code heeft een ongeldig controlecijfer";
-    return null;
-}
+export { validateGln } from "./floriday-gln.js";
+import { decideGln, decidePreferredWarehouse, isOwnWarehouse, warehouseLabel } from "./floriday-own-config.js";
 const FLORYDAY_ENDPOINTS = {
     staging: {
         tokenUrl: "https://idm.staging.floriday.io/oauth2/ausmw6b47z1BnlHkw0h7/v1/token",
@@ -281,20 +262,36 @@ async function fetchAndStoreFlorydayOrganizationName(supabase, env, connectionId
         }
         const orgJson = await orgRes.json().catch(() => null);
         const name = orgJson?.name ?? orgJson?.commercialName ?? null;
-        const gln = orgJson?.companyGln ?? null;
-        if (!name)
-            return null;
-        // Lees huidige rij om gln_code niet te overschrijven als die al gezet is.
+        const remoteGln = orgJson?.companyGln ?? null;
         const { data: existing } = await supabaseAdmin
             .from("floriday_connections")
             .select("gln_code")
             .eq("id", connectionId)
             .maybeSingle();
-        const update = { organization_name: name };
-        if (gln && !existing?.gln_code) {
-            update.gln_code = gln;
+        const storedGln = existing?.gln_code ?? null;
+        const decision = decideGln({ stored: storedGln, fromFloriday: remoteGln });
+        if (name) {
+            await supabaseAdmin
+                .from("floriday_connections")
+                .update({ organization_name: name })
+                .eq("id", connectionId);
+        }
+        if (decision.kind === "fill") {
+            // Alleen een leeg veld vullen; filter op null voorkomt overschrijven.
+            await supabaseAdmin
+                .from("floriday_connections")
+                .update({ gln_code: decision.gln })
+                .eq("id", connectionId)
+                .is("gln_code", null);
+            console.log(`[floriday] gln_code automatisch ingevuld uit Floriday (connection ${connectionId})`);
+        }
+        else if (decision.kind === "mismatch") {
+            console.warn(`[floriday] GLN in Floriday wijkt af van opgeslagen GLN (connection ${connectionId}); niet overschreven`);
         }
-        await supabaseAdmin.from("floriday_connections").update(update).eq("id", connectionId);
+        else if (decision.kind === "invalid") {
+            console.warn(`[floriday] companyGln uit Floriday ongeldig (${decision.error}); niet opgeslagen`);
+        }
+        await autoFillPreferredWarehouse(supabaseAdmin, connectionId).catch(() => null);
         return name;
     }
     catch (e) {
@@ -302,6 +299,113 @@ async function fetchAndStoreFlorydayOrganizationName(supabase, env, connectionId
         return null;
     }
 }
+/** Haalt companyGln van de eigen organisatie op (null als niet beschikbaar). */
+async function fetchOwnCompanyGln(supabase, env) {
+    try {
+        const tsRes = await florydayFetch(supabase, env, `/${SUPPLIERS_API_VERSION}/trade-settings/supplier/current-organization`);
+        if (!tsRes.ok)
+            return null;
+        const orgId = (await tsRes.json().catch(() => null))?.supplierOrganizationId;
+        if (!orgId)
+            return null;
+        const orgRes = await florydayFetch(supabase, env, `/${SUPPLIERS_API_VERSION}/organizations/${orgId}`);
+        if (!orgRes.ok)
+            return null;
+        return (await orgRes.json().catch(() => null))?.companyGln ?? null;
+    }
+    catch {
+        return null;
+    }
+}
+/** Eigen magazijnen van een koppeling uit de cache (op id). */
+export async function loadOwnWarehousesFromCache(admin, connectionId) {
+    const { data } = await admin
+        .from("floriday_warehouses_cache")
+        .select("floriday_id, name, gln_code, data")
+        .eq("connection_id", connectionId)
+        .limit(500);
+    return (data ?? [])
+        .map((r) => ({
+        id: String(r.floriday_id ?? r?.data?.warehouseId ?? ""),
+        name: warehouseLabel(r),
+        gln: r.gln_code ?? r?.data?.location?.gln ?? null,
+        isDefault: r?.data?.isDefault === true,
+        isDeleted: r?.data?.isDeleted === true,
+        isExternal: r?.data?.isExternal === true,
+        hasAccess: r?.data?.hasAccess !== false,
+    }))
+        .filter((w) => w.id && isOwnWarehouse(w));
+}
+/**
+ * Vult preferred_warehouse_id alleen als die leeg is: bij precies één eigen
+ * magazijn, of bij meerdere met precies één Floriday-standaardmagazijn.
+ * Altijd op id; bestaande keuze wordt nooit overschreven.
+ */
+export async function autoFillPreferredWarehouse(admin, connectionId) {
+    const { data: conn } = await admin
+        .from("floriday_connections")
+        .select("preferred_warehouse_id")
+        .eq("id", connectionId)
+        .maybeSingle();
+    const own = await loadOwnWarehousesFromCache(admin, connectionId);
+    const decision = decidePreferredWarehouse({ currentId: conn?.preferred_warehouse_id ?? null, warehouses: own });
+    if (decision.kind === "fill") {
+        const chosen = own.find((w) => w.id === decision.id);
+        const { data: updated } = await admin
+            .from("floriday_connections")
+            .update({ preferred_warehouse_id: decision.id, preferred_warehouse_name: chosen?.name ?? null })
+            .eq("id", connectionId)
+            .is("preferred_warehouse_id", null)
+            .select("id");
+        if (Array.isArray(updated) && updated.length > 0) {
+            console.log(`[floriday] voorkeursmagazijn automatisch ingevuld (${decision.reason}) voor connection ${connectionId}`);
+        }
+    }
+    return decision;
+}
+export const getFlorydayOwnConfigStatus = createServerFn({ method: "POST" })
+    .middleware([requireSupabaseAuth])
+    .inputValidator((input) => {
+    if (!["staging", "live"].includes(input.environment))
+        throw new Error("Ongeldige environment");
+    return input;
+})
+    .handler(async ({ data, context }) => {
+    const { supabaseAdmin } = await import("../integrations/supabase/client.server.js");
+    const row = await getActiveFlorydayCredentials(context.supabase, data.environment);
+    if (!row) {
+        return { connected: false, gln: null, storedGln: null, warehouse: null, preferredWarehouseId: null, preferredWarehouseName: null, ownWarehouses: [] };
+    }
+    // GLN: lezen uit Floriday, alleen een leeg veld vullen.
+    const remote = await fetchOwnCompanyGln(context.supabase, data.environment);
+    const { data: cur } = await supabaseAdmin
+        .from("floriday_connections")
+        .select("gln_code")
+        .eq("id", row.id)
+        .maybeSingle();
+    const gln = decideGln({ stored: cur?.gln_code ?? null, fromFloriday: remote });
+    if (gln.kind === "fill") {
+        await supabaseAdmin.from("floriday_connections").update({ gln_code: gln.gln }).eq("id", row.id).is("gln_code", null);
+    }
+    const warehouse = await autoFillPreferredWarehouse(supabaseAdmin, row.id);
+    const { data: after } = await supabaseAdmin
+        .from("floriday_connections")
+        .select("gln_code, preferred_warehouse_id, preferred_warehouse_name")
+        .eq("id", row.id)
+        .maybeSingle();
+    const own = await loadOwnWarehousesFromCache(supabaseAdmin, row.id);
+    return {
+        connected: true,
+        gln,
+        storedGln: after?.gln_code ?? null,
+        warehouse,
+        preferredWarehouseId: after?.preferred_warehouse_id ?? null,
+        preferredWarehouseName: after?.preferred_warehouse_name ?? null,
+        ownWarehouses: own
+            .map((w) => ({ id: w.id, name: w.name, gln: w.gln, isDefault: w.isDefault }))
+            .sort((a, b) => (a.isDefault !== b.isDefault ? (a.isDefault ? -1 : 1) : a.name.localeCompare(b.name, "nl"))),
+    };
+});
 export async function getActiveFlorydayEnvironment(supabase) {
     const { data } = await supabase
         .from("floriday_settings")
@@ -1097,8 +1201,7 @@ export const listFlorydayWarehouses = createServerFn({ method: "POST" })
         const json = await res.json().catch(() => null);
         const raw = Array.isArray(json) ? json : [];
         const warehouses = raw
-            .filter((w) => w?.isDeleted !== true &&
-            w?.hasAccess !== false &&
+            .filter((w) => isOwnWarehouse(w ?? {}) &&
             Boolean(String(w?.name ?? "").trim() ||
                 String(w?.location?.address?.addressLine ?? "").trim() ||
                 String(w?.location?.gln ?? w?.location?.glnCode ?? "").trim()))
@@ -1131,25 +1234,26 @@ export const updateFlorydayPublishingSettings = createServerFn({ method: "POST"
     if (!["staging", "live"].includes(input.environment)) {
         throw new Error("Ongeldige environment");
     }
-    const trimmed = input.gln_code?.trim();
-    if (trimmed) {
-        const err = validateGln(trimmed);
-        if (err)
-            throw new Error(err);
-    }
-    return { ...input, gln_code: trimmed || null };
+    const id = String(input.preferred_warehouse_id ?? "").trim();
+    if (!id)
+        throw new Error("Kies een magazijn");
+    // GLN wordt niet meer aangenomen: die komt altijd uit Floriday.
+    return { environment: input.environment, preferred_warehouse_id: id };
 })
     .handler(async ({ data, context }) => {
     const { supabaseAdmin } = await import("../integrations/supabase/client.server.js");
     const row = await getActiveFlorydayCredentials(context.supabase, data.environment);
     if (!row)
         throw new Error(`Geen actieve Floriday-koppeling voor ${data.environment}`);
+    const own = await loadOwnWarehousesFromCache(supabaseAdmin, row.id);
+    const chosen = own.find((w) => w.id === data.preferred_warehouse_id);
+    if (!chosen)
+        throw new Error("Dit magazijn is geen eigen magazijn van deze koppeling");
     const { error } = await supabaseAdmin
         .from("floriday_connections")
         .update({
-        gln_code: data.gln_code?.trim() || null,
-        preferred_warehouse_id: data.preferred_warehouse_id || null,
-        preferred_warehouse_name: data.preferred_warehouse_name || null,
+        preferred_warehouse_id: chosen.id,
+        preferred_warehouse_name: chosen.name,
     })
         .eq("id", row.id);
     if (error)