Added Update Username & Password

Author: BretRen

app/controllers/me_controller.ts

@@ -1,19 +1,19 @@
 import type { HttpContext } from '@adonisjs/core/http'
-import User from '#models/user'
-import { updateEmailValidator } from '#validators/me'
+import { updateEmailValidator, updatePasswordValidator, updateUsernameValidator } from '#validators/me'
 import redis from '@adonisjs/redis/services/main'
-
+import User from '#models/user'
+import { APP_STATUS_CODE, config } from '#start/pdnode'
 // MeController: /me/*
 /*
    -- TODOS --
  * 添加更改用户邮箱 (2/2)
- * TODO: 添加更改用户名
- * TODO: 添加更改密码
+ * 添加更改用户名 (2/2)
+ * 添加更改密码 (2/2)
 */
 export default class MeController {
   async show({ response, auth }: HttpContext) {
     const user = auth.user
-    return response.ok(user)
+    return response.ok({ ...user, status: APP_STATUS_CODE.SUCCESS })
   }
   async updateEmail({ request, response, auth }: HttpContext) {
     const payload = await updateEmailValidator.validate(request.all())
@@ -22,33 +22,60 @@ export default class MeController {
     const savedOldCode = await redis.get(oldEmailKey)
 
     if (!savedOldCode || savedOldCode !== String(payload.oldEmailCode)) {
-      return response.badRequest({ status: 'e_old_email_code_invalid' })
+      return response.badRequest({ status: APP_STATUS_CODE.E_WRONG_EMAIL_CODE })
     }
 
-
     const newEmailKey = `auth:code:verifyEmail:email:${payload.newEmail}`
     const savedNewCode = await redis.get(newEmailKey)
 
     if (!savedNewCode || savedNewCode !== String(payload.newEmailCode)) {
-      return response.badRequest({ status: 'e_new_email_code_invalid' })
+      return response.badRequest({ status: APP_STATUS_CODE.E_WRONG_EMAIL_CODE })
     }
 
     const isTaken = await User.findBy('email', payload.newEmail)
     if (isTaken) {
-      return response.conflict({ status: 'e_email_already_registered' })
+      return response.conflict({ status: APP_STATUS_CODE.E_EMAIL_ALREADY_REGISTER })
     }
 
     user.email = payload.newEmail
     await user.save()
 
-    await Promise.all([
-      redis.del(oldEmailKey),
-      redis.del(newEmailKey)
-    ])
+    await Promise.all([redis.del(oldEmailKey), redis.del(newEmailKey)])
+
+    return response.ok({ status: APP_STATUS_CODE.SUCCESS })
+  }
+  async updatePassword({ request, response, auth }: HttpContext) {
+    const { newPassword, oldPassword } = await updatePasswordValidator.validate(request.all())
+
+    await User.verifyCredentials(auth.user!.username, oldPassword)
+
+    if (newPassword === oldPassword) {
+      return response.badRequest({ status: APP_STATUS_CODE.E_NEW_PASSWORD_SAME_AS_OLD_PASSWORD })
+    }
+
+    auth.user!.password = newPassword
+
+    await auth.user!.save()
+
+    return response.ok({ status: APP_STATUS_CODE.SUCCESS })
+  }
+  async updateUsername({ request, response, auth }: HttpContext) {
+    const { newUsername, password } = await updateUsernameValidator.validate(request.all(), {
+      meta: {
+        bannedUsernames: config.banned.username,
+      },
+    })
+
+
+    await User.verifyCredentials(auth.user!.username, password)
+
+    if (await User.query().whereILike('username', newUsername).first()) return response.badRequest({ status: APP_STATUS_CODE.E_USERNAME_ALREADY_REGISTER })
 
-    return response.ok({ status: 's_email_updated' })
+    auth.user!.username = newUsername
 
+    await auth.user!.save()
 
+    return response.ok({ status: APP_STATUS_CODE.SUCCESS })
 
 
   }

app/validators/me.ts

@@ -1,9 +1,27 @@
 import vine from '@vinejs/vine'
+import { isBannedRule } from '#validators/user'
 
 export const updateEmailValidator = vine.compile(
   vine.object({
     newEmail: vine.string().trim().email(),
     newEmailCode: vine.number().min(100000).max(999999),
     oldEmailCode: vine.number().min(100000).max(999999),
+
   }),
 );
+
+export const updatePasswordValidator = vine.compile(
+  vine.object({
+    newPassword: vine.string().trim().minLength(6).maxLength(24),
+    oldPassword: vine.string().trim().minLength(6).maxLength(24),
+
+  })
+)
+
+export const updateUsernameValidator = vine.compile(
+  vine.object({
+    newUsername: vine.string().trim().regex(/^[a-zA-Z0-9._-]+$/).minLength(3)
+      .maxLength(12).use(isBannedRule({type: "username"})),
+    password: vine.string().trim().minLength(6).maxLength(24),
+  })
+)

app/validators/user.ts

@@ -11,7 +11,7 @@ type RegistrationMeta = {
   bannedNicknames: string[]
 }
 
-const isBannedRule = vine.createRule(
+export const isBannedRule = vine.createRule(
   (
     value: unknown,
     options: { type: "username" | "nickname" },
@@ -37,6 +37,7 @@ const isBannedRule = vine.createRule(
     if (hasBadWord) {
       field.report(
         `${options.type === "username" ? "Username" : "Nickname"} contains prohibited words.`,
+        // TODO: Add to APP_STATUS_CODE
         `e_bad_${options.type}`,
         field,
       );

start/routes.ts

@@ -39,6 +39,8 @@ router.group(() => {
 router.group(() => {
   router.get("/", [MeController, "show"])
   router.put("/email", [MeController, "updateEmail"])
+  router.put("/password", [MeController, "updatePassword"])
+  router.put("/username", [MeController, "updateUsername"])
 }).use(middleware.auth()).prefix("/me")