@nocobase/portal-template-default 1.0.4 → 1.0.6

package/src/providers/auth.ts

@@ -25,6 +25,10 @@ type NocoBaseSignInResponse = {
   user?: NocoBaseUser;
 };
 
+type NocoBaseSignOutResponse = {
+  redirect?: string;
+};
+
 type CurrentUserCache = {
   token: string;
   user: NocoBaseUser;
@@ -77,25 +81,26 @@ const getCurrentUser = async (): Promise<NocoBaseUser> => {
 };
 
 export const authProvider: AuthProvider = {
-  login: async ({ username, email, password, providerName }) => {
-    if (providerName) {
-      return {
-        success: false,
-        error: {
-          name: "UnsupportedAuthenticator",
-          message:
-            "Configure this provider as a NocoBase authenticator before using social sign-in.",
-        },
-      };
-    }
+  login: async (params) => {
+    const {
+      authenticator = nocobaseClient.getAuthenticator(),
+      username,
+      email,
+      redirectTo = "/",
+      ...values
+    } = params ?? {};
+    const account = values.account ?? username ?? email;
+    const body = {
+      ...values,
+      ...(account ? { account } : {}),
+    };
 
-    const account = username ?? email;
-    if (!account || !password) {
+    if (Object.keys(body).length === 0) {
       return {
         success: false,
         error: {
           name: "LoginError",
-          message: "Please enter your account and password.",
+          message: "Please enter your sign-in details.",
         },
       };
     }
@@ -106,8 +111,8 @@ export const authProvider: AuthProvider = {
         "signIn",
         {
           method: "POST",
-          includeAuthenticator: true,
-          body: { account, password },
+          authenticator,
+          body,
         }
       );
       if (!result.token) {
@@ -120,11 +125,12 @@ export const authProvider: AuthProvider = {
         };
       }
 
+      nocobaseClient.setAuthenticator(authenticator);
       nocobaseClient.setToken(result.token);
       nocobaseClient.setRole(null);
       clearCurrentUserCache();
       clearAcl();
-      return { success: true, redirectTo: "/" };
+      return { success: true, redirectTo };
     } catch (error) {
       return {
         success: false,
@@ -140,23 +146,101 @@ export const authProvider: AuthProvider = {
     }
   },
 
+  register: async (params) => {
+    const {
+      authenticator = nocobaseClient.getAuthenticator(),
+      redirectTo = "/login",
+      ...values
+    } = params ?? {};
+
+    try {
+      await nocobaseClient.action("auth", "signUp", {
+        method: "POST",
+        authenticator,
+        body: values,
+      });
+      return {
+        success: true,
+        redirectTo,
+        successNotification: {
+          message: "Account created",
+          description: "You can now sign in with your new account.",
+        },
+      };
+    } catch (error) {
+      return {
+        success: false,
+        error: {
+          name: "RegistrationError",
+          message: getErrorMessage(error, "Unable to create the account."),
+        },
+      };
+    }
+  },
+
+  forgotPassword: async (params) => {
+    const {
+      authenticator = nocobaseClient.getAuthenticator(),
+      ...values
+    } = params ?? {};
+    const baseURL =
+      typeof window === "undefined"
+        ? undefined
+        : window.location.href.split("/forgot-password")[0];
+
+    try {
+      await nocobaseClient.action("auth", "lostPassword", {
+        method: "POST",
+        authenticator,
+        body: { ...values, baseURL },
+      });
+      return {
+        success: true,
+        successNotification: {
+          message: "Reset link sent",
+          description: "Check your inbox for password reset instructions.",
+        },
+      };
+    } catch (error) {
+      return {
+        success: false,
+        error: {
+          name: "PasswordResetError",
+          message: getErrorMessage(error, "Unable to send the reset link."),
+        },
+      };
+    }
+  },
+
   logout: async () => {
     const token = nocobaseClient.getToken();
+    let redirect: string | undefined;
     try {
       if (token) {
-        await nocobaseClient.action("auth", "signOut", {
-          method: "POST",
-          token,
-          includeAuthenticator: true,
-        });
+        const result = await nocobaseClient.action<NocoBaseSignOutResponse>(
+          "auth",
+          "signOut",
+          {
+            method: "POST",
+            token,
+            includeAuthenticator: true,
+          }
+        );
+        redirect = result?.redirect;
       }
     } finally {
       nocobaseClient.setToken(null);
+      nocobaseClient.setAuthenticator(null);
       nocobaseClient.setRole(null);
       clearCurrentUserCache();
       clearAcl();
     }
 
+    if (redirect && typeof window !== "undefined") {
+      window.location.assign(nocobaseClient.resolveUrl(redirect));
+      return { success: true };
+    }
+
     return { success: true, redirectTo: "/login" };
   },
 
@@ -166,6 +250,7 @@ export const authProvider: AuthProvider = {
       return { authenticated: true };
     } catch {
       nocobaseClient.setToken(null);
+      nocobaseClient.setAuthenticator(null);
       nocobaseClient.setRole(null);
       clearCurrentUserCache();
       clearAcl();
@@ -207,6 +292,7 @@ export const authProvider: AuthProvider = {
 
     if (status === 401) {
       nocobaseClient.setToken(null);
+      nocobaseClient.setAuthenticator(null);
       nocobaseClient.setRole(null);
       clearCurrentUserCache();
       clearAcl();

package/src/providers/constants.ts

@@ -1,5 +1,7 @@
+import { getRuntimeApiUrl } from "./runtime-config";
+
 const rawApiUrl =
-  import.meta.env.NOCOBASE_API_URL ?? "http://127.0.0.1:13000/api";
+  getRuntimeApiUrl() ?? "http://127.0.0.1:13000/api";
 
 const getDefaultProxyTarget = (apiUrl?: string) => {
   if (!apiUrl || apiUrl.startsWith("/")) return undefined;
@@ -35,6 +37,7 @@ const toProxyRelativeUrl = (url: string, target?: string) => {
 export const API_URL = toProxyRelativeUrl(rawApiUrl, proxyTarget);
 export const API_ORIGIN = getDefaultProxyTarget(rawApiUrl);
 export const NOCOBASE_TOKEN_KEY = "nocobase-auth-token";
+export const NOCOBASE_AUTHENTICATOR_KEY = "nocobase-authenticator";
 export const NOCOBASE_ROLE_KEY = "nocobase-auth-role";
 export const NOCOBASE_LOCALE_KEY = "nocobase-locale";
 export const NOCOBASE_AUTHENTICATOR =

package/src/providers/runtime-config.ts

@@ -0,0 +1,19 @@
+const getWindowValue = (key: "NOCOBASE_PORTAL_BASE" | "NOCOBASE_API_URL") => {
+  if (typeof window === "undefined") return undefined;
+  const value = window[key];
+  return typeof value === "string" && value.trim() ? value.trim() : undefined;
+};
+
+export const normalizePortalBase = (base?: string) => {
+  const normalized = String(base || "/").trim();
+  if (!normalized || normalized === "/") return "/";
+  return `/${normalized.replace(/^\/+|\/+$/g, "")}/`;
+};
+
+export const getPortalBase = () =>
+  normalizePortalBase(
+    getWindowValue("NOCOBASE_PORTAL_BASE") ?? import.meta.env.BASE_URL
+  );
+
+export const getRuntimeApiUrl = () =>
+  getWindowValue("NOCOBASE_API_URL") ?? import.meta.env.NOCOBASE_API_URL;

package/src/vite-env.d.ts

@@ -1 +1,6 @@
 /// <reference types="vite/client" />
+
+interface Window {
+  NOCOBASE_PORTAL_BASE?: string;
+  NOCOBASE_API_URL?: string;
+}

package/vite.config.ts

@@ -1,5 +1,6 @@
 import tailwindcss from "@tailwindcss/vite";
 import react from "@vitejs/plugin-react";
+import fs from "node:fs";
 import path from "path";
 import { defineConfig, loadEnv } from "vite";
 
@@ -30,6 +31,56 @@ const normalizeBase = (base?: string) => {
   return `/${normalized.replace(/^\/+|\/+$/g, "")}/`;
 };
 
+const getBasePrefix = (base: string) => base.replace(/\/$/, "");
+
+const defaultRuntimeConfig = `<!-- nocobase-runtime-config:start -->
+<script>
+  window.NOCOBASE_PORTAL_BASE = "/";
+  window.NOCOBASE_API_URL = "/api";
+</script>
+<!-- nocobase-runtime-config:end -->
+`;
+
+const stripBaseFromIndexHtml = (html: string, base: string) => {
+  const basePrefix = getBasePrefix(base);
+  if (!basePrefix) return html;
+
+  const attributePattern = /\b(src|href|content)=(["'])\/(?!\/)([^"']*)\2/g;
+
+  return html.replace(attributePattern, (match, attribute, quote, path) => {
+    const value = `/${path}`;
+    if (!value.startsWith(`${basePrefix}/`)) return match;
+    return `${attribute}=${quote}${value.slice(basePrefix.length) || "/"}${quote}`;
+  });
+};
+
+const copyRawIndexHtmlPlugin = (base: string) => ({
+  name: "copy-raw-index-html",
+  closeBundle() {
+    const distDir = path.resolve(__dirname, "dist");
+    const indexHtml = path.join(distDir, "index.html");
+    const rawIndexHtml = path.join(distDir, "index.raw.html");
+
+    if (fs.existsSync(indexHtml)) {
+      const html = fs.readFileSync(indexHtml, "utf8");
+      const rawHtml = stripBaseFromIndexHtml(html, base);
+      const moduleScriptPattern =
+        /<script\s+[^>]*type=["']module["'][^>]*>/i;
+      const moduleScriptMatch = rawHtml.match(moduleScriptPattern);
+
+      if (moduleScriptMatch?.index === undefined) {
+        fs.writeFileSync(rawIndexHtml, rawHtml);
+        return;
+      }
+
+      fs.writeFileSync(
+        rawIndexHtml,
+        `${rawHtml.slice(0, moduleScriptMatch.index)}${defaultRuntimeConfig}${rawHtml.slice(moduleScriptMatch.index)}`
+      );
+    }
+  },
+});
+
 // https://vite.dev/config/
 export default defineConfig(({ mode }) => {
   const env = loadEnv(mode, process.cwd(), "");
@@ -44,10 +95,12 @@ export default defineConfig(({ mode }) => {
       })()
     : undefined;
 
+  const portalBase = normalizeBase(env.NOCOBASE_PORTAL_BASE);
+
   return {
-    base: normalizeBase(env.NOCOBASE_PORTAL_BASE),
+    base: portalBase,
     envPrefix: ["VITE_", "NOCOBASE_"],
-    plugins: [react(), tailwindcss()],
+    plugins: [react(), tailwindcss(), copyRawIndexHtmlPlugin(portalBase)],
     resolve: {
       alias: {
         "@": path.resolve(__dirname, "./src"),