NoLog.cz/gancio
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity

[fix] auth user

Browse source
This commit is contained in:
les 2019-10-31 23:27:59 +01:00
parent 6d9f6699ef
commit a2505e913f
3 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
components/Login.vue
View file

@ -66,6 +66,8 @@ export default {
try {
this.loading = true
await this.$auth.loginWith('local', { data: { email: this.email, password: this.password } })
const user = await this.$axios.get('/auth/user')
this.$auth.setUser(user.data)
this.loading = false
Message({ message: this.$t('login.ok'), showClose: true, type: 'success' })
this.close()

2
server/api/controller/user.js
View file

@ -201,7 +201,7 @@ const userController = {
async current (req, res) {
if (!req.user) { return res.status(400).send('Not logged') }
const user = await User.findByPk(req.user.id, { include: { model: FedUsers, as: 'followers' } })
const user = await User.scope('withoutPassword').findByPk(req.user.id, { include: { model: FedUsers, as: 'followers' } })
res.json(user)
},

2
server/api/models/user.js
View file

@ -34,7 +34,7 @@ module.exports = (sequelize, DataTypes) => {
}, {
scopes: {
withoutPassword: {
attributes: { exclude: ['password', 'recover_code'] }
attributes: { exclude: ['password', 'recover_code', 'rsa'] }
}
}
})