Skip to content

Papermark is the open-source DocSend alternative and secure data rooms with built-in analytics and custom domains.

merge in passkey and update register / login pages

Marc Seitzf2f8c468a4e3
diff --git a/app/(auth)/login/page.tsx b/app/(auth)/login/page.tsx
index 2c78feba..022528be 100644
--- a/app/(auth)/login/page.tsx
+++ b/app/(auth)/login/page.tsx
@@ -8,10 +8,14 @@ import { useRouter } from "next/router";
import { Input } from "@/components/ui/input";
import { useParams } from "next/navigation";
import Passkey from "@/components/shared/icons/passkey";
+import { useState } from "react";
+import { toast } from "sonner";
export default function Login() {
const { next } = useParams as { next?: string };
+ const [email, setEmail] = useState<string>("");
+
return (
<div className="flex h-screen w-screen justify-center">
<div
@@ -26,7 +30,7 @@ export default function Login() {
}}
/>
</div>
- <div className="z-10 mt-[calc(30vh)] h-fit w-full mx-5 sm:mx-0 max-w-md overflow-hidden border border-border bg-gray-50 dark:bg-gray-900 rounded-lg sm:shadow-xl">
+ <div className="z-10 mt-[calc(20vh)] h-fit w-full mx-5 sm:mx-0 max-w-md overflow-hidden border border-border bg-gray-50 dark:bg-gray-900 rounded-lg sm:shadow-xl">
<div className="flex flex-col items-center justify-center space-y-3 px-4 py-6 pt-8 text-center sm:px-16">
<Link href="/">
<span className="text-xl font-bold tracking-tighter text-foreground">
@@ -41,13 +45,26 @@ export default function Login() {
className="flex flex-col p-4 pt-8 sm:px-16 gap-4"
onSubmit={(e) => {
e.preventDefault();
- const form = e.target as HTMLFormElement;
signIn("email", {
- email: (form.elements[0] as HTMLInputElement).value,
+ email: email,
+ redirect: false,
+ ...(next && next.length > 0 ? { callbackUrl: next } : {}),
+ }).then((res) => {
+ if (res?.ok && !res?.error) {
+ setEmail("");
+ toast.success("Email sent - check your inbox!");
+ } else {
+ toast.error("Error sending email - try again?");
+ }
});
}}
>
- <Input className=" border-4" placeholder="[email protected]" />
+ <Input
+ className=" border-4"
+ placeholder="[email protected]"
+ value={email}
+ onChange={(e) => setEmail(e.target.value)}
+ />
<Button type="submit">Continue with Email</Button>
</form>
<p className="text-center">or</p>
@@ -68,7 +85,7 @@ export default function Login() {
>
<path d="M488 261.8C488 403.3 391.1 504 248 504 110.8 504 0 393.2 0 256S110.8 8 248 8c66.8 0 123 24.5 166.3 64.9l-67.5 64.9C258.5 52.6 94.3 116.6 94.3 256c0 86.5 69.1 156.6 153.7 156.6 98.2 0 135-70.4 140.8-106.9H248v-85.3h236.1c2.3 12.7 3.9 24.9 3.9 41.4z" />
</svg>
- <span>Sign in with Google</span>
+ <span>Continue with Google</span>
</Button>
<Button
onClick={() =>
@@ -80,7 +97,7 @@ export default function Login() {
className="flex justify-center items-center space-x-2"
>
<Passkey className="w-4 h-4" />
- <span>Sign in with a passkey</span>
+ <span>Continue with a passkey</span>
</Button>
</div>
</div>
diff --git a/app/(auth)/register/page.tsx b/app/(auth)/register/page.tsx
index abd878d9..b3a46a8b 100644
--- a/app/(auth)/register/page.tsx
+++ b/app/(auth)/register/page.tsx
@@ -10,11 +10,16 @@ import {
startServerPasskeyRegistration,
} from "@/lib/api/auth/passkey";
import { create } from "@github/webauthn-json";
+import { Input } from "@/components/ui/input";
+import { useState } from "react";
+import { toast } from "sonner";
export default function Register() {
const router = useRouter();
const { next } = useParams as { next?: string };
+ const [email, setEmail] = useState<string>("");
+
async function registerPasskey() {
const createOptions = await startServerPasskeyRegistration();
@@ -50,6 +55,33 @@ export default function Register() {
Start sharing documents
</h3>
</div>
+ <form
+ className="flex flex-col p-4 pt-8 sm:px-16 gap-4"
+ onSubmit={(e) => {
+ e.preventDefault();
+ signIn("email", {
+ email: email,
+ redirect: false,
+ ...(next && next.length > 0 ? { callbackUrl: next } : {}),
+ }).then((res) => {
+ if (res?.ok && !res?.error) {
+ setEmail("");
+ toast.success("Email sent - check your inbox!");
+ } else {
+ toast.error("Error sending email - try again?");
+ }
+ });
+ }}
+ >
+ <Input
+ className=" border-4"
+ placeholder="[email protected]"
+ value={email}
+ onChange={(e) => setEmail(e.target.value)}
+ />
+ <Button type="submit">Continue with Email</Button>
+ </form>
+ <p className="text-center">or</p>
<div className="flex flex-col px-4 py-8 sm:px-16 space-y-2">
<Button
onClick={() => {
@@ -69,13 +101,13 @@ export default function Register() {
</svg>
<span>Continue with Google</span>
</Button>
- <Button
+ {/* <Button
onClick={() => registerPasskey().then(router.refresh)}
className="flex justify-center items-center space-x-2"
>
<Passkey className="w-4 h-4" />
<span>Register a passkey</span>
- </Button>
+ </Button> */}
</div>
</div>
</div>
diff --git a/components/Sidebar.tsx b/components/Sidebar.tsx
index fd7caa64..7f76680f 100644
--- a/components/Sidebar.tsx
+++ b/components/Sidebar.tsx
@@ -20,6 +20,7 @@ import { usePlan } from "@/lib/swr/use-billing";
import Image from "next/image";
import SelectTeam from "./teams/select-team";
import { TeamContextType, initialState, useTeam } from "@/context/team-context";
+import UserRound from "./shared/icons/user-round";
export default function Sidebar() {
const { data: session, status } = useSession();
@@ -243,16 +244,26 @@ export default function Sidebar() {
<div className="flex justify-between items-center space-x-2">
<Menu as="div" className="relative grow">
<Menu.Button className="flex items-center group rounded-md gap-x-3 p-2 w-full text-sm font-semibold leading-6 text-foreground hover:bg-gray-200 hover:dark:bg-secondary">
- <Image
- className="h-8 w-8 rounded-full bg-secondary"
- src={session?.user?.image || ""}
- width={32}
- height={32}
- alt={`Profile picture of ${session?.user?.name}`}
- />
+ {session?.user?.image ? (
+ <Image
+ className="h-8 w-8 rounded-full bg-secondary"
+ src={session?.user?.image}
+ width={32}
+ height={32}
+ alt={`Profile picture of ${session?.user?.name}`}
+ />
+ ) : (
+ <div className="">
+ <UserRound className="h-8 w-8 p-1 rounded-full ring-1 ring-muted-foreground/50 bg-secondary" />
+ </div>
+ )}
<span className="flex items-center w-full justify-between">
<span className="sr-only">Your profile</span>
- <span aria-hidden="true">{session?.user?.name}</span>
+ <span aria-hidden="true">
+ {session?.user?.name
+ ? session?.user?.name
+ : session?.user?.email?.split("@")[0]}
+ </span>
<ChevronUp
className="ml-2 h-5 w-5 text-muted-foreground"
aria-hidden="true"
@@ -333,13 +344,19 @@ export default function Sidebar() {
<Menu as="div" className="relative">
<Menu.Button className="-m-1.5 flex items-center p-1.5">
<span className="sr-only">Open user menu</span>
- <Image
- className="h-8 w-8 rounded-full bg-secondary"
- src={session?.user?.image || ""}
- width={32}
- height={32}
- alt={`Profile picture of ${session?.user?.name}`}
- />
+ {session?.user?.image ? (
+ <Image
+ className="h-8 w-8 rounded-full bg-secondary"
+ src={session?.user?.image}
+ width={32}
+ height={32}
+ alt={`Profile picture of ${session?.user?.name}`}
+ />
+ ) : (
+ <div className="">
+ <UserRound className="h-8 w-8 p-1 rounded-full ring-1 ring-muted-foreground/50 bg-secondary" />
+ </div>
+ )}
</Menu.Button>
<Transition
as={Fragment}
diff --git a/package-lock.json b/package-lock.json
index 8b9db29a..d69e8462 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -66,6 +66,7 @@
"next-auth": "^4.24.5",
"next-plausible": "^3.12.0",
"next-themes": "^0.2.1",
+ "nodemailer": "^6.9.7",
"notion-client": "^6.16.0",
"notion-utils": "^6.16.0",
"openai": "^4.20.0",
@@ -8530,6 +8531,14 @@
"resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.13.tgz",
"integrity": "sha512-uYr7J37ae/ORWdZeQ1xxMJe3NtdmqMC/JZK+geofDrkLUApKRHPd18/TxtBOJ4A0/+uUIliorNrfYV6s1b02eQ=="
},
+ "node_modules/nodemailer": {
+ "version": "6.9.7",
+ "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-6.9.7.tgz",
+ "integrity": "sha512-rUtR77ksqex/eZRLmQ21LKVH5nAAsVicAtAYudK7JgwenEDZ0UIQ1adUGqErz7sMkWYxWTTU1aeP2Jga6WQyJw==",
+ "engines": {
+ "node": ">=6.0.0"
+ }
+ },
"node_modules/nopt": {
"version": "6.0.0",
"resolved": "https://registry.npmjs.org/nopt/-/nopt-6.0.0.tgz",
diff --git a/package.json b/package.json
index 3203f932..0ddefb49 100644
--- a/package.json
+++ b/package.json
@@ -73,6 +73,7 @@
"next-auth": "^4.24.5",
"next-plausible": "^3.12.0",
"next-themes": "^0.2.1",
+ "nodemailer": "^6.9.7",
"notion-client": "^6.16.0",
"notion-utils": "^6.16.0",
"openai": "^4.20.0",
diff --git a/pages/api/auth/[...nextauth].ts b/pages/api/auth/[...nextauth].ts
index 19c2390c..3fa023f4 100644
--- a/pages/api/auth/[...nextauth].ts
+++ b/pages/api/auth/[...nextauth].ts
@@ -24,12 +24,12 @@ export const authOptions: NextAuthOptions = {
clientSecret: process.env.GOOGLE_CLIENT_SECRET as string,
}),
EmailProvider({
- sendVerificationRequest({ identifier, url }) {
+ async sendVerificationRequest({ identifier, url }) {
if (process.env.NODE_ENV === "development") {
console.log(`Login link: ${url}`);
return;
} else {
- sendVerificationRequestEmail({
+ await sendVerificationRequestEmail({
url,
email: identifier,
});
@@ -76,7 +76,7 @@ export const authOptions: NextAuthOptions = {
// @ts-ignore
...(token || session).user,
};
- console.log("session", session);
+ // console.log("session", session);
return session;
},
},
@@ -84,9 +84,7 @@ export const authOptions: NextAuthOptions = {
async createUser(message) {
const params: CreateUserEmailProps = {
user: {
- name: message?.user?.name
- ? message.user.name
- : message.user.email?.split("@")[0],
+ name: message.user.name,
email: message.user.email,
},
};