fix: tests

e2e/src/api/specs/user.e2e-spec.ts

@@ -42,7 +42,9 @@ describe('/user', () => {
     });
 
     it('should get users', async () => {
-      const { status, body } = await request(app).get('/user').set('Authorization', `Bearer ${admin.accessToken}`);
+      const { status, body } = await request(app)
+        .get('/user/admin')
+        .set('Authorization', `Bearer ${admin.accessToken}`);
       expect(status).toEqual(200);
       expect(body).toHaveLength(5);
       expect(body).toEqual(
@@ -75,7 +77,7 @@ describe('/user', () => {
 
     it('should include deleted users', async () => {
       const { status, body } = await request(app)
-        .get(`/user`)
+        .get(`/user/admin`)
         .query({ isAll: false })
         .set('Authorization', `Bearer ${admin.accessToken}`);
 

open-api/immich-openapi-specs.json

@@ -6844,7 +6844,7 @@
         ]
       }
     },
-    "/user/info/{id}": {
+    "/user/admin/info/{id}": {
       "get": {
         "operationId": "getUserById",
         "parameters": [
@@ -6858,6 +6858,48 @@
             }
           }
         ],
+        "responses": {
+          "200": {
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UserResponseDto"
+                }
+              }
+            },
+            "description": ""
+          }
+        },
+        "security": [
+          {
+            "bearer": []
+          },
+          {
+            "cookie": []
+          },
+          {
+            "api_key": []
+          }
+        ],
+        "tags": [
+          "User"
+        ]
+      }
+    },
+    "/user/info/{id}": {
+      "get": {
+        "operationId": "getPublicUserById",
+        "parameters": [
+          {
+            "name": "id",
+            "required": true,
+            "in": "path",
+            "schema": {
+              "format": "uuid",
+              "type": "string"
+            }
+          }
+        ],
         "responses": {
           "200": {
             "content": {

open-api/typescript-sdk/src/fetch-client.ts

@@ -2832,6 +2832,16 @@ export function getAllUsers({ isAll }: {
 }
 export function getUserById({ id }: {
     id: string;
+}, opts?: Oazapfts.RequestOpts) {
+    return oazapfts.ok(oazapfts.fetchJson<{
+        status: 200;
+        data: UserResponseDto;
+    }>(`/user/admin/info/${encodeURIComponent(id)}`, {
+        ...opts
+    }));
+}
+export function getPublicUserById({ id }: {
+    id: string;
 }, opts?: Oazapfts.RequestOpts) {
     return oazapfts.ok(oazapfts.fetchJson<{
         status: 200;

server/src/controllers/user.controller.ts

@@ -32,18 +32,24 @@ export class UserController {
   constructor(private service: UserService) {}
 
   @Get()
-  getAllPublicUsers(@Auth() auth: AuthDto): Promise<UserDto[]> {
-    return this.service.getAllPublic(auth);
+  getAllPublicUsers(): Promise<UserDto[]> {
+    return this.service.getAllPublic();
   }
 
   @AdminRoute()
   @Get('admin')
-  getAllUsers(@Auth() auth: AuthDto, @Query('isAll') isAll: boolean): Promise<UserResponseDto[]> {
-    return this.service.getAll(auth, isAll);
+  getAllUsers(@Query('isAll') isAll: boolean): Promise<UserResponseDto[]> {
+    return this.service.getAll(isAll);
   }
 
   @Get('info/:id')
-  getUserById(@Param() { id }: UUIDParamDto): Promise<UserDto> {
+  getPublicUserById(@Param() { id }: UUIDParamDto): Promise<UserDto> {
+    return this.service.getPublic(id);
+  }
+
+  @AdminRoute()
+  @Get('admin/info/:id')
+  getUserById(@Param() { id }: UUIDParamDto): Promise<UserResponseDto> {
     return this.service.get(id);
   }
 

server/src/services/user.service.spec.ts

@@ -76,7 +76,7 @@ describe(UserService.name, () => {
   describe('getAll', () => {
     it('should get all users', async () => {
       userMock.getList.mockResolvedValue([userStub.admin]);
-      await expect(sut.getAll(authStub.admin, false)).resolves.toEqual([
+      await expect(sut.getAll(false)).resolves.toEqual([
         expect.objectContaining({
           id: authStub.admin.user.id,
           email: authStub.admin.user.email,

server/src/services/user.service.ts

@@ -50,16 +50,25 @@ export class UserService {
     return users.map((user) => mapUser(user));
   }
 
-  async getAll(auth: AuthDto, isAll: boolean): Promise<UserResponseDto[]> {
+  async getAll(isAll: boolean): Promise<UserResponseDto[]> {
     const users = await this.userRepository.getList({ withDeleted: !isAll });
     return users.map((user) => mapUser(user));
   }
 
-  async getAllPublic(auth: AuthDto): Promise<UserDto[] | UserResponseDto[]> {
+  async getAllPublic(): Promise<UserDto[] | UserResponseDto[]> {
     const users = await this.userRepository.getList({ withDeleted: false });
     return users.map((user) => mapSimpleUser(user));
   }
 
+  async getPublic(userId: string): Promise<UserDto> {
+    const user = await this.userRepository.get(userId, { withDeleted: false });
+    if (!user) {
+      throw new NotFoundException('User not found');
+    }
+
+    return mapSimpleUser(user);
+  }
+
   async get(userId: string): Promise<UserResponseDto> {
     const user = await this.userRepository.get(userId, { withDeleted: false });
     if (!user) {

server/test/fixtures/shared-link.stub.ts

@@ -2,7 +2,7 @@ import { AlbumResponseDto } from 'src/dtos/album.dto';
 import { AssetResponseDto } from 'src/dtos/asset-response.dto';
 import { ExifResponseDto } from 'src/dtos/exif.dto';
 import { SharedLinkResponseDto } from 'src/dtos/shared-link.dto';
-import { mapUser } from 'src/dtos/user.dto';
+import { mapSimpleUser } from 'src/dtos/user.dto';
 import { AssetOrder } from 'src/entities/album.entity';
 import { AssetType } from 'src/entities/asset.entity';
 import { SharedLinkEntity, SharedLinkType } from 'src/entities/shared-link.entity';
@@ -101,7 +101,7 @@ const albumResponse: AlbumResponseDto = {
   updatedAt: today,
   id: 'album-123',
   ownerId: 'admin_id',
-  owner: mapUser(userStub.admin),
+  owner: mapSimpleUser(userStub.admin),
   sharedUsers: [],
   shared: false,
   hasSharedLink: false,

web/src/routes/(user)/partners/[userId]/+page.ts

@@ -1,11 +1,11 @@
 import { authenticate } from '$lib/utils/auth';
-import { getUserById } from '@immich/sdk';
+import { getPublicUserById } from '@immich/sdk';
 import type { PageLoad } from './$types';
 
 export const load = (async ({ params }) => {
   await authenticate();
 
-  const partner = await getUserById({ id: params.userId });
+  const partner = await getPublicUserById({ id: params.userId });
 
   return {
     partner,