@lukoweb/apitogo 0.1.65 → 0.1.67

package/dist/cli/cli.js

@@ -433,6 +433,19 @@ function isUserPanelEnabled(normalized) {
   const plans = asRecord(userPanel?.plans);
   return dashboard?.enabled === true || userManagement?.enabled === true || apiKeys?.enabled === true || plans?.enabled === true;
 }
+function resolveDashboardRedirectPath(normalized) {
+  const userPanel = asRecord(asRecord(normalized.modules)?.userPanel);
+  const dashboard = asRecord(userPanel?.dashboard);
+  if (dashboard?.enabled !== true) {
+    return void 0;
+  }
+  const basePath = typeof userPanel?.basePath === "string" && userPanel.basePath.length > 0 ? userPanel.basePath.replace(/\/+$/, "") : "/account";
+  const dashboardPath = typeof dashboard.path === "string" && dashboard.path.length > 0 ? dashboard.path : "dashboard";
+  if (dashboardPath.startsWith("/")) {
+    return dashboardPath.replace(/\/+$/, "") || "/";
+  }
+  return `${basePath}/${dashboardPath.replace(/^\/+/, "")}`;
+}
 function syncAuthentication(normalized) {
   const userPanelEnabled = isUserPanelEnabled(normalized);
   const authentication = asRecord(normalized.authentication);
@@ -455,6 +468,15 @@ function syncAuthentication(normalized) {
     if (auth.demoMode === void 0) {
       auth.demoMode = topLevelDemoMode !== false;
     }
+    const dashboardRedirect = resolveDashboardRedirectPath(normalized);
+    if (dashboardRedirect) {
+      if (auth.redirectToAfterSignIn === void 0) {
+        auth.redirectToAfterSignIn = dashboardRedirect;
+      }
+      if (auth.redirectToAfterSignUp === void 0) {
+        auth.redirectToAfterSignUp = dashboardRedirect;
+      }
+    }
   }
   if (normalized.demoMode !== void 0) {
     auth.demoMode = normalized.demoMode !== false;
@@ -5335,7 +5357,7 @@ import {
 // package.json
 var package_default = {
   name: "@lukoweb/apitogo",
-  version: "0.1.65",
+  version: "0.1.67",
   type: "module",
   sideEffects: [
     "**/*.css",

package/dist/declarations/lib/authentication/providers/dev-portal-auth-pages.d.ts

@@ -1,9 +1,11 @@
-export declare function DevPortalLoginPage({ apiBaseUrl, demoMode, }: {
+export declare function DevPortalLoginPage({ apiBaseUrl, demoMode, defaultReturnUrl, }: {
     apiBaseUrl?: string;
     demoMode?: boolean;
+    defaultReturnUrl?: string;
 }): import("react/jsx-runtime").JSX.Element;
-export declare function DevPortalRegisterPage({ apiBaseUrl }: {
+export declare function DevPortalRegisterPage({ apiBaseUrl, defaultReturnUrl, }: {
     apiBaseUrl?: string;
+    defaultReturnUrl?: string;
 }): import("react/jsx-runtime").JSX.Element;
 export declare function DevPortalVerifyEmailPage({ apiBaseUrl, }: {
     apiBaseUrl?: string;

package/dist/declarations/lib/authentication/providers/dev-portal-constants.d.ts

@@ -1,6 +1,6 @@
 export declare const DEV_PORTAL_PLACEHOLDER_API_URL = "https://dp-example.azurecontainerapps.io";
 export type DevPortalAuthMode = "live" | "preview";
-export type EndUserMeResponse = {
+export type UserMeResponse = {
     userId: string;
     displayName: string | null;
     email?: string | null;

package/dist/declarations/lib/authentication/providers/dev-portal-demo.d.ts

@@ -1,6 +1,6 @@
 import type { DevPortalAuthenticationConfig } from "../../../config/config.js";
 import type { UserProfile } from "../state.js";
-import type { EndUserMeResponse } from "./dev-portal-constants.js";
+import type { UserMeResponse } from "./dev-portal-constants.js";
 export declare const DEMO_EMAIL = "demo@apitogo.local";
 export declare const DEMO_PASSWORD = "password";
 export declare const DEMO_USER_ID = "00000000-0000-0000-0000-000000000001";
@@ -14,7 +14,7 @@ export declare function resolveDemoMode(config: Pick<DevPortalAuthenticationConf
 export declare function isDemoCredential(email: string, password: string): boolean;
 export declare function createDemoProfile(): UserProfile;
 export declare function resolveDemoPlanSku(plans: DemoPlanInput[] | undefined): string;
-export declare function createDemoMeResponse(plans?: DemoPlanInput[]): EndUserMeResponse;
+export declare function createDemoMeResponse(plans?: DemoPlanInput[]): UserMeResponse;
 export type DemoCredentialsResponse = {
     idToken: string;
     accessToken: string | null;

package/dist/declarations/lib/authentication/providers/dev-portal-utils.d.ts

@@ -1,5 +1,5 @@
 import type { DevPortalAuthenticationConfig } from "../../../config/config.js";
-import { type EndUserMeResponse } from "./dev-portal-constants.js";
+import { type UserMeResponse } from "./dev-portal-constants.js";
 export declare function resolveDevPortalApiBaseUrl(config: Pick<DevPortalAuthenticationConfig, "apiBaseUrl">): string | undefined;
 export declare function isPlaceholderDevPortalApiUrl(apiBaseUrl: string | undefined): boolean;
 export declare function toAbsoluteReturnUrl(pathOrUrl: string): string;
@@ -11,4 +11,4 @@ export declare function isNativeAuthEnabled(config: import("./dev-portal-constan
 export declare function fetchDevPortalAuthConfig(apiBaseUrl: string, fetchImpl?: typeof fetch): Promise<import("./dev-portal-constants.js").DevPortalAuthConfigResponse>;
 export declare function postDevPortalAuth<T>(apiBaseUrl: string, path: string, body: unknown, fetchImpl?: typeof fetch): Promise<T>;
 export declare function probeDevPortalBackend(apiBaseUrl: string, fetchImpl?: typeof fetch): Promise<boolean>;
-export declare function mapEndUserMeToProfile(me: EndUserMeResponse): import("../state.js").UserProfile;
+export declare function mapUserMeToProfile(me: UserMeResponse): import("../state.js").UserProfile;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lukoweb/apitogo",
-  "version": "0.1.65",
+  "version": "0.1.67",
   "type": "module",
   "sideEffects": [
     "**/*.css",

package/src/config/apitogo-config-core.ts

@@ -511,6 +511,32 @@ export function isNativeAuthEnabled(config: ApitogoJsonConfig): boolean {
   return native?.enabled !== false;
 }
 
+/** Default account dashboard path when modules.userPanel.dashboard is enabled. */
+function resolveDashboardRedirectPath(
+  normalized: ApitogoJsonConfig,
+): string | undefined {
+  const userPanel = asRecord(asRecord(normalized.modules)?.userPanel);
+  const dashboard = asRecord(userPanel?.dashboard);
+  if (dashboard?.enabled !== true) {
+    return undefined;
+  }
+
+  const basePath =
+    typeof userPanel?.basePath === "string" && userPanel.basePath.length > 0
+      ? userPanel.basePath.replace(/\/+$/, "")
+      : "/account";
+  const dashboardPath =
+    typeof dashboard.path === "string" && dashboard.path.length > 0
+      ? dashboard.path
+      : "dashboard";
+
+  if (dashboardPath.startsWith("/")) {
+    return dashboardPath.replace(/\/+$/, "") || "/";
+  }
+
+  return `${basePath}/${dashboardPath.replace(/^\/+/, "")}`;
+}
+
 function syncAuthentication(normalized: ApitogoJsonConfig): void {
   const userPanelEnabled = isUserPanelEnabled(normalized);
   const authentication = asRecord(normalized.authentication);
@@ -538,6 +564,16 @@ function syncAuthentication(normalized: ApitogoJsonConfig): void {
     if (auth.demoMode === undefined) {
       auth.demoMode = topLevelDemoMode !== false;
     }
+
+    const dashboardRedirect = resolveDashboardRedirectPath(normalized);
+    if (dashboardRedirect) {
+      if (auth.redirectToAfterSignIn === undefined) {
+        auth.redirectToAfterSignIn = dashboardRedirect;
+      }
+      if (auth.redirectToAfterSignUp === undefined) {
+        auth.redirectToAfterSignUp = dashboardRedirect;
+      }
+    }
   }
 
   if (normalized.demoMode !== undefined) {

package/src/lib/authentication/hook.ts

@@ -95,13 +95,8 @@ export const useAuth = () => {
         throw new Error("Authentication is not enabled.");
       }
       // TODO: Should handle errors/state
-      await authentication.signIn(
-        { navigate },
-        {
-          ...options,
-          redirectTo: options?.redirectTo ?? window.location.href,
-        },
-      );
+      // Omit redirectTo when unset so providers can apply redirectToAfterSignIn.
+      await authentication.signIn({ navigate }, options);
     },
 
     logout: async () => {
@@ -119,13 +114,8 @@ export const useAuth = () => {
       if (!isAuthEnabled) {
         throw new Error("Authentication is not enabled.");
       }
-      await authentication.signUp(
-        { navigate },
-        {
-          ...options,
-          redirectTo: options?.redirectTo ?? window.location.href,
-        },
-      );
+      // Omit redirectTo when unset so providers can apply redirectToAfterSignUp.
+      await authentication.signUp({ navigate }, options);
     },
 
     requestEmailVerification: async (options?: AuthActionOptions) => {

package/src/lib/authentication/providers/dev-portal-auth-pages.tsx

@@ -50,9 +50,9 @@ function AuthPageShell({ title, description, children }: AuthPageShellProps) {
   );
 }
 
-function useReturnUrl(): string {
+function useReturnUrl(defaultReturnUrl = "/"): string {
   const [search] = useSearchParams();
-  return search.get("redirect") ?? search.get("returnUrl") ?? "/";
+  return search.get("redirect") ?? search.get("returnUrl") ?? defaultReturnUrl;
 }
 
 function useApiBaseUrl(apiBaseUrl?: string): string | undefined {
@@ -124,12 +124,14 @@ function DemoLoginHint() {
 export function DevPortalLoginPage({
   apiBaseUrl,
   demoMode = false,
+  defaultReturnUrl = "/",
 }: {
   apiBaseUrl?: string;
   demoMode?: boolean;
+  defaultReturnUrl?: string;
 }) {
   const baseUrl = useApiBaseUrl(apiBaseUrl);
-  const returnUrl = useReturnUrl();
+  const returnUrl = useReturnUrl(defaultReturnUrl);
   const [config, setConfig] = useState<DevPortalAuthConfigResponse | null>(
     null,
   );
@@ -305,9 +307,15 @@ export function DevPortalLoginPage({
   );
 }
 
-export function DevPortalRegisterPage({ apiBaseUrl }: { apiBaseUrl?: string }) {
+export function DevPortalRegisterPage({
+  apiBaseUrl,
+  defaultReturnUrl = "/",
+}: {
+  apiBaseUrl?: string;
+  defaultReturnUrl?: string;
+}) {
   const baseUrl = useApiBaseUrl(apiBaseUrl);
-  const returnUrl = useReturnUrl();
+  const returnUrl = useReturnUrl(defaultReturnUrl);
   const [email, setEmail] = useState("");
   const [password, setPassword] = useState("");
   const [displayName, setDisplayName] = useState("");

package/src/lib/authentication/providers/dev-portal-constants.ts

@@ -4,7 +4,7 @@ export const DEV_PORTAL_PLACEHOLDER_API_URL =
 
 export type DevPortalAuthMode = "live" | "preview";
 
-export type EndUserMeResponse = {
+export type UserMeResponse = {
   userId: string;
   displayName: string | null;
   email?: string | null;

package/src/lib/authentication/providers/dev-portal-demo.ts

@@ -1,7 +1,7 @@
 import type { DevPortalAuthenticationConfig } from "../../../config/config.js";
 import type { UserProfile } from "../state.js";
 import { useAuthState } from "../state.js";
-import type { EndUserMeResponse } from "./dev-portal-constants.js";
+import type { UserMeResponse } from "./dev-portal-constants.js";
 
 export const DEMO_EMAIL = "demo@apitogo.local";
 export const DEMO_PASSWORD = "password";
@@ -47,9 +47,7 @@ export function resolveDemoPlanSku(plans: DemoPlanInput[] | undefined): string {
   return first?.sku ?? "free";
 }
 
-export function createDemoMeResponse(
-  plans?: DemoPlanInput[],
-): EndUserMeResponse {
+export function createDemoMeResponse(plans?: DemoPlanInput[]): UserMeResponse {
   const planSku = resolveDemoPlanSku(plans);
   const periodEnd = new Date();
   periodEnd.setMonth(periodEnd.getMonth() + 1);

package/src/lib/authentication/providers/dev-portal-utils.ts

@@ -2,7 +2,7 @@ import type { DevPortalAuthenticationConfig } from "../../../config/config.js";
 import {
   DEV_PORTAL_PLACEHOLDER_API_URL,
   type DevPortalAuthStatusResponse,
-  type EndUserMeResponse,
+  type UserMeResponse,
 } from "./dev-portal-constants.js";
 
 declare const VITE_APITOGO_AUTHENTICATION_API_BASE_URL: string | undefined;
@@ -261,10 +261,10 @@ function readOptionalBoolean(...values: unknown[]): boolean | undefined {
   return undefined;
 }
 
-export function mapEndUserMeToProfile(
-  me: EndUserMeResponse,
+export function mapUserMeToProfile(
+  me: UserMeResponse,
 ): import("../state.js").UserProfile {
-  const raw = me as EndUserMeResponse & Record<string, unknown>;
+  const raw = me as UserMeResponse & Record<string, unknown>;
   const email = readOptionalString(raw.email, raw.Email, raw.emailAddress);
   const emailVerified =
     readOptionalBoolean(

package/src/lib/authentication/providers/dev-portal.tsx

@@ -21,7 +21,7 @@ import {
 } from "./dev-portal-auth-pages.js";
 import type {
   DevPortalAuthMode,
-  EndUserMeResponse,
+  UserMeResponse,
 } from "./dev-portal-constants.js";
 import {
   clearDemoSession,
@@ -33,7 +33,7 @@ import {
   buildDevPortalLogoutUrl,
   isNativeAuthEnabled,
   isPlaceholderDevPortalApiUrl,
-  mapEndUserMeToProfile,
+  mapUserMeToProfile,
   probeDevPortalBackend,
   resolveDevPortalApiBaseUrl,
   toAbsoluteReturnUrl,
@@ -84,14 +84,34 @@ export class DevPortalAuthenticationProvider
   }
 
   getRoutes() {
+    const defaultReturnUrl =
+      this.redirectToAfterSignIn ?? this.redirectToAfterSignUp ?? "/";
     const pageProps = {
       apiBaseUrl: this.apiBaseUrl,
       demoMode: this.demoMode,
     };
     return [
       ...super.getRoutes(),
-      { path: "/login", element: <DevPortalLoginPage {...pageProps} /> },
-      { path: "/register", element: <DevPortalRegisterPage {...pageProps} /> },
+      {
+        path: "/login",
+        element: (
+          <DevPortalLoginPage
+            {...pageProps}
+            defaultReturnUrl={defaultReturnUrl}
+          />
+        ),
+      },
+      {
+        path: "/register",
+        element: (
+          <DevPortalRegisterPage
+            apiBaseUrl={this.apiBaseUrl}
+            defaultReturnUrl={
+              this.redirectToAfterSignUp ?? this.redirectToAfterSignIn ?? "/"
+            }
+          />
+        ),
+      },
       {
         path: "/verify-email",
         element: <DevPortalVerifyEmailPage {...pageProps} />,
@@ -297,12 +317,12 @@ export class DevPortalAuthenticationProvider
         return false;
       }
 
-      const me = (await response.json()) as EndUserMeResponse;
+      const me = (await response.json()) as UserMeResponse;
       if (generation !== this.refreshGeneration) {
         return useAuthState.getState().isAuthenticated;
       }
 
-      const profile: UserProfile = mapEndUserMeToProfile(me);
+      const profile: UserProfile = mapUserMeToProfile(me);
 
       useAuthState.setState({
         isAuthenticated: true,

package/src/lib/components/HeaderAuthActions.tsx

@@ -1,12 +1,10 @@
 import { Button } from "@lukoweb/apitogo/ui/Button.js";
 import { ArrowRightIcon } from "lucide-react";
-import { useLocation } from "react-router";
 import { useAuth } from "../authentication/hook.js";
 import { cn } from "../util/cn.js";
 
 export const HeaderAuthActions = ({ className }: { className?: string }) => {
   const auth = useAuth();
-  const location = useLocation();
   const { isAuthEnabled, isAuthenticated } = auth;
 
   if (!isAuthEnabled || isAuthenticated) {
@@ -19,14 +17,14 @@ export const HeaderAuthActions = ({ className }: { className?: string }) => {
         variant="ghost"
         size="lg"
         className="font-semibold text-foreground hover:text-primary px-3"
-        onClick={() => void auth.login({ redirectTo: location.pathname })}
+        onClick={() => void auth.login()}
       >
         Sign in
       </Button>
       <Button
         size="lg"
         className="gap-1.5 rounded-[9px] px-4 font-semibold shadow-[0_4px_14px_-4px] shadow-primary/30"
-        onClick={() => void auth.signup({ redirectTo: location.pathname })}
+        onClick={() => void auth.signup()}
       >
         Start free
         <ArrowRightIcon size={15} strokeWidth={2} />

package/src/lib/components/MobileTopNavigation.tsx

@@ -10,7 +10,7 @@ import {
   type LucideIcon,
 } from "lucide-react";
 import { useState } from "react";
-import { Link, useLocation } from "react-router";
+import { Link } from "react-router";
 import {
   isHeaderNavGroup,
   type HeaderNavItem,
@@ -122,7 +122,6 @@ const MobileHeaderNavItem = ({
 export const MobileTopNavigation = () => {
   const context = useZudoku();
   const authState = useAuth();
-  const location = useLocation();
   const currentNav = useCurrentNavigation();
 
   const {
@@ -256,7 +255,7 @@ export const MobileTopNavigation = () => {
                       className="font-semibold"
                       onClick={() => {
                         setDrawerOpen(false);
-                        void login({ redirectTo: location.pathname });
+                        void login();
                       }}
                     >
                       Sign in
@@ -265,7 +264,7 @@ export const MobileTopNavigation = () => {
                       className="gap-1.5"
                       onClick={() => {
                         setDrawerOpen(false);
-                        void signup({ redirectTo: location.pathname });
+                        void signup();
                       }}
                     >
                       Start free