Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wiki-js
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
1
Issues
1
List
Board
Labels
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
wiki-js
Commits
aa96e970
Commit
aa96e970
authored
Sep 09, 2020
by
NGPixel
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: force lowercase for email on local auth
parent
5295e413
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
16 additions
and
2 deletions
+16
-2
2.5.128.js
server/db/migrations-sqlite/2.5.128.js
+7
-0
2.5.128.js
server/db/migrations/2.5.128.js
+7
-0
users.js
server/models/users.js
+1
-1
authentication.js
server/modules/authentication/local/authentication.js
+1
-1
No files found.
server/db/migrations-sqlite/2.5.128.js
0 → 100644
View file @
aa96e970
exports
.
up
=
async
knex
=>
{
await
knex
(
'users'
).
update
({
email
:
knex
.
raw
(
'LOWER(email)'
)
})
}
exports
.
down
=
knex
=>
{
}
server/db/migrations/2.5.128.js
0 → 100644
View file @
aa96e970
exports
.
up
=
async
knex
=>
{
await
knex
(
'users'
).
update
({
email
:
knex
.
raw
(
'LOWER(??)'
,
[
'email'
])
})
}
exports
.
down
=
knex
=>
{
}
server/models/users.js
View file @
aa96e970
...
...
@@ -675,7 +675,7 @@ module.exports = class User extends Model {
if
(
dupUsr
)
{
throw
new
WIKI
.
Error
.
AuthAccountAlreadyExists
()
}
usrData
.
email
=
email
usrData
.
email
=
_
.
toLower
(
email
)
}
if
(
!
_
.
isEmpty
(
name
)
&&
name
!==
usr
.
name
)
{
usrData
.
name
=
_
.
trim
(
name
)
...
...
server/modules/authentication/local/authentication.js
View file @
aa96e970
...
...
@@ -15,7 +15,7 @@ module.exports = {
},
async
(
uEmail
,
uPassword
,
done
)
=>
{
try
{
const
user
=
await
WIKI
.
models
.
users
.
query
().
findOne
({
email
:
uEmail
,
email
:
uEmail
.
toLowerCase
()
,
providerKey
:
'local'
})
if
(
user
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment