mirror of
https://github.com/immich-app/immich.git
synced 2024-12-25 10:43:13 +02:00
Update get user info controller to avoid conflict with /count
This commit is contained in:
parent
c6ecfb679a
commit
cbdb8fa51f
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -45,7 +45,7 @@ export class UserController {
|
||||
return await this.userService.getAllUsers(authUser, isAll);
|
||||
}
|
||||
|
||||
@Get('/:userId')
|
||||
@Get('/info/:userId')
|
||||
async getUserById(@Param('userId') userId: string): Promise<UserResponseDto> {
|
||||
return await this.userService.getUserById(userId);
|
||||
}
|
||||
|
@ -39,6 +39,7 @@ export class UserService {
|
||||
}
|
||||
|
||||
async getUserById(userId: string): Promise<UserResponseDto> {
|
||||
console.log(userId);
|
||||
const user = await this.userRepository.get(userId);
|
||||
if (!user) {
|
||||
throw new NotFoundException('User not found');
|
||||
@ -46,6 +47,7 @@ export class UserService {
|
||||
|
||||
return mapUser(user);
|
||||
}
|
||||
|
||||
async getUserInfo(authUser: AuthUserDto): Promise<UserResponseDto> {
|
||||
const user = await this.userRepository.get(authUser.id);
|
||||
if (!user) {
|
||||
|
File diff suppressed because one or more lines are too long
@ -3623,7 +3623,7 @@ export const UserApiAxiosParamCreator = function (configuration?: Configuration)
|
||||
getUserById: async (userId: string, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
|
||||
// verify required parameter 'userId' is not null or undefined
|
||||
assertParamExists('getUserById', 'userId', userId)
|
||||
const localVarPath = `/user/{userId}`
|
||||
const localVarPath = `/user/info/{userId}`
|
||||
.replace(`{${"userId"}}`, encodeURIComponent(String(userId)));
|
||||
// use dummy base URL string because the URL constructor only accepts absolute URLs.
|
||||
const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
|
||||
|
Loading…
Reference in New Issue
Block a user