{user.pubkey}
diff --git a/src/db/models/userModels.js b/src/db/models/userModels.js
index 0e23b54..c1bf435 100644
--- a/src/db/models/userModels.js
+++ b/src/db/models/userModels.js
@@ -85,12 +85,15 @@ export const addCoursePurchaseToUser = async (userId, purchaseData) => {
export const createUser = async (data) => {
return await prisma.user.create({
- data,
+ data: {
+ ...data,
+ emailVerified: data.email ? new Date() : null,
+ },
});
};
export const updateUser = async (id, data) => {
- console.log("user modelllll", id, data)
+ console.log("Updating user", id, data)
return await prisma.user.update({
where: { id },
data,
@@ -169,3 +172,18 @@ export const expireUserSubscriptions = async (userIds) => {
await prisma.$transaction(updatePromises);
return userIds.length;
};
+
+export const getUserByEmail = async (email) => {
+ return await prisma.user.findUnique({
+ where: { email },
+ include: {
+ role: true,
+ purchased: {
+ include: {
+ course: true,
+ resource: true,
+ },
+ },
+ },
+ });
+};
diff --git a/src/pages/api/auth/[...nextauth].js b/src/pages/api/auth/[...nextauth].js
index a853c1e..383f3f1 100644
--- a/src/pages/api/auth/[...nextauth].js
+++ b/src/pages/api/auth/[...nextauth].js
@@ -1,8 +1,14 @@
import NextAuth from "next-auth";
import CredentialsProvider from "next-auth/providers/credentials";
+import EmailProvider from "next-auth/providers/email";
import NDK from "@nostr-dev-kit/ndk";
import axios from "axios";
+import { PrismaAdapter } from "@next-auth/prisma-adapter";
+import prisma from "@/db/prisma";
import { findKind0Fields } from "@/utils/nostr";
+import { generateSecretKey, getPublicKey } from 'nostr-tools/pure'
+import { bytesToHex } from '@noble/hashes/utils'
+import { updateUser } from "@/db/models/userModels";
const relayUrls = [
"wss://nos.lol/",
@@ -43,7 +49,6 @@ const authorize = async (pubkey) => {
// Create user
if (profile) {
const fields = await findKind0Fields(profile);
- console.log('FEEEEELDS', fields);
const payload = { pubkey, ...fields };
const createUserResponse = await axios.post(`${BASE_URL}/api/users`, payload);
@@ -58,6 +63,7 @@ const authorize = async (pubkey) => {
export default NextAuth({
+ adapter: PrismaAdapter(prisma),
providers: [
CredentialsProvider({
id: "nostr",
@@ -72,15 +78,43 @@ export default NextAuth({
return null;
},
}),
+ EmailProvider({
+ server: {
+ host: process.env.EMAIL_SERVER_HOST,
+ port: process.env.EMAIL_SERVER_PORT,
+ auth: {
+ user: process.env.EMAIL_SERVER_USER,
+ pass: process.env.EMAIL_SERVER_PASSWORD
+ }
+ },
+ from: process.env.EMAIL_FROM
+ }),
],
callbacks: {
async jwt({ token, trigger, user }) {
- console.log('TRIGGER', trigger);
if (trigger === "update") {
// if we trigger an update call the authorize function again
const newUser = await authorize(token.user.pubkey);
token.user = newUser;
}
+ // if the user has no pubkey, generate a new key pair
+ if (token && token?.user && token?.user?.id && !token.user?.pubkey) {
+ try {
+ let sk = generateSecretKey()
+ let pk = getPublicKey(sk)
+ let skHex = bytesToHex(sk)
+ const updatedUser = await updateUser(token.user.id, {pubkey: pk, privkey: skHex});
+ if (!updatedUser) {
+ console.error("Failed to update user");
+ return null;
+ }
+ token.user = updatedUser;
+ } catch (error) {
+ console.error("Ephemeral key pair generation error:", error);
+ return null;
+ }
+ }
+
// Add combined user object to the token
if (user) {
token.user = user;
@@ -88,6 +122,7 @@ export default NextAuth({
return token;
},
async session({ session, token }) {
+ console.log('SESSION', session);
// Add user from token to session
session.user = token.user;
session.jwt = token;
@@ -97,7 +132,6 @@ export default NextAuth({
return baseUrl;
},
async signOut({ token, session }) {
- console.log('signOut', token, session);
token = {}
session = {}
return true
diff --git a/src/pages/api/users/[slug].js b/src/pages/api/users/[slug].js
index c602fc8..05dfc32 100644
--- a/src/pages/api/users/[slug].js
+++ b/src/pages/api/users/[slug].js
@@ -2,14 +2,18 @@ import { getUserById, getUserByPubkey, updateUser, deleteUser } from "@/db/model
export default async function handler(req, res) {
const { slug } = req.query;
- // Determine if slug is a pubkey or an ID
+ // Determine if slug is a pubkey, ID, or email
const isPubkey = /^[0-9a-fA-F]{64}$/.test(slug);
+ const isEmail = /^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(slug);
try {
let user;
if (isPubkey) {
// If slug is a pubkey
user = await getUserByPubkey(slug);
+ } else if (isEmail) {
+ // If slug is an email
+ user = await getUserByEmail(slug);
} else {
// Assume slug is an ID
const id = parseInt(slug);
diff --git a/src/pages/auth/signin.js b/src/pages/auth/signin.js
index d8edc06..f87318f 100644
--- a/src/pages/auth/signin.js
+++ b/src/pages/auth/signin.js
@@ -2,72 +2,86 @@ import { signIn, useSession } from "next-auth/react"
import { useState, useEffect } from "react"
import { useNDKContext } from "@/context/NDKContext";
import { Button } from 'primereact/button';
+import { InputText } from 'primereact/inputtext';
export default function SignIn() {
- const [email, setEmail] = useState("")
- const [nostrPubkey, setNostrPubkey] = useState("")
- const [nostrPrivkey, setNostrPrivkey] = useState("")
+ const [email, setEmail] = useState("")
+ const [showEmailInput, setShowEmailInput] = useState(false)
+ const [nostrPubkey, setNostrPubkey] = useState("")
+ const [nostrPrivkey, setNostrPrivkey] = useState("")
+ const {ndk, addSigner} = useNDKContext();
+ const { data: session, status } = useSession(); // Get the current session's data and status
- const {ndk, addSigner} = useNDKContext();
+ useEffect(() => {
+ console.log("session", session)
+ }, [session])
- const { data: session, status } = useSession(); // Get the current session's data and status
+ const handleEmailSignIn = async (e) => {
+ e.preventDefault()
+ await signIn("email", { email, callbackUrl: '/' })
+ }
- useEffect(() => {
- console.log("session", session)
- }, [session])
-
- const handleEmailSignIn = (e) => {
- e.preventDefault()
- signIn("email", { email })
+ const handleNostrSignIn = async (e) => {
+ e.preventDefault()
+ if (!ndk.signer) {
+ await addSigner();
}
-
- const handleNostrSignIn = async (e) => {
- e.preventDefault()
-
- if (!ndk.signer) {
- await addSigner();
- }
-
-
- try {
- const user = await ndk.signer.user()
-
- const pubkey = user?._pubkey
- signIn("nostr", { pubkey })
- } catch (error) {
- console.error("Error signing Nostr event:", error)
- }
+ try {
+ const user = await ndk.signer.user()
+ const pubkey = user?._pubkey
+ signIn("nostr", { pubkey })
+ } catch (error) {
+ console.error("Error signing Nostr event:", error)
}
+ }
- const handleAnonymousSignIn = (e) => {
- e.preventDefault()
- signIn("anonymous")
- }
+ const handleAnonymousSignIn = (e) => {
+ e.preventDefault()
+ signIn("anonymous")
+ }
- return (
-
-
Sign In
-
-
-
-
- )
+ return (
+
+
Sign In
+
+
+
+ )
}
\ No newline at end of file