实现修改密码,但引入了修改密码后无法点击窗口的bug
This commit is contained in:
10
tone-page-server/src/user/dto/update-user-password.dto.ts
Normal file
10
tone-page-server/src/user/dto/update-user-password.dto.ts
Normal file
@@ -0,0 +1,10 @@
|
|||||||
|
import { IsString, Length, Matches } from "class-validator";
|
||||||
|
|
||||||
|
export class UpdateUserPasswordDto {
|
||||||
|
@IsString({ message: '密码不得为空' })
|
||||||
|
@Length(6, 32, { message: '密码长度只能为6~32' })
|
||||||
|
@Matches(/^(?=.*[a-zA-Z])(?=.*\d)[a-zA-Z\d!@#$%^&*()_+\-=\[\]{};:'",.<>/?]{6,32}$/,
|
||||||
|
{ message: '密码必须包含字母和数字,且长度在6~32之间' }
|
||||||
|
)
|
||||||
|
password: string;
|
||||||
|
}
|
||||||
@@ -1,21 +1,30 @@
|
|||||||
import { Controller, Get, Injectable, Request, UnauthorizedException, UseGuards } from '@nestjs/common';
|
import { Body, Controller, Get, Put, Request, UseGuards } from '@nestjs/common';
|
||||||
import { UserService } from './user.service';
|
import { UserService } from './user.service';
|
||||||
import { AuthGuard } from '@nestjs/passport';
|
import { AuthGuard } from '@nestjs/passport';
|
||||||
|
import { UpdateUserPasswordDto } from './dto/update-user-password.dto';
|
||||||
|
import { AuthService } from 'src/auth/auth.service';
|
||||||
|
|
||||||
@Controller('user')
|
@Controller('user')
|
||||||
export class UserController {
|
export class UserController {
|
||||||
|
|
||||||
constructor(
|
constructor(
|
||||||
private readonly userService: UserService
|
private readonly userService: UserService,
|
||||||
|
private readonly authService: AuthService,
|
||||||
) { }
|
) { }
|
||||||
|
|
||||||
@UseGuards(AuthGuard('jwt'))
|
@UseGuards(AuthGuard('jwt'))
|
||||||
@Get('me')
|
@Get('me')
|
||||||
async getMe(@Request() req) {
|
async getMe(@Request() req) {
|
||||||
const { user } = req;
|
const { user } = req;
|
||||||
if (!user || !user.userId) {
|
|
||||||
throw new UnauthorizedException('Unauthorized');
|
|
||||||
}
|
|
||||||
return this.userService.findOne({ userId: user.userId });
|
return this.userService.findOne({ userId: user.userId });
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@UseGuards(AuthGuard('jwt'))
|
||||||
|
@Put('password')
|
||||||
|
async update(
|
||||||
|
@Request() req,
|
||||||
|
@Body() dto: UpdateUserPasswordDto,
|
||||||
|
) {
|
||||||
|
return this.userService.setPassword(req.user.userId, dto.password);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -32,6 +32,8 @@ import { Skeleton } from "./ui/skeleton"
|
|||||||
import { toast } from "sonner"
|
import { toast } from "sonner"
|
||||||
import { useRouter } from "next/navigation"
|
import { useRouter } from "next/navigation"
|
||||||
import { ApiError } from "next/dist/server/api-utils"
|
import { ApiError } from "next/dist/server/api-utils"
|
||||||
|
import SetPassword from "./nav-user/SetPassword"
|
||||||
|
import { useState } from "react"
|
||||||
|
|
||||||
export function NavUser({ }: {}) {
|
export function NavUser({ }: {}) {
|
||||||
const { isMobile } = useSidebar();
|
const { isMobile } = useSidebar();
|
||||||
@@ -68,7 +70,10 @@ export function NavUser({ }: {}) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const [passwordOpen, setPasswordOpen] = useState(false);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
|
<>
|
||||||
<SidebarMenu>
|
<SidebarMenu>
|
||||||
<SidebarMenuItem>
|
<SidebarMenuItem>
|
||||||
<DropdownMenu>
|
<DropdownMenu>
|
||||||
@@ -136,7 +141,7 @@ export function NavUser({ }: {}) {
|
|||||||
<UserRoundCog />
|
<UserRoundCog />
|
||||||
账户信息
|
账户信息
|
||||||
</DropdownMenuItem>
|
</DropdownMenuItem>
|
||||||
<DropdownMenuItem>
|
<DropdownMenuItem onClick={() => setPasswordOpen(true)}>
|
||||||
<KeyRound />
|
<KeyRound />
|
||||||
修改密码
|
修改密码
|
||||||
</DropdownMenuItem>
|
</DropdownMenuItem>
|
||||||
@@ -148,6 +153,9 @@ export function NavUser({ }: {}) {
|
|||||||
</DropdownMenuContent>
|
</DropdownMenuContent>
|
||||||
</DropdownMenu>
|
</DropdownMenu>
|
||||||
</SidebarMenuItem>
|
</SidebarMenuItem>
|
||||||
</SidebarMenu>
|
</SidebarMenu >
|
||||||
|
|
||||||
|
<SetPassword open={passwordOpen} onOpenChange={setPasswordOpen} />
|
||||||
|
</>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|||||||
76
tone-page-web/components/nav-user/SetPassword.tsx
Normal file
76
tone-page-web/components/nav-user/SetPassword.tsx
Normal file
@@ -0,0 +1,76 @@
|
|||||||
|
'use client';
|
||||||
|
|
||||||
|
import { SeparatorProps } from "@radix-ui/react-separator";
|
||||||
|
import { Button } from "@/components/ui/button"
|
||||||
|
import {
|
||||||
|
Dialog,
|
||||||
|
DialogContent,
|
||||||
|
DialogDescription,
|
||||||
|
DialogFooter,
|
||||||
|
DialogHeader,
|
||||||
|
DialogTitle,
|
||||||
|
DialogTrigger,
|
||||||
|
} from "@/components/ui/dialog"
|
||||||
|
import { Input } from "@/components/ui/input"
|
||||||
|
import { Label } from "@/components/ui/label"
|
||||||
|
import { FC } from "react";
|
||||||
|
import { DialogProps } from "@radix-ui/react-dialog";
|
||||||
|
import { toast } from "sonner";
|
||||||
|
import { UserApi } from "@/lib/api";
|
||||||
|
import { ApiError } from "next/dist/server/api-utils";
|
||||||
|
|
||||||
|
export default function SetPassword({ onOpenChange, ...props }: React.ComponentProps<FC<DialogProps>>) {
|
||||||
|
async function handleSetPassword(password: string) {
|
||||||
|
if (! /^(?=.*[a-zA-Z])(?=.*\d)[a-zA-Z\d!@#$%^&*()_+\-=\[\]{};:'",.<>/?]{6,32}$/.test(password)) {
|
||||||
|
toast.error('新密码不符合规范,请重新输入');
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
await UserApi.updatePassword(password);
|
||||||
|
toast.success('新密码设置成功');
|
||||||
|
onOpenChange?.(false);
|
||||||
|
} catch (error) {
|
||||||
|
toast.error((error as ApiError).message || '新密码设置失败');
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return (
|
||||||
|
<Dialog onOpenChange={onOpenChange} {...props}>
|
||||||
|
<DialogContent className="sm:max-w-[425px]">
|
||||||
|
<DialogHeader>
|
||||||
|
<DialogTitle>修改密码</DialogTitle>
|
||||||
|
<DialogDescription>
|
||||||
|
新密码长度在6-32位之间,且至少包含一个字母和一个数字,可以包含特殊字符
|
||||||
|
</DialogDescription>
|
||||||
|
</DialogHeader>
|
||||||
|
|
||||||
|
<form onSubmit={e => {
|
||||||
|
e.preventDefault();
|
||||||
|
const formData = new FormData(e.currentTarget);
|
||||||
|
const password = formData.get('password') as string;
|
||||||
|
|
||||||
|
handleSetPassword(password);
|
||||||
|
}}>
|
||||||
|
<div className="grid gap-4 py-4">
|
||||||
|
<div className="grid grid-cols-4 items-center gap-4">
|
||||||
|
<Label htmlFor="password" className="text-right">
|
||||||
|
新密码
|
||||||
|
</Label>
|
||||||
|
<Input
|
||||||
|
id="password"
|
||||||
|
name="password"
|
||||||
|
defaultValue=""
|
||||||
|
className="col-span-3"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<DialogFooter>
|
||||||
|
<Button type="button" variant='secondary' onClick={() => onOpenChange?.(false)}>取消</Button>
|
||||||
|
<Button type="submit">保存密码</Button>
|
||||||
|
</DialogFooter>
|
||||||
|
</form>
|
||||||
|
</DialogContent>
|
||||||
|
</Dialog >
|
||||||
|
)
|
||||||
|
}
|
||||||
@@ -1 +1,2 @@
|
|||||||
export * from './me';
|
export * from './me';
|
||||||
|
export * from './updatePassword';
|
||||||
10
tone-page-web/lib/api/user/updatePassword.ts
Normal file
10
tone-page-web/lib/api/user/updatePassword.ts
Normal file
@@ -0,0 +1,10 @@
|
|||||||
|
import fetcher from "../fetcher";
|
||||||
|
|
||||||
|
export async function updatePassword(password: string) {
|
||||||
|
return fetcher(`/api/user/password`, {
|
||||||
|
method: 'PUT',
|
||||||
|
body: JSON.stringify({
|
||||||
|
password: password,
|
||||||
|
}),
|
||||||
|
})
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user