chore: resolve conflicts

Author: donaldp

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2021 - 2024 Donald Pakkies
+Copyright (c) 2021 - 2025 Donald Pakkies
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -1,7 +1,7 @@
 # Formidablejs Core
 
 ## About Formidablejs
-Note: This repository contains the core code of the Formidable framework. If you want to build an application using Formidable, visit the main [Formidablejs repository](https://github.com/formidablejs/formidablejs).
+Note: This repository contains the core code of the Formidable framework. If you want to build an application using Formidable, visit the main [Formidablejs repository](https://github.com/formidablejs/formidablejs-typescript).
 
 <center>
 

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@formidablejs/framework",
-  "version": "0.27.6",
+  "version": "0.27.7",
   "description": "Formidable Framework Core",
   "author": "Donald Pakkies",
   "license": "MIT",
@@ -58,16 +58,19 @@
     "redis": "^4.6.12",
     "session-file-store": "^1.5.0",
     "stacktrace-js": "^2.0.2",
+    "ts-node": "^10.9.2",
     "validatorjs": "^3.22.1"
   },
   "peerDependencies": {
+    "@faker-js/faker": ">= 8.3.0",
     "@formidablejs/mailer": ">=0.4.0",
-    "@formidablejs/stubs": ">= 0.3.0",
+    "@formidablejs/stubs": ">= 0.6.0",
     "imba-shell": ">=0.4.0 <0.5.0"
   },
   "devDependencies": {
+    "@faker-js/faker": "^9.6.0",
     "@formidablejs/mailer": "0.4.0",
-    "@formidablejs/stubs": "^0.5.1",
+    "@formidablejs/stubs": "^0.6.0",
     "@types/connect-redis": "^0.0.18",
     "@types/express-session": "^1.17.5",
     "@types/jest": "^29.5.1",

package.json

@@ -53,21 +53,24 @@ class Auth
 		let property = 'username'
 
 		if dbIdentifier === 'email'
-			user = await Database.table(dbTable).where('email', body.email).first!
+			user = await Database.table(dbTable).whereRaw('LOWER(email) = LOWER(?)', [body.email]).first!
 
 			property = 'email'
 
 		elif dbIdentifier === 'username'
-			user = await Database.table(dbTable).where('username', body.username).first!
+			user = await Database.table(dbTable).whereRaw('LOWER(username) = LOWER(?)', [body.username]).first!
 		elif dbIdentifier === 'username-email'
-			user = await Database.table(dbTable).where('username', body.username).orWhere('email', body.username).first!
+			user = await Database.table(dbTable)
+				.whereRaw('LOWER(username) = LOWER(?)', [body.username])
+				.orWhereRaw('LOWER(email) = LOWER(?)', [body.username])
+				.first!
 
 		if user && await Hash.check(body.password, user.password)
 			return user
 
 		throw ValidationException.withMessages({
 			[property]: [
-				'Invalid credentials'
+				"Invalid {dbIdentifier === 'email' ? 'Email' : 'Username'} or password."
 			]
 		})