|
@@ -99,7 +102,7 @@ This is for you if you want to contribute to the Stack project or run the Stack
### Setup
-Pre-populated .env files for the setup below are available and used by default in `.env.development` in each of the packages. You should copy all the `.env.development` files to `.env.local` in the respective packages for local development.
+Pre-populated .env files for the setup below are available and used by default in `.env.development` in each of the packages. (Note: If you're creating a production build (eg. with `pnpm run build`), you must supply the environment variables manually.)
In a new terminal:
@@ -107,7 +110,7 @@ In a new terminal:
pnpm install
# Run build to build everything once
-pnpm run build
+pnpm run build:dev
# reset & start the dependencies (DB, Inbucket, etc.) as Docker containers, seeding the DB with the Prisma schema
pnpm run start-deps
@@ -121,7 +124,7 @@ pnpm run dev
pnpm run test
```
-You can now open the dashboard at [http://localhost:8101](http://localhost:8101), API on port 8102, demo on port 8103, docs on port 8104, Inbucket (e-mails) on port 8105, and Prisma Studio on port 8106.
+You can now open the dashboard at [http://localhost:8101](http://localhost:8101), API on port 8102, demo on port 8103, docs on port 8104, Inbucket (e-mails) on port 8105, and Prisma Studio on port 8106. See the section below on more information on the ports of the running services.
Your IDE may show an error on all `@stackframe/XYZ` imports. To fix this, simply restart the TypeScript language server; for example, in VSCode you can open the command palette (Ctrl+Shift+P) and run `Developer: Reload Window` or `TypeScript: Restart TS server`.
@@ -131,6 +134,25 @@ You can also open Prisma Studio to see the database interface and edit data dire
pnpm run prisma studio
```
+### Development environment port mapping
+
+8101. Dashboard (equivalent to https://app.stack-auth.com)
+8102. Backend (equivalent to https://api.stack-auth.com)
+8103. Demo app (equivalent to https://demo.stack-auth.com)
+8104. Docs (equivalent to https://docs.stack-auth.com)
+8105. Inbucket (e-mails)
+8106. Prisma Studio
+8107. Jaeger UI/OpenTelemetry (for performance tracing)
+8108. `examples/docs-examples`
+8109. `examples/partial-prerendering`
+8110. `examples/cjs-test`
+8111. `examples/e-commerce`
+8112. `examples/middleware`
+8113. Svix server (for webhooks)
+8114. OAuth mock server
+8115. `examples/supabase`
+
+
### Database migrations
If you make changes to the Prisma schema, you need to run the following command to create a migration:
@@ -151,16 +173,16 @@ Storia trained an [AI on our codebase](https://sage.storia.ai/stack-auth) that c
User((User))
Admin((Admin))
subgraph "Stack Auth System"
- Dashboard[Stack Dashboard
-
);
-}
\ No newline at end of file
+}
diff --git a/apps/dashboard/src/app/(main)/(protected)/projects/[projectId]/page.tsx b/apps/dashboard/src/app/(main)/(protected)/projects/[projectId]/page.tsx
index 88e4e5512b..ad33e5605f 100644
--- a/apps/dashboard/src/app/(main)/(protected)/projects/[projectId]/page.tsx
+++ b/apps/dashboard/src/app/(main)/(protected)/projects/[projectId]/page.tsx
@@ -2,4 +2,4 @@ import { redirect } from "next/navigation";
export default function Page({ params }: { params: { projectId: string } }) {
redirect(`/projects/${params.projectId}/users`);
-}
\ No newline at end of file
+}
diff --git a/apps/dashboard/src/app/(main)/(protected)/projects/[projectId]/sidebar-layout.tsx b/apps/dashboard/src/app/(main)/(protected)/projects/[projectId]/sidebar-layout.tsx
index fd135f17bc..3a0f80d4d4 100644
--- a/apps/dashboard/src/app/(main)/(protected)/projects/[projectId]/sidebar-layout.tsx
+++ b/apps/dashboard/src/app/(main)/(protected)/projects/[projectId]/sidebar-layout.tsx
@@ -1,5 +1,6 @@
'use client';
+import { FeedbackDialog } from "@/components/feedback-dialog";
import { Link } from "@/components/link";
import { ProjectSwitcher } from "@/components/project-switcher";
import { cn } from "@/lib/utils";
@@ -37,7 +38,6 @@ import { useTheme } from "next-themes";
import { usePathname } from "next/navigation";
import { Fragment, useMemo, useState } from "react";
import { useAdminApp } from "./use-admin-app";
-import { FeedbackDialog } from "@/components/feedback-dialog";
type BreadcrumbItem = { item: React.ReactNode, href: string }
@@ -340,7 +340,9 @@ function HeaderBreadcrumb({
- {/* a transparent cover that prevents the card being clicked */}
+
- {emailConfig?.type === 'standard' ? emailConfig.senderEmail : 'noreply@stack-auth.com'}
+ {emailConfig?.type === 'standard' ? emailConfig.senderEmail : 'noreply@stackframe.co'}
diff --git a/apps/dashboard/src/app/(main)/(protected)/projects/[projectId]/page-layout.tsx b/apps/dashboard/src/app/(main)/(protected)/projects/[projectId]/page-layout.tsx
index df7a5113d4..8a1b54da67 100644
--- a/apps/dashboard/src/app/(main)/(protected)/projects/[projectId]/page-layout.tsx
+++ b/apps/dashboard/src/app/(main)/(protected)/projects/[projectId]/page-layout.tsx
@@ -28,4 +28,4 @@ export function PageLayout(props: {
+ {/* a transparent cover that prevents the card from being clicked, even when pointer-events is overridden */}
diff --git a/apps/dashboard/src/app/(main)/(protected)/projects/[projectId]/teams/[teamId]/page.tsx b/apps/dashboard/src/app/(main)/(protected)/projects/[projectId]/teams/[teamId]/page.tsx
index 6395eb6a9c..7ea9011e28 100644
--- a/apps/dashboard/src/app/(main)/(protected)/projects/[projectId]/teams/[teamId]/page.tsx
+++ b/apps/dashboard/src/app/(main)/(protected)/projects/[projectId]/teams/[teamId]/page.tsx
@@ -8,4 +8,4 @@ export default function Page({ params }: { params: { teamId: string } }) {
return (
{
- await adminApp.createUser(values);
+ await adminApp.createUser({
+ ...values,
+ primaryEmailAuthEnabled: true,
+ });
}}
cancelButton
render={(form) => (
<>
- (data: {
loaded: true,
data: data.data,
};
-}
\ No newline at end of file
+}
diff --git a/apps/dashboard/src/app/(main)/handler/[...stack]/layout.tsx b/apps/dashboard/src/app/(main)/handler/[...stack]/layout.tsx
index c27ffb2be0..a2530db071 100644
--- a/apps/dashboard/src/app/(main)/handler/[...stack]/layout.tsx
+++ b/apps/dashboard/src/app/(main)/handler/[...stack]/layout.tsx
@@ -9,4 +9,4 @@ export default function Page ({ children } : { children?: React.ReactNode }) {
);
-}
\ No newline at end of file
+}
diff --git a/apps/dashboard/src/app/(main)/page.tsx b/apps/dashboard/src/app/(main)/page.tsx
index 4c2b10aeb5..1d3f0bdd33 100644
--- a/apps/dashboard/src/app/(main)/page.tsx
+++ b/apps/dashboard/src/app/(main)/page.tsx
@@ -2,4 +2,4 @@ import { redirect } from "next/navigation";
export default function Page() {
redirect("projects");
-}
\ No newline at end of file
+}
diff --git a/apps/dashboard/src/app/(main)/wizard-congrats/actions.tsx b/apps/dashboard/src/app/(main)/wizard-congrats/actions.tsx
index 88562649bd..8034e646b6 100644
--- a/apps/dashboard/src/app/(main)/wizard-congrats/actions.tsx
+++ b/apps/dashboard/src/app/(main)/wizard-congrats/actions.tsx
@@ -15,4 +15,4 @@ export default function Actions() {
);
-}
\ No newline at end of file
+}
diff --git a/apps/dashboard/src/app/layout.tsx b/apps/dashboard/src/app/layout.tsx
index 42081170ef..c431ca8185 100644
--- a/apps/dashboard/src/app/layout.tsx
+++ b/apps/dashboard/src/app/layout.tsx
@@ -20,6 +20,7 @@ import './globals.css';
import { CSPostHogProvider, UserIdentity } from './providers';
import dynamic from 'next/dynamic';
import { SpeedInsights } from "@vercel/speed-insights/next";
+import { VersionAlerter } from '../components/version-alerter';
export const metadata: Metadata = {
metadataBase: new URL(env('NEXT_PUBLIC_STACK_URL') || ''),
@@ -100,6 +101,7 @@ export default function RootLayout({
-
-
-
-
-
-
-
+
);
diff --git a/examples/demo/src/app/protected/page.tsx b/examples/demo/src/app/protected/page.tsx
index 9c42f8ecc8..16f4ca907f 100644
--- a/examples/demo/src/app/protected/page.tsx
+++ b/examples/demo/src/app/protected/page.tsx
@@ -3,4 +3,4 @@ import { stackServerApp } from "src/stack";
export default async function ProtectedPage() {
await stackServerApp.getUser({ or: 'redirect' });
return
{props.displayName.slice(0,1).toUpperCase()}
@@ -28,12 +28,12 @@ export function ProjectSwitcher(props: { currentProjectId: string }) { return (This is protected. You can see this because you are signed in
;
-}
\ No newline at end of file
+}
diff --git a/examples/demo/src/app/settings/page.tsx b/examples/demo/src/app/settings/page.tsx
new file mode 100644
index 0000000000..78e378e3b9
--- /dev/null
+++ b/examples/demo/src/app/settings/page.tsx
@@ -0,0 +1,5 @@
+import { AccountSettings } from "@stackframe/stack";
+
+export default function SettingsPage() {
+ return
+
+ );
+}
diff --git a/examples/docs-examples/src/app/components/credential-sign-up/page.tsx b/examples/docs-examples/src/app/components/credential-sign-up/page.tsx
new file mode 100644
index 0000000000..8ced6e2dc3
--- /dev/null
+++ b/examples/docs-examples/src/app/components/credential-sign-up/page.tsx
@@ -0,0 +1,10 @@
+import { CredentialSignUp } from '@stackframe/stack';
+
+export default function Page() {
+ return (
+ Sign In
+
+
+ );
+}
diff --git a/examples/docs-examples/src/app/components/oauth-button-group/page.tsx b/examples/docs-examples/src/app/components/oauth-button-group/page.tsx
new file mode 100644
index 0000000000..d922eb62ba
--- /dev/null
+++ b/examples/docs-examples/src/app/components/oauth-button-group/page.tsx
@@ -0,0 +1,10 @@
+import { OAuthButtonGroup } from '@stackframe/stack';
+
+export default function Page() {
+ return (
+ Sign Up
+
+
+ );
+}
diff --git a/examples/docs-examples/src/app/components/oauth-button/page.tsx b/examples/docs-examples/src/app/components/oauth-button/page.tsx
new file mode 100644
index 0000000000..2d19dae437
--- /dev/null
+++ b/examples/docs-examples/src/app/components/oauth-button/page.tsx
@@ -0,0 +1,10 @@
+import { OAuthButton } from '@stackframe/stack';
+
+export default function Page() {
+ return (
+ Sign In
+
+
+ );
+}
diff --git a/examples/docs-examples/src/app/components/selected-team-switcher/page.tsx b/examples/docs-examples/src/app/components/selected-team-switcher/page.tsx
new file mode 100644
index 0000000000..846f547886
--- /dev/null
+++ b/examples/docs-examples/src/app/components/selected-team-switcher/page.tsx
@@ -0,0 +1,10 @@
+import { SelectedTeamSwitcher } from '@stackframe/stack';
+
+export default function Page() {
+ return (
+ Sign In
+
+
+ );
+}
diff --git a/examples/docs-examples/src/app/components/sign-in/page.tsx b/examples/docs-examples/src/app/components/sign-in/page.tsx
new file mode 100644
index 0000000000..73bbb8ee2a
--- /dev/null
+++ b/examples/docs-examples/src/app/components/sign-in/page.tsx
@@ -0,0 +1,12 @@
+import { SignIn } from '@stackframe/stack';
+
+export default function Page() {
+ return (
+ Team Switcher
+
+
+ );
+}
diff --git a/examples/docs-examples/src/app/components/user-button/page.tsx b/examples/docs-examples/src/app/components/user-button/page.tsx
new file mode 100644
index 0000000000..5e46d329b5
--- /dev/null
+++ b/examples/docs-examples/src/app/components/user-button/page.tsx
@@ -0,0 +1,13 @@
+'use client';
+import { UserButton } from '@stackframe/stack';
+
+export default function Page() {
+ return (
+ Sign In
+
+ { console.log("color mode toggle clicked"); }}
+ />
+
+ );
+}
diff --git a/examples/docs-examples/src/app/drive/page.tsx b/examples/docs-examples/src/app/drive/page.tsx
index e1ff3550dc..c31827b01b 100644
--- a/examples/docs-examples/src/app/drive/page.tsx
+++ b/examples/docs-examples/src/app/drive/page.tsx
@@ -19,4 +19,4 @@ export default function Page() {
}, [tokens]);
return User Button
+{response ? JSON.stringify(response) : 'Loading...'}
;
-}
\ No newline at end of file
+}
diff --git a/examples/docs-examples/src/app/layout.tsx b/examples/docs-examples/src/app/layout.tsx
index 859aed4b6a..472bc8addb 100644
--- a/examples/docs-examples/src/app/layout.tsx
+++ b/examples/docs-examples/src/app/layout.tsx
@@ -1,9 +1,12 @@
-import { Metadata } from "next";
import { StackProvider } from "@stackframe/stack";
-import { stackServerApp } from "src/stack";
+import { Metadata } from "next";
+import { Inter } from 'next/font/google';
import Provider from "src/components/provider";
+import { stackServerApp } from "src/stack";
import './global.css';
+const inter = Inter({ subsets: ['latin'] });
+
export const metadata: Metadata = {
title: 'Stack Demo',
description: 'Example of using Stack as your authentication system.',
@@ -15,7 +18,7 @@ export default function RootLayout({
children: React.ReactNode,
}) {
return (
-
+
-
-`;
-
-const unauthenticatedTemplateSource = `
-
-`;
-
-const authenticatedTemplate = handlebars.compile(authenticatedTemplateSource);
-const unauthenticatedTemplate = handlebars.compile(
- unauthenticatedTemplateSource
-);
-
-app.get("/", (req, res) => {
- const authenticated = !!req.headers["x-stack-authenticated"];
- const displayName = req.headers["x-stack-user-display-name"] || "";
-
- let html;
- if (authenticated) {
- html = authenticatedTemplate({ displayName });
- } else {
- html = unauthenticatedTemplate();
- }
-
- res.send(html);
-});
-
-app.get("/protected", (req, res) => {
- const protectedTemplate = handlebars.compile(
- "Authenticated: Yes
-Display Name: {{displayName}}
- - - -This is a protected page, only authenticated users can access it
" - ); - res.send(protectedTemplate()); -}); - -app.listen(PORT, () => { - console.log(`Server is running on http://localhost:${PORT}`); -}); diff --git a/examples/middleware/CHANGELOG.md b/examples/middleware/CHANGELOG.md index 0c59bf6cd1..0302e3e830 100644 --- a/examples/middleware/CHANGELOG.md +++ b/examples/middleware/CHANGELOG.md @@ -1,4 +1,66 @@ -# middleware-demo +# @stackframe/example-middleware-demo + +## 2.6.11 + +### Patch Changes + +- fixed account settings bugs +- Updated dependencies + - @stackframe/stack@2.6.11 + +## 2.6.10 + +### Patch Changes + +- Various bugfixes +- Updated dependencies + - @stackframe/stack@2.6.10 + +## 2.6.9 + +### Patch Changes + +- - New contact channel API + - Fixed some visual gitches and typos + - Bug fixes +- Updated dependencies + - @stackframe/stack@2.6.9 + +## 2.6.8 + +### Patch Changes + +- @stackframe/stack@2.6.8 + +## 2.6.7 + +### Patch Changes + +- Updated dependencies + - @stackframe/stack@2.6.7 + +## 2.6.6 + +### Patch Changes + +- Updated dependencies + - @stackframe/stack@2.6.6 + +## 2.6.5 + +### Patch Changes + +- Minor improvements +- Updated dependencies + - @stackframe/stack@2.6.5 + +## 2.6.4 + +### Patch Changes + +- fixed small problems +- Updated dependencies + - @stackframe/stack@2.6.4 ## 2.6.3 diff --git a/examples/middleware/package.json b/examples/middleware/package.json index 638dbc9df6..68e7885d24 100644 --- a/examples/middleware/package.json +++ b/examples/middleware/package.json @@ -1,6 +1,6 @@ { "name": "@stackframe/example-middleware-demo", - "version": "2.6.3", + "version": "2.6.11", "private": true, "scripts": { "dev": "next dev --port 8112", diff --git a/examples/partial-prerendering/CHANGELOG.md b/examples/partial-prerendering/CHANGELOG.md index a0c025d1ac..bd74ad0b1c 100644 --- a/examples/partial-prerendering/CHANGELOG.md +++ b/examples/partial-prerendering/CHANGELOG.md @@ -1,4 +1,66 @@ -# partial-prerendering +# @stackframe/example-partial-prerendering + +## 2.6.11 + +### Patch Changes + +- fixed account settings bugs +- Updated dependencies + - @stackframe/stack@2.6.11 + +## 2.6.10 + +### Patch Changes + +- Various bugfixes +- Updated dependencies + - @stackframe/stack@2.6.10 + +## 2.6.9 + +### Patch Changes + +- - New contact channel API + - Fixed some visual gitches and typos + - Bug fixes +- Updated dependencies + - @stackframe/stack@2.6.9 + +## 2.6.8 + +### Patch Changes + +- @stackframe/stack@2.6.8 + +## 2.6.7 + +### Patch Changes + +- Updated dependencies + - @stackframe/stack@2.6.7 + +## 2.6.6 + +### Patch Changes + +- Updated dependencies + - @stackframe/stack@2.6.6 + +## 2.6.5 + +### Patch Changes + +- Minor improvements +- Updated dependencies + - @stackframe/stack@2.6.5 + +## 2.6.4 + +### Patch Changes + +- fixed small problems +- Updated dependencies + - @stackframe/stack@2.6.4 ## 2.6.3 diff --git a/examples/partial-prerendering/package.json b/examples/partial-prerendering/package.json index 2746ab56ec..d41db48c7f 100644 --- a/examples/partial-prerendering/package.json +++ b/examples/partial-prerendering/package.json @@ -1,6 +1,6 @@ { "name": "@stackframe/example-partial-prerendering", - "version": "2.6.3", + "version": "2.6.11", "private": true, "scripts": { "dev": "next dev --port 8109", diff --git a/examples/supabase/CHANGELOG.md b/examples/supabase/CHANGELOG.md index c17e4a08d8..3c68a41026 100644 --- a/examples/supabase/CHANGELOG.md +++ b/examples/supabase/CHANGELOG.md @@ -1,5 +1,67 @@ # @stackframe/example-supabase +## 2.6.11 + +### Patch Changes + +- fixed account settings bugs +- Updated dependencies + - @stackframe/stack@2.6.11 + +## 2.6.10 + +### Patch Changes + +- Various bugfixes +- Updated dependencies + - @stackframe/stack@2.6.10 + +## 2.6.9 + +### Patch Changes + +- - New contact channel API + - Fixed some visual gitches and typos + - Bug fixes +- Updated dependencies + - @stackframe/stack@2.6.9 + +## 2.6.8 + +### Patch Changes + +- @stackframe/stack@2.6.8 + +## 2.6.7 + +### Patch Changes + +- Updated dependencies + - @stackframe/stack@2.6.7 + +## 2.6.6 + +### Patch Changes + +- Updated dependencies + - @stackframe/stack@2.6.6 + +## 2.6.5 + +### Patch Changes + +- Minor improvements +- Updated dependencies + - @stackframe/stack@2.6.5 + +## 2.6.4 + +### Patch Changes + +- fixed small problems +- Updated dependencies + - @stackframe/stack@2.6.4 + ## 2.6.3 ### Patch Changes diff --git a/examples/supabase/package.json b/examples/supabase/package.json index 652ad88129..4aeda5a0e7 100644 --- a/examples/supabase/package.json +++ b/examples/supabase/package.json @@ -1,9 +1,9 @@ { "name": "@stackframe/example-supabase", - "version": "2.6.3", + "version": "2.6.11", "private": true, "scripts": { - "dev": "next dev", + "dev": "next dev --port 8115", "build": "next build", "start": "next start" }, diff --git a/package.json b/package.json index 97155a1847..aa616448e2 100644 --- a/package.json +++ b/package.json @@ -6,6 +6,7 @@ "scripts": { "preinstall": "npx -y only-allow pnpm", "typecheck": "only-allow pnpm && turbo typecheck", + "build:dev": "NODE_ENV=development pnpm run build", "build": "only-allow pnpm && turbo build", "build:backend": "only-allow pnpm && turbo run build --filter=@stackframe/stack-backend...", "build:dashboard": "only-allow pnpm && turbo run build --filter=@stackframe/stack-dashboard...", @@ -18,6 +19,7 @@ "start-deps:no-delay": "pnpm run deps-compose up --detach && sleep 5 && pnpm run init-db && echo \"\\nDependencies started in the background as Docker containers. 'pnpm run stop-deps' to stop them\"n", "start-deps": "POSTGRES_DELAY_MS=${POSTGRES_DELAY_MS:-20} pnpm run start-deps:no-delay", "restart-deps": "pnpm run stop-deps && pnpm run start-deps", + "restart-deps:no-delay": "pnpm run stop-deps && pnpm run start-deps:no-delay", "psql": "only-allow pnpm && pnpm run --filter=@stackframe/stack-backend psql", "prisma": "only-allow pnpm && pnpm run --filter=@stackframe/stack-backend prisma", "fern": "only-allow pnpm && pnpm run --filter=@stackframe/docs fern", diff --git a/packages/init-stack/CHANGELOG.md b/packages/init-stack/CHANGELOG.md index f937c8d4b5..d7543b1299 100644 --- a/packages/init-stack/CHANGELOG.md +++ b/packages/init-stack/CHANGELOG.md @@ -1,5 +1,43 @@ # @stackframe/init-stack +## 2.6.11 + +### Patch Changes + +- fixed account settings bugs + +## 2.6.10 + +### Patch Changes + +- Various bugfixes + +## 2.6.9 + +### Patch Changes + +- - New contact channel API + - Fixed some visual gitches and typos + - Bug fixes + +## 2.6.8 + +## 2.6.7 + +## 2.6.6 + +## 2.6.5 + +### Patch Changes + +- Minor improvements + +## 2.6.4 + +### Patch Changes + +- fixed small problems + ## 2.6.3 ## 2.6.2 diff --git a/packages/init-stack/package.json b/packages/init-stack/package.json index dbcab50b01..ffc2c6abeb 100644 --- a/packages/init-stack/package.json +++ b/packages/init-stack/package.json @@ -1,6 +1,6 @@ { "name": "@stackframe/init-stack", - "version": "2.6.3", + "version": "2.6.11", "description": "The setup wizard for Stack. https://stack-auth.com", "main": "index.mjs", "bin": "./index.mjs", diff --git a/packages/stack-emails/CHANGELOG.md b/packages/stack-emails/CHANGELOG.md index 480dfefc8a..24a10c2853 100644 --- a/packages/stack-emails/CHANGELOG.md +++ b/packages/stack-emails/CHANGELOG.md @@ -1,5 +1,74 @@ # @stackframe/stack-emails +## 2.6.11 + +### Patch Changes + +- fixed account settings bugs +- Updated dependencies + - @stackframe/stack-shared@2.6.11 + - @stackframe/stack-ui@2.6.11 + +## 2.6.10 + +### Patch Changes + +- Various bugfixes +- Updated dependencies + - @stackframe/stack-shared@2.6.10 + - @stackframe/stack-ui@2.6.10 + +## 2.6.9 + +### Patch Changes + +- - New contact channel API + - Fixed some visual gitches and typos + - Bug fixes +- Updated dependencies + - @stackframe/stack-shared@2.6.9 + - @stackframe/stack-ui@2.6.9 + +## 2.6.8 + +### Patch Changes + +- Updated dependencies + - @stackframe/stack-shared@2.6.8 + - @stackframe/stack-ui@2.6.8 + +## 2.6.7 + +### Patch Changes + +- @stackframe/stack-shared@2.6.7 +- @stackframe/stack-ui@2.6.7 + +## 2.6.6 + +### Patch Changes + +- @stackframe/stack-shared@2.6.6 +- @stackframe/stack-ui@2.6.6 + +## 2.6.5 + +### Patch Changes + +- Minor improvements +- Updated dependencies + - @stackframe/stack-shared@2.6.5 + - @stackframe/stack-ui@2.6.5 + +## 2.6.4 + +### Patch Changes + +- fixed small problems +- Updated dependencies + - @stackframe/stack-shared@2.6.4 + - @stackframe/stack-ui@2.6.4 + ## 2.6.3 ### Patch Changes diff --git a/packages/stack-emails/package.json b/packages/stack-emails/package.json index b8483ec249..b53ee65fc2 100644 --- a/packages/stack-emails/package.json +++ b/packages/stack-emails/package.json @@ -1,6 +1,6 @@ { "name": "@stackframe/stack-emails", - "version": "2.6.3", + "version": "2.6.11", "main": "./dist/index.js", "types": "./dist/index.d.ts", "private": true, diff --git a/packages/stack-emails/src/editor/blocks/block-text.tsx b/packages/stack-emails/src/editor/blocks/block-text.tsx index b69e257a7a..bcfea964f0 100644 --- a/packages/stack-emails/src/editor/blocks/block-text.tsx +++ b/packages/stack-emails/src/editor/blocks/block-text.tsx @@ -150,4 +150,4 @@ export function Text({ style, props }: TextProps) { const parsedText = parseText(text); return{parsedText}
; -} \ No newline at end of file +} diff --git a/packages/stack-emails/src/templates/email-verification.tsx b/packages/stack-emails/src/templates/email-verification.tsx index d5607834b2..5d0a79a6c0 100644 --- a/packages/stack-emails/src/templates/email-verification.tsx +++ b/packages/stack-emails/src/templates/email-verification.tsx @@ -128,4 +128,4 @@ export const emailVerificationTemplate: TEditorConfiguration = { } } } -}; \ No newline at end of file +}; diff --git a/packages/stack-emails/src/utils.tsx b/packages/stack-emails/src/utils.tsx index b908c541a1..6fd0264402 100644 --- a/packages/stack-emails/src/utils.tsx +++ b/packages/stack-emails/src/utils.tsx @@ -13,8 +13,6 @@ import { teamInvitationTemplate } from "./templates/team-invitation"; const userVars = [ { name: 'userDisplayName', label: 'User Display Name', defined: false, example: 'John Doe' }, - // TODO: rename this to userEmail - { name: 'userPrimaryEmail', label: 'User Primary Email', defined: true, example: 'example@email.com' }, ] as const; const projectVars = [ diff --git a/packages/stack-proxy/.env.development b/packages/stack-proxy/.env.development deleted file mode 100644 index 76ec17eaa9..0000000000 --- a/packages/stack-proxy/.env.development +++ /dev/null @@ -1,6 +0,0 @@ -# Contains the credentials for the internal project of Stack's default development environment setup. -# Do not use in a production environment, instead replace it with actual values gathered from https://app.stack-auth.com. -NEXT_PUBLIC_STACK_URL=http://localhost:8102 -NEXT_PUBLIC_STACK_PROJECT_ID=internal -NEXT_PUBLIC_STACK_PUBLISHABLE_CLIENT_KEY=this-publishable-client-key-is-for-local-development-only -STACK_SECRET_SERVER_KEY=this-secret-server-key-is-for-local-development-only diff --git a/packages/stack-proxy/.eslintrc.json b/packages/stack-proxy/.eslintrc.json deleted file mode 100644 index bffb357a71..0000000000 --- a/packages/stack-proxy/.eslintrc.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "extends": "next/core-web-vitals" -} diff --git a/packages/stack-proxy/.gitignore b/packages/stack-proxy/.gitignore deleted file mode 100644 index 852b9e6e24..0000000000 --- a/packages/stack-proxy/.gitignore +++ /dev/null @@ -1,38 +0,0 @@ -# See https://help.github.com/articles/ignoring-files/ for more about ignoring files. - -# dependencies -/node_modules -/.pnp -.pnp.js -.yarn/install-state.gz - -# testing -/coverage - -# next.js -/.next/ -/out/ - -# production -/build - -# misc -.DS_Store -*.pem - -# debug -npm-debug.log* -yarn-debug.log* -yarn-error.log* - -# local env files -.env*.local - -# vercel -.vercel - -# typescript -*.tsbuildinfo -next-env.d.ts - -/dist \ No newline at end of file diff --git a/packages/stack-proxy/CHANGELOG.md b/packages/stack-proxy/CHANGELOG.md deleted file mode 100644 index 7b8847bb99..0000000000 --- a/packages/stack-proxy/CHANGELOG.md +++ /dev/null @@ -1,63 +0,0 @@ -# @stackframe/stack-proxy - -## 2.6.3 - -### Patch Changes - -- Updated dependencies - - @stackframe/stack@2.6.3 - -## 2.6.2 - -### Patch Changes - -- Updated dependencies - - @stackframe/stack@2.6.2 - -## 2.6.1 - -### Patch Changes - -- Updated dependencies - - @stackframe/stack@2.6.1 - -## 2.6.0 - -### Minor Changes - -- OTP login, more providers, and styling improvements - -### Patch Changes - -- Updated dependencies - - @stackframe/stack@2.6.0 - -## 2.5.37 - -### Patch Changes - -- Updated dependencies - - @stackframe/stack@2.5.37 - -## 2.5.36 - -### Patch Changes - -- added apple oauth -- Updated dependencies - - @stackframe/stack@2.5.36 - -## 2.5.35 - -### Patch Changes - -- Updated dependencies - - @stackframe/stack@2.5.35 - -## 2.5.34 - -### Patch Changes - -- Internationalization -- Updated dependencies - - @stackframe/stack@2.5.34 diff --git a/packages/stack-proxy/README.md b/packages/stack-proxy/README.md deleted file mode 100644 index d241f07d40..0000000000 --- a/packages/stack-proxy/README.md +++ /dev/null @@ -1,121 +0,0 @@ -# Stack Auth Proxy - -Stack Auth Proxy is a simple one-command proxy that authenticates your HTTP requests and redirects to a pre-built sign-in page if a user is not authenticated. - -## Setup - -First, create your API keys on the [Stack Auth Dashboard](https://app.stack-auth.com) and retrieve your environment variables. Note that Stack Auth is open-source and can be self-hosted; more details are available [here](https://github.com/stack-auth/stack). - -```sh -STACK_PROJECT_ID=
- && \
-STACK_PUBLISHABLE_CLIENT_KEY= && \
-STACK_SECRET_SERVER_KEY= && \
-npx @stackframe/stack-proxy \
- -s 3001 \
- -p 3000 \
- -u "/protected**"
-```
-
-You can explore the proxy at [localhost:3000](http://localhost:3000).
-
-
-## What You Get
-
-If you access a protected page through the proxy without being authenticated, you will be redirected to a sign-in page like this (customizable on the dashboard):
-
-If you don't have a website, you can run our example server to play around with the proxy
- -Start the example server on port 3000: -```sh -PORT=3001 && npx @stackframe/proxied-server-example -``` - -You can check out the original server without the proxy at [localhost:3001](http://localhost:3001). - -Now, open a new terminal and run the proxy server on port 3000: - -```sh -STACK_PROJECT_ID=
-
-
-
-After signing in, you will be able to access the protected pages. To retrieve user information from your webpage, you can read the headers as shown in this JavaScript Express example (works similarly on other languages/frameworks):
-
-```js
-const handlebars = require('handlebars');
-const template = handlebars.compile(`
-
-`);
-
-app.get('/', (req, res) => {
- const authenticated = !!req.headers['x-stack-authenticated'];
- const displayName = req.headers['x-stack-user-display-name'] || '';
- const html = template({ authenticated, displayName });
- res.send(html);
-});
-
-Available headers:
-
-- `x-stack-authenticated`: "true" if authenticated; not present otherwise.
-- `x-stack-user-id`
-- `x-stack-user-primary-email`
-- `x-stack-user-display-name`
-
-Available URLs (redirect your app server to these URLs as needed):
-
-- `/handler/sign-in`
-- `/handler/sign-up`
-- `/handler/sign-out`: Clears cookies and redirects back to your homepage.
-- `/handler/account-settings`: Users can update their email, display name, password, etc.
-
-## How It Works
-
-When a request is received, the logic is as follows:
-
-```
-if url is /handler/*:
- render the auth pages
-else:
- if user is not authenticated && url is protected:
- redirect to /handler/sign-in
- else:
- forward the request to your server with user info headers
-```
-
-```mermaid
-graph TB
- Client((Request))
- Proxy[Stack Auth Proxy]
- YourServer[Your Server]
- StackAuthServer[Stack Auth Server]
-
- Client --> Proxy
- Proxy --> |"add user info headers"| YourServer
- Proxy --> StackAuthServer
- StackAuthServer --> Proxy
-
- classDef container fill:#1168bd,stroke:#0b4884,color:#ffffff
- class StackAuthServer container
- class YourServer container
- class Proxy container
-```
-
-This diagram illustrates the request flow and interactions between the client, the proxy, your server, and the Stack Auth server.
\ No newline at end of file
diff --git a/packages/stack-proxy/app/[...stack]/layout.tsx b/packages/stack-proxy/app/[...stack]/layout.tsx
deleted file mode 100644
index 41aff14562..0000000000
--- a/packages/stack-proxy/app/[...stack]/layout.tsx
+++ /dev/null
@@ -1,17 +0,0 @@
-import React from "react";
-
-export default function Layout({ children }: { children: React.ReactNode }) {
- return (
-
-
-
-
- Back
-
-
- {children}
-
- );
-}
\ No newline at end of file
diff --git a/packages/stack-proxy/app/[...stack]/page.tsx b/packages/stack-proxy/app/[...stack]/page.tsx
deleted file mode 100644
index c47404eec4..0000000000
--- a/packages/stack-proxy/app/[...stack]/page.tsx
+++ /dev/null
@@ -1,6 +0,0 @@
-import { StackHandler } from "@stackframe/stack";
-import { stackServerApp } from "../../stack";
-
-export default function Handler(props: any) {
- return
- {editing ? (
- <>
- setEditingValue(e.target.value)}
- />
-
-
-
- ) : (
- <>
- {props.value}
-
-
- )}
-
- );
-}
\ No newline at end of file
diff --git a/packages/stack-ui/src/components/ui/button.tsx b/packages/stack-ui/src/components/ui/button.tsx
index 1369bf4bfa..40ef43154b 100644
--- a/packages/stack-ui/src/components/ui/button.tsx
+++ b/packages/stack-ui/src/components/ui/button.tsx
@@ -13,13 +13,13 @@ const buttonVariants = cva(
variants: {
variant: {
default:
- "bg-primary text-primary-foreground shadow hover:bg-primary/90",
+ "bg-primary text-primary-foreground hover:bg-primary/90",
destructive:
- "bg-destructive text-destructive-foreground shadow-sm hover:bg-destructive/90",
+ "bg-destructive text-destructive-foreground hover:bg-destructive/90",
outline:
- "border border-input bg-background shadow-sm hover:bg-accent hover:text-accent-foreground",
+ "border border-input bg-background hover:bg-accent hover:text-accent-foreground",
secondary:
- "bg-secondary text-secondary-foreground shadow-sm hover:bg-secondary/80",
+ "bg-secondary text-secondary-foreground hover:bg-secondary/80",
ghost: "hover:bg-accent hover:text-accent-foreground",
link: "text-primary underline-offset-4 hover:underline",
},
diff --git a/packages/stack-ui/src/components/ui/inline-code.tsx b/packages/stack-ui/src/components/ui/inline-code.tsx
index 7e4f73b3e3..238829c622 100644
--- a/packages/stack-ui/src/components/ui/inline-code.tsx
+++ b/packages/stack-ui/src/components/ui/inline-code.tsx
@@ -36,4 +36,4 @@ const InlineCode = React.forwardRef<
});
InlineCode.displayName = "Code";
-export { InlineCode };
\ No newline at end of file
+export { InlineCode };
diff --git a/packages/stack-ui/src/components/ui/input.tsx b/packages/stack-ui/src/components/ui/input.tsx
index d0ed5eacf2..85b76050f8 100644
--- a/packages/stack-ui/src/components/ui/input.tsx
+++ b/packages/stack-ui/src/components/ui/input.tsx
@@ -11,7 +11,7 @@ const Input = React.forwardRef
+
{team.displayName}
,
type: 'item',
- subpath: `/teams/${team.id}`,
+ id: `team-${team.id}`,
content: ,
} as const)),
...project.config.clientTeamCreationEnabled ? [{
title: t('Create a team'),
icon: CirclePlus,
type: 'item',
- subpath: '/team-creation',
+ id: 'team-creation',
content:
+
);
}
-function SettingsPage() {
- const deleteAccountSection = useDeleteAccountSection();
- const signOutSection = useSignOutSection();
+function EmailsAndAuthPage() {
+ const passwordSection = usePasswordSection();
+ const mfaSection = useMfaSection();
+ const otpSection = useOtpSection();
return (
+ {t("Emails")}
+ {addingEmail ? (
+
+ ) : (
+
+
+ {contactChannels.length > 0 ? (
+
+
+
+ )}
+
+
+
+
+ ) : null}
+
- {user.primaryEmailVerified ? (
- {t("Your email has been verified.")}
- ) : (
-
+ {deleteAccountSection}
+ {signOutSection}
+
+ );
+}
+
function usePasswordSection() {
const { t } = useTranslation();
+ const user = useUser({ or: "throw" });
+ const contactChannels = user.useContactChannels();
+ const [changingPassword, setChangingPassword] = useState(false);
+ const [loading, setLoading] = useState(false);
const passwordSchema = yupObject({
- oldPassword: yupString().required(t('Please enter your old password')),
+ oldPassword: user.hasPassword ? yupString().required(t('Please enter your old password')) : yupString(),
newPassword: yupString().required(t('Please enter your password')).test({
name: 'is-valid-password',
test: (value, ctx) => {
@@ -247,24 +450,25 @@ function usePasswordSection() {
newPasswordRepeat: yupString().nullable().oneOf([yup.ref('newPassword'), "", null], t('Passwords do not match')).required(t('Please repeat your password'))
});
- const user = useUser({ or: "throw" });
- const [changingPassword, setChangingPassword] = useState(false);
const { register, handleSubmit, setError, formState: { errors }, clearErrors, reset } = useForm({
resolver: yupResolver(passwordSchema)
});
- const [alreadyReset, setAlreadyReset] = useState(false);
- const [loading, setLoading] = useState(false);
+
+ // eslint-disable-next-line @typescript-eslint/no-unnecessary-condition
+ const hasValidEmail = contactChannels.filter(x => x.type === 'email' && x.isVerified && x.usedForAuth).length > 0;
const onSubmit = async (data: yup.InferType) => {
setLoading(true);
try {
const { oldPassword, newPassword } = data;
- const error = await user.updatePassword({ oldPassword, newPassword });
+ const error = user.hasPassword
+ ? await user.updatePassword({ oldPassword: oldPassword!, newPassword })
+ : await user.setPassword({ password: newPassword! });
if (error) {
setError('oldPassword', { type: 'manual', message: t('Incorrect password') });
} else {
reset();
- setAlreadyReset(true);
+ setChangingPassword(false);
}
} finally {
setLoading(false);
@@ -274,28 +478,30 @@ function usePasswordSection() {
const registerPassword = register('newPassword');
const registerPasswordRepeat = register('newPasswordRepeat');
- if (!user.hasPassword) {
- return null;
- }
-
return (
-
+
+ {t("To enable OTP sign-in, please add a verified email and set it as your sign-in email.")}
)}
);
}
+function SettingsPage() {
+ const deleteAccountSection = useDeleteAccountSection();
+ const signOutSection = useSignOutSection();
+
+ return (
+
+ {hasValidEmail ? (
+ user.otpAuthEnabled ? (
+ !isLastAuth ? (
+ !disabling ? (
+
+ ) : (
+ {t("OTP sign-in is enabled and cannot be disabled as it is currently the only sign-in method")}
+ )
+ ) : (
-
+ )
+ ) : (
+
+
+ {t("Are you sure you want to disable OTP sign-in? You will not be able to sign in with only emails anymore.")}
+
+
+ )
+ ) : (
+
+
+
+
+
-
-
- {t("Disable")}
+ {t("Disable MFA")}
) : !generatedSecret && (
)}
@@ -729,7 +950,7 @@ export function TeamCreation() {
setLoading(false);
}
- router.push(app.urls.accountSettings + `/teams/${team.id}`);
+ router.push(`#team-${team.id}`);
};
return (
@@ -814,4 +1035,48 @@ export function useDeleteAccountSection() {
- {
- alreadyReset ?
- {t("Password changed successfully!")} :
- !changingPassword ?
- :
-
+
);
}
@@ -367,7 +588,7 @@ function useMfaSection() {
return (
+ {editing ? (
+ <>
+ setEditingValue(e.target.value)}
+ />
+
+
+
+ ) : (
+ <>
+ {props.value}
+
+
+ )}
+
+ );
+}
diff --git a/packages/stack/src/components-page/auth-page.tsx b/packages/stack/src/components-page/auth-page.tsx
index a47645a5be..214f809eef 100644
--- a/packages/stack/src/components-page/auth-page.tsx
+++ b/packages/stack/src/components-page/auth-page.tsx
@@ -57,7 +57,7 @@ export function AuthPage(props: {
return (
+
{props.type === 'sign-in' ? t("Sign in to your account") : t("Create a new account")}
@@ -112,4 +112,4 @@ export function AuthPage(props: {
);
-}
\ No newline at end of file
+}
diff --git a/packages/stack/src/components-page/forgot-password.tsx b/packages/stack/src/components-page/forgot-password.tsx
index 4cf1ac976d..82561a883e 100644
--- a/packages/stack/src/components-page/forgot-password.tsx
+++ b/packages/stack/src/components-page/forgot-password.tsx
@@ -77,7 +77,7 @@ export function ForgotPassword(props: { fullPage?: boolean }) {
return (
diff --git a/packages/stack/src/components-page/oauth-callback.tsx b/packages/stack/src/components-page/oauth-callback.tsx
index 393ce44b57..cb0eabd0ec 100644
--- a/packages/stack/src/components-page/oauth-callback.tsx
+++ b/packages/stack/src/components-page/oauth-callback.tsx
@@ -42,4 +42,4 @@ export function OAuthCallback(props: { fullPage?: boolean }) {
: null}
;
-}
\ No newline at end of file
+}
diff --git a/packages/stack/src/components-page/password-reset.tsx b/packages/stack/src/components-page/password-reset.tsx
index 24c1494c5b..6d28559f40 100644
--- a/packages/stack/src/components-page/password-reset.tsx
+++ b/packages/stack/src/components-page/password-reset.tsx
@@ -78,7 +78,7 @@ export default function PasswordResetForm(props: {
return (
{t("This is most likely an error in Stack. Please report it.")}
diff --git a/packages/stack/src/components-page/stack-handler.tsx b/packages/stack/src/components-page/stack-handler.tsx
index 94317af74c..1803b10d8d 100644
--- a/packages/stack/src/components-page/stack-handler.tsx
+++ b/packages/stack/src/components-page/stack-handler.tsx
@@ -73,18 +73,12 @@ export default async function StackHandler(props:
oauthCallback: 'oauth-callback',
magicLinkCallback: 'magic-link-callback',
teamInvitation: 'team-invitation',
+ accountSettings: 'account-settings',
error: 'error',
};
const path = props.params.stack.join('/');
- if (path.startsWith('account-settings')) {
- return (props:
{...filterUndefinedINU(props.componentProps?.TeamInvitation)}
/>;
}
+ case availablePaths.accountSettings: {
+ return
-
-
+
{t('Create a Team')}
diff --git a/packages/stack/src/components/credential-sign-up.tsx b/packages/stack/src/components/credential-sign-up.tsx
index 542b2a367b..c8a5c649a3 100644
--- a/packages/stack/src/components/credential-sign-up.tsx
+++ b/packages/stack/src/components/credential-sign-up.tsx
@@ -61,11 +61,11 @@ export function CredentialSignUp(props: { noPasswordRepeat?: boolean }) {
onSubmit={e => runAsynchronouslyWithAlert(handleSubmit(onSubmit)(e))}
noValidate
>
-
+
-
+
- Sign Up
+ {t('Sign Up')}
);
diff --git a/packages/stack/src/components/elements/sidebar-layout.tsx b/packages/stack/src/components/elements/sidebar-layout.tsx
index bd87071eee..367e4e6305 100644
--- a/packages/stack/src/components/elements/sidebar-layout.tsx
+++ b/packages/stack/src/components/elements/sidebar-layout.tsx
@@ -1,41 +1,45 @@
'use client';
+import { useHash } from '@stackframe/stack-shared/dist/hooks/use-hash';
import { Button, Typography, cn } from '@stackframe/stack-ui';
import { LucideIcon, XIcon } from 'lucide-react';
-import { usePathname, useRouter } from 'next/navigation';
-import React, { ReactNode } from 'react';
+import { useRouter } from 'next/navigation';
+import React, { ReactNode, useEffect } from 'react';
export type SidebarItem = {
title: React.ReactNode,
type: 'item' | 'divider',
description?: React.ReactNode,
- subpath?: string,
+ id?: string,
icon?: LucideIcon,
content?: React.ReactNode,
contentTitle?: React.ReactNode,
}
-export function SidebarLayout(props: { items: SidebarItem[], title?: ReactNode, basePath: string, className?: string }) {
- const pathname = usePathname();
- const selectedIndex = props.items.findIndex(item => item.subpath && (props.basePath + item.subpath === pathname));
+export function SidebarLayout(props: { items: SidebarItem[], title?: ReactNode, className?: string }) {
const router = useRouter();
- if (pathname !== props.basePath && selectedIndex === -1) {
- router.push(props.basePath);
- }
+ const hash = useHash();
+ const selectedIndex = props.items.findIndex(item => item.id && (item.id === hash));
+
+ useEffect(() => {
+ if (selectedIndex === -1) {
+ router.push('#' + props.items[0].id);
+ }
+ }, [hash]);
return (
<>
{props.title}
}
-
);
}
-}
\ No newline at end of file
+}
diff --git a/packages/stack/src/components/elements/user-avatar.tsx b/packages/stack/src/components/elements/user-avatar.tsx
index 3b0003d612..53cb849925 100644
--- a/packages/stack/src/components/elements/user-avatar.tsx
+++ b/packages/stack/src/components/elements/user-avatar.tsx
@@ -25,4 +25,4 @@ export function UserAvatar(props: {
);
-}
\ No newline at end of file
+}
diff --git a/packages/stack/src/components/message-cards/message-card.tsx b/packages/stack/src/components/message-cards/message-card.tsx
index b2dc46f7c4..7f7c87146c 100644
--- a/packages/stack/src/components/message-cards/message-card.tsx
+++ b/packages/stack/src/components/message-cards/message-card.tsx
@@ -18,7 +18,7 @@ export function MessageCard(
) {
return (
-
-
);
}
-function Items(props: { items: SidebarItem[], basePath: string, selectedIndex: number }) {
+function Items(props: { items: SidebarItem[], selectedIndex: number }) {
const router = useRouter();
return props.items.map((item, index) => (
@@ -49,8 +53,8 @@ function Items(props: { items: SidebarItem[], basePath: string, selectedIndex: n
"justify-start text-md text-zinc-800 dark:text-zinc-300 px-2 text-left",
)}
onClick={() => {
- if (item.subpath) {
- router.push(props.basePath + item.subpath);
+ if (item.id) {
+ router.push('#' + item.id);
}
}}
>
@@ -64,7 +68,7 @@ function Items(props: { items: SidebarItem[], basePath: string, selectedIndex: n
}
-function DesktopLayout(props: { items: SidebarItem[], title?: ReactNode, selectedIndex: number, basePath: string }) {
+function DesktopLayout(props: { items: SidebarItem[], title?: ReactNode, selectedIndex: number }) {
const selectedItem = props.items[props.selectedIndex === -1 ? 0 : props.selectedIndex];
return (
@@ -74,7 +78,7 @@ function DesktopLayout(props: { items: SidebarItem[], title?: ReactNode, selecte
@@ -91,7 +95,7 @@ function DesktopLayout(props: { items: SidebarItem[], title?: ReactNode, selecte
);
}
-function MobileLayout(props: { items: SidebarItem[], title?: ReactNode, selectedIndex: number, basePath: string }) {
+function MobileLayout(props: { items: SidebarItem[], title?: ReactNode, selectedIndex: number }) {
const selectedItem = props.items[props.selectedIndex];
const router = useRouter();
@@ -102,7 +106,7 @@ function MobileLayout(props: { items: SidebarItem[], title?: ReactNode, selected
{props.title}
}
-
+
{props.title}
{props.children}
{(props.primaryButtonText || props.secondaryButtonText) && (
diff --git a/packages/stack/src/components/message-cards/predefined-message-card.tsx b/packages/stack/src/components/message-cards/predefined-message-card.tsx
index a4c16ba2fd..4ad80b26bd 100644
--- a/packages/stack/src/components/message-cards/predefined-message-card.tsx
+++ b/packages/stack/src/components/message-cards/predefined-message-card.tsx
@@ -1,7 +1,7 @@
"use client";
import { Typography } from "@stackframe/stack-ui";
-import { useStackApp } from "../..";
+import { useStackApp, useUser } from "../..";
import { MessageCard } from "./message-card";
import { useTranslation } from "../../lib/translations";
@@ -13,6 +13,7 @@ export function PredefinedMessageCard({
fullPage?: boolean,
}) {
const stackApp = useStackApp();
+ const user = useUser();
const { t } = useTranslation();
let title: string;
@@ -62,8 +63,13 @@ export function PredefinedMessageCard({
case 'emailVerified': {
title = t("Email verified!");
message = t("Your have successfully verified your email.");
- primaryAction = () => stackApp.redirectToSignIn({ noRedirectBack: true });
- primaryButton = t("Sign in");
+ if (user) {
+ primaryAction = () => stackApp.redirectToSignIn({ noRedirectBack: true });
+ primaryButton = t("Sign in");
+ } else {
+ primaryAction = () => stackApp.redirectToHome();
+ primaryButton = t("Go to home");
+ }
break;
}
case 'unknownError': {
diff --git a/packages/stack/src/components/oauth-button.tsx b/packages/stack/src/components/oauth-button.tsx
index e1d3ea6374..c416d91005 100644
--- a/packages/stack/src/components/oauth-button.tsx
+++ b/packages/stack/src/components/oauth-button.tsx
@@ -302,7 +302,7 @@ export function OAuthButton({
);
-}
\ No newline at end of file
+}
diff --git a/packages/stack/src/components/selected-team-switcher.tsx b/packages/stack/src/components/selected-team-switcher.tsx
index a2b2a5ed52..4164168259 100644
--- a/packages/stack/src/components/selected-team-switcher.tsx
+++ b/packages/stack/src/components/selected-team-switcher.tsx
@@ -60,15 +60,17 @@ export function SelectedTeamSwitcher(props: SelectedTeamSwitcherProps) {
});
}}
>
-
+
{user?.selectedTeam ?
{user.selectedTeam.displayName}
+ {user.selectedTeam.displayName}
: undefined}
@@ -89,7 +91,7 @@ export function SelectedTeamSwitcher(props: SelectedTeamSwitcherProps) {
{team.displayName}
+ {team.displayName}
))}
@@ -102,7 +104,7 @@ export function SelectedTeamSwitcher(props: SelectedTeamSwitcherProps) {
- {t('Current team')}
-
@@ -76,7 +78,7 @@ export function SelectedTeamSwitcher(props: SelectedTeamSwitcherProps) {