From 6026e4dda63579c7144b2e104eee4e1ef6000831 Mon Sep 17 00:00:00 2001
From: Aditya Pulipaka <adipu@utexas.edu>
Date: Thu, 19 Mar 2026 05:44:48 +0000
Subject: [PATCH] Fixes, will add normal acct creation and smoothen login
 process tmr

---
 App.tsx                 | 28 +++++++++++++---------------
 server/src/auth/auth.ts |  5 -----
 2 files changed, 13 insertions(+), 20 deletions(-)

diff --git a/App.tsx b/App.tsx
index a16210c..6c8817a 100644
--- a/App.tsx
+++ b/App.tsx
@@ -44,21 +44,19 @@ export default function App() {
             <p className="text-center text-muted-foreground text-sm">
               Sign in to access your lab inventory and protocols.
             </p>
-            <div className="space-y-3">
-              <Button
-                className="w-full"
-                onClick={() => signIn.social({ provider: "google", callbackURL: "/" })}
-              >
-                Sign in with Google
-              </Button>
-              <Button
-                variant="outline"
-                className="w-full"
-                onClick={() => signIn.social({ provider: "github", callbackURL: "/" })}
-              >
-                Sign in with GitHub
-              </Button>
-            </div>
+            <Button
+              variant="outline"
+              className="w-full flex items-center gap-3"
+              onClick={() => signIn.social({ provider: "google", callbackURL: "/" })}
+            >
+              <svg viewBox="0 0 24 24" className="h-4 w-4" xmlns="http://www.w3.org/2000/svg">
+                <path d="M22.56 12.25c0-.78-.07-1.53-.2-2.25H12v4.26h5.92c-.26 1.37-1.04 2.53-2.21 3.31v2.77h3.57c2.08-1.92 3.28-4.74 3.28-8.09z" fill="#4285F4"/>
+                <path d="M12 23c2.97 0 5.46-.98 7.28-2.66l-3.57-2.77c-.98.66-2.23 1.06-3.71 1.06-2.86 0-5.29-1.93-6.16-4.53H2.18v2.84C3.99 20.53 7.7 23 12 23z" fill="#34A853"/>
+                <path d="M5.84 14.09c-.22-.66-.35-1.36-.35-2.09s.13-1.43.35-2.09V7.07H2.18C1.43 8.55 1 10.22 1 12s.43 3.45 1.18 4.93l3.66-2.84z" fill="#FBBC05"/>
+                <path d="M12 5.38c1.62 0 3.06.56 4.21 1.64l3.15-3.15C17.45 2.09 14.97 1 12 1 7.7 1 3.99 3.47 2.18 7.07l3.66 2.84c.87-2.6 3.3-4.53 6.16-4.53z" fill="#EA4335"/>
+              </svg>
+              Sign in with Google
+            </Button>
           </CardContent>
         </Card>
       </div>
diff --git a/server/src/auth/auth.ts b/server/src/auth/auth.ts
index 5b65957..8ad60fd 100644
--- a/server/src/auth/auth.ts
+++ b/server/src/auth/auth.ts
@@ -23,11 +23,6 @@ export const auth = betterAuth({
       clientId: process.env.GOOGLE_CLIENT_ID || '',
       clientSecret: process.env.GOOGLE_CLIENT_SECRET || '',
     },
-    microsoft: {
-      clientId: process.env.MICROSOFT_CLIENT_ID || '',
-      clientSecret: process.env.MICROSOFT_CLIENT_SECRET || '',
-      tenantId: process.env.MICROSOFT_TENANT_ID || 'common',
-    },
   },
 
   trustedOrigins: [