Skip to content

Commit

Permalink
fix(auth): return promise reject on request error
Browse files Browse the repository at this point in the history
  • Loading branch information
breakingrobot authored and pi0 committed Apr 1, 2018
1 parent ffd44de commit f2883c6
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 10 deletions.
Empty file added examples/demo/store/index.js
Empty file.
25 changes: 15 additions & 10 deletions lib/auth/auth.js
Expand Up @@ -89,9 +89,10 @@ export default class Auth {
return this.fetchUserOnce()
}

return Promise.resolve(this.strategy.mounted(...arguments)).catch(error =>
return Promise.resolve(this.strategy.mounted(...arguments)).catch(error => {
this.callOnError(error, { method: 'mounted' })
)
return Promise.reject(error)
})
}

loginWith (name, ...args) {
Expand All @@ -103,19 +104,21 @@ export default class Auth {
return Promise.resolve()
}

return this.wrapLogin(this.strategy.login(...arguments)).catch(error =>
return this.wrapLogin(this.strategy.login(...arguments)).catch(error => {
this.callOnError(error, { method: 'login' })
)
return Promise.reject(error)
})
}

fetchUser () {
if (!this.strategy.fetchUser) {
return Promise.resolve()
}

return Promise.resolve(this.strategy.fetchUser(...arguments)).catch(error =>
return Promise.resolve(this.strategy.fetchUser(...arguments)).catch(error => {
this.callOnError(error, { method: 'fetchUser' })
)
return Promise.reject(error)
})
}

logout () {
Expand All @@ -124,9 +127,10 @@ export default class Auth {
return Promise.resolve()
}

return Promise.resolve(this.strategy.logout(...arguments)).catch(error =>
return Promise.resolve(this.strategy.logout(...arguments)).catch(error => {
this.callOnError(error, { method: 'logout' })
)
return Promise.reject(error)
})
}

reset () {
Expand All @@ -136,9 +140,10 @@ export default class Auth {
return Promise.resolve()
}

return Promise.resolve(this.strategy.reset(...arguments)).catch(error =>
return Promise.resolve(this.strategy.reset(...arguments)).catch(error => {
this.callOnError(error, { method: 'reset' })
)
return Promise.reject(error)
})
}

// ---------------------------------------------------------------
Expand Down

0 comments on commit f2883c6

Please sign in to comment.