Skip to content

Cleanup inner funcs #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 5, 2017
Merged

Cleanup inner funcs #5

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,17 +34,19 @@ function errorHandler(err) {
}

function auth({username, password}) {
const userQuery = hashStringAsync(password)
.then(hashPass => ({username, hashPass}))
const loginEvent = () => auditLogAsync({event: 'login', username})

return Promise
.resolve({username, password})
.catch(errorHandler)
.then(authValidate)
.tap(() => auditLogAsync({event: 'login', username}))
.tap(loginEvent)
.then(usersModel)
.then(users => {
// Inner Promise's value will bubble all the way up
// Note: This can also be further flattened... Keep reading.
return hashStringAsync(password)
.then(hashPass => users.findOneAsync({username, passHash}))
return userQuery
.then(users.findOneAsync)
.then(userFound)
})

Expand Down