Skip to content

🐸 Rybbit - open-source and privacy-friendly alternative to Google Analytics that is 10x more intuitive.

Refactor invitation components to utilize callback URL

Bill Yang5997087c2bc0
diff --git a/client/src/app/invitation/components/login.tsx b/client/src/app/invitation/components/login.tsx
index 1d54df721..6a322fb2b 100644
--- a/client/src/app/invitation/components/login.tsx
+++ b/client/src/app/invitation/components/login.tsx
@@ -9,11 +9,10 @@ import { AuthError } from "@/components/auth/AuthError";
import { SocialButtons } from "@/components/auth/SocialButtons";
interface LoginProps {
- inviterEmail?: string | null;
- organization?: string | null;
+ callbackURL: string;
}
-export function Login({ inviterEmail, organization }: LoginProps) {
+export function Login({ callbackURL }: LoginProps) {
const [isLoading, setIsLoading] = useState(false);
const [error, setError] = useState<string>("");
const [email, setEmail] = useState("");
@@ -51,7 +50,7 @@ export function Login({ inviterEmail, organization }: LoginProps) {
return (
<form onSubmit={handleLogin}>
<div className="flex flex-col gap-4">
- <SocialButtons onError={setError} />
+ <SocialButtons onError={setError} callbackURL={callbackURL} />
<AuthInput
id="email"
label="Email"
diff --git a/client/src/app/invitation/components/signup.tsx b/client/src/app/invitation/components/signup.tsx
index 8571190e5..2ce5f31b6 100644
--- a/client/src/app/invitation/components/signup.tsx
+++ b/client/src/app/invitation/components/signup.tsx
@@ -11,11 +11,10 @@ import { SocialButtons } from "@/components/auth/SocialButtons";
import { Turnstile } from "@/components/auth/Turnstile";
interface SignupProps {
- inviterEmail?: string | null;
- organization?: string | null;
+ callbackURL: string;
}
-export function Signup({ inviterEmail, organization }: SignupProps) {
+export function Signup({ callbackURL }: SignupProps) {
const [isLoading, setIsLoading] = useState(false);
const [error, setError] = useState<string>("");
const [email, setEmail] = useState("");
@@ -71,7 +70,7 @@ export function Signup({ inviterEmail, organization }: SignupProps) {
return (
<form onSubmit={handleSignup}>
<div className="flex flex-col gap-4">
- <SocialButtons onError={setError} />
+ <SocialButtons onError={setError} callbackURL={callbackURL} mode="signup" />
<AuthInput
id="email"
diff --git a/client/src/app/invitation/page.tsx b/client/src/app/invitation/page.tsx
index 9c307b272..90b32efd3 100644
--- a/client/src/app/invitation/page.tsx
+++ b/client/src/app/invitation/page.tsx
@@ -14,10 +14,14 @@ import { Login } from "./components/login";
import { Signup } from "./components/signup";
function AuthComponent() {
- const organization = useSearchParams().get("organization");
- const inviterEmail = useSearchParams().get("inviterEmail");
+ const searchParams = useSearchParams();
+ const organization = searchParams.get("organization");
+ const inviterEmail = searchParams.get("inviterEmail");
const [activeTab, setActiveTab] = useState<"login" | "signup">("signup");
+ // Construct callback URL to return to this page after OAuth
+ const callbackURL = `/invitation?${searchParams.toString()}`;
+
return (
<Card className="w-full max-w-md p-1">
<CardHeader>
@@ -33,11 +37,11 @@ function AuthComponent() {
</TabsList>
<TabsContent value="login">
- <Login inviterEmail={inviterEmail} organization={organization} />
+ <Login callbackURL={callbackURL} />
</TabsContent>
<TabsContent value="signup">
- <Signup inviterEmail={inviterEmail} organization={organization} />
+ <Signup callbackURL={callbackURL} />
</TabsContent>
</Tabs>
</CardContent>