rainbownapkin/canopy
1
0
Fork 0
Code Issues 2 Pull requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev'

Browse source
This commit is contained in:
rainbow napkin 2025-11-23 07:54:31 -05:00
parent 60338eaeb1 02f57fafd5
commit fedd913c80
6 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -9,7 +9,7 @@ Canopy
<a href="https://git.ourfore.st/rainbownapkin/canopy/issues" target="_blank"><img src="https://git.ourfore.st/rainbownapkin/canopy/badges/issues/closed.svg"></a> <a href="https://git.ourfore.st/rainbownapkin/canopy/issues" target="_blank"><img src="https://git.ourfore.st/rainbownapkin/canopy/badges/issues/closed.svg"></a>
<a href="https://www.gnu.org/licenses/agpl-3.0.en.html" target="_blank"><img src="https://img.shields.io/badge/License-AGPL_v3-663366.svg"></a> <a href="https://www.gnu.org/licenses/agpl-3.0.en.html" target="_blank"><img src="https://img.shields.io/badge/License-AGPL_v3-663366.svg"></a>
0.1-Alpha 0.1-Alpha (Panama Red) - Hotfix 1
========= =========
Canopy - /ˈkæ.nə.pi/: Canopy - /ˈkæ.nə.pi/:

4
package.json
View file

@ -1,7 +1,7 @@
{ {
"name": "canopy-of-alpha", "name": "canopy-of-alpha",
"version": "0.1", "version": "0.1.1",
"canopyDisplayVersion": "0.1-Alpha", "canopyDisplayVersion": "0.1-Alpha (Panama Red) - Hotfix 1",
"license": "AGPL-3.0-only", "license": "AGPL-3.0-only",
"dependencies": { "dependencies": {
"@braintree/sanitize-url": "^7.1.1", "@braintree/sanitize-url": "^7.1.1",

2
src/controllers/api/account/emailChangeRequestController.js
View file

@ -60,7 +60,7 @@ module.exports.post = async function(req, res){
//Look through DB and migration cache for existing email //Look through DB and migration cache for existing email
const existingDB = await userModel.findOne({email: new RegExp(email, 'i')}); const existingDB = await userModel.findOne({email: new RegExp(`^${email}$`, 'i')});
const needsMigration = userModel.migrationCache.emails.includes(email.toLowerCase()); const needsMigration = userModel.migrationCache.emails.includes(email.toLowerCase());
//If the email is in use //If the email is in use

2
src/controllers/api/account/loginController.js
View file

@ -90,7 +90,7 @@ module.exports.post = async function(req, res){
const {user, pass} = matchedData(req); const {user, pass} = matchedData(req);
//Look for the username in the migration DB //Look for the username in the migration DB
const migrationDB = await migrationModel.findOne({user}); const migrationDB = await migrationModel.findOne({user: new RegExp(`^${user}$`, 'i')});
//If we found a migration profile //If we found a migration profile
if(migrationDB != null){ if(migrationDB != null){

2
src/schemas/user/migrationSchema.js
View file

@ -323,7 +323,7 @@ migrationSchema.statics.buildMigrationCache = async function(){
migrationSchema.statics.consumeByUsername = async function(ip, migration){ migrationSchema.statics.consumeByUsername = async function(ip, migration){
//Pull migration doc by case-insensitive username //Pull migration doc by case-insensitive username
const migrationDB = await this.findOne({user: new RegExp(migration.user, 'i')}); const migrationDB = await this.findOne({user: new RegExp(`^${migration.user}$`, 'i')});
//If we have no migration document //If we have no migration document
if(migrationDB == null){ if(migrationDB == null){

6
src/schemas/user/userSchema.js
View file

@ -256,13 +256,13 @@ userSchema.statics.register = async function(userObj, ip){
//Check password confirmation matches //Check password confirmation matches
if(pass == passConfirm){ if(pass == passConfirm){
//Setup user query //Setup user query
let userQuery = {user: new RegExp(user, 'i')}; let userQuery = {user: new RegExp(`^${user}$`, 'i')};
//If we have an email //If we have an email
if(email != null && email != ""){ if(email != null && email != ""){
userQuery = {$or: [ userQuery = {$or: [
userQuery, userQuery,
{email: new RegExp(email, 'i')} {email: new RegExp(`^${email}$`, 'i')}
]}; ]};
} }
@ -319,7 +319,7 @@ userSchema.statics.authenticate = async function(user, pass, failLine = "Bad Use
} }
//get the user if it exists //get the user if it exists
const userDB = await this.findOne({ user: new RegExp(user, 'i')}); const userDB = await this.findOne({ user: new RegExp(`^${user}$`, 'i')});
//if not scream and shout //if not scream and shout
if(!userDB){ if(!userDB){