Merge pull request 'Add @somaiya.edu email domain restriction for authentication and pop up error if non somaiya email ID used for sign in' (#5) from arav/nextplacement:main into main

Reviewed-on: Arnab-Afk/nextplacement#5

.env.example

@@ -0,0 +1,13 @@
+DATABASE_URL="..."
+
+AUTH_SECRET="shhh_no_one_can_know"
+
+AUTH_GOOGLE_ID="..."
+AUTH_GOOGLE_SECRET="..."
+
+STUDENT_URL="http://localhost:9000"
+ADMIN_URL="http://localhost:9000"
+ADMIN_DOMAIN="http://localhost:9001"
+
+ALLOWED_EMAIL_DOMAIN="@somaiya.edu"
+AUTH_TRUST_HOST=TRUE

apps/admin/app/login/page.tsx

@@ -1,4 +1,6 @@
 import { Button } from '@workspace/ui/components/button';
+import { Alert, AlertDescription, AlertTitle } from '@workspace/ui/components/alert';
+import { AlertCircle } from 'lucide-react';
 import { signIn } from '@/auth';
 
 async function logIn() {
@@ -6,7 +8,9 @@ async function logIn() {
   await signIn('google', { redirectTo: '/' });
 }
 
-export default async function Page() {
+export default async function Page(props: { searchParams: Promise<{ error?: string }> }) {
+  const searchParams = await props.searchParams;
+  const error = searchParams?.error;
   return (
     <div className="relative min-h-svh flex items-center justify-center overflow-hidden bg-gradient-to-br from-blue-100 via-red-100 to-pink-100 transition-colors duration-500">
       {/* Animated floating shapes */}
@@ -18,11 +22,22 @@ export default async function Page() {
       <div className="relative z-10 backdrop-blur-md bg-white/70 rounded-2xl shadow-2xl p-10 flex flex-col items-center gap-8 border border-white/30 max-w-sm w-full transition-all duration-300 hover:shadow-[0_0_32px_4px_rgba(239,68,68,0.25)] hover:border-red-400/60">
         <div className="flex flex-col items-center gap-2">
           {/* Animated logo */}
-          <img src="favicon.ico" alt="Logo" className="w-14 h-14 mb-2 drop-shadow-lg animate-bounce-slow" />
+          <img src="/favicon.ico" alt="Logo" className="w-14 h-14 mb-2 drop-shadow-lg animate-bounce-slow" />
           <h1 className="text-2xl font-bold text-gray-800 tracking-tight">Placement Portal Admin</h1>
           <p className="text-gray-500 text-sm text-center">Sign in to manage placements and students</p>
           <p className="text-xs text-red-500 font-semibold italic mt-1 animate-fade-in">Empower your journey. Shape the future.</p>
         </div>
+
+        {error === 'AccessDenied' && (
+           <Alert variant="destructive" className="animate-in fade-in slide-in-from-top-4 duration-300">
+             <AlertCircle className="h-4 w-4" />
+             <AlertTitle>Access Denied</AlertTitle>
+             <AlertDescription>
+               Please sign in with your somaiya email ID.
+             </AlertDescription>
+           </Alert>
+        )}
+
         <form action={logIn} className="w-full">
           <Button type="submit" variant="outline" className="w-full h-12 relative overflow-hidden group rounded-lg shadow-md hover:shadow-lg transition-all focus:ring-2 focus:ring-red-400">
             <span className="absolute inset-0 bg-gradient-to-r from-red-200/0 via-red-200/20 to-red-200/0 translate-x-[-100%] group-hover:translate-x-[100%] transition-transform duration-700 ease-out pointer-events-none" />

apps/admin/auth.ts

@@ -1,6 +1,6 @@
 import NextAuth, { type DefaultSession } from 'next-auth';
 import type { NextAuthConfig } from 'next-auth';
-import Google from "next-auth/providers/google";
+import Google from 'next-auth/providers/google';
 import { db, admins, students } from '@workspace/db';
 import { eq } from '@workspace/db/drizzle';
 
@@ -12,7 +12,7 @@ declare module 'next-auth' {
       studentId?: number;
       completedProfile?: boolean;
       [key: string]: any;
-    } & DefaultSession["user"];
+    } & DefaultSession['user'];
   }
   
   interface JWT {
@@ -32,6 +32,13 @@ declare module 'next/server' {
 const authConfig: NextAuthConfig = {
   providers: [Google],
   callbacks: {
+    async signIn({ user }) {
+      const allowedDomain = process.env.ALLOWED_EMAIL_DOMAIN;
+      if (allowedDomain && user.email && !user.email.endsWith(allowedDomain)) {
+        return false;
+      }
+      return true;
+    },
     async jwt({ token, account, user }) {
       // Only check DB on first sign in
       if (account && user && user.email) {

apps/student/app/login/page.tsx

@@ -1,4 +1,6 @@
 import { Button } from '@workspace/ui/components/button';
+import { Alert, AlertDescription, AlertTitle } from '@workspace/ui/components/alert';
+import { AlertCircle } from 'lucide-react';
 import { signIn } from '@/auth';
 
 async function logIn() {
@@ -6,7 +8,10 @@ async function logIn() {
   await signIn('google', { redirectTo: '/' });
 }
 
-export default async function Page() {
+// export default async function Page() {
+export default async function Page(props: { searchParams: Promise<{ error?: string }> }) {
+  const searchParams = await props.searchParams;
+  const error = searchParams?.error;
   return (
     <div className="relative min-h-svh flex items-center justify-center overflow-hidden bg-gradient-to-br from-blue-100 via-red-100 to-pink-100 transition-colors duration-500">
       {/* Animated floating shapes */}
@@ -23,6 +28,17 @@ export default async function Page() {
           <p className="text-gray-500 text-sm text-center">Sign in to manage your placements</p>
           <p className="text-xs text-red-500 font-semibold italic mt-1 animate-fade-in">Empower your journey. Shape the future.</p>
         </div>
+
+        {error === 'AccessDenied' && (
+           <Alert variant="destructive" className="animate-in fade-in slide-in-from-top-4 duration-300">
+             <AlertCircle className="h-4 w-4" />
+             <AlertTitle>Access Denied</AlertTitle>
+             <AlertDescription>
+               Please sign in with your somaiya email ID.
+             </AlertDescription>
+           </Alert>
+        )}
+
         <form action={logIn} className="w-full">
           <Button type="submit" variant="outline" className="w-full h-12 relative overflow-hidden group rounded-lg shadow-md hover:shadow-lg transition-all focus:ring-2 focus:ring-red-400">
             <span className="absolute inset-0 bg-gradient-to-r from-red-200/0 via-red-200/20 to-red-200/0 translate-x-[-100%] group-hover:translate-x-[100%] transition-transform duration-700 ease-out pointer-events-none" />

apps/student/auth.ts

@@ -1,6 +1,6 @@
 import NextAuth, { type DefaultSession } from 'next-auth';
 import type { NextAuthConfig } from 'next-auth';
-import Google from "next-auth/providers/google";
+import Google from 'next-auth/providers/google';
 import { db, admins, students } from '@workspace/db';
 import { eq } from '@workspace/db/drizzle';
 
@@ -12,7 +12,7 @@ declare module 'next-auth' {
       studentId?: number;
       completedProfile?: boolean;
       [key: string]: any;
-    } & DefaultSession["user"];
+    } & DefaultSession['user'];
   }
   
   interface JWT {
@@ -32,6 +32,13 @@ declare module 'next/server' {
 const authConfig: NextAuthConfig = {
   providers: [Google],
   callbacks: {
+    async signIn({ user }) {
+      const allowedDomain = process.env.ALLOWED_EMAIL_DOMAIN;
+      if (allowedDomain && user.email && !user.email.endsWith(allowedDomain)) {
+        return false;
+      }
+      return true;
+    },
     async jwt({ token, account, user }) {
       // Only set role, adminId, studentId, and email in JWT
       const email = user?.email || token?.email;
@@ -94,6 +101,9 @@ const authConfig: NextAuthConfig = {
       return session;
     },
   },
+  pages: {
+    error: '/login',
+  },
 };
 
 // Note: TypeScript warnings about inferred types are expected with NextAuth v5 beta

apps/student/components/job-application-modal.tsx

@@ -40,6 +40,9 @@ export default function JobApplicationModal({ job, studentId, resumes, isApplied
   const [isPending, startTransition] = useTransition();
   const [message, setMessage] = useState<{ type: 'success' | 'error'; text: string } | null>(null);
 
+  const deadline = new Date(job.applicationDeadline);
+  const isDeadlinePassed = new Date() > deadline;
+
   const handleApply = async () => {
     if (!selectedResume) {
       setMessage({ type: 'error', text: 'Please select a resume' });
@@ -63,12 +66,14 @@ export default function JobApplicationModal({ job, studentId, resumes, isApplied
           setMessage({ type: 'error', text: result.error || 'Failed to submit application' });
         }
       } catch (error) {
-        setMessage({ type: 'error', text: 'An error occurred while submitting your application' });
+        setMessage({
+          type: 'error',
+          text: error instanceof Error ? error.message : 'An error occurred while submitting your application'
+        });
       }
     });
   };
 
-  const isDeadlinePassed = new Date() > new Date(job.applicationDeadline as any);
   const cannotApplyReason = isApplied
     ? 'You have already applied to this job'
     : resumes.length === 0
@@ -78,21 +83,33 @@ export default function JobApplicationModal({ job, studentId, resumes, isApplied
         : null;
 
   return (
-    <Dialog open={isOpen} onOpenChange={setIsOpen}>
+    <Dialog open={isOpen} onOpenChange={(open) => !isPending && setIsOpen(open)}>
+      {!cannotApplyReason && (
         <DialogTrigger asChild>
           <div className="flex flex-col items-start">
             <Button
               size="sm"
               className="bg-blue-600 hover:bg-blue-700"
-            disabled={Boolean(cannotApplyReason)}
+            >
+              Apply Now
+            </Button>
+          </div>
+        </DialogTrigger>
+      )}
+
+      {cannotApplyReason && (
+        <div className="flex flex-col items-start">
+          <Button
+            size="sm"
+            className="bg-blue-600 hover:bg-blue-700"
+            disabled
           >
             {isApplied ? 'Applied' : 'Apply Now'}
           </Button>
-          {cannotApplyReason && (
           <span className="mt-1 text-xs text-red-600">{cannotApplyReason}</span>
-          )}
         </div>
-      </DialogTrigger>
+      )}
+
       <DialogContent className="max-w-2xl max-h-[90vh] overflow-y-auto">
         <DialogHeader>
           <DialogTitle className="flex items-center gap-2">
@@ -127,7 +144,7 @@ export default function JobApplicationModal({ job, studentId, resumes, isApplied
                 </div>
                 <div className="flex items-center gap-1">
                   <Calendar className="w-4 h-4" />
-                  <span>Deadline: {job.applicationDeadline.toLocaleDateString()}</span>
+                  <span>Deadline: {deadline.toLocaleDateString()}</span>
                 </div>
                 <div className="flex items-center gap-1">
                   <Star className="w-4 h-4" />
@@ -162,6 +179,18 @@ export default function JobApplicationModal({ job, studentId, resumes, isApplied
                   ))}
                 </SelectContent>
               </Select>
+
+              {selectedResume && (
+                <a
+                  href={resumes.find(r => r.id.toString() === selectedResume)?.fileUrl}
+                  target="_blank"
+                  rel="noopener noreferrer"
+                  className="text-sm text-blue-600 underline mt-2 inline-block"
+                >
+                  Preview selected resume
+                </a>
+              )}
+
               {resumes.length === 0 && (
                 <p className="text-sm text-red-600 mt-1">
                   No resumes found. Please upload a resume first.
@@ -171,8 +200,7 @@ export default function JobApplicationModal({ job, studentId, resumes, isApplied
 
             {/* Message Display */}
             {message && (
-              <div className={`p-3 rounded-lg ${
+              <div className={`p-3 rounded-lg ${message.type === 'success'
-                message.type === 'success'
                   ? 'bg-green-100 text-green-700 border border-green-200'
                   : 'bg-red-100 text-red-700 border border-red-200'
                 }`}>