100xdevs-cohort-2 · saurabhg412 · Apr 10, 2024 · Apr 21, 2024 · Apr 21, 2024 · Apr 21, 2024
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -0,0 +1,25 @@
+name: Build on PR
+
+on:
+  pull_request:
+    branches:
+      - master
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - name: Use Node.js
+        uses: actions/setup-node@v3
+        with:
+          node-version: '21'
+
+      - name: Install Dependencies
+        run: npm install
+
+      - name: Generate prisma client
+        run: cd packages/db && npx prisma generate && cd ../..
+
+      - name: Run Build
+        run: npm run build
diff --git a/apps/bank-webhook/package.json b/apps/bank-webhook/package.json
@@ -0,0 +1,17 @@
+{
+  "name": "bank-webhook",
+  "version": "1.0.0",
+  "description": "",
+  "main": "index.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "keywords": [],
+  "author": "",
+  "license": "ISC",
+  "dependencies": {
+    "@repo/common" : "*",
+    "@repo/db" : "*",
+    "@types/express": "^4.17.21"
+  }
+}
diff --git a/apps/bank-webhook/src/index.ts b/apps/bank-webhook/src/index.ts
@@ -0,0 +1,2 @@
+const common = require ("@repo/common/type")
+console.log(common.DATA_URL)
diff --git a/apps/bank-webhook/tsconfig.json b/apps/bank-webhook/tsconfig.json
@@ -0,0 +1,8 @@
+{
+  "extends": "@repo/typescript-config/base.json",
+  "compilerOptions": {
+    "outDir": "dist"
+  },
+  "include": ["src"],
+  "exclude": ["node_modules", "dist"]
+}
diff --git a/apps/merchant-app/app/api/auth/[...nextauth]/route.ts b/apps/merchant-app/app/api/auth/[...nextauth]/route.ts
@@ -1,6 +1,59 @@
-import NextAuth from "next-auth"
-import { authOptions } from "../../../../lib/auth"
 
-const handler = NextAuth(authOptions)
+import prisma from "@repo/db/client";
+import nextAuth from "next-auth";
+import CredentialsProvider from "next-auth/providers/credentials"
+import Google from "next-auth/providers/google";
 
-export { handler as GET, handler as POST }
+
+const handler = nextAuth({
+    providers: [
+      CredentialsProvider({
+          name: 'Credentials',
+          credentials: {
+            email : { label: "Email", type: "email",placeholder:"Enter your Email address"},
+            password: { label: "Password", type: "password",placeholder: "Enter your Password"} 
+          },
+          // TODO: User credentials type from next-aut
+        //   @ts-ignore
+          async authorize(credentials: any) {
+            console.log(credentials);
+            // Do zod validation, OTP validation here
+            const existingUser = await prisma.merchant.findFirst({
+                where: {
+                    email: credentials.email,
+                    password : credentials.password
+                }
+            });
+
+            if (existingUser) {
+
+                    return {
+                        email: existingUser.email
+                    }
+                }
+
+            try {
+                const merchant = await prisma.merchant.create({
+                    data: {
+                        email : credentials.email,
+                        password : credentials.password
+                    }
+                });
+                return {
+                    email: merchant.email
+                }
+            } catch(e) {
+                console.error(e);
+            }
+            return null
+          },
+        }),
+        Google({
+            clientId:process.env.GOOGLE_CLIENT_ID || "",
+            clientSecret: process.env.GOOGLE_SECRET || ""
+        })
+    ],
+    secret: process.env.NEXTAUTH_SECRET || "saurabh412",
+  })
+
+  export { handler as GET, handler as POST}
diff --git a/apps/merchant-app/app/api/user/route.ts b/apps/merchant-app/app/api/user/route.ts
diff --git a/apps/merchant-app/app/layout.tsx b/apps/merchant-app/app/layout.tsx
@@ -1,7 +1,7 @@
 import "./globals.css";
 import type { Metadata } from "next";
 import { Inter } from "next/font/google";
-import { Providers } from "../provider";
+import Provider from "../provider";
 
 const inter = Inter({ subsets: ["latin"] });
 
@@ -17,9 +17,10 @@ export default function RootLayout({
 }): JSX.Element {
   return (
     <html lang="en">
-      <Providers>
+      <Provider>
         <body className={inter.className}>{children}</body>
-      </Providers>
+      </Provider>
+
     </html>
   );
 }
diff --git a/apps/merchant-app/app/page.tsx b/apps/merchant-app/app/page.tsx
@@ -1,10 +1,19 @@
-"use client";
+"use client"
+import { signIn, signOut, useSession } from "next-auth/react";
 
