jeena/PeerTube
1
0
Fork 0
Code Issues Pull requests Projects Packages Wiki Activity Actions

Cleanup express locals typings

Browse source
This commit is contained in:
Chocobozzz 2019-03-19 10:35:15 +01:00
parent e65c0c5b1f
commit dae86118ed
No known key found for this signature in database
GPG key ID: 583A612D890159BE
45 changed files with 270 additions and 234 deletions
Download patch file Download diff file Expand all files Collapse all files

30
server/controllers/api/users/index.ts
View file

@ -221,8 +221,8 @@ async function registerUser (req: express.Request, res: express.Response) {
return res.type('json').status(204).end()
}
async function unblockUser (req: express.Request, res: express.Response, next: express.NextFunction) {
const user: UserModel = res.locals.user
async function unblockUser (req: express.Request, res: express.Response) {
const user = res.locals.user
await changeUserBlock(res, user, false)
@ -230,7 +230,7 @@ async function unblockUser (req: express.Request, res: express.Response, next: e
}
async function blockUser (req: express.Request, res: express.Response) {
const user: UserModel = res.locals.user
const user = res.locals.user
const reason = req.body.reason
await changeUserBlock(res, user, true, reason)
@ -239,7 +239,7 @@ async function blockUser (req: express.Request, res: express.Response) {
}
function getUser (req: express.Request, res: express.Response) {
return res.json((res.locals.user as UserModel).toFormattedJSON())
return res.json(res.locals.user.toFormattedJSON())
}
async function autocompleteUsers (req: express.Request, res: express.Response) {
@ -255,7 +255,7 @@ async function listUsers (req: express.Request, res: express.Response) {
}
async function removeUser (req: express.Request, res: express.Response) {
const user: UserModel = res.locals.user
const user = res.locals.user
await user.destroy()
@ -266,7 +266,7 @@ async function removeUser (req: express.Request, res: express.Response) {
async function updateUser (req: express.Request, res: express.Response) {
const body: UserUpdate = req.body
const userToUpdate = res.locals.user as UserModel
const userToUpdate = res.locals.user
const oldUserAuditView = new UserAuditView(userToUpdate.toFormattedJSON())
const roleChanged = body.role !== undefined && body.role !== userToUpdate.role
@ -289,8 +289,8 @@ async function updateUser (req: express.Request, res: express.Response) {
return res.sendStatus(204)
}
async function askResetUserPassword (req: express.Request, res: express.Response, next: express.NextFunction) {
const user = res.locals.user as UserModel
async function askResetUserPassword (req: express.Request, res: express.Response) {
const user = res.locals.user
const verificationString = await Redis.Instance.setResetPasswordVerificationString(user.id)
const url = CONFIG.WEBSERVER.URL + '/reset-password?userId=' + user.id + '&verificationString=' + verificationString
@ -299,8 +299,8 @@ async function askResetUserPassword (req: express.Request, res: express.Response
return res.status(204).end()
}
async function resetUserPassword (req: express.Request, res: express.Response, next: express.NextFunction) {
const user = res.locals.user as UserModel
async function resetUserPassword (req: express.Request, res: express.Response) {
const user = res.locals.user
user.password = req.body.password
await user.save()
@ -315,16 +315,16 @@ async function sendVerifyUserEmail (user: UserModel) {
return
}
async function askSendVerifyUserEmail (req: express.Request, res: express.Response, next: express.NextFunction) {
const user = res.locals.user as UserModel
async function askSendVerifyUserEmail (req: express.Request, res: express.Response) {
const user = res.locals.user
await sendVerifyUserEmail(user)
return res.status(204).end()
}
async function verifyUserEmail (req: express.Request, res: express.Response, next: express.NextFunction) {
const user = res.locals.user as UserModel
async function verifyUserEmail (req: express.Request, res: express.Response) {
const user = res.locals.user
user.emailVerified = true
await user.save()
@ -332,7 +332,7 @@ async function verifyUserEmail (req: express.Request, res: express.Response, nex
return res.status(204).end()
}
function success (req: express.Request, res: express.Response, next: express.NextFunction) {
function success (req: express.Request, res: express.Response) {
res.end()
}