n08i40k/schedule-parser-next
1
0
Fork 0
mirror of https://github.com/n08i40k/schedule-parser-next.git synced 2025-12-06 09:47:46 +03:00
Code Issues Packages Projects Releases Wiki Activity

Фикс регистрации для адекватной работы регистрации преподавателей.

Browse Source
This commit is contained in:
N08I40K
2024-12-20 22:41:47 +04:00
parent 31f7f3c9c3
commit f92e27dd34
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/auth/auth.service.ts
View File

@@ -61,7 +61,7 @@ export class AuthService {
*/ */
async signUp(signUp: SignUpDto): Promise<User> { async signUp(signUp: SignUpDto): Promise<User> {
const group = signUp.group.replaceAll(" ", ""); const group = signUp.group.replaceAll(" ", "");
const username = signUp.username.replaceAll(" ", ""); const username = signUp.username.trim();
if (![UserRole.STUDENT, UserRole.TEACHER].includes(signUp.role)) if (![UserRole.STUDENT, UserRole.TEACHER].includes(signUp.role))
throw new NotAcceptableException("Передана неизвестная роль"); throw new NotAcceptableException("Передана неизвестная роль");
@@ -100,7 +100,7 @@ export class AuthService {
*/ */
async signIn(signIn: SignInDto): Promise<User> { async signIn(signIn: SignInDto): Promise<User> {
const user = await this.usersService.findUnique({ const user = await this.usersService.findUnique({
username: signIn.username.replaceAll(" ", ""), username: signIn.username,
}); });
if ( if (

6
src/users/v1-users.controller.ts
View File

@@ -22,6 +22,7 @@ import {
import { ChangeUsernameDto } from "./dto/change-username.dto"; import { ChangeUsernameDto } from "./dto/change-username.dto";
import { ChangeGroupDto } from "./dto/change-group.dto"; import { ChangeGroupDto } from "./dto/change-group.dto";
import { V1ClientUserDto } from "./dto/v1/v1-client-user.dto"; import { V1ClientUserDto } from "./dto/v1/v1-client-user.dto";
import { UserRole } from "./user-role.enum";
@ApiTags("v1/users") @ApiTags("v1/users")
@ApiBearerAuth() @ApiBearerAuth()
@@ -67,6 +68,11 @@ export class V1UsersController {
): Promise<void> { ): Promise<void> {
const user = await this.authService.decodeUserToken(token); const user = await this.authService.decodeUserToken(token);
reqDto.username =
user.role == UserRole.ADMIN
? reqDto.username
: reqDto.username.replace(/\s/g, "");
return await this.usersService.changeUsername(user, reqDto); return await this.usersService.changeUsername(user, reqDto);
} }