-import { useBalance } from "@repo/store/balance";
-
-export default function() {
-  const balance = useBalance();
-  return <div>
-    hi there {balance}
-  </div>
+export default function(){
+  const session = useSession()
+ return(
+  <>
+    <div className="bg-red-500 flex flex-row justify-between">
+      <div>
+        <button onClick={()=>signIn()}>Signin</button>
+      </div>
+      <div>
+        <button onClick={()=>signOut()}>Log Out</button>
+      </div>
+    </div>
+    {JSON.stringify(session)}
+  </>
+ ) 
 }
diff --git a/apps/merchant-app/lib/auth.ts b/apps/merchant-app/lib/auth.ts
diff --git a/apps/merchant-app/provider.tsx b/apps/merchant-app/provider.tsx
@@ -1,10 +1,13 @@
 "use client"
-import { RecoilRoot } from "recoil";
-import { SessionProvider } from "next-auth/react";
-export const Providers = ({children}: {children: React.ReactNode}) => {
-    return <RecoilRoot>
-        <SessionProvider>
-            {children}
-        </SessionProvider>
-    </RecoilRoot>
+import { SessionProvider } from "next-auth/react"
+import {RecoilRoot} from "recoil"
+
+export default function Provider({children}:any){
+    return(
+        <RecoilRoot>
+            <SessionProvider>
+                {children}
+            </SessionProvider>
+        </RecoilRoot>
+    )
 }
diff --git a/apps/user-app/app/api/auth/[...nextauth]/route.ts b/apps/user-app/app/api/auth/[...nextauth]/route.ts
@@ -1,6 +1,58 @@
-import NextAuth from "next-auth"
-import { authOptions } from "../../../lib/auth"
 
-const handler = NextAuth(authOptions)
+import prisma from "@repo/db/client";
+import nextAuth from "next-auth";
+import CredentialsProvider from "next-auth/providers/credentials"
 
-export { handler as GET, handler as POST }
+interface Credentials {
+    email : string
+    password : string
+}
+
+const handler = nextAuth({
+    providers: [
+      CredentialsProvider({
+          name: 'Credentials',
+          credentials: {
+            email : { label: "Email", type: "email",placeholder:"Enter your Email address"},
+            password: { label: "Password", type: "password",placeholder: "Enter your Password"} 
+          },
+          // TODO: User credentials type from next-aut
+        //   @ts-ignore
+          async authorize(credentials:Credentials) : Promise<{email : string} | null> {
+            console.log(credentials);
+            // Do zod validation, OTP validation here
+            const existingUser = await prisma.user.findFirst({
+                where: {
+                    email: credentials.email,
+                    password : credentials.password
+                }
+            });
+
+            if (existingUser) {
+
+                    return {
+                        email: existingUser.email
+                    }
+                }
+
+            try {
+                const user = await prisma.user.create({
+                    data: {
+                        email : credentials.email,
+                        password : credentials.password
+                    }
+                });
+                return {
+                    email: user.email
+                }
+            } catch(e) {
+                console.error(e);
+            }
+            return null
+          },
+        })
+    ],
+    secret: process.env.NEXTAUTH_SECRET || "saurabh412",
+  })
+
+  export { handler as GET, handler as POST}
diff --git a/apps/user-app/app/api/user/route.ts b/apps/user-app/app/api/user/route.ts
@@ -1,17 +1,10 @@
 import { getServerSession } from "next-auth"
 import { NextResponse } from "next/server";
-import { authOptions } from "../../lib/auth";
 
-export const GET = async () => {
-    const session = await getServerSession(authOptions);
-    if (session.user) {
-        return NextResponse.json({
-            user: session.user
-        })
-    }
+export async function GET() {
+    const session = await getServerSession();
+
     return NextResponse.json({
-        message: "You are not logged in"
-    }, {
-        status: 403
+        email: session?.user?.email,
     })
 }
diff --git a/apps/user-app/app/layout.tsx b/apps/user-app/app/layout.tsx
@@ -10,13 +10,9 @@ export const metadata: Metadata = {
   description: "Generated by create turbo",
 };
 
-export default function RootLayout({
-  children,
-}: {
-  children: React.ReactNode;
-}): JSX.Element {
+export default function RootLayout({children,}: {children: React.ReactNode;}): JSX.Element {
   return (
-    <html lang="en">
+    <html lang="en"> 
       <Providers>
         <body className={inter.className}>{children}</body>
       </Providers>
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		const common = require ("@repo/common/type")
		console.log(common.DATA_URL)