stack-auth · fomalhautb · Mar 13, 2024 · Mar 12, 2024 · Mar 13, 2024 · Mar 13, 2024
diff --git a/.changeset/little-pets-drop.md b/.changeset/little-pets-drop.md
@@ -0,0 +1,6 @@
+---
+"@stackframe/stack-shared": major
+"@stackframe/stack": major
+---
+
+removed redirect URL in function options, redirect automatically to default URL
diff --git a/apps/dev/src/app/signin/custom-credential.tsx b/apps/dev/src/app/signin/custom-credential.tsx
@@ -14,7 +14,7 @@ export default function CustomCredentialSignIn() {
       setError('Please enter your password');
       return;
     }
-    const errorCode = await app.signInWithCredential({ email, password, redirectUrl: app.urls.userHome });
+    const errorCode = await app.signInWithCredential({ email, password });
     // It is better to handle each error code separately, but for simplicity, we will just show the error code directly
     if (errorCode) {
       setError(errorCode);

diff --git a/apps/dev/src/app/signin/custom-oauth.tsx b/apps/dev/src/app/signin/custom-oauth.tsx
@@ -7,6 +7,11 @@ export default function CustomOAuthSignIn() {
 
   return <div>
     <h1>My Custom Sign In page</h1>
-    <button onClick={async () => await app.signInWithOAuth('google')}>Sign In with Google</button>
+    <button onClick={async () => {
+      // this will redirect to the OAuth provider's login page
+      await app.signInWithOAuth('google');
+    }}>
+      Sign In with Google
+    </button>
   </div>;
 }
diff --git a/apps/dev/src/app/signin/page.tsx b/apps/dev/src/app/signin/page.tsx
@@ -1,8 +1,5 @@
 import { SignIn } from "@stackframe/stack";
-import { stackServerApp } from "src/stack";
-import CustomCredentialSignIn from "./custom-credential";
-import CustomOAuthSignIn from "./custom-oauth";
 
 export default function Page() {
-  return <SignIn fullPage redirectUrl={stackServerApp.urls.home} />;
+  return <SignIn fullPage />;
 }
diff --git a/apps/dev/src/components/SignOutButton.tsx b/apps/dev/src/components/SignOutButton.tsx
@@ -1,6 +1,6 @@
 'use client';
 
-import { useUser, useStackApp } from "@stackframe/stack";
+import { useUser } from "@stackframe/stack";
 import { runAsynchronously } from "@stackframe/stack-shared/dist/utils/promises";
 
 export default function SignOutButton() {

diff --git a/apps/dev/src/stack.tsx b/apps/dev/src/stack.tsx
@@ -6,5 +6,7 @@ export const stackServerApp = new StackServerApp({
   tokenStore: "nextjs-cookie",
   urls: {
     signIn: "/signin",
+    // afterSignIn: "/after-signin",
+    // afterSignUp: "/after-signup",
   }
 });
diff --git a/docs/docs/01-getting-started/02-users.md b/docs/docs/01-getting-started/02-users.md
@@ -82,7 +82,7 @@ Call `useUser` (or `getUser`) with the `{ or: 'redirect' }` option to protect th
 
 ## Signing out
 
-You can sign out the user by redirecting them to `/handler/signout` or simply by calling `user.signOut()`.
+You can sign out the user by redirecting them to `/handler/signout` or simply by calling `user.signOut()`. The user will be redirected to `afterSignOut` URL. you can customize it in the `StackServerApp` constructor (see [here](/docs/api-documentation/app)).
 
 
 <Tabs>
@@ -93,7 +93,7 @@ You can sign out the user by redirecting them to `/handler/signout` or simply by
 
     export default function SignOutButton() {
       const user = useUser();
-      return <button onClick={() => user?.signOut()}>
+      return <button onClick={user?.signOut}>
         Sign Out
       </button>;
     }

diff --git a/docs/docs/02-advanced-guides/01-customization/01-overview.md b/docs/docs/02-advanced-guides/01-customization/01-overview.md
@@ -52,15 +52,20 @@ For more examples, please refer to the [Examples](/docs/category/examples).
 We also provide the low-level functions powering our components, so that you can build your own logic. For example, to build a custom OAuth sign-in button, create a file at `app/signin/page.tsx`:
 
 ```tsx
-"use client";
+'use client';
 import { useStackApp } from "@stackframe/stack";
 
-export default function CustomOAuthSignInPage() {
+export default function CustomOAuthSignIn() {
   const app = useStackApp();
 
   return <div>
     <h1>My Custom Sign In page</h1>
-    <button onClick={async () => await app.signInWithOAuth('google')}>Sign In with Google</button>
+    <button onClick={async () => {
+      // this will redirect to the OAuth provider's login page
+      await app.signInWithOAuth('google');
+    }}>
+      Sign In with Google
+    </button>
   </div>;
 }
 ```

diff --git a/docs/docs/02-advanced-guides/01-customization/02-examples/01-signin.md b/docs/docs/02-advanced-guides/01-customization/02-examples/01-signin.md
@@ -13,7 +13,7 @@ import { useStackApp, SignIn } from "@stackframe/stack";
 export default function DefaultSignIn() {
   const app = useStackApp();
 
-  return <SignIn fullPage redirectUrl={app.urls.userHome} />;
+  return <SignIn fullPage />;
 }
 ```
 
@@ -43,10 +43,13 @@ export default function CustomOAuthSignIn() {
   const app = useStackApp();
 
   return <div>
-    <button onClick={async () => await app.signInWithOAuth({ 
-      provider: 'google', 
-      redirectUrl: app.urls.userHome
-    })}>Sign In with Google</button>
+    <h1>My Custom Sign In page</h1>
+    <button onClick={async () => {
+      // this will redirect to the OAuth provider's login page
+      await app.signInWithOAuth('google');
+    }}>
+      Sign In with Google
+    </button>
   </div>;
 }
 ```
@@ -69,8 +72,9 @@ export default function CustomCredentialSignIn() {
       setError('Please enter your password');
       return;
     }
-    const errorCode = await app.signInWithCredential({ email, password, redirectUrl: app.urls.userHome });
-    // It is better to handle each error code separately, but for simplicity in this example, we will just show the error code directly
+    // this will rediret to app.urls.afterSignIn if successful, you can customize it in the StackServerApp constructor
+    const errorCode = await app.signInWithCredential({ email, password });
+    // It is better to handle each error code separately, but we will just show the error code directly for simplicity here
     if (errorCode) {
       setError(errorCode);
     }

diff --git a/...s/stack-server/prisma/migrations/20240313024014_authroization_code_new_user/migration.sql b/...s/stack-server/prisma/migrations/20240313024014_authroization_code_new_user/migration.sql
@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE "ProjectUserAuthorizationCode" ADD COLUMN     "newUser" BOOLEAN NOT NULL DEFAULT false;
diff --git a/packages/stack-server/prisma/schema.prisma b/packages/stack-server/prisma/schema.prisma
@@ -147,6 +147,7 @@ model ProjectUserAuthorizationCode {
 
   codeChallenge       String
   codeChallengeMethod String
+  newUser             Boolean
 
   projectUser ProjectUser @relation(fields: [projectId, projectUserId], references: [projectId, projectUserId], onDelete: Cascade)
 

diff --git a/packages/stack-server/src/app/(main)/(protected)/projects/[projectId]/sidebar.tsx b/packages/stack-server/src/app/(main)/(protected)/projects/[projectId]/sidebar.tsx
@@ -64,6 +64,7 @@ function SidebarItem({
 function AvatarSection() {
   const { mode, setMode } = useColorScheme();
   const user = useUser({ or: 'redirect' });
+  const app = useAdminApp();
   const nameStyle = { 
     textOverflow: 'ellipsis', 
     whiteSpace: 'nowrap', 

diff --git a/packages/stack-server/src/app/api/v1/auth/callback/[provider]/route.tsx b/packages/stack-server/src/app/api/v1/auth/callback/[provider]/route.tsx
@@ -73,11 +73,8 @@ export const GET = smartRouteHandler(async (req: NextRequest, options: { params:
   }
 
   const provider = project.evaluatedConfig.oauthProviders.find((p) => p.id === providerId);
-  if (!provider) {
-    throw new StatusError(StatusError.NotFound, "Provider not found");
-  }
-  if (!provider.enabled) {
-    throw new StatusError(StatusError.NotFound, "Provider not enabled");
+  if (!provider || !provider.enabled) {
+    throw new StatusError(StatusError.NotFound, "Provider not found or not enabled");
   }
 
   const userInfo = await getAuthorizationCallback(
@@ -114,16 +111,25 @@ export const GET = smartRouteHandler(async (req: NextRequest, options: { params:
     {
       authenticateHandler: {
         handle: async () => {
-          const account = await prismaClient.projectUserOAuthAccount.upsert({
+          const oldAccount = await prismaClient.projectUserOAuthAccount.findUnique({
             where: {
               projectId_oauthProviderConfigId_providerAccountId: {
                 projectId: decoded.projectId,
                 oauthProviderConfigId: provider.id,
                 providerAccountId: userInfo.accountId,
               },
             },
-            update: {},
-            create: {
+          });
+
+          if (oldAccount) {
+            return {
+              id: oldAccount.projectUserId,
+              newUser: false
+            };
+          }
+
+          const newAccount = await prismaClient.projectUserOAuthAccount.create({
+            data: {
               providerAccountId: userInfo.accountId,
               email: userInfo.email,
               providerConfig: {
@@ -147,7 +153,8 @@ export const GET = smartRouteHandler(async (req: NextRequest, options: { params:
           });
 
           return {
-            id: account.projectUserId,
+            id: newAccount.projectUserId,
+            newUser: true
           };
         }
       }

diff --git a/packages/stack-server/src/oauth/index.tsx b/packages/stack-server/src/oauth/index.tsx
@@ -104,4 +104,5 @@ export async function getAuthorizationCallback(
 
 export const oauthServer = new OAuth2Server({
   model: new OAuthModel(),
+  allowExtendedTokenAttributes: true,
 });
diff --git a/packages/stack-server/src/oauth/model.tsx b/packages/stack-server/src/oauth/model.tsx
@@ -91,7 +91,10 @@ export class OAuthModel implements AuthorizationCodeModel {
 
     token.client = client;
     token.user = user;
-    return token;
+    return {
+      ...token,
+      newUser: user.newUser,
+    };
   }
 
   async getAccessToken(accessToken: string): Promise<Token | Falsey> {
@@ -164,6 +167,7 @@ export class OAuthModel implements AuthorizationCodeModel {
         redirectUri: code.redirectUri,
         expiresAt: code.expiresAt,
         projectUserId: user.id,
+        newUser: user.newUser,
         projectId: client.id,
       },
     });
@@ -177,9 +181,7 @@ export class OAuthModel implements AuthorizationCodeModel {
         id: client.id,
         grants: ["authorization_code", "refresh_token"],
       },
-      user: {
-        id: user.id,
-      },
+      user,
     };
   }
 
@@ -205,6 +207,7 @@ export class OAuthModel implements AuthorizationCodeModel {
       },
       user: {
         id: code.projectUserId,
+        newUser: code.newUser,
       },
     };
   }

diff --git a/packages/stack-server/src/stack.tsx b/packages/stack-server/src/stack.tsx
@@ -3,6 +3,8 @@ import { StackServerApp } from '@stackframe/stack';
 export const stackServerApp = new StackServerApp({
   tokenStore: "nextjs-cookie",
   urls: {
-    userHome: "/projects",
+    afterSignIn: "/projects",
+    afterSignUp: "/projects",
+    afterSignOut: "/",
   }
 });
diff --git a/packages/stack-shared/src/interface/clientInterface.ts b/packages/stack-shared/src/interface/clientInterface.ts
@@ -578,6 +578,8 @@ export class StackClientInterface {
       accessToken: result.access_token ?? null,
       refreshToken: result.refresh_token ?? old?.refreshToken ?? null,
     }));
+
+    return result;
   }
 
   async signOut(tokenStore: TokenStore): Promise<void> {

diff --git a/packages/stack/src/components/EmailVerification.tsx b/packages/stack/src/components/EmailVerification.tsx
@@ -14,7 +14,6 @@ export default function EmailVerification({
 }: { 
   searchParams?: Record<string, string>,
   fullPage?: boolean,
-  redirectUrl?: string,
 }) {
   const stackApp = useStackApp();
 

diff --git a/packages/stack/src/components/OAuthCallback.tsx b/packages/stack/src/components/OAuthCallback.tsx
@@ -3,18 +3,15 @@ import { useRef, useEffect } from "react";
 import { useStackApp } from "..";
 import { runAsynchronously } from "@stackframe/stack-shared/dist/utils/promises";
 import MessageCard from "../elements/MessageCard";
-import { useRouter } from "next/navigation";
 
 export default function OAuthCallback () {
   const app = useStackApp();
-  const router = useRouter();
   const called = useRef(false);
 
   useEffect(() => runAsynchronously(async () => {
     if (called.current) return;
     called.current = true;
     await app.callOAuthCallback();
-    router.push(app.urls.userHome);
   }), []);
 
   return <MessageCard title='Redirecting...' fullPage />;

diff --git a/packages/stack/src/components/SignIn.tsx b/packages/stack/src/components/SignIn.tsx
@@ -9,7 +9,7 @@ import CardHeader from '../elements/CardHeader';
 import { useUser, useStackApp } from '..';
 import RedirectMessageCard from '../elements/RedirectMessageCard';
 
-export default function SignIn({ redirectUrl, fullPage=false }: { redirectUrl?: string, fullPage?: boolean }) {
+export default function SignIn({ fullPage=false }: { fullPage?: boolean }) {
   const stackApp = useStackApp();
   const user = useUser();
   const project = stackApp.useProject();
@@ -28,11 +28,11 @@ export default function SignIn({ redirectUrl, fullPage=false }: { redirectUrl?:
           </NextLink>
         </p>
       </CardHeader>
-      <OAuthGroup type='signin' redirectUrl={redirectUrl} />
+      <OAuthGroup type='signin'/>
       {project.credentialEnabled &&
       <>
         <DividerWithText text={'OR'} />
-        <CredentialSignIn redirectUrl={redirectUrl} />
+        <CredentialSignIn/>
       </>}
     </CardFrame>
   );

diff --git a/packages/stack/src/components/SignOut.tsx b/packages/stack/src/components/SignOut.tsx
@@ -1,14 +1,15 @@
 'use client';
 
 import { use } from "react";
-import { useUser } from "..";
+import { useStackApp, useUser } from "..";
 import GoHomeMessageCard from "../elements/RedirectMessageCard";
 
-export default function Signout({ redirectUrl }: { redirectUrl?: string }) {
+export default function Signout() {
   const user = useUser();
+  const app = useStackApp();
 
   if (user) {
-    use(user.signOut(redirectUrl));
+    use(user.signOut());
   }
 
   return <GoHomeMessageCard type='signedOut' fullPage />;

diff --git a/packages/stack/src/components/SignUp.tsx b/packages/stack/src/components/SignUp.tsx
@@ -6,10 +6,9 @@ import CardFrame from '../elements/CardFrame';
 import CredentialSignUp from '../elements/CredentialSignUp';
 import CardHeader from '../elements/CardHeader';
 import { useUser, useStackApp } from '..';
-import AlreadySignedInMessageCard from '../elements/RedirectMessageCard';
 import RedirectMessageCard from '../elements/RedirectMessageCard';
 
-export default function SignUp({ redirectUrl, fullPage=false }: { redirectUrl?: string, fullPage?: boolean }) {
+export default function SignUp({ fullPage=false }: { fullPage?: boolean }) {
   const stackApp = useStackApp();
   const user = useUser();
   const project = stackApp.useProject();
@@ -28,10 +27,10 @@ export default function SignUp({ redirectUrl, fullPage=false }: { redirectUrl?:
           </NextLink>
         </p>
       </CardHeader>
-      <OAuthGroup type='signup' redirectUrl={redirectUrl} />
+      <OAuthGroup type='signup'/>
       {project.credentialEnabled && <>
         <DividerWithText text={'OR'} />
-        <CredentialSignUp redirectUrl={redirectUrl} />
+        <CredentialSignUp/>
       </>}
     </CardFrame>
   );

diff --git a/packages/stack/src/components/StackHandler.tsx b/packages/stack/src/components/StackHandler.tsx
@@ -42,15 +42,15 @@ export default async function StackHandler<HasTokenStore extends boolean>({
   switch (path) {
     case 'signin': {
       redirectIfNotHandler('signIn');
-      return <SignIn fullPage redirectUrl={app.urls.userHome}/>;
+      return <SignIn fullPage/>;
     }
     case 'signup': {
       redirectIfNotHandler('signUp');
-      return <SignUp fullPage redirectUrl={app.urls.userHome}/>;
+      return <SignUp fullPage/>;
     }
     case 'email-verification': {
       redirectIfNotHandler('emailVerification');
-      return <EmailVerification searchParams={searchParams} fullPage redirectUrl={app.urls.signIn} />;
+      return <EmailVerification searchParams={searchParams} fullPage/>;
     }
     case 'password-reset': {
       redirectIfNotHandler('passwordReset');
@@ -62,7 +62,7 @@ export default async function StackHandler<HasTokenStore extends boolean>({
     }
     case 'signout': {
       redirectIfNotHandler('signOut');
-      return <Signout redirectUrl={app.urls.home} />;
+      return <Signout/>;
     }
     case 'oauth-callback': {
       redirectIfNotHandler('oauthCallback');
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		-- AlterTable
		ALTER TABLE "ProjectUserAuthorizationCode" ADD COLUMN "newUser" BOOLEAN NOT NULL DEFAULT false;