@lukoweb/apitogo 0.1.38 → 0.1.39

package/dist/cli/cli.js

@@ -4121,7 +4121,7 @@ import {
 // package.json
 var package_default = {
   name: "@lukoweb/apitogo",
-  version: "0.1.38",
+  version: "0.1.39",
   type: "module",
   sideEffects: [
     "**/*.css",

package/dist/declarations/lib/authentication/authentication.d.ts

@@ -14,6 +14,7 @@ export interface AuthenticationPlugin {
     signUp({ navigate }: AuthActionContext, options?: AuthActionOptions): Promise<void>;
     signIn({ navigate }: AuthActionContext, options?: AuthActionOptions): Promise<void>;
     signOut({ navigate }: AuthActionContext): Promise<void>;
+    hasDistinctSignUpFlow?(): boolean;
     signRequest(request: Request): Promise<Request>;
     requestEmailVerification?({ navigate }: AuthActionContext, options?: AuthActionOptions): Promise<void>;
     getAccessToken?(): Promise<string>;

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

@@ -33,6 +33,7 @@ export declare class DevPortalAuthenticationProvider extends CoreAuthenticationP
     signIn(_: AuthActionContext, { redirectTo }?: AuthActionOptions): Promise<void>;
     signUp(_: AuthActionContext, { redirectTo }?: AuthActionOptions): Promise<void>;
     signOut(_: AuthActionContext): Promise<void>;
+    hasDistinctSignUpFlow(): boolean;
     signRequest(request: Request): Promise<Request>;
 }
 declare const devPortalAuth: AuthenticationProviderInitializer<DevPortalAuthenticationConfig>;

package/package.json

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

package/src/lib/authentication/authentication.ts

@@ -26,6 +26,9 @@ export interface AuthenticationPlugin {
 
   signOut({ navigate }: AuthActionContext): Promise<void>;
 
+  /** When false, sign-in and sign-up use the same IdP redirect; UI should not offer separate choices. */
+  hasDistinctSignUpFlow?(): boolean;
+
   signRequest(request: Request): Promise<Request>;
   requestEmailVerification?(
     { navigate }: AuthActionContext,

package/src/lib/authentication/hook.ts

@@ -79,6 +79,7 @@ export const useAuth = () => {
     ...authState,
     isBackendAvailable: authState.isBackendAvailable,
     authMode: authState.authMode,
+    hasDistinctSignUpFlow: authentication?.hasDistinctSignUpFlow?.() ?? true,
 
     login: async (options?: AuthActionOptions) => {
       if (!isAuthEnabled) {

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

@@ -258,6 +258,10 @@ export class DevPortalAuthenticationProvider
     );
   }
 
+  hasDistinctSignUpFlow(): boolean {
+    return false;
+  }
+
   async signRequest(request: Request): Promise<Request> {
     return request;
   }

package/src/lib/core/RouteGuard.tsx

@@ -8,7 +8,7 @@ import {
   DialogTitle,
 } from "@lukoweb/apitogo/ui/Dialog.js";
 import { Helmet } from "@zudoku/react-helmet-async";
-import { use, useCallback, useEffect, useMemo } from "react";
+import { use, useCallback, useEffect, useMemo, useRef } from "react";
 import {
   matchPath,
   Outlet,
@@ -31,6 +31,7 @@ type LoginDialogProps = {
   onCancel: () => void;
   onLogin: () => void;
   onRegister: () => void;
+  hasDistinctSignUpFlow: boolean;
 };
 
 const LoginDialog = ({
@@ -38,22 +39,33 @@ const LoginDialog = ({
   onCancel,
   onLogin,
   onRegister,
+  hasDistinctSignUpFlow,
 }: LoginDialogProps) => (
   <Dialog open={open} onOpenChange={(nextOpen) => !nextOpen && onCancel()}>
     <DialogContent>
       <DialogHeader>
         <DialogTitle>Login to continue</DialogTitle>
       </DialogHeader>
-      <DialogDescription>Please login to access this page.</DialogDescription>
+      <DialogDescription>
+        {hasDistinctSignUpFlow
+          ? "Please login to access this page."
+          : "You'll be redirected to sign in or create an account."}
+      </DialogDescription>
       <DialogFooter>
         <Button variant="outline" onClick={onCancel}>
           Cancel
         </Button>
         <div className="w-full" />
-        <Button variant="secondary" onClick={onRegister}>
-          Register
-        </Button>
-        <Button onClick={onLogin}>Login</Button>
+        {hasDistinctSignUpFlow ? (
+          <>
+            <Button variant="secondary" onClick={onRegister}>
+              Register
+            </Button>
+            <Button onClick={onLogin}>Login</Button>
+          </>
+        ) : (
+          <Button onClick={onLogin}>Continue</Button>
+        )}
       </DialogFooter>
     </DialogContent>
   </Dialog>
@@ -155,6 +167,41 @@ export const RouteGuard = () => {
     getAuthCheck,
   ]);
 
+  const needsAuth = needsToSignIn || isBlocked;
+  const redirectTo = isBlocked
+    ? blocker.location.pathname + blocker.location.search
+    : location.pathname + location.search;
+  const showDialog =
+    auth.isBackendAvailable &&
+    needsAuth &&
+    auth.hasDistinctSignUpFlow;
+  const unifiedRedirectKeyRef = useRef<string | null>(null);
+
+  useEffect(() => {
+    if (
+      !auth.isBackendAvailable ||
+      auth.isPending ||
+      !needsAuth ||
+      auth.hasDistinctSignUpFlow
+    ) {
+      unifiedRedirectKeyRef.current = null;
+      return;
+    }
+
+    if (unifiedRedirectKeyRef.current === redirectTo) {
+      return;
+    }
+
+    unifiedRedirectKeyRef.current = redirectTo;
+    void auth.login({ redirectTo });
+  }, [
+    auth.isBackendAvailable,
+    auth.isPending,
+    auth.hasDistinctSignUpFlow,
+    needsAuth,
+    redirectTo,
+  ]);
+
   if (isForbidden) {
     return <ForbiddenPage />;
   }
@@ -184,16 +231,12 @@ export const RouteGuard = () => {
     return <ProductionUnlockPage />;
   }
 
-  const showDialog = auth.isBackendAvailable && (needsToSignIn || isBlocked);
-  const redirectTo = isBlocked
-    ? blocker.location.pathname + blocker.location.search
-    : location.pathname + location.search;
-
   return (
     <>
       {!needsToSignIn && <Outlet />}
       <LoginDialog
         open={showDialog}
+        hasDistinctSignUpFlow={auth.hasDistinctSignUpFlow}
         onCancel={needsToSignIn ? () => navigate(-1) : () => blocker.reset?.()}
         onLogin={() => void auth.login({ redirectTo })}
         onRegister={() => void auth.signup({ redirectTo })}

package/src/lib/plugins/openapi/playground/PlaygroundDialog.tsx

@@ -15,8 +15,14 @@ export type PlaygroundDialogProps = PropsWithChildren<PlaygroundContentProps>;
 
 const PlaygroundDialog = (props: PlaygroundDialogProps) => {
   const [open, setOpen] = useState(false);
-  const { isAuthEnabled, login, signup, isPending, isAuthenticated } =
-    useAuth();
+  const {
+    isAuthEnabled,
+    login,
+    signup,
+    isPending,
+    isAuthenticated,
+    hasDistinctSignUpFlow,
+  } = useAuth();
 
   return (
     <Dialog onOpenChange={(open) => setOpen(open)}>
@@ -44,7 +50,7 @@ const PlaygroundDialog = (props: PlaygroundDialogProps) => {
           <Playground
             requiresLogin={isAuthEnabled && !isAuthenticated && !isPending}
             onLogin={() => login()}
-            onSignUp={() => signup()}
+            onSignUp={hasDistinctSignUpFlow ? () => signup() : undefined}
             {...props}
           />
         )}