rogadev
diff --git a/‎composables/useAuth.ts
Copy file name to clipboardExpand all lines: composables/useAuth.ts
+2-2Lines changed: 2 additions & 2 deletions b/‎composables/useAuth.ts
Copy file name to clipboardExpand all lines: composables/useAuth.ts
+2-2Lines changed: 2 additions & 2 deletions
diff --git a/‎pages/login.vue
Copy file name to clipboardExpand all lines: pages/login.vue
+5-5Lines changed: 5 additions & 5 deletions b/‎pages/login.vue
Copy file name to clipboardExpand all lines: pages/login.vue
+5-5Lines changed: 5 additions & 5 deletions
diff --git a/‎server/api/auth/login.ts
Copy file name to clipboardExpand all lines: server/api/auth/login.ts
+3-2Lines changed: 3 additions & 2 deletions b/‎server/api/auth/login.ts
Copy file name to clipboardExpand all lines: server/api/auth/login.ts
+3-2Lines changed: 3 additions & 2 deletions
diff --git a/‎server/database/repositories/userRespository.ts
Copy file name to clipboardExpand all lines: server/database/repositories/userRespository.ts
+12-7Lines changed: 12 additions & 7 deletions b/‎server/database/repositories/userRespository.ts
Copy file name to clipboardExpand all lines: server/database/repositories/userRespository.ts
+12-7Lines changed: 12 additions & 7 deletions
@@ -72,8 +72,8 @@ export async function registerWithEmail(
   }
 }
 
-export async function loginWithEmail(email: string, password: string) {
-  const user = await $fetch<IUser>('/api/auth/login', { method: 'POST', body: { email: email, password: password } })
+export async function loginWithEmail(usernameOrEmail: string, password: string) {
+  const user = await $fetch<IUser>('/api/auth/login', { method: 'POST', body: { usernameOrEmail: usernameOrEmail, password: password } })
   useState('user').value = user
   await useRouter().push('/dashboard')
 }
@@ -2,7 +2,7 @@
 import { ref } from "@vue/reactivity";
 import {loginWithEmail} from "~/composables/useAuth";
 
-const email = ref(null)
+const usernameOrEmail = ref(null)
 const password = ref(null)
 const hasError = ref(null)
 const errorMessage = ref(null)
@@ -13,7 +13,7 @@ definePageMeta({
 })
 
 const postLoginForm = async function () {
-  await loginWithEmail(email.value, password.value)
+  await loginWithEmail(usernameOrEmail.value, password.value)
 }
 </script>
 
@@ -50,10 +50,10 @@ const postLoginForm = async function () {
           <input type="hidden" name="remember" value="true">
           <div class="rounded-md shadow-sm -space-y-px mb-1">
             <div>
-              <label for="email-address" class="sr-only">Email address</label>
-              <input v-model="email" id="email-address" name="email" type="email" autocomplete="email" required
+              <label for="email-address" class="sr-only">Username or Email</label>
+              <input v-model="usernameOrEmail" id="email-address" name="email" type="email" autocomplete="email" required
                 class="appearance-none rounded-none relative block w-full px-3 py-2 border border-gray-300 placeholder-gray-500 text-gray-900 rounded-t-md focus:outline-none focus:ring-indigo-500 focus:border-indigo-500 focus:z-10 sm:text-sm"
-                placeholder="Email address">
+                placeholder="Username or Email">
             </div>
           </div>
           <div>
 
@@ -6,9 +6,10 @@ import { makeSession } from '~~/server/services/sessionService';
 
 export default async (event: CompatibilityEvent) => {
   const body = await readBody(event)
-  const email: string = body.email
+  const usernameOrEmail: string = body.usernameOrEmail
   const password: string = body.password
-  const user = await getUserByEmail(email)
+  
+  const user = await getUserByEmail(usernameOrEmail)
 
   if (user === null) {
     sendError(event, createError({ statusCode: 401, statusMessage: 'Unauthenticated' }))
 
@@ -1,15 +1,20 @@
 import prisma from "~/server/database/client";
-import {IUser} from '~/types/IUser';
+import { IUser } from '~/types/IUser';
 import { ISubscription } from "~~/types/ISubscription";
 
-export async function getUserByEmail(email: string): Promise<IUser> {
-  return await prisma.user.findUnique({
+export async function getUserByEmail(emailOrEmail: string): Promise<IUser> {
+  return await prisma.user.findFirst({
     where: {
-      email: email,
+      OR:
+        [
+          { email: emailOrEmail },
+          { username: emailOrEmail },
+        ]
     },
     select: {
       id: true,
       username: true,
+      password: true
     },
   })
 }
@@ -78,7 +83,7 @@ export async function getSubscriptionById(stripeId: string): Promise<ISubscripti
 
 export async function updateStripeCustomerId(data: IUser) {
   return await prisma.user.update({
-    where: {email: data.email},
+    where: { email: data.email },
     data: {
       stripeCustomerId: data.stripeCustomerId,
     }
@@ -87,8 +92,8 @@ export async function updateStripeCustomerId(data: IUser) {
 
 export async function createOrUpdateSubscription(data: ISubscription) {
   return await prisma.subscription.upsert({
-    where:{
-    stripeId: data.stripeId
+    where: {
+      stripeId: data.stripeId
     },
     create: {
       userId: data.userId,
Original file line number	Diff line number	Diff line change
`@@ -72,8 +72,8 @@ export async function registerWithEmail(`
`72`	`72`	`}`
`73`	`73`	`}`
`74`	`74`
`75`		`-export async function loginWithEmail(email: string, password: string) {`
`76`		`- const user = await $fetch<IUser>('/api/auth/login', { method: 'POST', body: { email: email, password: password } })`
	`75`	`+export async function loginWithEmail(usernameOrEmail: string, password: string) {`
	`76`	`+ const user = await $fetch<IUser>('/api/auth/login', { method: 'POST', body: { usernameOrEmail: usernameOrEmail, password: password } })`
`77`	`77`	`useState('user').value = user`
`78`	`78`	`await useRouter().push('/dashboard')`
`79`	`79`	`}`