Update web/src/lib/components/photos-page/asset-grid.svelte

Co-authored-by: Daniel Dietzler <36593685+danieldietzler@users.noreply.github.com>

cli/src/commands/auth.ts

@@ -1,4 +1,4 @@
-import { getMyUser } from '@immich/sdk';
+import { getMyUserInfo } from '@immich/sdk';
 import { existsSync } from 'node:fs';
 import { mkdir, unlink } from 'node:fs/promises';
 import { BaseOptions, connect, getAuthFilePath, logError, withError, writeAuthFile } from 'src/utils';
@@ -10,13 +10,13 @@ export const login = async (url: string, key: string, options: BaseOptions) => {
 
   await connect(url, key);
 
-  const [error, user] = await withError(getMyUser());
+  const [error, userInfo] = await withError(getMyUserInfo());
   if (error) {
     logError(error, 'Failed to load user info');
     process.exit(1);
   }
 
-  console.log(`Logged in as ${user.email}`);
+  console.log(`Logged in as ${userInfo.email}`);
 
   if (!existsSync(configDir)) {
     // Create config folder if it doesn't exist

cli/src/commands/server-info.ts

@@ -1,4 +1,4 @@
-import { getAssetStatistics, getMyUser, getServerVersion, getSupportedMediaTypes } from '@immich/sdk';
+import { getAssetStatistics, getMyUserInfo, getServerVersion, getSupportedMediaTypes } from '@immich/sdk';
 import { BaseOptions, authenticate } from 'src/utils';
 
 export const serverInfo = async (options: BaseOptions) => {
@@ -8,7 +8,7 @@ export const serverInfo = async (options: BaseOptions) => {
     getServerVersion(),
     getSupportedMediaTypes(),
     getAssetStatistics({}),
-    getMyUser(),
+    getMyUserInfo(),
   ]);
 
   console.log(`Server Info (via ${userInfo.email})`);

cli/src/utils.ts

@@ -1,4 +1,4 @@
-import { getMyUser, init, isHttpError } from '@immich/sdk';
+import { getMyUserInfo, init, isHttpError } from '@immich/sdk';
 import { glob } from 'fast-glob';
 import { createHash } from 'node:crypto';
 import { createReadStream } from 'node:fs';
@@ -48,7 +48,7 @@ export const connect = async (url: string, key: string) => {
 
   init({ baseUrl: url, apiKey: key });
 
-  const [error] = await withError(getMyUser());
+  const [error] = await withError(getMyUserInfo());
   if (isHttpError(error)) {
     logError(error, 'Failed to connect to server');
     process.exit(1);

docker/docker-compose.dev.yml

@@ -9,9 +9,6 @@ services:
     container_name: immich_server
     command: ['/usr/src/app/bin/immich-dev']
     image: immich-server-dev:latest
-    # extends:
-    #   file: hwaccel.transcoding.yml
-    #   service: cpu # set to one of [nvenc, quicksync, rkmpp, vaapi, vaapi-wsl] for accelerated transcoding
     build:
       context: ../
       dockerfile: server/Dockerfile

docker/docker-compose.prod.yml

@@ -4,9 +4,6 @@ services:
   immich-server:
     container_name: immich_server
     image: immich-server:latest
-    # extends:
-    #   file: hwaccel.transcoding.yml
-    #   service: cpu # set to one of [nvenc, quicksync, rkmpp, vaapi, vaapi-wsl] for accelerated transcoding
     build:
       context: ../
       dockerfile: server/Dockerfile

docker/docker-compose.yml

@@ -12,9 +12,6 @@ services:
   immich-server:
     container_name: immich_server
     image: ghcr.io/immich-app/immich-server:${IMMICH_VERSION:-release}
-    # extends:
-    #   file: hwaccel.transcoding.yml
-    #   service: cpu # set to one of [nvenc, quicksync, rkmpp, vaapi, vaapi-wsl] for accelerated transcoding
     volumes:
       - ${UPLOAD_LOCATION}:/usr/src/app/upload
       - /etc/localtime:/etc/localtime:ro

docs/docs/administration/oauth.md

@@ -110,44 +110,8 @@ Immich has a route (`/api/oauth/mobile-redirect`) that is already configured to
 
 ## Example Configuration
 
-<details>
-<summary>Authentik Example</summary>
-
-### Authentik Example
-
 Here's an example of OAuth configured for Authentik:
 
-<img src={require('./img/oauth-settings.png').default} title="OAuth settings" />
+![OAuth Settings](./img/oauth-settings.png)
-
-</details>
-
-<details>
-<summary>Google Example</summary>
-
-### Google Example
-
-Configuration of Authorised redirect URIs (Google Console)
-
-<img src={require('./img/google-example.webp').default} width='50%' title="Authorised redirect URIs" />
-
-Configuration of OAuth in System Settings
-
-| Setting                      | Value                                                                                                  |
-| ---------------------------- | ------------------------------------------------------------------------------------------------------ |
-| Issuer URL                   | [https://accounts.google.com](https://accounts.google.com)                                             |
-| Client ID                    | 7\***\*\*\*\*\*\*\***\*\*\***\*\*\*\*\*\*\***vuls.apps.googleusercontent.com                           |
-| Client Secret                | G\***\*\*\*\*\*\*\***\*\*\***\*\*\*\*\*\*\***OO                                                        |
-| Scope                        | openid email profile                                                                                   |
-| Signing Algorithm            | RS256                                                                                                  |
-| Storage Label Claim          | preferred_username                                                                                     |
-| Storage Quota Claim          | immich_quota                                                                                           |
-| Default Storage Quota (GiB)  | 0 (0 for unlimited quota)                                                                              |
-| Button Text                  | Sign in with Google (optional)                                                                         |
-| Auto Register                | Enabled (optional)                                                                                     |
-| Auto Launch                  | Enabled                                                                                                |
-| Mobile Redirect URI Override | Enabled (required)                                                                                     |
-| Mobile Redirect URI          | [https://demo.immich.app/api/oauth/mobile-redirect](https://demo.immich.app/api/oauth/mobile-redirect) |
-
-</details>
 
 [oidc]: https://openid.net/connect/

docs/docs/guides/remote-machine-learning.md

@@ -15,7 +15,7 @@ The [hwaccel.ml.yml](https://github.com/immich-app/immich/releases/latest/downlo
 :::
 
 ```yaml
-name: immich_remote_ml
+version: '3.8'
 
 services:
   immich-machine-learning:

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

@@ -4,7 +4,7 @@ import {
   AlbumUserRole,
   AssetFileUploadResponseDto,
   AssetOrder,
-  deleteUserAdmin,
+  deleteUser,
   getAlbumInfo,
   LoginResponseDto,
   SharedLinkType,
@@ -107,7 +107,7 @@ describe('/albums', () => {
       }),
     ]);
 
-    await deleteUserAdmin({ id: user3.userId, userAdminDeleteDto: {} }, { headers: asBearerAuth(admin.accessToken) });
+    await deleteUser({ id: user3.userId, deleteUserDto: {} }, { headers: asBearerAuth(admin.accessToken) });
   });
 
   describe('GET /albums', () => {

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

@@ -5,7 +5,7 @@ import {
   LoginResponseDto,
   SharedLinkType,
   getAssetInfo,
-  getMyUser,
+  getMyUserInfo,
   updateAssets,
 } from '@immich/sdk';
 import { exiftool } from 'exiftool-vendored';
@@ -86,8 +86,6 @@ describe('/asset', () => {
       utils.userSetup(admin.accessToken, createUserDto.create('stack')),
     ]);
 
-    await utils.createPartner(user1.accessToken, user2.userId);
-
     // asset location
     locationAsset = await utils.createAsset(admin.accessToken, {
       assetData: {
@@ -235,35 +233,6 @@ describe('/asset', () => {
       expect(data.status).toBe(200);
       expect(data.body).toMatchObject({ people: [] });
     });
-
-    describe('partner assets', () => {
-      it('should get the asset info', async () => {
-        const { status, body } = await request(app)
-          .get(`/asset/${user1Assets[0].id}`)
-          .set('Authorization', `Bearer ${user2.accessToken}`);
-        expect(status).toBe(200);
-        expect(body).toMatchObject({ id: user1Assets[0].id });
-      });
-
-      it('disallows viewing archived assets', async () => {
-        const asset = await utils.createAsset(user1.accessToken, { isArchived: true });
-
-        const { status } = await request(app)
-          .get(`/asset/${asset.id}`)
-          .set('Authorization', `Bearer ${user2.accessToken}`);
-        expect(status).toBe(400);
-      });
-
-      it('disallows viewing trashed assets', async () => {
-        const asset = await utils.createAsset(user1.accessToken);
-        await utils.deleteAssets(user1.accessToken, [asset.id]);
-
-        const { status } = await request(app)
-          .get(`/asset/${asset.id}`)
-          .set('Authorization', `Bearer ${user2.accessToken}`);
-        expect(status).toBe(400);
-      });
-    });
   });
 
   describe('GET /asset/statistics', () => {
@@ -1162,7 +1131,7 @@ describe('/asset', () => {
       expect(body).toEqual({ id: expect.any(String), duplicate: false });
       expect(status).toBe(201);
 
-      const user = await getMyUser({ headers: asBearerAuth(quotaUser.accessToken) });
+      const user = await getMyUserInfo({ headers: asBearerAuth(quotaUser.accessToken) });
 
       expect(user).toEqual(expect.objectContaining({ quotaUsageInBytes: 70 }));
     });

e2e/src/api/specs/shared-link.e2e-spec.ts

@@ -5,7 +5,7 @@ import {
   SharedLinkResponseDto,
   SharedLinkType,
   createAlbum,
-  deleteUserAdmin,
+  deleteUser,
 } from '@immich/sdk';
 import { createUserDto, uuidDto } from 'src/fixtures';
 import { errorDto } from 'src/responses';
@@ -86,7 +86,7 @@ describe('/shared-links', () => {
         }),
       ]);
 
-    await deleteUserAdmin({ id: user2.userId, userAdminDeleteDto: {} }, { headers: asBearerAuth(admin.accessToken) });
+    await deleteUser({ id: user2.userId, deleteUserDto: {} }, { headers: asBearerAuth(admin.accessToken) });
   });
 
   describe('GET /share/${key}', () => {

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

@@ -1,317 +0,0 @@
-import { LoginResponseDto, deleteUserAdmin, getMyUser, getUserAdmin, login } from '@immich/sdk';
-import { Socket } from 'socket.io-client';
-import { createUserDto, uuidDto } from 'src/fixtures';
-import { errorDto } from 'src/responses';
-import { app, asBearerAuth, utils } from 'src/utils';
-import request from 'supertest';
-import { afterAll, beforeAll, describe, expect, it } from 'vitest';
-
-describe('/admin/users', () => {
-  let websocket: Socket;
-
-  let admin: LoginResponseDto;
-  let nonAdmin: LoginResponseDto;
-  let deletedUser: LoginResponseDto;
-  let userToDelete: LoginResponseDto;
-  let userToHardDelete: LoginResponseDto;
-
-  beforeAll(async () => {
-    await utils.resetDatabase();
-    admin = await utils.adminSetup({ onboarding: false });
-
-    [websocket, nonAdmin, deletedUser, userToDelete, userToHardDelete] = await Promise.all([
-      utils.connectWebsocket(admin.accessToken),
-      utils.userSetup(admin.accessToken, createUserDto.user1),
-      utils.userSetup(admin.accessToken, createUserDto.user2),
-      utils.userSetup(admin.accessToken, createUserDto.user3),
-      utils.userSetup(admin.accessToken, createUserDto.user4),
-    ]);
-
-    await deleteUserAdmin(
-      { id: deletedUser.userId, userAdminDeleteDto: {} },
-      { headers: asBearerAuth(admin.accessToken) },
-    );
-  });
-
-  afterAll(() => {
-    utils.disconnectWebsocket(websocket);
-  });
-
-  describe('GET /admin/users', () => {
-    it('should require authentication', async () => {
-      const { status, body } = await request(app).get(`/admin/users`);
-      expect(status).toBe(401);
-      expect(body).toEqual(errorDto.unauthorized);
-    });
-
-    it('should require authorization', async () => {
-      const { status, body } = await request(app)
-        .get(`/admin/users`)
-        .set('Authorization', `Bearer ${nonAdmin.accessToken}`);
-      expect(status).toBe(403);
-      expect(body).toEqual(errorDto.forbidden);
-    });
-
-    it('should hide deleted users by default', async () => {
-      const { status, body } = await request(app)
-        .get(`/admin/users`)
-        .set('Authorization', `Bearer ${admin.accessToken}`);
-      expect(status).toBe(200);
-      expect(body).toHaveLength(4);
-      expect(body).toEqual(
-        expect.arrayContaining([
-          expect.objectContaining({ email: admin.userEmail }),
-          expect.objectContaining({ email: nonAdmin.userEmail }),
-          expect.objectContaining({ email: userToDelete.userEmail }),
-          expect.objectContaining({ email: userToHardDelete.userEmail }),
-        ]),
-      );
-    });
-
-    it('should include deleted users', async () => {
-      const { status, body } = await request(app)
-        .get(`/admin/users?withDeleted=true`)
-        .set('Authorization', `Bearer ${admin.accessToken}`);
-
-      expect(status).toBe(200);
-      expect(body).toHaveLength(5);
-      expect(body).toEqual(
-        expect.arrayContaining([
-          expect.objectContaining({ email: admin.userEmail }),
-          expect.objectContaining({ email: nonAdmin.userEmail }),
-          expect.objectContaining({ email: userToDelete.userEmail }),
-          expect.objectContaining({ email: userToHardDelete.userEmail }),
-          expect.objectContaining({ email: deletedUser.userEmail }),
-        ]),
-      );
-    });
-  });
-
-  describe('POST /admin/users', () => {
-    it('should require authentication', async () => {
-      const { status, body } = await request(app).post(`/admin/users`).send(createUserDto.user1);
-      expect(status).toBe(401);
-      expect(body).toEqual(errorDto.unauthorized);
-    });
-
-    it('should require authorization', async () => {
-      const { status, body } = await request(app)
-        .post(`/admin/users`)
-        .set('Authorization', `Bearer ${nonAdmin.accessToken}`)
-        .send(createUserDto.user1);
-      expect(status).toBe(403);
-      expect(body).toEqual(errorDto.forbidden);
-    });
-
-    for (const key of [
-      'password',
-      'email',
-      'name',
-      'quotaSizeInBytes',
-      'shouldChangePassword',
-      'memoriesEnabled',
-      'notify',
-    ]) {
-      it(`should not allow null ${key}`, async () => {
-        const { status, body } = await request(app)
-          .post(`/admin/users`)
-          .set('Authorization', `Bearer ${admin.accessToken}`)
-          .send({ ...createUserDto.user1, [key]: null });
-        expect(status).toBe(400);
-        expect(body).toEqual(errorDto.badRequest());
-      });
-    }
-
-    it('should ignore `isAdmin`', async () => {
-      const { status, body } = await request(app)
-        .post(`/admin/users`)
-        .send({
-          isAdmin: true,
-          email: 'user5@immich.cloud',
-          password: 'password123',
-          name: 'Immich',
-        })
-        .set('Authorization', `Bearer ${admin.accessToken}`);
-      expect(body).toMatchObject({
-        email: 'user5@immich.cloud',
-        isAdmin: false,
-        shouldChangePassword: true,
-      });
-      expect(status).toBe(201);
-    });
-
-    it('should create a user without memories enabled', async () => {
-      const { status, body } = await request(app)
-        .post(`/admin/users`)
-        .send({
-          email: 'no-memories@immich.cloud',
-          password: 'Password123',
-          name: 'No Memories',
-          memoriesEnabled: false,
-        })
-        .set('Authorization', `Bearer ${admin.accessToken}`);
-      expect(body).toMatchObject({
-        email: 'no-memories@immich.cloud',
-        memoriesEnabled: false,
-      });
-      expect(status).toBe(201);
-    });
-  });
-
-  describe('PUT /admin/users/:id', () => {
-    it('should require authentication', async () => {
-      const { status, body } = await request(app).put(`/admin/users/${uuidDto.notFound}`);
-      expect(status).toBe(401);
-      expect(body).toEqual(errorDto.unauthorized);
-    });
-
-    it('should require authorization', async () => {
-      const { status, body } = await request(app)
-        .put(`/admin/users/${uuidDto.notFound}`)
-        .set('Authorization', `Bearer ${nonAdmin.accessToken}`);
-      expect(status).toBe(403);
-      expect(body).toEqual(errorDto.forbidden);
-    });
-
-    for (const key of ['password', 'email', 'name', 'shouldChangePassword', 'memoriesEnabled']) {
-      it(`should not allow null ${key}`, async () => {
-        const { status, body } = await request(app)
-          .put(`/admin/users/${uuidDto.notFound}`)
-          .set('Authorization', `Bearer ${admin.accessToken}`)
-          .send({ [key]: null });
-        expect(status).toBe(400);
-        expect(body).toEqual(errorDto.badRequest());
-      });
-    }
-
-    it('should not allow a non-admin to become an admin', async () => {
-      const { status, body } = await request(app)
-        .put(`/admin/users/${nonAdmin.userId}`)
-        .send({ isAdmin: true })
-        .set('Authorization', `Bearer ${admin.accessToken}`);
-
-      expect(status).toBe(200);
-      expect(body).toMatchObject({ isAdmin: false });
-    });
-
-    it('ignores updates to profileImagePath', async () => {
-      const { status, body } = await request(app)
-        .put(`/admin/users/${admin.userId}`)
-        .send({ profileImagePath: 'invalid.jpg' })
-        .set('Authorization', `Bearer ${admin.accessToken}`);
-
-      expect(status).toBe(200);
-      expect(body).toMatchObject({ id: admin.userId, profileImagePath: '' });
-    });
-
-    it('should update first and last name', async () => {
-      const before = await getUserAdmin({ id: admin.userId }, { headers: asBearerAuth(admin.accessToken) });
-
-      const { status, body } = await request(app)
-        .put(`/admin/users/${admin.userId}`)
-        .send({ name: 'Name' })
-        .set('Authorization', `Bearer ${admin.accessToken}`);
-
-      expect(status).toBe(200);
-      expect(body).toEqual({
-        ...before,
-        updatedAt: expect.any(String),
-        name: 'Name',
-      });
-      expect(before.updatedAt).not.toEqual(body.updatedAt);
-    });
-
-    it('should update memories enabled', async () => {
-      const before = await getUserAdmin({ id: admin.userId }, { headers: asBearerAuth(admin.accessToken) });
-      const { status, body } = await request(app)
-        .put(`/admin/users/${admin.userId}`)
-        .send({ memoriesEnabled: false })
-        .set('Authorization', `Bearer ${admin.accessToken}`);
-
-      expect(status).toBe(200);
-      expect(body).toMatchObject({
-        ...before,
-        updatedAt: expect.anything(),
-        memoriesEnabled: false,
-      });
-      expect(before.updatedAt).not.toEqual(body.updatedAt);
-    });
-
-    it('should update password', async () => {
-      const { status, body } = await request(app)
-        .put(`/admin/users/${nonAdmin.userId}`)
-        .send({ password: 'super-secret' })
-        .set('Authorization', `Bearer ${admin.accessToken}`);
-
-      expect(status).toBe(200);
-      expect(body).toMatchObject({ email: nonAdmin.userEmail });
-
-      const token = await login({ loginCredentialDto: { email: nonAdmin.userEmail, password: 'super-secret' } });
-      expect(token.accessToken).toBeDefined();
-
-      const user = await getMyUser({ headers: asBearerAuth(token.accessToken) });
-      expect(user).toMatchObject({ email: nonAdmin.userEmail });
-    });
-  });
-
-  describe('DELETE /admin/users/:id', () => {
-    it('should require authentication', async () => {
-      const { status, body } = await request(app).delete(`/admin/users/${userToDelete.userId}`);
-      expect(status).toBe(401);
-      expect(body).toEqual(errorDto.unauthorized);
-    });
-
-    it('should require authorization', async () => {
-      const { status, body } = await request(app)
-        .delete(`/admin/users/${userToDelete.userId}`)
-        .set('Authorization', `Bearer ${nonAdmin.accessToken}`);
-      expect(status).toBe(403);
-      expect(body).toEqual(errorDto.forbidden);
-    });
-
-    it('should delete user', async () => {
-      const { status, body } = await request(app)
-        .delete(`/admin/users/${userToDelete.userId}`)
-        .set('Authorization', `Bearer ${admin.accessToken}`);
-
-      expect(status).toBe(200);
-      expect(body).toMatchObject({
-        id: userToDelete.userId,
-        updatedAt: expect.any(String),
-        deletedAt: expect.any(String),
-      });
-    });
-
-    it('should hard delete a user', async () => {
-      const { status, body } = await request(app)
-        .delete(`/admin/users/${userToHardDelete.userId}`)
-        .send({ force: true })
-        .set('Authorization', `Bearer ${admin.accessToken}`);
-
-      expect(status).toBe(200);
-      expect(body).toMatchObject({
-        id: userToHardDelete.userId,
-        updatedAt: expect.any(String),
-        deletedAt: expect.any(String),
-      });
-
-      await utils.waitForWebsocketEvent({ event: 'userDelete', id: userToHardDelete.userId, timeout: 5000 });
-    });
-  });
-
-  describe('POST /admin/users/:id/restore', () => {
-    it('should require authentication', async () => {
-      const { status, body } = await request(app).post(`/admin/users/${userToDelete.userId}/restore`);
-      expect(status).toBe(401);
-      expect(body).toEqual(errorDto.unauthorized);
-    });
-
-    it('should require authorization', async () => {
-      const { status, body } = await request(app)
-        .post(`/admin/users/${userToDelete.userId}/restore`)
-        .set('Authorization', `Bearer ${nonAdmin.accessToken}`);
-      expect(status).toBe(403);
-      expect(body).toEqual(errorDto.forbidden);
-    });
-  });
-});

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

@@ -1,28 +1,37 @@
-import { LoginResponseDto, SharedLinkType, deleteUserAdmin, getMyUser, login } from '@immich/sdk';
+import { LoginResponseDto, deleteUser, getUserById } from '@immich/sdk';
-import { createUserDto } from 'src/fixtures';
+import { Socket } from 'socket.io-client';
+import { createUserDto, userDto } from 'src/fixtures';
 import { errorDto } from 'src/responses';
 import { app, asBearerAuth, utils } from 'src/utils';
 import request from 'supertest';
-import { beforeAll, describe, expect, it } from 'vitest';
+import { afterAll, beforeAll, describe, expect, it } from 'vitest';
 
 describe('/users', () => {
+  let websocket: Socket;
+
   let admin: LoginResponseDto;
   let deletedUser: LoginResponseDto;
+  let userToDelete: LoginResponseDto;
+  let userToHardDelete: LoginResponseDto;
   let nonAdmin: LoginResponseDto;
 
   beforeAll(async () => {
     await utils.resetDatabase();
     admin = await utils.adminSetup({ onboarding: false });
 
-    [deletedUser, nonAdmin] = await Promise.all([
+    [websocket, deletedUser, nonAdmin, userToDelete, userToHardDelete] = await Promise.all([
+      utils.connectWebsocket(admin.accessToken),
       utils.userSetup(admin.accessToken, createUserDto.user1),
       utils.userSetup(admin.accessToken, createUserDto.user2),
+      utils.userSetup(admin.accessToken, createUserDto.user3),
+      utils.userSetup(admin.accessToken, createUserDto.user4),
     ]);
 
-    await deleteUserAdmin(
+    await deleteUser({ id: deletedUser.userId, deleteUserDto: {} }, { headers: asBearerAuth(admin.accessToken) });
-      { id: deletedUser.userId, userAdminDeleteDto: {} },
+  });
-      { headers: asBearerAuth(admin.accessToken) },
+
-    );
+  afterAll(() => {
+    utils.disconnectWebsocket(websocket);
   });
 
   describe('GET /users', () => {
@@ -35,14 +44,71 @@ describe('/users', () => {
     it('should get users', async () => {
       const { status, body } = await request(app).get('/users').set('Authorization', `Bearer ${admin.accessToken}`);
       expect(status).toEqual(200);
-      expect(body).toHaveLength(2);
+      expect(body).toHaveLength(5);
+      expect(body).toEqual(
+        expect.arrayContaining([
+          expect.objectContaining({ email: 'admin@immich.cloud' }),
+          expect.objectContaining({ email: 'user1@immich.cloud' }),
+          expect.objectContaining({ email: 'user2@immich.cloud' }),
+          expect.objectContaining({ email: 'user3@immich.cloud' }),
+          expect.objectContaining({ email: 'user4@immich.cloud' }),
+        ]),
+      );
+    });
+
+    it('should hide deleted users', async () => {
+      const { status, body } = await request(app)
+        .get(`/users`)
+        .query({ isAll: true })
+        .set('Authorization', `Bearer ${admin.accessToken}`);
+      expect(status).toBe(200);
+      expect(body).toHaveLength(4);
       expect(body).toEqual(
         expect.arrayContaining([
           expect.objectContaining({ email: 'admin@immich.cloud' }),
           expect.objectContaining({ email: 'user2@immich.cloud' }),
+          expect.objectContaining({ email: 'user3@immich.cloud' }),
+          expect.objectContaining({ email: 'user4@immich.cloud' }),
         ]),
       );
     });
+
+    it('should include deleted users', async () => {
+      const { status, body } = await request(app)
+        .get(`/users`)
+        .query({ isAll: false })
+        .set('Authorization', `Bearer ${admin.accessToken}`);
+
+      expect(status).toBe(200);
+      expect(body).toHaveLength(5);
+      expect(body).toEqual(
+        expect.arrayContaining([
+          expect.objectContaining({ email: 'admin@immich.cloud' }),
+          expect.objectContaining({ email: 'user1@immich.cloud' }),
+          expect.objectContaining({ email: 'user2@immich.cloud' }),
+          expect.objectContaining({ email: 'user3@immich.cloud' }),
+          expect.objectContaining({ email: 'user4@immich.cloud' }),
+        ]),
+      );
+    });
+  });
+
+  describe('GET /users/:id', () => {
+    it('should require authentication', async () => {
+      const { status } = await request(app).get(`/users/${admin.userId}`);
+      expect(status).toEqual(401);
+    });
+
+    it('should get the user info', async () => {
+      const { status, body } = await request(app)
+        .get(`/users/${admin.userId}`)
+        .set('Authorization', `Bearer ${admin.accessToken}`);
+      expect(status).toBe(200);
+      expect(body).toMatchObject({
+        id: admin.userId,
+        email: 'admin@immich.cloud',
+      });
+    });
   });
 
   describe('GET /users/me', () => {
@@ -52,54 +118,154 @@ describe('/users', () => {
       expect(body).toEqual(errorDto.unauthorized);
     });
 
-    it('should not work for shared links', async () => {
+    it('should get my info', async () => {
-      const album = await utils.createAlbum(admin.accessToken, { albumName: 'Album' });
-      const sharedLink = await utils.createSharedLink(admin.accessToken, {
-        type: SharedLinkType.Album,
-        albumId: album.id,
-      });
-      const { status, body } = await request(app).get(`/users/me?key=${sharedLink.key}`);
-      expect(status).toBe(403);
-      expect(body).toEqual(errorDto.forbidden);
-    });
-
-    it('should get my user', async () => {
       const { status, body } = await request(app).get(`/users/me`).set('Authorization', `Bearer ${admin.accessToken}`);
       expect(status).toBe(200);
       expect(body).toMatchObject({
         id: admin.userId,
         email: 'admin@immich.cloud',
-        memoriesEnabled: true,
-        quotaUsageInBytes: 0,
       });
     });
   });
 
-  describe('PUT /users/me', () => {
+  describe('POST /users', () => {
     it('should require authentication', async () => {
-      const { status, body } = await request(app).put(`/users/me`);
+      const { status, body } = await request(app).post(`/users`).send(createUserDto.user1);
       expect(status).toBe(401);
       expect(body).toEqual(errorDto.unauthorized);
     });
 
-    for (const key of ['email', 'name', 'memoriesEnabled', 'avatarColor']) {
+    for (const key of Object.keys(createUserDto.user1)) {
       it(`should not allow null ${key}`, async () => {
-        const dto = { [key]: null };
         const { status, body } = await request(app)
-          .put(`/users/me`)
+          .post(`/users`)
           .set('Authorization', `Bearer ${admin.accessToken}`)
-          .send(dto);
+          .send({ ...createUserDto.user1, [key]: null });
         expect(status).toBe(400);
         expect(body).toEqual(errorDto.badRequest());
       });
     }
 
+    it('should ignore `isAdmin`', async () => {
+      const { status, body } = await request(app)
+        .post(`/users`)
+        .send({
+          isAdmin: true,
+          email: 'user5@immich.cloud',
+          password: 'password123',
+          name: 'Immich',
+        })
+        .set('Authorization', `Bearer ${admin.accessToken}`);
+      expect(body).toMatchObject({
+        email: 'user5@immich.cloud',
+        isAdmin: false,
+        shouldChangePassword: true,
+      });
+      expect(status).toBe(201);
+    });
+
+    it('should create a user without memories enabled', async () => {
+      const { status, body } = await request(app)
+        .post(`/users`)
+        .send({
+          email: 'no-memories@immich.cloud',
+          password: 'Password123',
+          name: 'No Memories',
+          memoriesEnabled: false,
+        })
+        .set('Authorization', `Bearer ${admin.accessToken}`);
+      expect(body).toMatchObject({
+        email: 'no-memories@immich.cloud',
+        memoriesEnabled: false,
+      });
+      expect(status).toBe(201);
+    });
+  });
+
+  describe('DELETE /users/:id', () => {
+    it('should require authentication', async () => {
+      const { status, body } = await request(app).delete(`/users/${userToDelete.userId}`);
+      expect(status).toBe(401);
+      expect(body).toEqual(errorDto.unauthorized);
+    });
+
+    it('should delete user', async () => {
+      const { status, body } = await request(app)
+        .delete(`/users/${userToDelete.userId}`)
+        .set('Authorization', `Bearer ${admin.accessToken}`);
+
+      expect(status).toBe(200);
+      expect(body).toMatchObject({
+        id: userToDelete.userId,
+        updatedAt: expect.any(String),
+        deletedAt: expect.any(String),
+      });
+    });
+
+    it('should hard delete user', async () => {
+      const { status, body } = await request(app)
+        .delete(`/users/${userToHardDelete.userId}`)
+        .send({ force: true })
+        .set('Authorization', `Bearer ${admin.accessToken}`);
+
+      expect(status).toBe(200);
+      expect(body).toMatchObject({
+        id: userToHardDelete.userId,
+        updatedAt: expect.any(String),
+        deletedAt: expect.any(String),
+      });
+
+      await utils.waitForWebsocketEvent({ event: 'userDelete', id: userToHardDelete.userId, timeout: 5000 });
+    });
+  });
+
+  describe('PUT /users', () => {
+    it('should require authentication', async () => {
+      const { status, body } = await request(app).put(`/users`);
+      expect(status).toBe(401);
+      expect(body).toEqual(errorDto.unauthorized);
+    });
+
+    for (const key of Object.keys(userDto.admin)) {
+      it(`should not allow null ${key}`, async () => {
+        const { status, body } = await request(app)
+          .put(`/users`)
+          .set('Authorization', `Bearer ${admin.accessToken}`)
+          .send({ ...userDto.admin, [key]: null });
+        expect(status).toBe(400);
+        expect(body).toEqual(errorDto.badRequest());
+      });
+    }
+
+    it('should not allow a non-admin to become an admin', async () => {
+      const { status, body } = await request(app)
+        .put(`/users`)
+        .send({ isAdmin: true, id: nonAdmin.userId })
+        .set('Authorization', `Bearer ${admin.accessToken}`);
+
+      expect(status).toBe(400);
+      expect(body).toEqual(errorDto.alreadyHasAdmin);
+    });
+
+    it('ignores updates to profileImagePath', async () => {
+      const { status, body } = await request(app)
+        .put(`/users`)
+        .send({ id: admin.userId, profileImagePath: 'invalid.jpg' })
+        .set('Authorization', `Bearer ${admin.accessToken}`);
+
+      expect(status).toBe(200);
+      expect(body).toMatchObject({ id: admin.userId, profileImagePath: '' });
+    });
+
     it('should update first and last name', async () => {
-      const before = await getMyUser({ headers: asBearerAuth(admin.accessToken) });
+      const before = await getUserById({ id: admin.userId }, { headers: asBearerAuth(admin.accessToken) });
 
       const { status, body } = await request(app)
-        .put(`/users/me`)
+        .put(`/users`)
-        .send({ name: 'Name' })
+        .send({
+          id: admin.userId,
+          name: 'Name',
+        })
         .set('Authorization', `Bearer ${admin.accessToken}`);
 
       expect(status).toBe(200);
@@ -108,13 +274,17 @@ describe('/users', () => {
         updatedAt: expect.any(String),
         name: 'Name',
       });
+      expect(before.updatedAt).not.toEqual(body.updatedAt);
     });
 
     it('should update memories enabled', async () => {
-      const before = await getMyUser({ headers: asBearerAuth(admin.accessToken) });
+      const before = await getUserById({ id: admin.userId }, { headers: asBearerAuth(admin.accessToken) });
       const { status, body } = await request(app)
-        .put(`/users/me`)
+        .put(`/users`)
-        .send({ memoriesEnabled: false })
+        .send({
+          id: admin.userId,
+          memoriesEnabled: false,
+        })
         .set('Authorization', `Bearer ${admin.accessToken}`);
 
       expect(status).toBe(200);
@@ -123,80 +293,7 @@ describe('/users', () => {
         updatedAt: expect.anything(),
         memoriesEnabled: false,
       });
-
+      expect(before.updatedAt).not.toEqual(body.updatedAt);
-      const after = await getMyUser({ headers: asBearerAuth(admin.accessToken) });
-      expect(after.memoriesEnabled).toBe(false);
-    });
-
-    /** @deprecated */
-    it('should allow a user to change their password (deprecated)', async () => {
-      const user = await getMyUser({ headers: asBearerAuth(nonAdmin.accessToken) });
-
-      expect(user.shouldChangePassword).toBe(true);
-
-      const { status, body } = await request(app)
-        .put(`/users/me`)
-        .send({ password: 'super-secret' })
-        .set('Authorization', `Bearer ${nonAdmin.accessToken}`);
-
-      expect(status).toBe(200);
-      expect(body).toMatchObject({
-        email: nonAdmin.userEmail,
-        shouldChangePassword: false,
-      });
-
-      const token = await login({ loginCredentialDto: { email: nonAdmin.userEmail, password: 'super-secret' } });
-
-      expect(token.accessToken).toBeDefined();
-    });
-
-    it('should not allow user to change to a taken email', async () => {
-      const { status, body } = await request(app)
-        .put(`/users/me`)
-        .send({ email: 'admin@immich.cloud' })
-        .set('Authorization', `Bearer ${nonAdmin.accessToken}`);
-
-      expect(status).toBe(400);
-      expect(body).toMatchObject(errorDto.badRequest('Email already in use by another account'));
-    });
-
-    it('should update my email', async () => {
-      const before = await getMyUser({ headers: asBearerAuth(nonAdmin.accessToken) });
-      const { status, body } = await request(app)
-        .put(`/users/me`)
-        .send({ email: 'non-admin@immich.cloud' })
-        .set('Authorization', `Bearer ${nonAdmin.accessToken}`);
-
-      expect(status).toBe(200);
-      expect(body).toMatchObject({
-        ...before,
-        email: 'non-admin@immich.cloud',
-        updatedAt: expect.anything(),
-      });
-    });
-  });
-
-  describe('GET /users/:id', () => {
-    it('should require authentication', async () => {
-      const { status } = await request(app).get(`/users/${admin.userId}`);
-      expect(status).toEqual(401);
-    });
-
-    it('should get the user', async () => {
-      const { status, body } = await request(app)
-        .get(`/users/${admin.userId}`)
-        .set('Authorization', `Bearer ${admin.accessToken}`);
-      expect(status).toBe(200);
-      expect(body).toMatchObject({
-        id: admin.userId,
-        email: 'admin@immich.cloud',
-      });
-
-      expect(body).not.toMatchObject({
-        shouldChangePassword: expect.anything(),
-        memoriesEnabled: expect.anything(),
-        storageLabel: expect.anything(),
-      });
     });
   });
 });

e2e/src/utils.ts

@@ -5,18 +5,17 @@ import {
   CreateAlbumDto,
   CreateAssetDto,
   CreateLibraryDto,
+  CreateUserDto,
   MetadataSearchDto,
   PersonCreateDto,
   SharedLinkCreateDto,
-  UserAdminCreateDto,
   ValidateLibraryDto,
   createAlbum,
   createApiKey,
   createLibrary,
-  createPartner,
   createPerson,
   createSharedLink,
-  createUserAdmin,
+  createUser,
   deleteAssets,
   getAllJobsStatus,
   getAssetInfo,
@@ -273,8 +272,8 @@ export const utils = {
     return response;
   },
 
-  userSetup: async (accessToken: string, dto: UserAdminCreateDto) => {
+  userSetup: async (accessToken: string, dto: CreateUserDto) => {
-    await createUserAdmin({ userAdminCreateDto: dto }, { headers: asBearerAuth(accessToken) });
+    await createUser({ createUserDto: dto }, { headers: asBearerAuth(accessToken) });
     return login({
       loginCredentialDto: { email: dto.email, password: dto.password },
     });
@@ -386,8 +385,6 @@ export const utils = {
   validateLibrary: (accessToken: string, id: string, dto: ValidateLibraryDto) =>
     validate({ id, validateLibraryDto: dto }, { headers: asBearerAuth(accessToken) }),
 
-  createPartner: (accessToken: string, id: string) => createPartner({ id }, { headers: asBearerAuth(accessToken) }),
-
   setAuthCookies: async (context: BrowserContext, accessToken: string) =>
     await context.addCookies([
       {

e2e/src/web/specs/asset-viewer/detail-panel.e2e-spec.ts

@@ -43,18 +43,4 @@ test.describe('Detail Panel', () => {
     await page.keyboard.press('i');
     await expect(page.locator('#detail-panel')).toHaveCount(0);
   });
-
-  test('description is visible for owner on shared links', async ({ context, page }) => {
-    const sharedLink = await utils.createSharedLink(admin.accessToken, {
-      type: SharedLinkType.Individual,
-      assetIds: [asset.id],
-    });
-    await utils.setAuthCookies(context, admin.accessToken);
-    await page.goto(`/share/${sharedLink.key}/photos/${asset.id}`);
-
-    const textarea = page.getByRole('textbox', { name: 'Add a description' });
-    await page.getByRole('button', { name: 'Info' }).click();
-    await expect(textarea).toBeVisible();
-    await expect(textarea).not.toBeDisabled();
-  });
 });

mobile/lib/entities/user.entity.dart

@@ -27,7 +27,7 @@ class User {
 
   Id get isarId => fastHash(id);
 
-  User.fromUserDto(UserAdminResponseDto dto)
+  User.fromUserDto(UserResponseDto dto)
       : id = dto.id,
         updatedAt = dto.updatedAt,
         email = dto.email,
@@ -44,21 +44,21 @@ class User {
 
   User.fromPartnerDto(PartnerResponseDto dto)
       : id = dto.id,
-        updatedAt = DateTime.now(),
+        updatedAt = dto.updatedAt,
         email = dto.email,
         name = dto.name,
         isPartnerSharedBy = false,
         isPartnerSharedWith = false,
         profileImagePath = dto.profileImagePath,
-        isAdmin = false,
+        isAdmin = dto.isAdmin,
-        memoryEnabled = false,
+        memoryEnabled = dto.memoriesEnabled ?? false,
         avatarColor = dto.avatarColor.toAvatarColor(),
         inTimeline = dto.inTimeline ?? false,
-        quotaUsageInBytes = 0,
+        quotaUsageInBytes = dto.quotaUsageInBytes ?? 0,
-        quotaSizeInBytes = 0;
+        quotaSizeInBytes = dto.quotaSizeInBytes ?? 0;
 
   /// Base user dto used where the complete user object is not required
-  User.fromSimpleUserDto(UserResponseDto dto)
+  User.fromSimpleUserDto(UserDto dto)
       : id = dto.id,
         email = dto.email,
         name = dto.name,

mobile/lib/pages/common/album_viewer.page.dart

@@ -133,7 +133,7 @@ class AlbumViewerPage extends HookConsumerWidget {
 
     Widget buildTitle(Album album) {
       return Padding(
-        padding: const EdgeInsets.only(left: 8, right: 8),
+        padding: const EdgeInsets.only(left: 8, right: 8, top: 24),
         child: userId == album.ownerId && album.isRemote
             ? AlbumViewerEditableTitle(
                 album: album,
@@ -228,30 +228,9 @@ class AlbumViewerPage extends HookConsumerWidget {
     }
 
     return Scaffold(
-      body: Stack(
+      appBar: ref.watch(multiselectProvider)
-        children: [
+          ? null
-          album.widgetWhen(
+          : album.when(
-            onData: (data) => MultiselectGrid(
-              renderListProvider: albumRenderlistProvider(albumId),
-              topWidget: Column(
-                crossAxisAlignment: CrossAxisAlignment.start,
-                children: [
-                  buildHeader(data),
-                  if (data.isRemote) buildControlButton(data),
-                ],
-              ),
-              onRemoveFromAlbum: onRemoveFromAlbumPressed,
-              editEnabled: data.ownerId == userId,
-            ),
-          ),
-          AnimatedPositioned(
-            duration: const Duration(milliseconds: 300),
-            top: ref.watch(multiselectProvider)
-                ? -(kToolbarHeight + MediaQuery.of(context).padding.top)
-                : 0,
-            left: 0,
-            right: 0,
-            child: album.when(
               data: (data) => AlbumViewerAppbar(
                 titleFocusNode: titleFocusNode,
                 album: data,
@@ -263,8 +242,19 @@ class AlbumViewerPage extends HookConsumerWidget {
               error: (error, stackTrace) => AppBar(title: const Text("Error")),
               loading: () => AppBar(),
             ),
+      body: album.widgetWhen(
+        onData: (data) => MultiselectGrid(
+          renderListProvider: albumRenderlistProvider(albumId),
+          topWidget: Column(
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              buildHeader(data),
+              if (data.isRemote) buildControlButton(data),
+            ],
           ),
-        ],
+          onRemoveFromAlbum: onRemoveFromAlbumPressed,
+          editEnabled: data.ownerId == userId,
+        ),
       ),
     );
   }

mobile/lib/providers/authentication.provider.dart

@@ -138,9 +138,11 @@ class AuthenticationNotifier extends StateNotifier<AuthenticationState> {
 
   Future<bool> changePassword(String newPassword) async {
     try {
-      await _apiService.userApi.updateMyUser(
+      await _apiService.userApi.updateUser(
-        UserUpdateMeDto(
+        UpdateUserDto(
+          id: state.userId,
           password: newPassword,
+          shouldChangePassword: false,
         ),
       );
 
@@ -176,9 +178,9 @@ class AuthenticationNotifier extends StateNotifier<AuthenticationState> {
       user = offlineUser;
       retResult = false;
     } else {
-      UserAdminResponseDto? userResponseDto;
+      UserResponseDto? userResponseDto;
       try {
-        userResponseDto = await _apiService.userApi.getMyUser();
+        userResponseDto = await _apiService.userApi.getMyUserInfo();
       } on ApiException catch (error, stackTrace) {
         _log.severe(
           "Error getting user information from the server [API EXCEPTION]",

mobile/lib/providers/user.provider.dart

@@ -20,7 +20,7 @@ class CurrentUserProvider extends StateNotifier<User?> {
 
   refresh() async {
     try {
-      final user = await _apiService.userApi.getMyUser();
+      final user = await _apiService.userApi.getMyUserInfo();
       if (user != null) {
         Store.put(
           StoreKey.currentUser,

mobile/lib/routing/tab_navigation_observer.dart

@@ -57,7 +57,7 @@ class TabNavigationObserver extends AutoRouterObserver {
       // Update user info
       try {
         final userResponseDto =
-            await ref.read(apiServiceProvider).userApi.getMyUser();
+            await ref.read(apiServiceProvider).userApi.getMyUserInfo();
 
         if (userResponseDto == null) {
           return;

mobile/lib/services/user.service.dart

@@ -37,10 +37,10 @@ class UserService {
     this._partnerService,
   );
 
-  Future<List<User>?> _getAllUsers() async {
+  Future<List<User>?> _getAllUsers({required bool isAll}) async {
     try {
-      final dto = await _apiService.userApi.searchUsers();
+      final dto = await _apiService.userApi.getAllUsers(isAll);
-      return dto?.map(User.fromSimpleUserDto).toList();
+      return dto?.map(User.fromUserDto).toList();
     } catch (e) {
       _log.warning("Failed get all users", e);
       return null;
@@ -71,7 +71,7 @@ class UserService {
   }
 
   Future<List<User>?> getUsersFromServer() async {
-    final List<User>? users = await _getAllUsers();
+    final List<User>? users = await _getAllUsers(isAll: true);
     final List<User>? sharedBy =
         await _partnerService.getPartners(PartnerDirection.sharedBy);
     final List<User>? sharedWith =

mobile/lib/widgets/album/album_viewer_editable_title.dart

@@ -36,62 +36,58 @@ class AlbumViewerEditableTitle extends HookConsumerWidget {
       [],
     );
 
-    return Material(
+    return TextField(
-      color: Colors.transparent,
+      onChanged: (value) {
-      child: TextField(
+        if (value.isEmpty) {
-        onChanged: (value) {
+        } else {
-          if (value.isEmpty) {
+          ref.watch(albumViewerProvider.notifier).setEditTitleText(value);
-          } else {
+        }
-            ref.watch(albumViewerProvider.notifier).setEditTitleText(value);
+      },
-          }
+      focusNode: titleFocusNode,
-        },
+      style: context.textTheme.headlineMedium,
-        focusNode: titleFocusNode,
+      controller: titleTextEditController,
-        style: context.textTheme.headlineMedium,
+      onTap: () {
-        controller: titleTextEditController,
+        FocusScope.of(context).requestFocus(titleFocusNode);
-        onTap: () {
-          FocusScope.of(context).requestFocus(titleFocusNode);
 
-          ref.watch(albumViewerProvider.notifier).setEditTitleText(album.name);
+        ref.watch(albumViewerProvider.notifier).setEditTitleText(album.name);
-          ref.watch(albumViewerProvider.notifier).enableEditAlbum();
+        ref.watch(albumViewerProvider.notifier).enableEditAlbum();
 
-          if (titleTextEditController.text == 'Untitled') {
+        if (titleTextEditController.text == 'Untitled') {
-            titleTextEditController.clear();
+          titleTextEditController.clear();
-          }
+        }
-        },
+      },
-        decoration: InputDecoration(
+      decoration: InputDecoration(
-          contentPadding:
+        contentPadding: const EdgeInsets.symmetric(horizontal: 8, vertical: 8),
-              const EdgeInsets.symmetric(horizontal: 8, vertical: 8),
+        suffixIcon: titleFocusNode.hasFocus
-          suffixIcon: titleFocusNode.hasFocus
+            ? IconButton(
-              ? IconButton(
+                onPressed: () {
-                  onPressed: () {
+                  titleTextEditController.clear();
-                    titleTextEditController.clear();
+                },
-                  },
+                icon: Icon(
-                  icon: Icon(
+                  Icons.cancel_rounded,
-                    Icons.cancel_rounded,
+                  color: context.primaryColor,
-                    color: context.primaryColor,
+                ),
-                  ),
+                splashRadius: 10,
-                  splashRadius: 10,
+              )
-                )
+            : null,
-              : null,
+        enabledBorder: OutlineInputBorder(
-          enabledBorder: OutlineInputBorder(
+          borderSide: const BorderSide(color: Colors.transparent),
-            borderSide: const BorderSide(color: Colors.transparent),
+          borderRadius: BorderRadius.circular(10),
-            borderRadius: BorderRadius.circular(10),
+        ),
-          ),
+        focusedBorder: OutlineInputBorder(
-          focusedBorder: OutlineInputBorder(
+          borderSide: const BorderSide(color: Colors.transparent),
-            borderSide: const BorderSide(color: Colors.transparent),
+          borderRadius: BorderRadius.circular(10),
-            borderRadius: BorderRadius.circular(10),
+        ),
-          ),
+        focusColor: Colors.grey[300],
-          focusColor: Colors.grey[300],
+        fillColor: context.isDarkTheme
-          fillColor: context.isDarkTheme
+            ? const Color.fromARGB(255, 32, 33, 35)
-              ? const Color.fromARGB(255, 32, 33, 35)
+            : Colors.grey[200],
-              : Colors.grey[200],
+        filled: titleFocusNode.hasFocus,
-          filled: titleFocusNode.hasFocus,
+        hintText: 'share_add_title'.tr(),
-          hintText: 'share_add_title'.tr(),
+        hintStyle: TextStyle(
-          hintStyle: TextStyle(
+          fontSize: 28,
-            fontSize: 28,
+          color: context.isDarkTheme ? Colors.grey[300] : Colors.grey[700],
-            color: context.isDarkTheme ? Colors.grey[300] : Colors.grey[700],
+          fontWeight: FontWeight.bold,
-            fontWeight: FontWeight.bold,
-          ),
         ),
       ),
     );

mobile/lib/widgets/asset_grid/immich_asset_grid_view.dart

@@ -238,10 +238,8 @@ class ImmichAssetGridViewState extends ConsumerState<ImmichAssetGridView> {
     }
 
     bool appBarOffset() {
-      return (ref.watch(tabProvider).index == 0 &&
+      return ref.watch(tabProvider).index == 0 &&
-              ModalRoute.of(context)?.settings.name ==
+          ModalRoute.of(context)?.settings.name == TabControllerRoute.name;
-                  TabControllerRoute.name) ||
-          (ModalRoute.of(context)?.settings.name == AlbumViewerRoute.name);
     }
 
     final listWidget = ScrollablePositionedList.builder(

mobile/openapi/README.md

@@ -212,18 +212,15 @@ Class | Method | HTTP request | Description
 *TrashApi* | [**restoreAssets**](doc//TrashApi.md#restoreassets) | **POST** /trash/restore/assets | 
 *TrashApi* | [**restoreTrash**](doc//TrashApi.md#restoretrash) | **POST** /trash/restore | 
 *UserApi* | [**createProfileImage**](doc//UserApi.md#createprofileimage) | **POST** /users/profile-image | 
-*UserApi* | [**createUserAdmin**](doc//UserApi.md#createuseradmin) | **POST** /admin/users | 
+*UserApi* | [**createUser**](doc//UserApi.md#createuser) | **POST** /users | 
 *UserApi* | [**deleteProfileImage**](doc//UserApi.md#deleteprofileimage) | **DELETE** /users/profile-image | 
-*UserApi* | [**deleteUserAdmin**](doc//UserApi.md#deleteuseradmin) | **DELETE** /admin/users/{id} | 
+*UserApi* | [**deleteUser**](doc//UserApi.md#deleteuser) | **DELETE** /users/{id} | 
-*UserApi* | [**getMyUser**](doc//UserApi.md#getmyuser) | **GET** /users/me | 
+*UserApi* | [**getAllUsers**](doc//UserApi.md#getallusers) | **GET** /users | 
+*UserApi* | [**getMyUserInfo**](doc//UserApi.md#getmyuserinfo) | **GET** /users/me | 
 *UserApi* | [**getProfileImage**](doc//UserApi.md#getprofileimage) | **GET** /users/{id}/profile-image | 
-*UserApi* | [**getUser**](doc//UserApi.md#getuser) | **GET** /users/{id} | 
+*UserApi* | [**getUserById**](doc//UserApi.md#getuserbyid) | **GET** /users/{id} | 
-*UserApi* | [**getUserAdmin**](doc//UserApi.md#getuseradmin) | **GET** /admin/users/{id} | 
+*UserApi* | [**restoreUser**](doc//UserApi.md#restoreuser) | **POST** /users/{id}/restore | 
-*UserApi* | [**restoreUserAdmin**](doc//UserApi.md#restoreuseradmin) | **POST** /admin/users/{id}/restore | 
+*UserApi* | [**updateUser**](doc//UserApi.md#updateuser) | **PUT** /users | 
-*UserApi* | [**searchUsers**](doc//UserApi.md#searchusers) | **GET** /users | 
-*UserApi* | [**searchUsersAdmin**](doc//UserApi.md#searchusersadmin) | **GET** /admin/users | 
-*UserApi* | [**updateMyUser**](doc//UserApi.md#updatemyuser) | **PUT** /users/me | 
-*UserApi* | [**updateUserAdmin**](doc//UserApi.md#updateuseradmin) | **PUT** /admin/users/{id} | 
 
 
 ## Documentation For Models
@@ -283,6 +280,8 @@ Class | Method | HTTP request | Description
  - [CreateLibraryDto](doc//CreateLibraryDto.md)
  - [CreateProfileImageResponseDto](doc//CreateProfileImageResponseDto.md)
  - [CreateTagDto](doc//CreateTagDto.md)
+ - [CreateUserDto](doc//CreateUserDto.md)
+ - [DeleteUserDto](doc//DeleteUserDto.md)
  - [DownloadArchiveInfo](doc//DownloadArchiveInfo.md)
  - [DownloadInfoDto](doc//DownloadInfoDto.md)
  - [DownloadResponseDto](doc//DownloadResponseDto.md)
@@ -403,15 +402,12 @@ Class | Method | HTTP request | Description
  - [UpdatePartnerDto](doc//UpdatePartnerDto.md)
  - [UpdateStackParentDto](doc//UpdateStackParentDto.md)
  - [UpdateTagDto](doc//UpdateTagDto.md)
+ - [UpdateUserDto](doc//UpdateUserDto.md)
  - [UsageByUserDto](doc//UsageByUserDto.md)
- - [UserAdminCreateDto](doc//UserAdminCreateDto.md)
- - [UserAdminDeleteDto](doc//UserAdminDeleteDto.md)
- - [UserAdminResponseDto](doc//UserAdminResponseDto.md)
- - [UserAdminUpdateDto](doc//UserAdminUpdateDto.md)
  - [UserAvatarColor](doc//UserAvatarColor.md)
+ - [UserDto](doc//UserDto.md)
  - [UserResponseDto](doc//UserResponseDto.md)
  - [UserStatus](doc//UserStatus.md)
- - [UserUpdateMeDto](doc//UserUpdateMeDto.md)
  - [ValidateAccessTokenResponseDto](doc//ValidateAccessTokenResponseDto.md)
  - [ValidateLibraryDto](doc//ValidateLibraryDto.md)
  - [ValidateLibraryImportPathResponseDto](doc//ValidateLibraryImportPathResponseDto.md)

mobile/openapi/lib/api.dart

@@ -112,6 +112,8 @@ part 'model/create_album_dto.dart';
 part 'model/create_library_dto.dart';
 part 'model/create_profile_image_response_dto.dart';
 part 'model/create_tag_dto.dart';
+part 'model/create_user_dto.dart';
+part 'model/delete_user_dto.dart';
 part 'model/download_archive_info.dart';
 part 'model/download_info_dto.dart';
 part 'model/download_response_dto.dart';
@@ -232,15 +234,12 @@ part 'model/update_library_dto.dart';
 part 'model/update_partner_dto.dart';
 part 'model/update_stack_parent_dto.dart';
 part 'model/update_tag_dto.dart';
+part 'model/update_user_dto.dart';
 part 'model/usage_by_user_dto.dart';
-part 'model/user_admin_create_dto.dart';
-part 'model/user_admin_delete_dto.dart';
-part 'model/user_admin_response_dto.dart';
-part 'model/user_admin_update_dto.dart';
 part 'model/user_avatar_color.dart';
+part 'model/user_dto.dart';
 part 'model/user_response_dto.dart';
 part 'model/user_status.dart';
-part 'model/user_update_me_dto.dart';
 part 'model/validate_access_token_response_dto.dart';
 part 'model/validate_library_dto.dart';
 part 'model/validate_library_import_path_response_dto.dart';

mobile/openapi/lib/api/authentication_api.dart

@@ -48,7 +48,7 @@ class AuthenticationApi {
   /// Parameters:
   ///
   /// * [ChangePasswordDto] changePasswordDto (required):
-  Future<UserAdminResponseDto?> changePassword(ChangePasswordDto changePasswordDto,) async {
+  Future<UserResponseDto?> changePassword(ChangePasswordDto changePasswordDto,) async {
     final response = await changePasswordWithHttpInfo(changePasswordDto,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
@@ -57,7 +57,7 @@ class AuthenticationApi {
     // At the time of writing this, `dart:convert` will throw an "Unexpected end of input"
     // FormatException when trying to decode an empty string.
     if (response.body.isNotEmpty && response.statusCode != HttpStatus.noContent) {
-      return await apiClient.deserializeAsync(await _decodeBodyBytes(response), 'UserAdminResponseDto',) as UserAdminResponseDto;
+      return await apiClient.deserializeAsync(await _decodeBodyBytes(response), 'UserResponseDto',) as UserResponseDto;
     
     }
     return null;
@@ -183,7 +183,7 @@ class AuthenticationApi {
   /// Parameters:
   ///
   /// * [SignUpDto] signUpDto (required):
-  Future<UserAdminResponseDto?> signUpAdmin(SignUpDto signUpDto,) async {
+  Future<UserResponseDto?> signUpAdmin(SignUpDto signUpDto,) async {
     final response = await signUpAdminWithHttpInfo(signUpDto,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
@@ -192,7 +192,7 @@ class AuthenticationApi {
     // At the time of writing this, `dart:convert` will throw an "Unexpected end of input"
     // FormatException when trying to decode an empty string.
     if (response.body.isNotEmpty && response.statusCode != HttpStatus.noContent) {
-      return await apiClient.deserializeAsync(await _decodeBodyBytes(response), 'UserAdminResponseDto',) as UserAdminResponseDto;
+      return await apiClient.deserializeAsync(await _decodeBodyBytes(response), 'UserResponseDto',) as UserResponseDto;
     
     }
     return null;

mobile/openapi/lib/api/o_auth_api.dart

@@ -95,7 +95,7 @@ class OAuthApi {
   /// Parameters:
   ///
   /// * [OAuthCallbackDto] oAuthCallbackDto (required):
-  Future<UserAdminResponseDto?> linkOAuthAccount(OAuthCallbackDto oAuthCallbackDto,) async {
+  Future<UserResponseDto?> linkOAuthAccount(OAuthCallbackDto oAuthCallbackDto,) async {
     final response = await linkOAuthAccountWithHttpInfo(oAuthCallbackDto,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
@@ -104,7 +104,7 @@ class OAuthApi {
     // At the time of writing this, `dart:convert` will throw an "Unexpected end of input"
     // FormatException when trying to decode an empty string.
     if (response.body.isNotEmpty && response.statusCode != HttpStatus.noContent) {
-      return await apiClient.deserializeAsync(await _decodeBodyBytes(response), 'UserAdminResponseDto',) as UserAdminResponseDto;
+      return await apiClient.deserializeAsync(await _decodeBodyBytes(response), 'UserResponseDto',) as UserResponseDto;
     
     }
     return null;
@@ -216,7 +216,7 @@ class OAuthApi {
     );
   }
 
-  Future<UserAdminResponseDto?> unlinkOAuthAccount() async {
+  Future<UserResponseDto?> unlinkOAuthAccount() async {
     final response = await unlinkOAuthAccountWithHttpInfo();
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
@@ -225,7 +225,7 @@ class OAuthApi {
     // At the time of writing this, `dart:convert` will throw an "Unexpected end of input"
     // FormatException when trying to decode an empty string.
     if (response.body.isNotEmpty && response.statusCode != HttpStatus.noContent) {
-      return await apiClient.deserializeAsync(await _decodeBodyBytes(response), 'UserAdminResponseDto',) as UserAdminResponseDto;
+      return await apiClient.deserializeAsync(await _decodeBodyBytes(response), 'UserResponseDto',) as UserResponseDto;
     
     }
     return null;

mobile/openapi/lib/api/user_api.dart

@@ -73,16 +73,16 @@ class UserApi {
     return null;
   }
 
-  /// Performs an HTTP 'POST /admin/users' operation and returns the [Response].
+  /// Performs an HTTP 'POST /users' operation and returns the [Response].
   /// Parameters:
   ///
-  /// * [UserAdminCreateDto] userAdminCreateDto (required):
+  /// * [CreateUserDto] createUserDto (required):
-  Future<Response> createUserAdminWithHttpInfo(UserAdminCreateDto userAdminCreateDto,) async {
+  Future<Response> createUserWithHttpInfo(CreateUserDto createUserDto,) async {
     // ignore: prefer_const_declarations
-    final path = r'/admin/users';
+    final path = r'/users';
 
     // ignore: prefer_final_locals
-    Object? postBody = userAdminCreateDto;
+    Object? postBody = createUserDto;
 
     final queryParams = <QueryParam>[];
     final headerParams = <String, String>{};
@@ -104,9 +104,9 @@ class UserApi {
 
   /// Parameters:
   ///
-  /// * [UserAdminCreateDto] userAdminCreateDto (required):
+  /// * [CreateUserDto] createUserDto (required):
-  Future<UserAdminResponseDto?> createUserAdmin(UserAdminCreateDto userAdminCreateDto,) async {
+  Future<UserResponseDto?> createUser(CreateUserDto createUserDto,) async {
-    final response = await createUserAdminWithHttpInfo(userAdminCreateDto,);
+    final response = await createUserWithHttpInfo(createUserDto,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -114,7 +114,7 @@ class UserApi {
     // At the time of writing this, `dart:convert` will throw an "Unexpected end of input"
     // FormatException when trying to decode an empty string.
     if (response.body.isNotEmpty && response.statusCode != HttpStatus.noContent) {
-      return await apiClient.deserializeAsync(await _decodeBodyBytes(response), 'UserAdminResponseDto',) as UserAdminResponseDto;
+      return await apiClient.deserializeAsync(await _decodeBodyBytes(response), 'UserResponseDto',) as UserResponseDto;
     
     }
     return null;
@@ -153,19 +153,19 @@ class UserApi {
     }
   }
 
-  /// Performs an HTTP 'DELETE /admin/users/{id}' operation and returns the [Response].
+  /// Performs an HTTP 'DELETE /users/{id}' operation and returns the [Response].
   /// Parameters:
   ///
   /// * [String] id (required):
   ///
-  /// * [UserAdminDeleteDto] userAdminDeleteDto (required):
+  /// * [DeleteUserDto] deleteUserDto (required):
-  Future<Response> deleteUserAdminWithHttpInfo(String id, UserAdminDeleteDto userAdminDeleteDto,) async {
+  Future<Response> deleteUserWithHttpInfo(String id, DeleteUserDto deleteUserDto,) async {
     // ignore: prefer_const_declarations
-    final path = r'/admin/users/{id}'
+    final path = r'/users/{id}'
       .replaceAll('{id}', id);
 
     // ignore: prefer_final_locals
-    Object? postBody = userAdminDeleteDto;
+    Object? postBody = deleteUserDto;
 
     final queryParams = <QueryParam>[];
     final headerParams = <String, String>{};
@@ -189,9 +189,9 @@ class UserApi {
   ///
   /// * [String] id (required):
   ///
-  /// * [UserAdminDeleteDto] userAdminDeleteDto (required):
+  /// * [DeleteUserDto] deleteUserDto (required):
-  Future<UserAdminResponseDto?> deleteUserAdmin(String id, UserAdminDeleteDto userAdminDeleteDto,) async {
+  Future<UserResponseDto?> deleteUser(String id, DeleteUserDto deleteUserDto,) async {
-    final response = await deleteUserAdminWithHttpInfo(id, userAdminDeleteDto,);
+    final response = await deleteUserWithHttpInfo(id, deleteUserDto,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -199,14 +199,66 @@ class UserApi {
     // At the time of writing this, `dart:convert` will throw an "Unexpected end of input"
     // FormatException when trying to decode an empty string.
     if (response.body.isNotEmpty && response.statusCode != HttpStatus.noContent) {
-      return await apiClient.deserializeAsync(await _decodeBodyBytes(response), 'UserAdminResponseDto',) as UserAdminResponseDto;
+      return await apiClient.deserializeAsync(await _decodeBodyBytes(response), 'UserResponseDto',) as UserResponseDto;
     
     }
     return null;
   }
 
+  /// Performs an HTTP 'GET /users' operation and returns the [Response].
+  /// Parameters:
+  ///
+  /// * [bool] isAll (required):
+  Future<Response> getAllUsersWithHttpInfo(bool isAll,) async {
+    // ignore: prefer_const_declarations
+    final path = r'/users';
+
+    // ignore: prefer_final_locals
+    Object? postBody;
+
+    final queryParams = <QueryParam>[];
+    final headerParams = <String, String>{};
+    final formParams = <String, String>{};
+
+      queryParams.addAll(_queryParams('', 'isAll', isAll));
+
+    const contentTypes = <String>[];
+
+
+    return apiClient.invokeAPI(
+      path,
+      'GET',
+      queryParams,
+      postBody,
+      headerParams,
+      formParams,
+      contentTypes.isEmpty ? null : contentTypes.first,
+    );
+  }
+
+  /// Parameters:
+  ///
+  /// * [bool] isAll (required):
+  Future<List<UserResponseDto>?> getAllUsers(bool isAll,) async {
+    final response = await getAllUsersWithHttpInfo(isAll,);
+    if (response.statusCode >= HttpStatus.badRequest) {
+      throw ApiException(response.statusCode, await _decodeBodyBytes(response));
+    }
+    // When a remote server returns no body with a status of 204, we shall not decode it.
+    // At the time of writing this, `dart:convert` will throw an "Unexpected end of input"
+    // FormatException when trying to decode an empty string.
+    if (response.body.isNotEmpty && response.statusCode != HttpStatus.noContent) {
+      final responseBody = await _decodeBodyBytes(response);
+      return (await apiClient.deserializeAsync(responseBody, 'List<UserResponseDto>') as List)
+        .cast<UserResponseDto>()
+        .toList(growable: false);
+
+    }
+    return null;
+  }
+
   /// Performs an HTTP 'GET /users/me' operation and returns the [Response].
-  Future<Response> getMyUserWithHttpInfo() async {
+  Future<Response> getMyUserInfoWithHttpInfo() async {
     // ignore: prefer_const_declarations
     final path = r'/users/me';
 
@@ -231,8 +283,8 @@ class UserApi {
     );
   }
 
-  Future<UserAdminResponseDto?> getMyUser() async {
+  Future<UserResponseDto?> getMyUserInfo() async {
-    final response = await getMyUserWithHttpInfo();
+    final response = await getMyUserInfoWithHttpInfo();
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -240,7 +292,7 @@ class UserApi {
     // At the time of writing this, `dart:convert` will throw an "Unexpected end of input"
     // FormatException when trying to decode an empty string.
     if (response.body.isNotEmpty && response.statusCode != HttpStatus.noContent) {
-      return await apiClient.deserializeAsync(await _decodeBodyBytes(response), 'UserAdminResponseDto',) as UserAdminResponseDto;
+      return await apiClient.deserializeAsync(await _decodeBodyBytes(response), 'UserResponseDto',) as UserResponseDto;
     
     }
     return null;
@@ -298,7 +350,7 @@ class UserApi {
   /// Parameters:
   ///
   /// * [String] id (required):
-  Future<Response> getUserWithHttpInfo(String id,) async {
+  Future<Response> getUserByIdWithHttpInfo(String id,) async {
     // ignore: prefer_const_declarations
     final path = r'/users/{id}'
       .replaceAll('{id}', id);
@@ -327,8 +379,8 @@ class UserApi {
   /// Parameters:
   ///
   /// * [String] id (required):
-  Future<UserResponseDto?> getUser(String id,) async {
+  Future<UserResponseDto?> getUserById(String id,) async {
-    final response = await getUserWithHttpInfo(id,);
+    final response = await getUserByIdWithHttpInfo(id,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -342,61 +394,13 @@ class UserApi {
     return null;
   }
 
-  /// Performs an HTTP 'GET /admin/users/{id}' operation and returns the [Response].
+  /// Performs an HTTP 'POST /users/{id}/restore' operation and returns the [Response].
   /// Parameters:
   ///
   /// * [String] id (required):
-  Future<Response> getUserAdminWithHttpInfo(String id,) async {
+  Future<Response> restoreUserWithHttpInfo(String id,) async {
     // ignore: prefer_const_declarations
-    final path = r'/admin/users/{id}'
+    final path = r'/users/{id}/restore'
-      .replaceAll('{id}', id);
-
-    // ignore: prefer_final_locals
-    Object? postBody;
-
-    final queryParams = <QueryParam>[];
-    final headerParams = <String, String>{};
-    final formParams = <String, String>{};
-
-    const contentTypes = <String>[];
-
-
-    return apiClient.invokeAPI(
-      path,
-      'GET',
-      queryParams,
-      postBody,
-      headerParams,
-      formParams,
-      contentTypes.isEmpty ? null : contentTypes.first,
-    );
-  }
-
-  /// Parameters:
-  ///
-  /// * [String] id (required):
-  Future<UserAdminResponseDto?> getUserAdmin(String id,) async {
-    final response = await getUserAdminWithHttpInfo(id,);
-    if (response.statusCode >= HttpStatus.badRequest) {
-      throw ApiException(response.statusCode, await _decodeBodyBytes(response));
-    }
-    // When a remote server returns no body with a status of 204, we shall not decode it.
-    // At the time of writing this, `dart:convert` will throw an "Unexpected end of input"
-    // FormatException when trying to decode an empty string.
-    if (response.body.isNotEmpty && response.statusCode != HttpStatus.noContent) {
-      return await apiClient.deserializeAsync(await _decodeBodyBytes(response), 'UserAdminResponseDto',) as UserAdminResponseDto;
-    
-    }
-    return null;
-  }
-
-  /// Performs an HTTP 'POST /admin/users/{id}/restore' operation and returns the [Response].
-  /// Parameters:
-  ///
-  /// * [String] id (required):
-  Future<Response> restoreUserAdminWithHttpInfo(String id,) async {
-    // ignore: prefer_const_declarations
-    final path = r'/admin/users/{id}/restore'
       .replaceAll('{id}', id);
 
     // ignore: prefer_final_locals
@@ -423,8 +427,8 @@ class UserApi {
   /// Parameters:
   ///
   /// * [String] id (required):
-  Future<UserAdminResponseDto?> restoreUserAdmin(String id,) async {
+  Future<UserResponseDto?> restoreUser(String id,) async {
-    final response = await restoreUserAdminWithHttpInfo(id,);
+    final response = await restoreUserWithHttpInfo(id,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -432,120 +436,22 @@ class UserApi {
     // At the time of writing this, `dart:convert` will throw an "Unexpected end of input"
     // FormatException when trying to decode an empty string.
     if (response.body.isNotEmpty && response.statusCode != HttpStatus.noContent) {
-      return await apiClient.deserializeAsync(await _decodeBodyBytes(response), 'UserAdminResponseDto',) as UserAdminResponseDto;
+      return await apiClient.deserializeAsync(await _decodeBodyBytes(response), 'UserResponseDto',) as UserResponseDto;
     
     }
     return null;
   }
 
-  /// Performs an HTTP 'GET /users' operation and returns the [Response].
+  /// Performs an HTTP 'PUT /users' operation and returns the [Response].
-  Future<Response> searchUsersWithHttpInfo() async {
+  /// Parameters:
+  ///
+  /// * [UpdateUserDto] updateUserDto (required):
+  Future<Response> updateUserWithHttpInfo(UpdateUserDto updateUserDto,) async {
     // ignore: prefer_const_declarations
     final path = r'/users';
 
     // ignore: prefer_final_locals
-    Object? postBody;
+    Object? postBody = updateUserDto;
-
-    final queryParams = <QueryParam>[];
-    final headerParams = <String, String>{};
-    final formParams = <String, String>{};
-
-    const contentTypes = <String>[];
-
-
-    return apiClient.invokeAPI(
-      path,
-      'GET',
-      queryParams,
-      postBody,
-      headerParams,
-      formParams,
-      contentTypes.isEmpty ? null : contentTypes.first,
-    );
-  }
-
-  Future<List<UserResponseDto>?> searchUsers() async {
-    final response = await searchUsersWithHttpInfo();
-    if (response.statusCode >= HttpStatus.badRequest) {
-      throw ApiException(response.statusCode, await _decodeBodyBytes(response));
-    }
-    // When a remote server returns no body with a status of 204, we shall not decode it.
-    // At the time of writing this, `dart:convert` will throw an "Unexpected end of input"
-    // FormatException when trying to decode an empty string.
-    if (response.body.isNotEmpty && response.statusCode != HttpStatus.noContent) {
-      final responseBody = await _decodeBodyBytes(response);
-      return (await apiClient.deserializeAsync(responseBody, 'List<UserResponseDto>') as List)
-        .cast<UserResponseDto>()
-        .toList(growable: false);
-
-    }
-    return null;
-  }
-
-  /// Performs an HTTP 'GET /admin/users' operation and returns the [Response].
-  /// Parameters:
-  ///
-  /// * [bool] withDeleted:
-  Future<Response> searchUsersAdminWithHttpInfo({ bool? withDeleted, }) async {
-    // ignore: prefer_const_declarations
-    final path = r'/admin/users';
-
-    // ignore: prefer_final_locals
-    Object? postBody;
-
-    final queryParams = <QueryParam>[];
-    final headerParams = <String, String>{};
-    final formParams = <String, String>{};
-
-    if (withDeleted != null) {
-      queryParams.addAll(_queryParams('', 'withDeleted', withDeleted));
-    }
-
-    const contentTypes = <String>[];
-
-
-    return apiClient.invokeAPI(
-      path,
-      'GET',
-      queryParams,
-      postBody,
-      headerParams,
-      formParams,
-      contentTypes.isEmpty ? null : contentTypes.first,
-    );
-  }
-
-  /// Parameters:
-  ///
-  /// * [bool] withDeleted:
-  Future<List<UserAdminResponseDto>?> searchUsersAdmin({ bool? withDeleted, }) async {
-    final response = await searchUsersAdminWithHttpInfo( withDeleted: withDeleted, );
-    if (response.statusCode >= HttpStatus.badRequest) {
-      throw ApiException(response.statusCode, await _decodeBodyBytes(response));
-    }
-    // When a remote server returns no body with a status of 204, we shall not decode it.
-    // At the time of writing this, `dart:convert` will throw an "Unexpected end of input"
-    // FormatException when trying to decode an empty string.
-    if (response.body.isNotEmpty && response.statusCode != HttpStatus.noContent) {
-      final responseBody = await _decodeBodyBytes(response);
-      return (await apiClient.deserializeAsync(responseBody, 'List<UserAdminResponseDto>') as List)
-        .cast<UserAdminResponseDto>()
-        .toList(growable: false);
-
-    }
-    return null;
-  }
-
-  /// Performs an HTTP 'PUT /users/me' operation and returns the [Response].
-  /// Parameters:
-  ///
-  /// * [UserUpdateMeDto] userUpdateMeDto (required):
-  Future<Response> updateMyUserWithHttpInfo(UserUpdateMeDto userUpdateMeDto,) async {
-    // ignore: prefer_const_declarations
-    final path = r'/users/me';
-
-    // ignore: prefer_final_locals
-    Object? postBody = userUpdateMeDto;
 
     final queryParams = <QueryParam>[];
     final headerParams = <String, String>{};
@@ -567,9 +473,9 @@ class UserApi {
 
   /// Parameters:
   ///
-  /// * [UserUpdateMeDto] userUpdateMeDto (required):
+  /// * [UpdateUserDto] updateUserDto (required):
-  Future<UserAdminResponseDto?> updateMyUser(UserUpdateMeDto userUpdateMeDto,) async {
+  Future<UserResponseDto?> updateUser(UpdateUserDto updateUserDto,) async {
-    final response = await updateMyUserWithHttpInfo(userUpdateMeDto,);
+    final response = await updateUserWithHttpInfo(updateUserDto,);
     if (response.statusCode >= HttpStatus.badRequest) {
       throw ApiException(response.statusCode, await _decodeBodyBytes(response));
     }
@@ -577,59 +483,7 @@ class UserApi {
     // At the time of writing this, `dart:convert` will throw an "Unexpected end of input"
     // FormatException when trying to decode an empty string.
     if (response.body.isNotEmpty && response.statusCode != HttpStatus.noContent) {
-      return await apiClient.deserializeAsync(await _decodeBodyBytes(response), 'UserAdminResponseDto',) as UserAdminResponseDto;
+      return await apiClient.deserializeAsync(await _decodeBodyBytes(response), 'UserResponseDto',) as UserResponseDto;
-    
-    }
-    return null;
-  }
-
-  /// Performs an HTTP 'PUT /admin/users/{id}' operation and returns the [Response].
-  /// Parameters:
-  ///
-  /// * [String] id (required):
-  ///
-  /// * [UserAdminUpdateDto] userAdminUpdateDto (required):
-  Future<Response> updateUserAdminWithHttpInfo(String id, UserAdminUpdateDto userAdminUpdateDto,) async {
-    // ignore: prefer_const_declarations
-    final path = r'/admin/users/{id}'
-      .replaceAll('{id}', id);
-
-    // ignore: prefer_final_locals
-    Object? postBody = userAdminUpdateDto;
-
-    final queryParams = <QueryParam>[];
-    final headerParams = <String, String>{};
-    final formParams = <String, String>{};
-
-    const contentTypes = <String>['application/json'];
-
-
-    return apiClient.invokeAPI(
-      path,
-      'PUT',
-      queryParams,
-      postBody,
-      headerParams,
-      formParams,
-      contentTypes.isEmpty ? null : contentTypes.first,
-    );
-  }
-
-  /// Parameters:
-  ///
-  /// * [String] id (required):
-  ///
-  /// * [UserAdminUpdateDto] userAdminUpdateDto (required):
-  Future<UserAdminResponseDto?> updateUserAdmin(String id, UserAdminUpdateDto userAdminUpdateDto,) async {
-    final response = await updateUserAdminWithHttpInfo(id, userAdminUpdateDto,);
-    if (response.statusCode >= HttpStatus.badRequest) {
-      throw ApiException(response.statusCode, await _decodeBodyBytes(response));
-    }
-    // When a remote server returns no body with a status of 204, we shall not decode it.
-    // At the time of writing this, `dart:convert` will throw an "Unexpected end of input"
-    // FormatException when trying to decode an empty string.
-    if (response.body.isNotEmpty && response.statusCode != HttpStatus.noContent) {
-      return await apiClient.deserializeAsync(await _decodeBodyBytes(response), 'UserAdminResponseDto',) as UserAdminResponseDto;
     
     }
     return null;

mobile/openapi/lib/api_client.dart

@@ -292,6 +292,10 @@ class ApiClient {
           return CreateProfileImageResponseDto.fromJson(value);
         case 'CreateTagDto':
           return CreateTagDto.fromJson(value);
+        case 'CreateUserDto':
+          return CreateUserDto.fromJson(value);
+        case 'DeleteUserDto':
+          return DeleteUserDto.fromJson(value);
         case 'DownloadArchiveInfo':
           return DownloadArchiveInfo.fromJson(value);
         case 'DownloadInfoDto':
@@ -532,24 +536,18 @@ class ApiClient {
           return UpdateStackParentDto.fromJson(value);
         case 'UpdateTagDto':
           return UpdateTagDto.fromJson(value);
+        case 'UpdateUserDto':
+          return UpdateUserDto.fromJson(value);
         case 'UsageByUserDto':
           return UsageByUserDto.fromJson(value);
-        case 'UserAdminCreateDto':
-          return UserAdminCreateDto.fromJson(value);
-        case 'UserAdminDeleteDto':
-          return UserAdminDeleteDto.fromJson(value);
-        case 'UserAdminResponseDto':
-          return UserAdminResponseDto.fromJson(value);
-        case 'UserAdminUpdateDto':
-          return UserAdminUpdateDto.fromJson(value);
         case 'UserAvatarColor':
           return UserAvatarColorTypeTransformer().decode(value);
+        case 'UserDto':
+          return UserDto.fromJson(value);
         case 'UserResponseDto':
           return UserResponseDto.fromJson(value);
         case 'UserStatus':
           return UserStatusTypeTransformer().decode(value);
-        case 'UserUpdateMeDto':
-          return UserUpdateMeDto.fromJson(value);
         case 'ValidateAccessTokenResponseDto':
           return ValidateAccessTokenResponseDto.fromJson(value);
         case 'ValidateLibraryDto':

mobile/openapi/lib/model/activity_response_dto.dart

@@ -31,7 +31,7 @@ class ActivityResponseDto {
 
   ActivityResponseDtoTypeEnum type;
 
-  UserResponseDto user;
+  UserDto user;
 
   @override
   bool operator ==(Object other) => identical(this, other) || other is ActivityResponseDto &&
@@ -87,7 +87,7 @@ class ActivityResponseDto {
         createdAt: mapDateTime(json, r'createdAt', r'')!,
         id: mapValueOfType<String>(json, r'id')!,
         type: ActivityResponseDtoTypeEnum.fromJson(json[r'type'])!,
-        user: UserResponseDto.fromJson(json[r'user'])!,
+        user: UserDto.fromJson(json[r'user'])!,
       );
     }
     return null;

mobile/openapi/lib/model/create_user_dto.dart

@@ -10,9 +10,9 @@
 
 part of openapi.api;
 
-class UserAdminCreateDto {
+class CreateUserDto {
-  /// Returns a new [UserAdminCreateDto] instance.
+  /// Returns a new [CreateUserDto] instance.
-  UserAdminCreateDto({
+  CreateUserDto({
     required this.email,
     this.memoriesEnabled,
     required this.name,
@@ -59,7 +59,7 @@ class UserAdminCreateDto {
   String? storageLabel;
 
   @override
-  bool operator ==(Object other) => identical(this, other) || other is UserAdminCreateDto &&
+  bool operator ==(Object other) => identical(this, other) || other is CreateUserDto &&
     other.email == email &&
     other.memoriesEnabled == memoriesEnabled &&
     other.name == name &&
@@ -82,7 +82,7 @@ class UserAdminCreateDto {
     (storageLabel == null ? 0 : storageLabel!.hashCode);
 
   @override
-  String toString() => 'UserAdminCreateDto[email=$email, memoriesEnabled=$memoriesEnabled, name=$name, notify=$notify, password=$password, quotaSizeInBytes=$quotaSizeInBytes, shouldChangePassword=$shouldChangePassword, storageLabel=$storageLabel]';
+  String toString() => 'CreateUserDto[email=$email, memoriesEnabled=$memoriesEnabled, name=$name, notify=$notify, password=$password, quotaSizeInBytes=$quotaSizeInBytes, shouldChangePassword=$shouldChangePassword, storageLabel=$storageLabel]';
 
   Map<String, dynamic> toJson() {
     final json = <String, dynamic>{};
@@ -117,14 +117,14 @@ class UserAdminCreateDto {
     return json;
   }
 
-  /// Returns a new [UserAdminCreateDto] instance and imports its values from
+  /// Returns a new [CreateUserDto] instance and imports its values from
   /// [value] if it's a [Map], null otherwise.
   // ignore: prefer_constructors_over_static_methods
-  static UserAdminCreateDto? fromJson(dynamic value) {
+  static CreateUserDto? fromJson(dynamic value) {
     if (value is Map) {
       final json = value.cast<String, dynamic>();
 
-      return UserAdminCreateDto(
+      return CreateUserDto(
         email: mapValueOfType<String>(json, r'email')!,
         memoriesEnabled: mapValueOfType<bool>(json, r'memoriesEnabled'),
         name: mapValueOfType<String>(json, r'name')!,
@@ -138,11 +138,11 @@ class UserAdminCreateDto {
     return null;
   }
 
-  static List<UserAdminCreateDto> listFromJson(dynamic json, {bool growable = false,}) {
+  static List<CreateUserDto> listFromJson(dynamic json, {bool growable = false,}) {
-    final result = <UserAdminCreateDto>[];
+    final result = <CreateUserDto>[];
     if (json is List && json.isNotEmpty) {
       for (final row in json) {
-        final value = UserAdminCreateDto.fromJson(row);
+        final value = CreateUserDto.fromJson(row);
         if (value != null) {
           result.add(value);
         }
@@ -151,12 +151,12 @@ class UserAdminCreateDto {
     return result.toList(growable: growable);
   }
 
-  static Map<String, UserAdminCreateDto> mapFromJson(dynamic json) {
+  static Map<String, CreateUserDto> mapFromJson(dynamic json) {
-    final map = <String, UserAdminCreateDto>{};
+    final map = <String, CreateUserDto>{};
     if (json is Map && json.isNotEmpty) {
       json = json.cast<String, dynamic>(); // ignore: parameter_assignments
       for (final entry in json.entries) {
-        final value = UserAdminCreateDto.fromJson(entry.value);
+        final value = CreateUserDto.fromJson(entry.value);
         if (value != null) {
           map[entry.key] = value;
         }
@@ -165,14 +165,14 @@ class UserAdminCreateDto {
     return map;
   }
 
-  // maps a json object with a list of UserAdminCreateDto-objects as value to a dart map
+  // maps a json object with a list of CreateUserDto-objects as value to a dart map
-  static Map<String, List<UserAdminCreateDto>> mapListFromJson(dynamic json, {bool growable = false,}) {
+  static Map<String, List<CreateUserDto>> mapListFromJson(dynamic json, {bool growable = false,}) {
-    final map = <String, List<UserAdminCreateDto>>{};
+    final map = <String, List<CreateUserDto>>{};
     if (json is Map && json.isNotEmpty) {
       // ignore: parameter_assignments
       json = json.cast<String, dynamic>();
       for (final entry in json.entries) {
-        map[entry.key] = UserAdminCreateDto.listFromJson(entry.value, growable: growable,);
+        map[entry.key] = CreateUserDto.listFromJson(entry.value, growable: growable,);
       }
     }
     return map;

mobile/openapi/lib/model/delete_user_dto.dart

@@ -10,9 +10,9 @@
 
 part of openapi.api;
 
-class UserAdminDeleteDto {
+class DeleteUserDto {
-  /// Returns a new [UserAdminDeleteDto] instance.
+  /// Returns a new [DeleteUserDto] instance.
-  UserAdminDeleteDto({
+  DeleteUserDto({
     this.force,
   });
 
@@ -25,7 +25,7 @@ class UserAdminDeleteDto {
   bool? force;
 
   @override
-  bool operator ==(Object other) => identical(this, other) || other is UserAdminDeleteDto &&
+  bool operator ==(Object other) => identical(this, other) || other is DeleteUserDto &&
     other.force == force;
 
   @override
@@ -34,7 +34,7 @@ class UserAdminDeleteDto {
     (force == null ? 0 : force!.hashCode);
 
   @override
-  String toString() => 'UserAdminDeleteDto[force=$force]';
+  String toString() => 'DeleteUserDto[force=$force]';
 
   Map<String, dynamic> toJson() {
     final json = <String, dynamic>{};
@@ -46,25 +46,25 @@ class UserAdminDeleteDto {
     return json;
   }
 
-  /// Returns a new [UserAdminDeleteDto] instance and imports its values from
+  /// Returns a new [DeleteUserDto] instance and imports its values from
   /// [value] if it's a [Map], null otherwise.
   // ignore: prefer_constructors_over_static_methods
-  static UserAdminDeleteDto? fromJson(dynamic value) {
+  static DeleteUserDto? fromJson(dynamic value) {
     if (value is Map) {
       final json = value.cast<String, dynamic>();
 
-      return UserAdminDeleteDto(
+      return DeleteUserDto(
         force: mapValueOfType<bool>(json, r'force'),
       );
     }
     return null;
   }
 
-  static List<UserAdminDeleteDto> listFromJson(dynamic json, {bool growable = false,}) {
+  static List<DeleteUserDto> listFromJson(dynamic json, {bool growable = false,}) {
-    final result = <UserAdminDeleteDto>[];
+    final result = <DeleteUserDto>[];
     if (json is List && json.isNotEmpty) {
       for (final row in json) {
-        final value = UserAdminDeleteDto.fromJson(row);
+        final value = DeleteUserDto.fromJson(row);
         if (value != null) {
           result.add(value);
         }
@@ -73,12 +73,12 @@ class UserAdminDeleteDto {
     return result.toList(growable: growable);
   }
 
-  static Map<String, UserAdminDeleteDto> mapFromJson(dynamic json) {
+  static Map<String, DeleteUserDto> mapFromJson(dynamic json) {
-    final map = <String, UserAdminDeleteDto>{};
+    final map = <String, DeleteUserDto>{};
     if (json is Map && json.isNotEmpty) {
       json = json.cast<String, dynamic>(); // ignore: parameter_assignments
       for (final entry in json.entries) {
-        final value = UserAdminDeleteDto.fromJson(entry.value);
+        final value = DeleteUserDto.fromJson(entry.value);
         if (value != null) {
           map[entry.key] = value;
         }
@@ -87,14 +87,14 @@ class UserAdminDeleteDto {
     return map;
   }
 
-  // maps a json object with a list of UserAdminDeleteDto-objects as value to a dart map
+  // maps a json object with a list of DeleteUserDto-objects as value to a dart map
-  static Map<String, List<UserAdminDeleteDto>> mapListFromJson(dynamic json, {bool growable = false,}) {
+  static Map<String, List<DeleteUserDto>> mapListFromJson(dynamic json, {bool growable = false,}) {
-    final map = <String, List<UserAdminDeleteDto>>{};
+    final map = <String, List<DeleteUserDto>>{};
     if (json is Map && json.isNotEmpty) {
       // ignore: parameter_assignments
       json = json.cast<String, dynamic>();
       for (final entry in json.entries) {
-        map[entry.key] = UserAdminDeleteDto.listFromJson(entry.value, growable: growable,);
+        map[entry.key] = DeleteUserDto.listFromJson(entry.value, growable: growable,);
       }
     }
     return map;

mobile/openapi/lib/model/partner_response_dto.dart

@@ -14,15 +14,30 @@ class PartnerResponseDto {
   /// Returns a new [PartnerResponseDto] instance.
   PartnerResponseDto({
     required this.avatarColor,
+    required this.createdAt,
+    required this.deletedAt,
     required this.email,
     required this.id,
     this.inTimeline,
+    required this.isAdmin,
+    this.memoriesEnabled,
     required this.name,
+    required this.oauthId,
     required this.profileImagePath,
+    required this.quotaSizeInBytes,
+    required this.quotaUsageInBytes,
+    required this.shouldChangePassword,
+    required this.status,
+    required this.storageLabel,
+    required this.updatedAt,
   });
 
   UserAvatarColor avatarColor;
 
+  DateTime createdAt;
+
+  DateTime? deletedAt;
+
   String email;
 
   String id;
@@ -35,44 +50,121 @@ class PartnerResponseDto {
   ///
   bool? inTimeline;
 
+  bool isAdmin;
+
+  ///
+  /// Please note: This property should have been non-nullable! Since the specification file
+  /// does not include a default value (using the "default:" property), however, the generated
+  /// source code must fall back to having a nullable type.
+  /// Consider adding a "default:" property in the specification file to hide this note.
+  ///
+  bool? memoriesEnabled;
+
   String name;
 
+  String oauthId;
+
   String profileImagePath;
 
+  int? quotaSizeInBytes;
+
+  int? quotaUsageInBytes;
+
+  bool shouldChangePassword;
+
+  UserStatus status;
+
+  String? storageLabel;
+
+  DateTime updatedAt;
+
   @override
   bool operator ==(Object other) => identical(this, other) || other is PartnerResponseDto &&
     other.avatarColor == avatarColor &&
+    other.createdAt == createdAt &&
+    other.deletedAt == deletedAt &&
     other.email == email &&
     other.id == id &&
     other.inTimeline == inTimeline &&
+    other.isAdmin == isAdmin &&
+    other.memoriesEnabled == memoriesEnabled &&
     other.name == name &&
-    other.profileImagePath == profileImagePath;
+    other.oauthId == oauthId &&
+    other.profileImagePath == profileImagePath &&
+    other.quotaSizeInBytes == quotaSizeInBytes &&
+    other.quotaUsageInBytes == quotaUsageInBytes &&
+    other.shouldChangePassword == shouldChangePassword &&
+    other.status == status &&
+    other.storageLabel == storageLabel &&
+    other.updatedAt == updatedAt;
 
   @override
   int get hashCode =>
     // ignore: unnecessary_parenthesis
     (avatarColor.hashCode) +
+    (createdAt.hashCode) +
+    (deletedAt == null ? 0 : deletedAt!.hashCode) +
     (email.hashCode) +
     (id.hashCode) +
     (inTimeline == null ? 0 : inTimeline!.hashCode) +
+    (isAdmin.hashCode) +
+    (memoriesEnabled == null ? 0 : memoriesEnabled!.hashCode) +
     (name.hashCode) +
-    (profileImagePath.hashCode);
+    (oauthId.hashCode) +
+    (profileImagePath.hashCode) +
+    (quotaSizeInBytes == null ? 0 : quotaSizeInBytes!.hashCode) +
+    (quotaUsageInBytes == null ? 0 : quotaUsageInBytes!.hashCode) +
+    (shouldChangePassword.hashCode) +
+    (status.hashCode) +
+    (storageLabel == null ? 0 : storageLabel!.hashCode) +
+    (updatedAt.hashCode);
 
   @override
-  String toString() => 'PartnerResponseDto[avatarColor=$avatarColor, email=$email, id=$id, inTimeline=$inTimeline, name=$name, profileImagePath=$profileImagePath]';
+  String toString() => 'PartnerResponseDto[avatarColor=$avatarColor, createdAt=$createdAt, deletedAt=$deletedAt, email=$email, id=$id, inTimeline=$inTimeline, isAdmin=$isAdmin, memoriesEnabled=$memoriesEnabled, name=$name, oauthId=$oauthId, profileImagePath=$profileImagePath, quotaSizeInBytes=$quotaSizeInBytes, quotaUsageInBytes=$quotaUsageInBytes, shouldChangePassword=$shouldChangePassword, status=$status, storageLabel=$storageLabel, updatedAt=$updatedAt]';
 
   Map<String, dynamic> toJson() {
     final json = <String, dynamic>{};
       json[r'avatarColor'] = this.avatarColor;
+      json[r'createdAt'] = this.createdAt.toUtc().toIso8601String();
+    if (this.deletedAt != null) {
+      json[r'deletedAt'] = this.deletedAt!.toUtc().toIso8601String();
+    } else {
+    //  json[r'deletedAt'] = null;
+    }
       json[r'email'] = this.email;
       json[r'id'] = this.id;
     if (this.inTimeline != null) {
       json[r'inTimeline'] = this.inTimeline;
     } else {
     //  json[r'inTimeline'] = null;
+    }
+      json[r'isAdmin'] = this.isAdmin;
+    if (this.memoriesEnabled != null) {
+      json[r'memoriesEnabled'] = this.memoriesEnabled;
+    } else {
+    //  json[r'memoriesEnabled'] = null;
     }
       json[r'name'] = this.name;
+      json[r'oauthId'] = this.oauthId;
       json[r'profileImagePath'] = this.profileImagePath;
+    if (this.quotaSizeInBytes != null) {
+      json[r'quotaSizeInBytes'] = this.quotaSizeInBytes;
+    } else {
+    //  json[r'quotaSizeInBytes'] = null;
+    }
+    if (this.quotaUsageInBytes != null) {
+      json[r'quotaUsageInBytes'] = this.quotaUsageInBytes;
+    } else {
+    //  json[r'quotaUsageInBytes'] = null;
+    }
+      json[r'shouldChangePassword'] = this.shouldChangePassword;
+      json[r'status'] = this.status;
+    if (this.storageLabel != null) {
+      json[r'storageLabel'] = this.storageLabel;
+    } else {
+    //  json[r'storageLabel'] = null;
+    }
+      json[r'updatedAt'] = this.updatedAt.toUtc().toIso8601String();
     return json;
   }
 
@@ -85,11 +177,22 @@ class PartnerResponseDto {
 
       return PartnerResponseDto(
         avatarColor: UserAvatarColor.fromJson(json[r'avatarColor'])!,
+        createdAt: mapDateTime(json, r'createdAt', r'')!,
+        deletedAt: mapDateTime(json, r'deletedAt', r''),
         email: mapValueOfType<String>(json, r'email')!,
         id: mapValueOfType<String>(json, r'id')!,
         inTimeline: mapValueOfType<bool>(json, r'inTimeline'),
+        isAdmin: mapValueOfType<bool>(json, r'isAdmin')!,
+        memoriesEnabled: mapValueOfType<bool>(json, r'memoriesEnabled'),
         name: mapValueOfType<String>(json, r'name')!,
+        oauthId: mapValueOfType<String>(json, r'oauthId')!,
         profileImagePath: mapValueOfType<String>(json, r'profileImagePath')!,
+        quotaSizeInBytes: mapValueOfType<int>(json, r'quotaSizeInBytes'),
+        quotaUsageInBytes: mapValueOfType<int>(json, r'quotaUsageInBytes'),
+        shouldChangePassword: mapValueOfType<bool>(json, r'shouldChangePassword')!,
+        status: UserStatus.fromJson(json[r'status'])!,
+        storageLabel: mapValueOfType<String>(json, r'storageLabel'),
+        updatedAt: mapDateTime(json, r'updatedAt', r'')!,
       );
     }
     return null;
@@ -138,10 +241,20 @@ class PartnerResponseDto {
   /// The list of required keys that must be present in a JSON.
   static const requiredKeys = <String>{
     'avatarColor',
+    'createdAt',
+    'deletedAt',
     'email',
     'id',
+    'isAdmin',
     'name',
+    'oauthId',
     'profileImagePath',
+    'quotaSizeInBytes',
+    'quotaUsageInBytes',
+    'shouldChangePassword',
+    'status',
+    'storageLabel',
+    'updatedAt',
   };
 }
 

mobile/openapi/lib/model/update_user_dto.dart

@@ -10,11 +10,13 @@
 
 part of openapi.api;
 
-class UserAdminUpdateDto {
+class UpdateUserDto {
-  /// Returns a new [UserAdminUpdateDto] instance.
+  /// Returns a new [UpdateUserDto] instance.
-  UserAdminUpdateDto({
+  UpdateUserDto({
     this.avatarColor,
     this.email,
+    required this.id,
+    this.isAdmin,
     this.memoriesEnabled,
     this.name,
     this.password,
@@ -39,6 +41,16 @@ class UserAdminUpdateDto {
   ///
   String? email;
 
+  String id;
+
+  ///
+  /// Please note: This property should have been non-nullable! Since the specification file
+  /// does not include a default value (using the "default:" property), however, the generated
+  /// source code must fall back to having a nullable type.
+  /// Consider adding a "default:" property in the specification file to hide this note.
+  ///
+  bool? isAdmin;
+
   ///
   /// Please note: This property should have been non-nullable! Since the specification file
   /// does not include a default value (using the "default:" property), however, the generated
@@ -74,12 +86,20 @@ class UserAdminUpdateDto {
   ///
   bool? shouldChangePassword;
 
+  ///
+  /// Please note: This property should have been non-nullable! Since the specification file
+  /// does not include a default value (using the "default:" property), however, the generated
+  /// source code must fall back to having a nullable type.
+  /// Consider adding a "default:" property in the specification file to hide this note.
+  ///
   String? storageLabel;
 
   @override
-  bool operator ==(Object other) => identical(this, other) || other is UserAdminUpdateDto &&
+  bool operator ==(Object other) => identical(this, other) || other is UpdateUserDto &&
     other.avatarColor == avatarColor &&
     other.email == email &&
+    other.id == id &&
+    other.isAdmin == isAdmin &&
     other.memoriesEnabled == memoriesEnabled &&
     other.name == name &&
     other.password == password &&
@@ -92,6 +112,8 @@ class UserAdminUpdateDto {
     // ignore: unnecessary_parenthesis
     (avatarColor == null ? 0 : avatarColor!.hashCode) +
     (email == null ? 0 : email!.hashCode) +
+    (id.hashCode) +
+    (isAdmin == null ? 0 : isAdmin!.hashCode) +
     (memoriesEnabled == null ? 0 : memoriesEnabled!.hashCode) +
     (name == null ? 0 : name!.hashCode) +
     (password == null ? 0 : password!.hashCode) +
@@ -100,7 +122,7 @@ class UserAdminUpdateDto {
     (storageLabel == null ? 0 : storageLabel!.hashCode);
 
   @override
-  String toString() => 'UserAdminUpdateDto[avatarColor=$avatarColor, email=$email, memoriesEnabled=$memoriesEnabled, name=$name, password=$password, quotaSizeInBytes=$quotaSizeInBytes, shouldChangePassword=$shouldChangePassword, storageLabel=$storageLabel]';
+  String toString() => 'UpdateUserDto[avatarColor=$avatarColor, email=$email, id=$id, isAdmin=$isAdmin, memoriesEnabled=$memoriesEnabled, name=$name, password=$password, quotaSizeInBytes=$quotaSizeInBytes, shouldChangePassword=$shouldChangePassword, storageLabel=$storageLabel]';
 
   Map<String, dynamic> toJson() {
     final json = <String, dynamic>{};
@@ -113,6 +135,12 @@ class UserAdminUpdateDto {
       json[r'email'] = this.email;
     } else {
     //  json[r'email'] = null;
+    }
+      json[r'id'] = this.id;
+    if (this.isAdmin != null) {
+      json[r'isAdmin'] = this.isAdmin;
+    } else {
+    //  json[r'isAdmin'] = null;
     }
     if (this.memoriesEnabled != null) {
       json[r'memoriesEnabled'] = this.memoriesEnabled;
@@ -147,16 +175,18 @@ class UserAdminUpdateDto {
     return json;
   }
 
-  /// Returns a new [UserAdminUpdateDto] instance and imports its values from
+  /// Returns a new [UpdateUserDto] instance and imports its values from
   /// [value] if it's a [Map], null otherwise.
   // ignore: prefer_constructors_over_static_methods
-  static UserAdminUpdateDto? fromJson(dynamic value) {
+  static UpdateUserDto? fromJson(dynamic value) {
     if (value is Map) {
       final json = value.cast<String, dynamic>();
 
-      return UserAdminUpdateDto(
+      return UpdateUserDto(
         avatarColor: UserAvatarColor.fromJson(json[r'avatarColor']),
         email: mapValueOfType<String>(json, r'email'),
+        id: mapValueOfType<String>(json, r'id')!,
+        isAdmin: mapValueOfType<bool>(json, r'isAdmin'),
         memoriesEnabled: mapValueOfType<bool>(json, r'memoriesEnabled'),
         name: mapValueOfType<String>(json, r'name'),
         password: mapValueOfType<String>(json, r'password'),
@@ -168,11 +198,11 @@ class UserAdminUpdateDto {
     return null;
   }
 
-  static List<UserAdminUpdateDto> listFromJson(dynamic json, {bool growable = false,}) {
+  static List<UpdateUserDto> listFromJson(dynamic json, {bool growable = false,}) {
-    final result = <UserAdminUpdateDto>[];
+    final result = <UpdateUserDto>[];
     if (json is List && json.isNotEmpty) {
       for (final row in json) {
-        final value = UserAdminUpdateDto.fromJson(row);
+        final value = UpdateUserDto.fromJson(row);
         if (value != null) {
           result.add(value);
         }
@@ -181,12 +211,12 @@ class UserAdminUpdateDto {
     return result.toList(growable: growable);
   }
 
-  static Map<String, UserAdminUpdateDto> mapFromJson(dynamic json) {
+  static Map<String, UpdateUserDto> mapFromJson(dynamic json) {
-    final map = <String, UserAdminUpdateDto>{};
+    final map = <String, UpdateUserDto>{};
     if (json is Map && json.isNotEmpty) {
       json = json.cast<String, dynamic>(); // ignore: parameter_assignments
       for (final entry in json.entries) {
-        final value = UserAdminUpdateDto.fromJson(entry.value);
+        final value = UpdateUserDto.fromJson(entry.value);
         if (value != null) {
           map[entry.key] = value;
         }
@@ -195,14 +225,14 @@ class UserAdminUpdateDto {
     return map;
   }
 
-  // maps a json object with a list of UserAdminUpdateDto-objects as value to a dart map
+  // maps a json object with a list of UpdateUserDto-objects as value to a dart map
-  static Map<String, List<UserAdminUpdateDto>> mapListFromJson(dynamic json, {bool growable = false,}) {
+  static Map<String, List<UpdateUserDto>> mapListFromJson(dynamic json, {bool growable = false,}) {
-    final map = <String, List<UserAdminUpdateDto>>{};
+    final map = <String, List<UpdateUserDto>>{};
     if (json is Map && json.isNotEmpty) {
       // ignore: parameter_assignments
       json = json.cast<String, dynamic>();
       for (final entry in json.entries) {
-        map[entry.key] = UserAdminUpdateDto.listFromJson(entry.value, growable: growable,);
+        map[entry.key] = UpdateUserDto.listFromJson(entry.value, growable: growable,);
       }
     }
     return map;
@@ -210,6 +240,7 @@ class UserAdminUpdateDto {
 
   /// The list of required keys that must be present in a JSON.
   static const requiredKeys = <String>{
+    'id',
   };
 }
 

mobile/openapi/lib/model/user_admin_response_dto.dart

@@ -1,243 +0,0 @@
-//
-// AUTO-GENERATED FILE, DO NOT MODIFY!
-//
-// @dart=2.18
-
-// ignore_for_file: unused_element, unused_import
-// ignore_for_file: always_put_required_named_parameters_first
-// ignore_for_file: constant_identifier_names
-// ignore_for_file: lines_longer_than_80_chars
-
-part of openapi.api;
-
-class UserAdminResponseDto {
-  /// Returns a new [UserAdminResponseDto] instance.
-  UserAdminResponseDto({
-    required this.avatarColor,
-    required this.createdAt,
-    required this.deletedAt,
-    required this.email,
-    required this.id,
-    required this.isAdmin,
-    this.memoriesEnabled,
-    required this.name,
-    required this.oauthId,
-    required this.profileImagePath,
-    required this.quotaSizeInBytes,
-    required this.quotaUsageInBytes,
-    required this.shouldChangePassword,
-    required this.status,
-    required this.storageLabel,
-    required this.updatedAt,
-  });
-
-  UserAvatarColor avatarColor;
-
-  DateTime createdAt;
-
-  DateTime? deletedAt;
-
-  String email;
-
-  String id;
-
-  bool isAdmin;
-
-  ///
-  /// Please note: This property should have been non-nullable! Since the specification file
-  /// does not include a default value (using the "default:" property), however, the generated
-  /// source code must fall back to having a nullable type.
-  /// Consider adding a "default:" property in the specification file to hide this note.
-  ///
-  bool? memoriesEnabled;
-
-  String name;
-
-  String oauthId;
-
-  String profileImagePath;
-
-  int? quotaSizeInBytes;
-
-  int? quotaUsageInBytes;
-
-  bool shouldChangePassword;
-
-  UserStatus status;
-
-  String? storageLabel;
-
-  DateTime updatedAt;
-
-  @override
-  bool operator ==(Object other) => identical(this, other) || other is UserAdminResponseDto &&
-    other.avatarColor == avatarColor &&
-    other.createdAt == createdAt &&
-    other.deletedAt == deletedAt &&
-    other.email == email &&
-    other.id == id &&
-    other.isAdmin == isAdmin &&
-    other.memoriesEnabled == memoriesEnabled &&
-    other.name == name &&
-    other.oauthId == oauthId &&
-    other.profileImagePath == profileImagePath &&
-    other.quotaSizeInBytes == quotaSizeInBytes &&
-    other.quotaUsageInBytes == quotaUsageInBytes &&
-    other.shouldChangePassword == shouldChangePassword &&
-    other.status == status &&
-    other.storageLabel == storageLabel &&
-    other.updatedAt == updatedAt;
-
-  @override
-  int get hashCode =>
-    // ignore: unnecessary_parenthesis
-    (avatarColor.hashCode) +
-    (createdAt.hashCode) +
-    (deletedAt == null ? 0 : deletedAt!.hashCode) +
-    (email.hashCode) +
-    (id.hashCode) +
-    (isAdmin.hashCode) +
-    (memoriesEnabled == null ? 0 : memoriesEnabled!.hashCode) +
-    (name.hashCode) +
-    (oauthId.hashCode) +
-    (profileImagePath.hashCode) +
-    (quotaSizeInBytes == null ? 0 : quotaSizeInBytes!.hashCode) +
-    (quotaUsageInBytes == null ? 0 : quotaUsageInBytes!.hashCode) +
-    (shouldChangePassword.hashCode) +
-    (status.hashCode) +
-    (storageLabel == null ? 0 : storageLabel!.hashCode) +
-    (updatedAt.hashCode);
-
-  @override
-  String toString() => 'UserAdminResponseDto[avatarColor=$avatarColor, createdAt=$createdAt, deletedAt=$deletedAt, email=$email, id=$id, isAdmin=$isAdmin, memoriesEnabled=$memoriesEnabled, name=$name, oauthId=$oauthId, profileImagePath=$profileImagePath, quotaSizeInBytes=$quotaSizeInBytes, quotaUsageInBytes=$quotaUsageInBytes, shouldChangePassword=$shouldChangePassword, status=$status, storageLabel=$storageLabel, updatedAt=$updatedAt]';
-
-  Map<String, dynamic> toJson() {
-    final json = <String, dynamic>{};
-      json[r'avatarColor'] = this.avatarColor;
-      json[r'createdAt'] = this.createdAt.toUtc().toIso8601String();
-    if (this.deletedAt != null) {
-      json[r'deletedAt'] = this.deletedAt!.toUtc().toIso8601String();
-    } else {
-    //  json[r'deletedAt'] = null;
-    }
-      json[r'email'] = this.email;
-      json[r'id'] = this.id;
-      json[r'isAdmin'] = this.isAdmin;
-    if (this.memoriesEnabled != null) {
-      json[r'memoriesEnabled'] = this.memoriesEnabled;
-    } else {
-    //  json[r'memoriesEnabled'] = null;
-    }
-      json[r'name'] = this.name;
-      json[r'oauthId'] = this.oauthId;
-      json[r'profileImagePath'] = this.profileImagePath;
-    if (this.quotaSizeInBytes != null) {
-      json[r'quotaSizeInBytes'] = this.quotaSizeInBytes;
-    } else {
-    //  json[r'quotaSizeInBytes'] = null;
-    }
-    if (this.quotaUsageInBytes != null) {
-      json[r'quotaUsageInBytes'] = this.quotaUsageInBytes;
-    } else {
-    //  json[r'quotaUsageInBytes'] = null;
-    }
-      json[r'shouldChangePassword'] = this.shouldChangePassword;
-      json[r'status'] = this.status;
-    if (this.storageLabel != null) {
-      json[r'storageLabel'] = this.storageLabel;
-    } else {
-    //  json[r'storageLabel'] = null;
-    }
-      json[r'updatedAt'] = this.updatedAt.toUtc().toIso8601String();
-    return json;
-  }
-
-  /// Returns a new [UserAdminResponseDto] instance and imports its values from
-  /// [value] if it's a [Map], null otherwise.
-  // ignore: prefer_constructors_over_static_methods
-  static UserAdminResponseDto? fromJson(dynamic value) {
-    if (value is Map) {
-      final json = value.cast<String, dynamic>();
-
-      return UserAdminResponseDto(
-        avatarColor: UserAvatarColor.fromJson(json[r'avatarColor'])!,
-        createdAt: mapDateTime(json, r'createdAt', r'')!,
-        deletedAt: mapDateTime(json, r'deletedAt', r''),
-        email: mapValueOfType<String>(json, r'email')!,
-        id: mapValueOfType<String>(json, r'id')!,
-        isAdmin: mapValueOfType<bool>(json, r'isAdmin')!,
-        memoriesEnabled: mapValueOfType<bool>(json, r'memoriesEnabled'),
-        name: mapValueOfType<String>(json, r'name')!,
-        oauthId: mapValueOfType<String>(json, r'oauthId')!,
-        profileImagePath: mapValueOfType<String>(json, r'profileImagePath')!,
-        quotaSizeInBytes: mapValueOfType<int>(json, r'quotaSizeInBytes'),
-        quotaUsageInBytes: mapValueOfType<int>(json, r'quotaUsageInBytes'),
-        shouldChangePassword: mapValueOfType<bool>(json, r'shouldChangePassword')!,
-        status: UserStatus.fromJson(json[r'status'])!,
-        storageLabel: mapValueOfType<String>(json, r'storageLabel'),
-        updatedAt: mapDateTime(json, r'updatedAt', r'')!,
-      );
-    }
-    return null;
-  }
-
-  static List<UserAdminResponseDto> listFromJson(dynamic json, {bool growable = false,}) {
-    final result = <UserAdminResponseDto>[];
-    if (json is List && json.isNotEmpty) {
-      for (final row in json) {
-        final value = UserAdminResponseDto.fromJson(row);
-        if (value != null) {
-          result.add(value);
-        }
-      }
-    }
-    return result.toList(growable: growable);
-  }
-
-  static Map<String, UserAdminResponseDto> mapFromJson(dynamic json) {
-    final map = <String, UserAdminResponseDto>{};
-    if (json is Map && json.isNotEmpty) {
-      json = json.cast<String, dynamic>(); // ignore: parameter_assignments
-      for (final entry in json.entries) {
-        final value = UserAdminResponseDto.fromJson(entry.value);
-        if (value != null) {
-          map[entry.key] = value;
-        }
-      }
-    }
-    return map;
-  }
-
-  // maps a json object with a list of UserAdminResponseDto-objects as value to a dart map
-  static Map<String, List<UserAdminResponseDto>> mapListFromJson(dynamic json, {bool growable = false,}) {
-    final map = <String, List<UserAdminResponseDto>>{};
-    if (json is Map && json.isNotEmpty) {
-      // ignore: parameter_assignments
-      json = json.cast<String, dynamic>();
-      for (final entry in json.entries) {
-        map[entry.key] = UserAdminResponseDto.listFromJson(entry.value, growable: growable,);
-      }
-    }
-    return map;
-  }
-
-  /// The list of required keys that must be present in a JSON.
-  static const requiredKeys = <String>{
-    'avatarColor',
-    'createdAt',
-    'deletedAt',
-    'email',
-    'id',
-    'isAdmin',
-    'name',
-    'oauthId',
-    'profileImagePath',
-    'quotaSizeInBytes',
-    'quotaUsageInBytes',
-    'shouldChangePassword',
-    'status',
-    'storageLabel',
-    'updatedAt',
-  };
-}
-

mobile/openapi/lib/model/user_dto.dart

@@ -0,0 +1,130 @@
+//
+// AUTO-GENERATED FILE, DO NOT MODIFY!
+//
+// @dart=2.18
+
+// ignore_for_file: unused_element, unused_import
+// ignore_for_file: always_put_required_named_parameters_first
+// ignore_for_file: constant_identifier_names
+// ignore_for_file: lines_longer_than_80_chars
+
+part of openapi.api;
+
+class UserDto {
+  /// Returns a new [UserDto] instance.
+  UserDto({
+    required this.avatarColor,
+    required this.email,
+    required this.id,
+    required this.name,
+    required this.profileImagePath,
+  });
+
+  UserAvatarColor avatarColor;
+
+  String email;
+
+  String id;
+
+  String name;
+
+  String profileImagePath;
+
+  @override
+  bool operator ==(Object other) => identical(this, other) || other is UserDto &&
+    other.avatarColor == avatarColor &&
+    other.email == email &&
+    other.id == id &&
+    other.name == name &&
+    other.profileImagePath == profileImagePath;
+
+  @override
+  int get hashCode =>
+    // ignore: unnecessary_parenthesis
+    (avatarColor.hashCode) +
+    (email.hashCode) +
+    (id.hashCode) +
+    (name.hashCode) +
+    (profileImagePath.hashCode);
+
+  @override
+  String toString() => 'UserDto[avatarColor=$avatarColor, email=$email, id=$id, name=$name, profileImagePath=$profileImagePath]';
+
+  Map<String, dynamic> toJson() {
+    final json = <String, dynamic>{};
+      json[r'avatarColor'] = this.avatarColor;
+      json[r'email'] = this.email;
+      json[r'id'] = this.id;
+      json[r'name'] = this.name;
+      json[r'profileImagePath'] = this.profileImagePath;
+    return json;
+  }
+
+  /// Returns a new [UserDto] instance and imports its values from
+  /// [value] if it's a [Map], null otherwise.
+  // ignore: prefer_constructors_over_static_methods
+  static UserDto? fromJson(dynamic value) {
+    if (value is Map) {
+      final json = value.cast<String, dynamic>();
+
+      return UserDto(
+        avatarColor: UserAvatarColor.fromJson(json[r'avatarColor'])!,
+        email: mapValueOfType<String>(json, r'email')!,
+        id: mapValueOfType<String>(json, r'id')!,
+        name: mapValueOfType<String>(json, r'name')!,
+        profileImagePath: mapValueOfType<String>(json, r'profileImagePath')!,
+      );
+    }
+    return null;
+  }
+
+  static List<UserDto> listFromJson(dynamic json, {bool growable = false,}) {
+    final result = <UserDto>[];
+    if (json is List && json.isNotEmpty) {
+      for (final row in json) {
+        final value = UserDto.fromJson(row);
+        if (value != null) {
+          result.add(value);
+        }
+      }
+    }
+    return result.toList(growable: growable);
+  }
+
+  static Map<String, UserDto> mapFromJson(dynamic json) {
+    final map = <String, UserDto>{};
+    if (json is Map && json.isNotEmpty) {
+      json = json.cast<String, dynamic>(); // ignore: parameter_assignments
+      for (final entry in json.entries) {
+        final value = UserDto.fromJson(entry.value);
+        if (value != null) {
+          map[entry.key] = value;
+        }
+      }
+    }
+    return map;
+  }
+
+  // maps a json object with a list of UserDto-objects as value to a dart map
+  static Map<String, List<UserDto>> mapListFromJson(dynamic json, {bool growable = false,}) {
+    final map = <String, List<UserDto>>{};
+    if (json is Map && json.isNotEmpty) {
+      // ignore: parameter_assignments
+      json = json.cast<String, dynamic>();
+      for (final entry in json.entries) {
+        map[entry.key] = UserDto.listFromJson(entry.value, growable: growable,);
+      }
+    }
+    return map;
+  }
+
+  /// The list of required keys that must be present in a JSON.
+  static const requiredKeys = <String>{
+    'avatarColor',
+    'email',
+    'id',
+    'name',
+    'profileImagePath',
+  };
+}
+

mobile/openapi/lib/model/user_response_dto.dart

@@ -14,49 +14,141 @@ class UserResponseDto {
   /// Returns a new [UserResponseDto] instance.
   UserResponseDto({
     required this.avatarColor,
+    required this.createdAt,
+    required this.deletedAt,
     required this.email,
     required this.id,
+    required this.isAdmin,
+    this.memoriesEnabled,
     required this.name,
+    required this.oauthId,
     required this.profileImagePath,
+    required this.quotaSizeInBytes,
+    required this.quotaUsageInBytes,
+    required this.shouldChangePassword,
+    required this.status,
+    required this.storageLabel,
+    required this.updatedAt,
   });
 
   UserAvatarColor avatarColor;
 
+  DateTime createdAt;
+
+  DateTime? deletedAt;
+
   String email;
 
   String id;
 
+  bool isAdmin;
+
+  ///
+  /// Please note: This property should have been non-nullable! Since the specification file
+  /// does not include a default value (using the "default:" property), however, the generated
+  /// source code must fall back to having a nullable type.
+  /// Consider adding a "default:" property in the specification file to hide this note.
+  ///
+  bool? memoriesEnabled;
+
   String name;
 
+  String oauthId;
+
   String profileImagePath;
 
+  int? quotaSizeInBytes;
+
+  int? quotaUsageInBytes;
+
+  bool shouldChangePassword;
+
+  UserStatus status;
+
+  String? storageLabel;
+
+  DateTime updatedAt;
+
   @override
   bool operator ==(Object other) => identical(this, other) || other is UserResponseDto &&
     other.avatarColor == avatarColor &&
+    other.createdAt == createdAt &&
+    other.deletedAt == deletedAt &&
     other.email == email &&
     other.id == id &&
+    other.isAdmin == isAdmin &&
+    other.memoriesEnabled == memoriesEnabled &&
     other.name == name &&
-    other.profileImagePath == profileImagePath;
+    other.oauthId == oauthId &&
+    other.profileImagePath == profileImagePath &&
+    other.quotaSizeInBytes == quotaSizeInBytes &&
+    other.quotaUsageInBytes == quotaUsageInBytes &&
+    other.shouldChangePassword == shouldChangePassword &&
+    other.status == status &&
+    other.storageLabel == storageLabel &&
+    other.updatedAt == updatedAt;
 
   @override
   int get hashCode =>
     // ignore: unnecessary_parenthesis
     (avatarColor.hashCode) +
+    (createdAt.hashCode) +
+    (deletedAt == null ? 0 : deletedAt!.hashCode) +
     (email.hashCode) +
     (id.hashCode) +
+    (isAdmin.hashCode) +
+    (memoriesEnabled == null ? 0 : memoriesEnabled!.hashCode) +
     (name.hashCode) +
-    (profileImagePath.hashCode);
+    (oauthId.hashCode) +
+    (profileImagePath.hashCode) +
+    (quotaSizeInBytes == null ? 0 : quotaSizeInBytes!.hashCode) +
+    (quotaUsageInBytes == null ? 0 : quotaUsageInBytes!.hashCode) +
+    (shouldChangePassword.hashCode) +
+    (status.hashCode) +
+    (storageLabel == null ? 0 : storageLabel!.hashCode) +
+    (updatedAt.hashCode);
 
   @override
-  String toString() => 'UserResponseDto[avatarColor=$avatarColor, email=$email, id=$id, name=$name, profileImagePath=$profileImagePath]';
+  String toString() => 'UserResponseDto[avatarColor=$avatarColor, createdAt=$createdAt, deletedAt=$deletedAt, email=$email, id=$id, isAdmin=$isAdmin, memoriesEnabled=$memoriesEnabled, name=$name, oauthId=$oauthId, profileImagePath=$profileImagePath, quotaSizeInBytes=$quotaSizeInBytes, quotaUsageInBytes=$quotaUsageInBytes, shouldChangePassword=$shouldChangePassword, status=$status, storageLabel=$storageLabel, updatedAt=$updatedAt]';
 
   Map<String, dynamic> toJson() {
     final json = <String, dynamic>{};
       json[r'avatarColor'] = this.avatarColor;
+      json[r'createdAt'] = this.createdAt.toUtc().toIso8601String();
+    if (this.deletedAt != null) {
+      json[r'deletedAt'] = this.deletedAt!.toUtc().toIso8601String();
+    } else {
+    //  json[r'deletedAt'] = null;
+    }
       json[r'email'] = this.email;
       json[r'id'] = this.id;
+      json[r'isAdmin'] = this.isAdmin;
+    if (this.memoriesEnabled != null) {
+      json[r'memoriesEnabled'] = this.memoriesEnabled;
+    } else {
+    //  json[r'memoriesEnabled'] = null;
+    }
       json[r'name'] = this.name;
+      json[r'oauthId'] = this.oauthId;
       json[r'profileImagePath'] = this.profileImagePath;
+    if (this.quotaSizeInBytes != null) {
+      json[r'quotaSizeInBytes'] = this.quotaSizeInBytes;
+    } else {
+    //  json[r'quotaSizeInBytes'] = null;
+    }
+    if (this.quotaUsageInBytes != null) {
+      json[r'quotaUsageInBytes'] = this.quotaUsageInBytes;
+    } else {
+    //  json[r'quotaUsageInBytes'] = null;
+    }
+      json[r'shouldChangePassword'] = this.shouldChangePassword;
+      json[r'status'] = this.status;
+    if (this.storageLabel != null) {
+      json[r'storageLabel'] = this.storageLabel;
+    } else {
+    //  json[r'storageLabel'] = null;
+    }
+      json[r'updatedAt'] = this.updatedAt.toUtc().toIso8601String();
     return json;
   }
 
@@ -69,10 +161,21 @@ class UserResponseDto {
 
       return UserResponseDto(
         avatarColor: UserAvatarColor.fromJson(json[r'avatarColor'])!,
+        createdAt: mapDateTime(json, r'createdAt', r'')!,
+        deletedAt: mapDateTime(json, r'deletedAt', r''),
         email: mapValueOfType<String>(json, r'email')!,
         id: mapValueOfType<String>(json, r'id')!,
+        isAdmin: mapValueOfType<bool>(json, r'isAdmin')!,
+        memoriesEnabled: mapValueOfType<bool>(json, r'memoriesEnabled'),
         name: mapValueOfType<String>(json, r'name')!,
+        oauthId: mapValueOfType<String>(json, r'oauthId')!,
         profileImagePath: mapValueOfType<String>(json, r'profileImagePath')!,
+        quotaSizeInBytes: mapValueOfType<int>(json, r'quotaSizeInBytes'),
+        quotaUsageInBytes: mapValueOfType<int>(json, r'quotaUsageInBytes'),
+        shouldChangePassword: mapValueOfType<bool>(json, r'shouldChangePassword')!,
+        status: UserStatus.fromJson(json[r'status'])!,
+        storageLabel: mapValueOfType<String>(json, r'storageLabel'),
+        updatedAt: mapDateTime(json, r'updatedAt', r'')!,
       );
     }
     return null;
@@ -121,10 +224,20 @@ class UserResponseDto {
   /// The list of required keys that must be present in a JSON.
   static const requiredKeys = <String>{
     'avatarColor',
+    'createdAt',
+    'deletedAt',
     'email',
     'id',
+    'isAdmin',
     'name',
+    'oauthId',
     'profileImagePath',
+    'quotaSizeInBytes',
+    'quotaUsageInBytes',
+    'shouldChangePassword',
+    'status',
+    'storageLabel',
+    'updatedAt',
   };
 }
 

mobile/openapi/lib/model/user_update_me_dto.dart

@@ -1,175 +0,0 @@
-//
-// AUTO-GENERATED FILE, DO NOT MODIFY!
-//
-// @dart=2.18
-
-// ignore_for_file: unused_element, unused_import
-// ignore_for_file: always_put_required_named_parameters_first
-// ignore_for_file: constant_identifier_names
-// ignore_for_file: lines_longer_than_80_chars
-
-part of openapi.api;
-
-class UserUpdateMeDto {
-  /// Returns a new [UserUpdateMeDto] instance.
-  UserUpdateMeDto({
-    this.avatarColor,
-    this.email,
-    this.memoriesEnabled,
-    this.name,
-    this.password,
-  });
-
-  ///
-  /// Please note: This property should have been non-nullable! Since the specification file
-  /// does not include a default value (using the "default:" property), however, the generated
-  /// source code must fall back to having a nullable type.
-  /// Consider adding a "default:" property in the specification file to hide this note.
-  ///
-  UserAvatarColor? avatarColor;
-
-  ///
-  /// Please note: This property should have been non-nullable! Since the specification file
-  /// does not include a default value (using the "default:" property), however, the generated
-  /// source code must fall back to having a nullable type.
-  /// Consider adding a "default:" property in the specification file to hide this note.
-  ///
-  String? email;
-
-  ///
-  /// Please note: This property should have been non-nullable! Since the specification file
-  /// does not include a default value (using the "default:" property), however, the generated
-  /// source code must fall back to having a nullable type.
-  /// Consider adding a "default:" property in the specification file to hide this note.
-  ///
-  bool? memoriesEnabled;
-
-  ///
-  /// Please note: This property should have been non-nullable! Since the specification file
-  /// does not include a default value (using the "default:" property), however, the generated
-  /// source code must fall back to having a nullable type.
-  /// Consider adding a "default:" property in the specification file to hide this note.
-  ///
-  String? name;
-
-  ///
-  /// Please note: This property should have been non-nullable! Since the specification file
-  /// does not include a default value (using the "default:" property), however, the generated
-  /// source code must fall back to having a nullable type.
-  /// Consider adding a "default:" property in the specification file to hide this note.
-  ///
-  String? password;
-
-  @override
-  bool operator ==(Object other) => identical(this, other) || other is UserUpdateMeDto &&
-    other.avatarColor == avatarColor &&
-    other.email == email &&
-    other.memoriesEnabled == memoriesEnabled &&
-    other.name == name &&
-    other.password == password;
-
-  @override
-  int get hashCode =>
-    // ignore: unnecessary_parenthesis
-    (avatarColor == null ? 0 : avatarColor!.hashCode) +
-    (email == null ? 0 : email!.hashCode) +
-    (memoriesEnabled == null ? 0 : memoriesEnabled!.hashCode) +
-    (name == null ? 0 : name!.hashCode) +
-    (password == null ? 0 : password!.hashCode);
-
-  @override
-  String toString() => 'UserUpdateMeDto[avatarColor=$avatarColor, email=$email, memoriesEnabled=$memoriesEnabled, name=$name, password=$password]';
-
-  Map<String, dynamic> toJson() {
-    final json = <String, dynamic>{};
-    if (this.avatarColor != null) {
-      json[r'avatarColor'] = this.avatarColor;
-    } else {
-    //  json[r'avatarColor'] = null;
-    }
-    if (this.email != null) {
-      json[r'email'] = this.email;
-    } else {
-    //  json[r'email'] = null;
-    }
-    if (this.memoriesEnabled != null) {
-      json[r'memoriesEnabled'] = this.memoriesEnabled;
-    } else {
-    //  json[r'memoriesEnabled'] = null;
-    }
-    if (this.name != null) {
-      json[r'name'] = this.name;
-    } else {
-    //  json[r'name'] = null;
-    }
-    if (this.password != null) {
-      json[r'password'] = this.password;
-    } else {
-    //  json[r'password'] = null;
-    }
-    return json;
-  }
-
-  /// Returns a new [UserUpdateMeDto] instance and imports its values from
-  /// [value] if it's a [Map], null otherwise.
-  // ignore: prefer_constructors_over_static_methods
-  static UserUpdateMeDto? fromJson(dynamic value) {
-    if (value is Map) {
-      final json = value.cast<String, dynamic>();
-
-      return UserUpdateMeDto(
-        avatarColor: UserAvatarColor.fromJson(json[r'avatarColor']),
-        email: mapValueOfType<String>(json, r'email'),
-        memoriesEnabled: mapValueOfType<bool>(json, r'memoriesEnabled'),
-        name: mapValueOfType<String>(json, r'name'),
-        password: mapValueOfType<String>(json, r'password'),
-      );
-    }
-    return null;
-  }
-
-  static List<UserUpdateMeDto> listFromJson(dynamic json, {bool growable = false,}) {
-    final result = <UserUpdateMeDto>[];
-    if (json is List && json.isNotEmpty) {
-      for (final row in json) {
-        final value = UserUpdateMeDto.fromJson(row);
-        if (value != null) {
-          result.add(value);
-        }
-      }
-    }
-    return result.toList(growable: growable);
-  }
-
-  static Map<String, UserUpdateMeDto> mapFromJson(dynamic json) {
-    final map = <String, UserUpdateMeDto>{};
-    if (json is Map && json.isNotEmpty) {
-      json = json.cast<String, dynamic>(); // ignore: parameter_assignments
-      for (final entry in json.entries) {
-        final value = UserUpdateMeDto.fromJson(entry.value);
-        if (value != null) {
-          map[entry.key] = value;
-        }
-      }
-    }
-    return map;
-  }
-
-  // maps a json object with a list of UserUpdateMeDto-objects as value to a dart map
-  static Map<String, List<UserUpdateMeDto>> mapListFromJson(dynamic json, {bool growable = false,}) {
-    final map = <String, List<UserUpdateMeDto>>{};
-    if (json is Map && json.isNotEmpty) {
-      // ignore: parameter_assignments
-      json = json.cast<String, dynamic>();
-      for (final entry in json.entries) {
-        map[entry.key] = UserUpdateMeDto.listFromJson(entry.value, growable: growable,);
-      }
-    }
-    return map;
-  }
-
-  /// The list of required keys that must be present in a JSON.
-  static const requiredKeys = <String>{
-  };
-}
-

open-api/immich-openapi-specs.json

@@ -206,274 +206,6 @@
         ]
       }
     },
-    "/admin/users": {
-      "get": {
-        "operationId": "searchUsersAdmin",
-        "parameters": [
-          {
-            "name": "withDeleted",
-            "required": false,
-            "in": "query",
-            "schema": {
-              "type": "boolean"
-            }
-          }
-        ],
-        "responses": {
-          "200": {
-            "content": {
-              "application/json": {
-                "schema": {
-                  "items": {
-                    "$ref": "#/components/schemas/UserAdminResponseDto"
-                  },
-                  "type": "array"
-                }
-              }
-            },
-            "description": ""
-          }
-        },
-        "security": [
-          {
-            "bearer": []
-          },
-          {
-            "cookie": []
-          },
-          {
-            "api_key": []
-          }
-        ],
-        "tags": [
-          "User"
-        ]
-      },
-      "post": {
-        "operationId": "createUserAdmin",
-        "parameters": [],
-        "requestBody": {
-          "content": {
-            "application/json": {
-              "schema": {
-                "$ref": "#/components/schemas/UserAdminCreateDto"
-              }
-            }
-          },
-          "required": true
-        },
-        "responses": {
-          "201": {
-            "content": {
-              "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/UserAdminResponseDto"
-                }
-              }
-            },
-            "description": ""
-          }
-        },
-        "security": [
-          {
-            "bearer": []
-          },
-          {
-            "cookie": []
-          },
-          {
-            "api_key": []
-          }
-        ],
-        "tags": [
-          "User"
-        ]
-      }
-    },
-    "/admin/users/{id}": {
-      "delete": {
-        "operationId": "deleteUserAdmin",
-        "parameters": [
-          {
-            "name": "id",
-            "required": true,
-            "in": "path",
-            "schema": {
-              "format": "uuid",
-              "type": "string"
-            }
-          }
-        ],
-        "requestBody": {
-          "content": {
-            "application/json": {
-              "schema": {
-                "$ref": "#/components/schemas/UserAdminDeleteDto"
-              }
-            }
-          },
-          "required": true
-        },
-        "responses": {
-          "200": {
-            "content": {
-              "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/UserAdminResponseDto"
-                }
-              }
-            },
-            "description": ""
-          }
-        },
-        "security": [
-          {
-            "bearer": []
-          },
-          {
-            "cookie": []
-          },
-          {
-            "api_key": []
-          }
-        ],
-        "tags": [
-          "User"
-        ]
-      },
-      "get": {
-        "operationId": "getUserAdmin",
-        "parameters": [
-          {
-            "name": "id",
-            "required": true,
-            "in": "path",
-            "schema": {
-              "format": "uuid",
-              "type": "string"
-            }
-          }
-        ],
-        "responses": {
-          "200": {
-            "content": {
-              "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/UserAdminResponseDto"
-                }
-              }
-            },
-            "description": ""
-          }
-        },
-        "security": [
-          {
-            "bearer": []
-          },
-          {
-            "cookie": []
-          },
-          {
-            "api_key": []
-          }
-        ],
-        "tags": [
-          "User"
-        ]
-      },
-      "put": {
-        "operationId": "updateUserAdmin",
-        "parameters": [
-          {
-            "name": "id",
-            "required": true,
-            "in": "path",
-            "schema": {
-              "format": "uuid",
-              "type": "string"
-            }
-          }
-        ],
-        "requestBody": {
-          "content": {
-            "application/json": {
-              "schema": {
-                "$ref": "#/components/schemas/UserAdminUpdateDto"
-              }
-            }
-          },
-          "required": true
-        },
-        "responses": {
-          "200": {
-            "content": {
-              "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/UserAdminResponseDto"
-                }
-              }
-            },
-            "description": ""
-          }
-        },
-        "security": [
-          {
-            "bearer": []
-          },
-          {
-            "cookie": []
-          },
-          {
-            "api_key": []
-          }
-        ],
-        "tags": [
-          "User"
-        ]
-      }
-    },
-    "/admin/users/{id}/restore": {
-      "post": {
-        "operationId": "restoreUserAdmin",
-        "parameters": [
-          {
-            "name": "id",
-            "required": true,
-            "in": "path",
-            "schema": {
-              "format": "uuid",
-              "type": "string"
-            }
-          }
-        ],
-        "responses": {
-          "201": {
-            "content": {
-              "application/json": {
-                "schema": {
-                  "$ref": "#/components/schemas/UserAdminResponseDto"
-                }
-              }
-            },
-            "description": ""
-          }
-        },
-        "security": [
-          {
-            "bearer": []
-          },
-          {
-            "cookie": []
-          },
-          {
-            "api_key": []
-          }
-        ],
-        "tags": [
-          "User"
-        ]
-      }
-    },
     "/albums": {
       "get": {
         "operationId": "getAllAlbums",
@@ -2147,7 +1879,7 @@
             "content": {
               "application/json": {
                 "schema": {
-                  "$ref": "#/components/schemas/UserAdminResponseDto"
+                  "$ref": "#/components/schemas/UserResponseDto"
                 }
               }
             },
@@ -2178,7 +1910,7 @@
             "content": {
               "application/json": {
                 "schema": {
-                  "$ref": "#/components/schemas/UserAdminResponseDto"
+                  "$ref": "#/components/schemas/UserResponseDto"
                 }
               }
             },
@@ -3428,7 +3160,7 @@
             "content": {
               "application/json": {
                 "schema": {
-                  "$ref": "#/components/schemas/UserAdminResponseDto"
+                  "$ref": "#/components/schemas/UserResponseDto"
                 }
               }
             },
@@ -3474,7 +3206,7 @@
             "content": {
               "application/json": {
                 "schema": {
-                  "$ref": "#/components/schemas/UserAdminResponseDto"
+                  "$ref": "#/components/schemas/UserResponseDto"
                 }
               }
             },
@@ -6298,8 +6030,17 @@
     },
     "/users": {
       "get": {
-        "operationId": "searchUsers",
+        "operationId": "getAllUsers",
-        "parameters": [],
+        "parameters": [
+          {
+            "name": "isAll",
+            "required": true,
+            "in": "query",
+            "schema": {
+              "type": "boolean"
+            }
+          }
+        ],
         "responses": {
           "200": {
             "content": {
@@ -6329,18 +6070,26 @@
         "tags": [
           "User"
         ]
-      }
+      },
-    },
+      "post": {
-    "/users/me": {
+        "operationId": "createUser",
-      "get": {
-        "operationId": "getMyUser",
         "parameters": [],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/CreateUserDto"
+              }
+            }
+          },
+          "required": true
+        },
         "responses": {
-          "200": {
+          "201": {
             "content": {
               "application/json": {
                 "schema": {
-                  "$ref": "#/components/schemas/UserAdminResponseDto"
+                  "$ref": "#/components/schemas/UserResponseDto"
                 }
               }
             },
@@ -6363,13 +6112,13 @@
         ]
       },
       "put": {
-        "operationId": "updateMyUser",
+        "operationId": "updateUser",
         "parameters": [],
         "requestBody": {
           "content": {
             "application/json": {
               "schema": {
-                "$ref": "#/components/schemas/UserUpdateMeDto"
+                "$ref": "#/components/schemas/UpdateUserDto"
               }
             }
           },
@@ -6380,7 +6129,39 @@
             "content": {
               "application/json": {
                 "schema": {
-                  "$ref": "#/components/schemas/UserAdminResponseDto"
+                  "$ref": "#/components/schemas/UserResponseDto"
+                }
+              }
+            },
+            "description": ""
+          }
+        },
+        "security": [
+          {
+            "bearer": []
+          },
+          {
+            "cookie": []
+          },
+          {
+            "api_key": []
+          }
+        ],
+        "tags": [
+          "User"
+        ]
+      }
+    },
+    "/users/me": {
+      "get": {
+        "operationId": "getMyUserInfo",
+        "parameters": [],
+        "responses": {
+          "200": {
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UserResponseDto"
                 }
               }
             },
@@ -6470,8 +6251,58 @@
       }
     },
     "/users/{id}": {
+      "delete": {
+        "operationId": "deleteUser",
+        "parameters": [
+          {
+            "name": "id",
+            "required": true,
+            "in": "path",
+            "schema": {
+              "format": "uuid",
+              "type": "string"
+            }
+          }
+        ],
+        "requestBody": {
+          "content": {
+            "application/json": {
+              "schema": {
+                "$ref": "#/components/schemas/DeleteUserDto"
+              }
+            }
+          },
+          "required": true
+        },
+        "responses": {
+          "200": {
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UserResponseDto"
+                }
+              }
+            },
+            "description": ""
+          }
+        },
+        "security": [
+          {
+            "bearer": []
+          },
+          {
+            "cookie": []
+          },
+          {
+            "api_key": []
+          }
+        ],
+        "tags": [
+          "User"
+        ]
+      },
       "get": {
-        "operationId": "getUser",
+        "operationId": "getUserById",
         "parameters": [
           {
             "name": "id",
@@ -6553,6 +6384,48 @@
           "User"
         ]
       }
+    },
+    "/users/{id}/restore": {
+      "post": {
+        "operationId": "restoreUser",
+        "parameters": [
+          {
+            "name": "id",
+            "required": true,
+            "in": "path",
+            "schema": {
+              "format": "uuid",
+              "type": "string"
+            }
+          }
+        ],
+        "responses": {
+          "201": {
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/UserResponseDto"
+                }
+              }
+            },
+            "description": ""
+          }
+        },
+        "security": [
+          {
+            "bearer": []
+          },
+          {
+            "cookie": []
+          },
+          {
+            "api_key": []
+          }
+        ],
+        "tags": [
+          "User"
+        ]
+      }
     }
   },
   "info": {
@@ -6694,7 +6567,7 @@
             "type": "string"
           },
           "user": {
-            "$ref": "#/components/schemas/UserResponseDto"
+            "$ref": "#/components/schemas/UserDto"
           }
         },
         "required": [
@@ -7902,6 +7775,52 @@
         ],
         "type": "object"
       },
+      "CreateUserDto": {
+        "properties": {
+          "email": {
+            "type": "string"
+          },
+          "memoriesEnabled": {
+            "type": "boolean"
+          },
+          "name": {
+            "type": "string"
+          },
+          "notify": {
+            "type": "boolean"
+          },
+          "password": {
+            "type": "string"
+          },
+          "quotaSizeInBytes": {
+            "format": "int64",
+            "minimum": 1,
+            "nullable": true,
+            "type": "integer"
+          },
+          "shouldChangePassword": {
+            "type": "boolean"
+          },
+          "storageLabel": {
+            "nullable": true,
+            "type": "string"
+          }
+        },
+        "required": [
+          "email",
+          "name",
+          "password"
+        ],
+        "type": "object"
+      },
+      "DeleteUserDto": {
+        "properties": {
+          "force": {
+            "type": "boolean"
+          }
+        },
+        "type": "object"
+      },
       "DownloadArchiveInfo": {
         "properties": {
           "assetIds": {
@@ -8884,6 +8803,15 @@
           "avatarColor": {
             "$ref": "#/components/schemas/UserAvatarColor"
           },
+          "createdAt": {
+            "format": "date-time",
+            "type": "string"
+          },
+          "deletedAt": {
+            "format": "date-time",
+            "nullable": true,
+            "type": "string"
+          },
           "email": {
             "type": "string"
           },
@@ -8893,19 +8821,62 @@
           "inTimeline": {
             "type": "boolean"
           },
+          "isAdmin": {
+            "type": "boolean"
+          },
+          "memoriesEnabled": {
+            "type": "boolean"
+          },
           "name": {
             "type": "string"
           },
+          "oauthId": {
+            "type": "string"
+          },
           "profileImagePath": {
             "type": "string"
+          },
+          "quotaSizeInBytes": {
+            "format": "int64",
+            "nullable": true,
+            "type": "integer"
+          },
+          "quotaUsageInBytes": {
+            "format": "int64",
+            "nullable": true,
+            "type": "integer"
+          },
+          "shouldChangePassword": {
+            "type": "boolean"
+          },
+          "status": {
+            "$ref": "#/components/schemas/UserStatus"
+          },
+          "storageLabel": {
+            "nullable": true,
+            "type": "string"
+          },
+          "updatedAt": {
+            "format": "date-time",
+            "type": "string"
           }
         },
         "required": [
           "avatarColor",
+          "createdAt",
+          "deletedAt",
           "email",
           "id",
+          "isAdmin",
           "name",
-          "profileImagePath"
+          "oauthId",
+          "profileImagePath",
+          "quotaSizeInBytes",
+          "quotaUsageInBytes",
+          "shouldChangePassword",
+          "status",
+          "storageLabel",
+          "updatedAt"
         ],
         "type": "object"
       },
@@ -10839,6 +10810,48 @@
         },
         "type": "object"
       },
+      "UpdateUserDto": {
+        "properties": {
+          "avatarColor": {
+            "$ref": "#/components/schemas/UserAvatarColor"
+          },
+          "email": {
+            "type": "string"
+          },
+          "id": {
+            "format": "uuid",
+            "type": "string"
+          },
+          "isAdmin": {
+            "type": "boolean"
+          },
+          "memoriesEnabled": {
+            "type": "boolean"
+          },
+          "name": {
+            "type": "string"
+          },
+          "password": {
+            "type": "string"
+          },
+          "quotaSizeInBytes": {
+            "format": "int64",
+            "minimum": 1,
+            "nullable": true,
+            "type": "integer"
+          },
+          "shouldChangePassword": {
+            "type": "boolean"
+          },
+          "storageLabel": {
+            "type": "string"
+          }
+        },
+        "required": [
+          "id"
+        ],
+        "type": "object"
+      },
       "UsageByUserDto": {
         "properties": {
           "photos": {
@@ -10873,53 +10886,49 @@
         ],
         "type": "object"
       },
-      "UserAdminCreateDto": {
+      "UserAvatarColor": {
+        "enum": [
+          "primary",
+          "pink",
+          "red",
+          "yellow",
+          "blue",
+          "green",
+          "purple",
+          "orange",
+          "gray",
+          "amber"
+        ],
+        "type": "string"
+      },
+      "UserDto": {
         "properties": {
+          "avatarColor": {
+            "$ref": "#/components/schemas/UserAvatarColor"
+          },
           "email": {
             "type": "string"
           },
-          "memoriesEnabled": {
+          "id": {
-            "type": "boolean"
+            "type": "string"
           },
           "name": {
             "type": "string"
           },
-          "notify": {
+          "profileImagePath": {
-            "type": "boolean"
-          },
-          "password": {
-            "type": "string"
-          },
-          "quotaSizeInBytes": {
-            "format": "int64",
-            "minimum": 1,
-            "nullable": true,
-            "type": "integer"
-          },
-          "shouldChangePassword": {
-            "type": "boolean"
-          },
-          "storageLabel": {
-            "nullable": true,
             "type": "string"
           }
         },
         "required": [
+          "avatarColor",
           "email",
+          "id",
           "name",
-          "password"
+          "profileImagePath"
         ],
         "type": "object"
       },
-      "UserAdminDeleteDto": {
+      "UserResponseDto": {
-        "properties": {
-          "force": {
-            "type": "boolean"
-          }
-        },
-        "type": "object"
-      },
-      "UserAdminResponseDto": {
         "properties": {
           "avatarColor": {
             "$ref": "#/components/schemas/UserAvatarColor"
@@ -10998,81 +11007,6 @@
         ],
         "type": "object"
       },
-      "UserAdminUpdateDto": {
-        "properties": {
-          "avatarColor": {
-            "$ref": "#/components/schemas/UserAvatarColor"
-          },
-          "email": {
-            "type": "string"
-          },
-          "memoriesEnabled": {
-            "type": "boolean"
-          },
-          "name": {
-            "type": "string"
-          },
-          "password": {
-            "type": "string"
-          },
-          "quotaSizeInBytes": {
-            "format": "int64",
-            "minimum": 1,
-            "nullable": true,
-            "type": "integer"
-          },
-          "shouldChangePassword": {
-            "type": "boolean"
-          },
-          "storageLabel": {
-            "nullable": true,
-            "type": "string"
-          }
-        },
-        "type": "object"
-      },
-      "UserAvatarColor": {
-        "enum": [
-          "primary",
-          "pink",
-          "red",
-          "yellow",
-          "blue",
-          "green",
-          "purple",
-          "orange",
-          "gray",
-          "amber"
-        ],
-        "type": "string"
-      },
-      "UserResponseDto": {
-        "properties": {
-          "avatarColor": {
-            "$ref": "#/components/schemas/UserAvatarColor"
-          },
-          "email": {
-            "type": "string"
-          },
-          "id": {
-            "type": "string"
-          },
-          "name": {
-            "type": "string"
-          },
-          "profileImagePath": {
-            "type": "string"
-          }
-        },
-        "required": [
-          "avatarColor",
-          "email",
-          "id",
-          "name",
-          "profileImagePath"
-        ],
-        "type": "object"
-      },
       "UserStatus": {
         "enum": [
           "active",
@@ -11081,26 +11015,6 @@
         ],
         "type": "string"
       },
-      "UserUpdateMeDto": {
-        "properties": {
-          "avatarColor": {
-            "$ref": "#/components/schemas/UserAvatarColor"
-          },
-          "email": {
-            "type": "string"
-          },
-          "memoriesEnabled": {
-            "type": "boolean"
-          },
-          "name": {
-            "type": "string"
-          },
-          "password": {
-            "type": "string"
-          }
-        },
-        "type": "object"
-      },
       "ValidateAccessTokenResponseDto": {
         "properties": {
           "authStatus": {

open-api/typescript-sdk/README.md

@@ -13,22 +13,13 @@ npm i --save @immich/sdk
 For a more detailed example, check out the [`@immich/cli`](https://github.com/immich-app/immich/tree/main/cli).
 
 ```typescript
-<<<<<<< HEAD
-import { getAllAlbums, getAllAssets, getMyUser, init } from "@immich/sdk";
-=======
 import { getAllAlbums, getMyUserInfo, init } from "@immich/sdk";
->>>>>>> e7c8501930a988dfb6c23ce1c48b0beb076a58c2
 
 const API_KEY = "<API_KEY>"; // process.env.IMMICH_API_KEY
 
 init({ baseUrl: "https://demo.immich.app/api", apiKey: API_KEY });
 
-<<<<<<< HEAD
-const user = await getMyUser();
-const assets = await getAllAssets({ take: 1000 });
-=======
 const user = await getMyUserInfo();
->>>>>>> e7c8501930a988dfb6c23ce1c48b0beb076a58c2
 const albums = await getAllAlbums({});
 
 console.log({ user, albums });

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

@@ -14,7 +14,7 @@ const oazapfts = Oazapfts.runtime(defaults);
 export const servers = {
     server1: "/api"
 };
-export type UserResponseDto = {
+export type UserDto = {
     avatarColor: UserAvatarColor;
     email: string;
     id: string;
@@ -27,7 +27,7 @@ export type ActivityResponseDto = {
     createdAt: string;
     id: string;
     "type": Type;
-    user: UserResponseDto;
+    user: UserDto;
 };
 export type ActivityCreateDto = {
     albumId: string;
@@ -38,7 +38,7 @@ export type ActivityCreateDto = {
 export type ActivityStatisticsResponseDto = {
     comments: number;
 };
-export type UserAdminResponseDto = {
+export type UserResponseDto = {
     avatarColor: UserAvatarColor;
     createdAt: string;
     deletedAt: string | null;
@@ -56,29 +56,6 @@ export type UserAdminResponseDto = {
     storageLabel: string | null;
     updatedAt: string;
 };
-export type UserAdminCreateDto = {
-    email: string;
-    memoriesEnabled?: boolean;
-    name: string;
-    notify?: boolean;
-    password: string;
-    quotaSizeInBytes?: number | null;
-    shouldChangePassword?: boolean;
-    storageLabel?: string | null;
-};
-export type UserAdminDeleteDto = {
-    force?: boolean;
-};
-export type UserAdminUpdateDto = {
-    avatarColor?: UserAvatarColor;
-    email?: string;
-    memoriesEnabled?: boolean;
-    name?: string;
-    password?: string;
-    quotaSizeInBytes?: number | null;
-    shouldChangePassword?: boolean;
-    storageLabel?: string | null;
-};
 export type AlbumUserResponseDto = {
     role: AlbumUserRole;
     user: UserResponseDto;
@@ -540,11 +517,22 @@ export type OAuthCallbackDto = {
 };
 export type PartnerResponseDto = {
     avatarColor: UserAvatarColor;
+    createdAt: string;
+    deletedAt: string | null;
     email: string;
     id: string;
     inTimeline?: boolean;
+    isAdmin: boolean;
+    memoriesEnabled?: boolean;
     name: string;
+    oauthId: string;
     profileImagePath: string;
+    quotaSizeInBytes: number | null;
+    quotaUsageInBytes: number | null;
+    shouldChangePassword: boolean;
+    status: UserStatus;
+    storageLabel: string | null;
+    updatedAt: string;
 };
 export type UpdatePartnerDto = {
     inTimeline: boolean;
@@ -1072,12 +1060,27 @@ export type TimeBucketResponseDto = {
     count: number;
     timeBucket: string;
 };
-export type UserUpdateMeDto = {
+export type CreateUserDto = {
+    email: string;
+    memoriesEnabled?: boolean;
+    name: string;
+    notify?: boolean;
+    password: string;
+    quotaSizeInBytes?: number | null;
+    shouldChangePassword?: boolean;
+    storageLabel?: string | null;
+};
+export type UpdateUserDto = {
     avatarColor?: UserAvatarColor;
     email?: string;
+    id: string;
+    isAdmin?: boolean;
     memoriesEnabled?: boolean;
     name?: string;
     password?: string;
+    quotaSizeInBytes?: number | null;
+    shouldChangePassword?: boolean;
+    storageLabel?: string;
 };
 export type CreateProfileImageDto = {
     file: Blob;
@@ -1086,6 +1089,9 @@ export type CreateProfileImageResponseDto = {
     profileImagePath: string;
     userId: string;
 };
+export type DeleteUserDto = {
+    force?: boolean;
+};
 export function getActivities({ albumId, assetId, level, $type, userId }: {
     albumId: string;
     assetId?: string;
@@ -1140,77 +1146,6 @@ export function deleteActivity({ id }: {
         method: "DELETE"
     }));
 }
-export function searchUsersAdmin({ withDeleted }: {
-    withDeleted?: boolean;
-}, opts?: Oazapfts.RequestOpts) {
-    return oazapfts.ok(oazapfts.fetchJson<{
-        status: 200;
-        data: UserAdminResponseDto[];
-    }>(`/admin/users${QS.query(QS.explode({
-        withDeleted
-    }))}`, {
-        ...opts
-    }));
-}
-export function createUserAdmin({ userAdminCreateDto }: {
-    userAdminCreateDto: UserAdminCreateDto;
-}, opts?: Oazapfts.RequestOpts) {
-    return oazapfts.ok(oazapfts.fetchJson<{
-        status: 201;
-        data: UserAdminResponseDto;
-    }>("/admin/users", oazapfts.json({
-        ...opts,
-        method: "POST",
-        body: userAdminCreateDto
-    })));
-}
-export function deleteUserAdmin({ id, userAdminDeleteDto }: {
-    id: string;
-    userAdminDeleteDto: UserAdminDeleteDto;
-}, opts?: Oazapfts.RequestOpts) {
-    return oazapfts.ok(oazapfts.fetchJson<{
-        status: 200;
-        data: UserAdminResponseDto;
-    }>(`/admin/users/${encodeURIComponent(id)}`, oazapfts.json({
-        ...opts,
-        method: "DELETE",
-        body: userAdminDeleteDto
-    })));
-}
-export function getUserAdmin({ id }: {
-    id: string;
-}, opts?: Oazapfts.RequestOpts) {
-    return oazapfts.ok(oazapfts.fetchJson<{
-        status: 200;
-        data: UserAdminResponseDto;
-    }>(`/admin/users/${encodeURIComponent(id)}`, {
-        ...opts
-    }));
-}
-export function updateUserAdmin({ id, userAdminUpdateDto }: {
-    id: string;
-    userAdminUpdateDto: UserAdminUpdateDto;
-}, opts?: Oazapfts.RequestOpts) {
-    return oazapfts.ok(oazapfts.fetchJson<{
-        status: 200;
-        data: UserAdminResponseDto;
-    }>(`/admin/users/${encodeURIComponent(id)}`, oazapfts.json({
-        ...opts,
-        method: "PUT",
-        body: userAdminUpdateDto
-    })));
-}
-export function restoreUserAdmin({ id }: {
-    id: string;
-}, opts?: Oazapfts.RequestOpts) {
-    return oazapfts.ok(oazapfts.fetchJson<{
-        status: 201;
-        data: UserAdminResponseDto;
-    }>(`/admin/users/${encodeURIComponent(id)}/restore`, {
-        ...opts,
-        method: "POST"
-    }));
-}
 export function getAllAlbums({ assetId, shared }: {
     assetId?: string;
     shared?: boolean;
@@ -1654,7 +1589,7 @@ export function signUpAdmin({ signUpDto }: {
 }, opts?: Oazapfts.RequestOpts) {
     return oazapfts.ok(oazapfts.fetchJson<{
         status: 201;
-        data: UserAdminResponseDto;
+        data: UserResponseDto;
     }>("/auth/admin-sign-up", oazapfts.json({
         ...opts,
         method: "POST",
@@ -1666,7 +1601,7 @@ export function changePassword({ changePasswordDto }: {
 }, opts?: Oazapfts.RequestOpts) {
     return oazapfts.ok(oazapfts.fetchJson<{
         status: 200;
-        data: UserAdminResponseDto;
+        data: UserResponseDto;
     }>("/auth/change-password", oazapfts.json({
         ...opts,
         method: "POST",
@@ -1999,7 +1934,7 @@ export function linkOAuthAccount({ oAuthCallbackDto }: {
 }, opts?: Oazapfts.RequestOpts) {
     return oazapfts.ok(oazapfts.fetchJson<{
         status: 201;
-        data: UserAdminResponseDto;
+        data: UserResponseDto;
     }>("/oauth/link", oazapfts.json({
         ...opts,
         method: "POST",
@@ -2014,7 +1949,7 @@ export function redirectOAuthToMobile(opts?: Oazapfts.RequestOpts) {
 export function unlinkOAuthAccount(opts?: Oazapfts.RequestOpts) {
     return oazapfts.ok(oazapfts.fetchJson<{
         status: 201;
-        data: UserAdminResponseDto;
+        data: UserResponseDto;
     }>("/oauth/unlink", {
         ...opts,
         method: "POST"
@@ -2752,34 +2687,50 @@ export function restoreAssets({ bulkIdsDto }: {
         body: bulkIdsDto
     })));
 }
-export function searchUsers(opts?: Oazapfts.RequestOpts) {
+export function getAllUsers({ isAll }: {
-    return oazapfts.ok(oazapfts.fetchJson<{
+    isAll: boolean;
-        status: 200;
-        data: UserResponseDto[];
-    }>("/users", {
-        ...opts
-    }));
-}
-export function getMyUser(opts?: Oazapfts.RequestOpts) {
-    return oazapfts.ok(oazapfts.fetchJson<{
-        status: 200;
-        data: UserAdminResponseDto;
-    }>("/users/me", {
-        ...opts
-    }));
-}
-export function updateMyUser({ userUpdateMeDto }: {
-    userUpdateMeDto: UserUpdateMeDto;
 }, opts?: Oazapfts.RequestOpts) {
     return oazapfts.ok(oazapfts.fetchJson<{
         status: 200;
-        data: UserAdminResponseDto;
+        data: UserResponseDto[];
-    }>("/users/me", oazapfts.json({
+    }>(`/users${QS.query(QS.explode({
+        isAll
+    }))}`, {
+        ...opts
+    }));
+}
+export function createUser({ createUserDto }: {
+    createUserDto: CreateUserDto;
+}, opts?: Oazapfts.RequestOpts) {
+    return oazapfts.ok(oazapfts.fetchJson<{
+        status: 201;
+        data: UserResponseDto;
+    }>("/users", oazapfts.json({
+        ...opts,
+        method: "POST",
+        body: createUserDto
+    })));
+}
+export function updateUser({ updateUserDto }: {
+    updateUserDto: UpdateUserDto;
+}, opts?: Oazapfts.RequestOpts) {
+    return oazapfts.ok(oazapfts.fetchJson<{
+        status: 200;
+        data: UserResponseDto;
+    }>("/users", oazapfts.json({
         ...opts,
         method: "PUT",
-        body: userUpdateMeDto
+        body: updateUserDto
     })));
 }
+export function getMyUserInfo(opts?: Oazapfts.RequestOpts) {
+    return oazapfts.ok(oazapfts.fetchJson<{
+        status: 200;
+        data: UserResponseDto;
+    }>("/users/me", {
+        ...opts
+    }));
+}
 export function deleteProfileImage(opts?: Oazapfts.RequestOpts) {
     return oazapfts.ok(oazapfts.fetchText("/users/profile-image", {
         ...opts,
@@ -2798,7 +2749,20 @@ export function createProfileImage({ createProfileImageDto }: {
         body: createProfileImageDto
     })));
 }
-export function getUser({ id }: {
+export function deleteUser({ id, deleteUserDto }: {
+    id: string;
+    deleteUserDto: DeleteUserDto;
+}, opts?: Oazapfts.RequestOpts) {
+    return oazapfts.ok(oazapfts.fetchJson<{
+        status: 200;
+        data: UserResponseDto;
+    }>(`/users/${encodeURIComponent(id)}`, oazapfts.json({
+        ...opts,
+        method: "DELETE",
+        body: deleteUserDto
+    })));
+}
+export function getUserById({ id }: {
     id: string;
 }, opts?: Oazapfts.RequestOpts) {
     return oazapfts.ok(oazapfts.fetchJson<{
@@ -2818,6 +2782,17 @@ export function getProfileImage({ id }: {
         ...opts
     }));
 }
+export function restoreUser({ id }: {
+    id: string;
+}, opts?: Oazapfts.RequestOpts) {
+    return oazapfts.ok(oazapfts.fetchJson<{
+        status: 201;
+        data: UserResponseDto;
+    }>(`/users/${encodeURIComponent(id)}/restore`, {
+        ...opts,
+        method: "POST"
+    }));
+}
 export enum ReactionLevel {
     Album = "album",
     Asset = "asset"
@@ -2842,15 +2817,15 @@ export enum UserAvatarColor {
     Gray = "gray",
     Amber = "amber"
 }
+export enum AlbumUserRole {
+    Editor = "editor",
+    Viewer = "viewer"
+}
 export enum UserStatus {
     Active = "active",
     Removing = "removing",
     Deleted = "deleted"
 }
-export enum AlbumUserRole {
-    Editor = "editor",
-    Viewer = "viewer"
-}
 export enum TagTypeEnum {
     Object = "OBJECT",
     Face = "FACE",

readme_i18n/README_fr_FR.md

@@ -11,7 +11,7 @@
 <p align="center">
 <img src="../design/immich-logo-stacked-light.svg" width="300" title="Login With Custom URL">
 </p>
-<h3 align="center">Immich - Solution de sauvegarde performante et auto-hébergée de photos et de vidéos</h3>
+<h3 align="center">Immich - Solution de sauvegarde performante et auto-hébergée des photos et des vidéos</h3>
 <br/>
 <a href="https://immich.app">
 <img src="../design/immich-screenshots.png" title="Main Screenshot">
@@ -36,16 +36,16 @@
 ## Clause de non-responsabilité
 
 - ⚠️ Le projet est en **très fort** développement.
-- ⚠️ Attendez-vous à rencontrer des bogues et des changements importants.
+- ⚠️ Attendez-vous à rencontrer des bugs et des changements importants.
-- ⚠️ **N'utilisez pas cette application comme seul support de sauvegarde de vos photos et vos vidéos.**
+- ⚠️ **N'utilisez pas cette application comme seule façon de sauvegarder vos photos et vos vidéos.**
 - ⚠️ Ayez toujours un plan de sauvegarde en [3-2-1](https://www.seagate.com/fr/fr/blog/what-is-a-3-2-1-backup-strategy/) pour vos précieuses photos et vidéos !
 
 ## Sommaire
 
 - [Documentation officielle](https://immich.app/docs)
 - [Feuille de route](https://github.com/orgs/immich-app/projects/1)
-- [Démo](#démo)
+- [Démo](#demo)
-- [Fonctionnalités](#fonctionnalités)
+- [Fonctionnalités](#features)
 - [Introduction](https://immich.app/docs/overview/introduction)
 - [Installation](https://immich.app/docs/install/requirements)
 - [Contribution](https://immich.app/docs/overview/support-the-project)
@@ -56,31 +56,26 @@ Vous pouvez trouver la documentation principale ainsi que les guides d'installat
 
 ## Démo
 
-Vous pouvez accéder à la démo en ligne sur https://demo.immich.app
+Vous pouvez accéder à la démo Web sur https://demo.immich.app
 
-Pour l'application mobile, vous pouvez utiliser `https://demo.immich.app/api` dans le champ `URL du point d'accès au serveur`
+Pour l'application mobile, vous pouvez utiliser `https://demo.immich.app/api` dans le champ 'URL du point d'accès au serveur'
 
-```bash title="Identifiants pour la démo"
+```bash title="Demo Credential"
 Les identifiants
 email: demo@immich.app
 mot de passe: demo
 ```
 
 ```
-Caractéristiques : Plan gratuit Oracle VM - Amsterdam - 2.4Ghz quatre-cœurs ARM64 CPU, 24GB RAM
+Caractéristiques: Plan gratuit Oracle VM - Amsterdam - 2.4Ghz quatre-cœurs ARM64 CPU, 24GB RAM
 ```
 
-## Activités
+# Fonctionnalités
-
-![Activités](https://repobeats.axiom.co/api/embed/9e86d9dc3ddd137161f2f6d2e758d7863b1789cb.svg "Image des statistiques Repobeats")
-
-## Fonctionnalités
 
 | Fonctionnalités                                                  | Mobile | Web |
 | ---------------------------------------------------------------- | ------ | --- |
 | Téléverser et voir les vidéos et photos                          | Oui    | Oui |
 | Sauvegarde automatique quand l'application est ouverte           | Oui    | N/A |
-| Prévention contre la duplication des photos et des vidéos        | Oui    | Oui |
 | Sélection des albums à sauvegarder                               | Oui    | N/A |
 | Télécharger les photos et les vidéos sur l'appareil              | Oui    | Oui |
 | Support multi-utilisateur                                        | Oui    | Oui |
@@ -94,32 +89,13 @@ Caractéristiques : Plan gratuit Oracle VM - Amsterdam - 2.4Ghz quatre-cœurs AR
 | Défilement virtuel                                               | Oui    | Oui |
 | Support de l'OAuth                                               | Oui    | Oui |
 | Clés d'API                                                       | N/A    | Oui |
-| Sauvegarde et lecture des LivePhoto/MotionPhoto                  | Oui    | Oui |
+| Sauvegarde et lecture des LivePhotos                             | iOS    | Oui |
-| Support de l'affichage des images à 360°                         | Non    | Oui |
 | Structure de stockage définissable                               | Oui    | Oui |
 | Partage public                                                   | Non    | Oui |
 | Archives et favoris                                              | Oui    | Oui |
-| Carte globale                                                    | Oui    | Oui |
+| Carte globale                                                    | Non    | Oui |
 | Partage entre utilisateurs                                       | Oui    | Oui |
 | Reconnaissance et regroupement facial                            | Oui    | Oui |
 | Souvenirs (il y a x années)                                      | Oui    | Oui |
 | Support hors-ligne                                               | Oui    | Non |
 | Gallerie en lecture seule                                        | Oui    | Oui |
-| Empilage de photos                                               | Oui    | Oui |
-
-
-## Contributeurs
-
-<a href="https://github.com/alextran1502/immich/graphs/contributors">
-  <img src="https://contrib.rocks/image?repo=immich-app/immich" width="100%"/>
-</a>
-
-## Historique des favoris
-
-<a href="https://star-history.com/#immich-app/immich&Date">
- <picture>
-   <source media="(prefers-color-scheme: dark)" srcset="https://api.star-history.com/svg?repos=immich-app/immich&type=Date&theme=dark" />
-   <source media="(prefers-color-scheme: light)" srcset="https://api.star-history.com/svg?repos=immich-app/immich&type=Date" />
-   <img alt="Star History Chart" src="https://api.star-history.com/svg?repos=immich-app/immich&type=Date" width="100%" />
- </picture>
-</a>

server/src/commands/reset-admin-password.command.ts

@@ -1,9 +1,9 @@
 import { Command, CommandRunner, InquirerService, Question, QuestionSet } from 'nest-commander';
-import { UserAdminResponseDto } from 'src/dtos/user.dto';
+import { UserResponseDto } from 'src/dtos/user.dto';
 import { CliService } from 'src/services/cli.service';
 
 const prompt = (inquirer: InquirerService) => {
-  return function ask(admin: UserAdminResponseDto) {
+  return function ask(admin: UserResponseDto) {
     const { id, oauthId, email, name } = admin;
     console.log(`Found Admin:
 - ID=${id}

server/src/config.ts

@@ -256,8 +256,8 @@ export const defaults = Object.freeze<SystemConfig>({
       modelName: 'ViT-B-32__openai',
     },
     duplicateDetection: {
-      enabled: true,
+      enabled: false,
-      maxDistance: 0.0155,
+      maxDistance: 0.03,
     },
     facialRecognition: {
       enabled: true,

server/src/controllers/auth.controller.ts

@@ -12,7 +12,7 @@ import {
   SignUpDto,
   ValidateAccessTokenResponseDto,
 } from 'src/dtos/auth.dto';
-import { UserAdminResponseDto } from 'src/dtos/user.dto';
+import { UserResponseDto, mapUser } from 'src/dtos/user.dto';
 import { Auth, Authenticated, GetLoginDetails } from 'src/middleware/auth.guard';
 import { AuthService, LoginDetails } from 'src/services/auth.service';
 import { respondWithCookie, respondWithoutCookie } from 'src/utils/response';
@@ -40,7 +40,7 @@ export class AuthController {
   }
 
   @Post('admin-sign-up')
-  signUpAdmin(@Body() dto: SignUpDto): Promise<UserAdminResponseDto> {
+  signUpAdmin(@Body() dto: SignUpDto): Promise<UserResponseDto> {
     return this.service.adminSignUp(dto);
   }
 
@@ -54,8 +54,8 @@ export class AuthController {
   @Post('change-password')
   @HttpCode(HttpStatus.OK)
   @Authenticated()
-  changePassword(@Auth() auth: AuthDto, @Body() dto: ChangePasswordDto): Promise<UserAdminResponseDto> {
+  changePassword(@Auth() auth: AuthDto, @Body() dto: ChangePasswordDto): Promise<UserResponseDto> {
-    return this.service.changePassword(auth, dto);
+    return this.service.changePassword(auth, dto).then(mapUser);
   }
 
   @Post('logout')

server/src/controllers/index.ts

@@ -27,7 +27,6 @@ import { SystemMetadataController } from 'src/controllers/system-metadata.contro
 import { TagController } from 'src/controllers/tag.controller';
 import { TimelineController } from 'src/controllers/timeline.controller';
 import { TrashController } from 'src/controllers/trash.controller';
-import { UserAdminController } from 'src/controllers/user-admin.controller';
 import { UserController } from 'src/controllers/user.controller';
 
 export const controllers = [
@@ -60,6 +59,5 @@ export const controllers = [
   TagController,
   TimelineController,
   TrashController,
-  UserAdminController,
   UserController,
 ];

server/src/controllers/oauth.controller.ts

@@ -10,7 +10,7 @@ import {
   OAuthCallbackDto,
   OAuthConfigDto,
 } from 'src/dtos/auth.dto';
-import { UserAdminResponseDto } from 'src/dtos/user.dto';
+import { UserResponseDto } from 'src/dtos/user.dto';
 import { Auth, Authenticated, GetLoginDetails } from 'src/middleware/auth.guard';
 import { AuthService, LoginDetails } from 'src/services/auth.service';
 import { respondWithCookie } from 'src/utils/response';
@@ -53,13 +53,13 @@ export class OAuthController {
 
   @Post('link')
   @Authenticated()
-  linkOAuthAccount(@Auth() auth: AuthDto, @Body() dto: OAuthCallbackDto): Promise<UserAdminResponseDto> {
+  linkOAuthAccount(@Auth() auth: AuthDto, @Body() dto: OAuthCallbackDto): Promise<UserResponseDto> {
     return this.service.link(auth, dto);
   }
 
   @Post('unlink')
   @Authenticated()
-  unlinkOAuthAccount(@Auth() auth: AuthDto): Promise<UserAdminResponseDto> {
+  unlinkOAuthAccount(@Auth() auth: AuthDto): Promise<UserResponseDto> {
     return this.service.unlink(auth);
   }
 }

server/src/controllers/user-admin.controller.ts

@@ -1,63 +0,0 @@
-import { Body, Controller, Delete, Get, Param, Post, Put, Query } from '@nestjs/common';
-import { ApiTags } from '@nestjs/swagger';
-import { AuthDto } from 'src/dtos/auth.dto';
-import {
-  UserAdminCreateDto,
-  UserAdminDeleteDto,
-  UserAdminResponseDto,
-  UserAdminSearchDto,
-  UserAdminUpdateDto,
-} from 'src/dtos/user.dto';
-import { Auth, Authenticated } from 'src/middleware/auth.guard';
-import { UserAdminService } from 'src/services/user-admin.service';
-import { UUIDParamDto } from 'src/validation';
-
-@ApiTags('User')
-@Controller('admin/users')
-export class UserAdminController {
-  constructor(private service: UserAdminService) {}
-
-  @Get()
-  @Authenticated({ admin: true })
-  searchUsersAdmin(@Auth() auth: AuthDto, @Query() dto: UserAdminSearchDto): Promise<UserAdminResponseDto[]> {
-    return this.service.search(auth, dto);
-  }
-
-  @Post()
-  @Authenticated({ admin: true })
-  createUserAdmin(@Body() createUserDto: UserAdminCreateDto): Promise<UserAdminResponseDto> {
-    return this.service.create(createUserDto);
-  }
-
-  @Get(':id')
-  @Authenticated({ admin: true })
-  getUserAdmin(@Auth() auth: AuthDto, @Param() { id }: UUIDParamDto): Promise<UserAdminResponseDto> {
-    return this.service.get(auth, id);
-  }
-
-  @Put(':id')
-  @Authenticated({ admin: true })
-  updateUserAdmin(
-    @Auth() auth: AuthDto,
-    @Param() { id }: UUIDParamDto,
-    @Body() dto: UserAdminUpdateDto,
-  ): Promise<UserAdminResponseDto> {
-    return this.service.update(auth, id, dto);
-  }
-
-  @Delete(':id')
-  @Authenticated({ admin: true })
-  deleteUserAdmin(
-    @Auth() auth: AuthDto,
-    @Param() { id }: UUIDParamDto,
-    @Body() dto: UserAdminDeleteDto,
-  ): Promise<UserAdminResponseDto> {
-    return this.service.delete(auth, id, dto);
-  }
-
-  @Post(':id/restore')
-  @Authenticated({ admin: true })
-  restoreUserAdmin(@Auth() auth: AuthDto, @Param() { id }: UUIDParamDto): Promise<UserAdminResponseDto> {
-    return this.service.restore(auth, id);
-  }
-}

server/src/controllers/user.controller.ts

@@ -10,6 +10,7 @@ import {
   Param,
   Post,
   Put,
+  Query,
   Res,
   UploadedFile,
   UseInterceptors,
@@ -18,7 +19,7 @@ import { ApiBody, ApiConsumes, ApiTags } from '@nestjs/swagger';
 import { NextFunction, Response } from 'express';
 import { AuthDto } from 'src/dtos/auth.dto';
 import { CreateProfileImageDto, CreateProfileImageResponseDto } from 'src/dtos/user-profile.dto';
-import { UserAdminResponseDto, UserResponseDto, UserUpdateMeDto } from 'src/dtos/user.dto';
+import { CreateUserDto, DeleteUserDto, UpdateUserDto, UserResponseDto } from 'src/dtos/user.dto';
 import { ILoggerRepository } from 'src/interfaces/logger.interface';
 import { Auth, Authenticated, FileResponse } from 'src/middleware/auth.guard';
 import { FileUploadInterceptor, Route } from 'src/middleware/file-upload.interceptor';
@@ -36,28 +37,58 @@ export class UserController {
 
   @Get()
   @Authenticated()
-  searchUsers(): Promise<UserResponseDto[]> {
+  getAllUsers(@Auth() auth: AuthDto, @Query('isAll') isAll: boolean): Promise<UserResponseDto[]> {
-    return this.service.search();
+    return this.service.getAll(auth, isAll);
+  }
+
+  @Post()
+  @Authenticated({ admin: true })
+  createUser(@Body() createUserDto: CreateUserDto): Promise<UserResponseDto> {
+    return this.service.create(createUserDto);
   }
 
   @Get('me')
   @Authenticated()
-  getMyUser(@Auth() auth: AuthDto): UserAdminResponseDto {
+  getMyUserInfo(@Auth() auth: AuthDto): Promise<UserResponseDto> {
     return this.service.getMe(auth);
   }
 
-  @Put('me')
-  @Authenticated()
-  updateMyUser(@Auth() auth: AuthDto, @Body() dto: UserUpdateMeDto): Promise<UserAdminResponseDto> {
-    return this.service.updateMe(auth, dto);
-  }
-
   @Get(':id')
   @Authenticated()
-  getUser(@Param() { id }: UUIDParamDto): Promise<UserResponseDto> {
+  getUserById(@Param() { id }: UUIDParamDto): Promise<UserResponseDto> {
     return this.service.get(id);
   }
 
+  @Delete('profile-image')
+  @HttpCode(HttpStatus.NO_CONTENT)
+  @Authenticated()
+  deleteProfileImage(@Auth() auth: AuthDto): Promise<void> {
+    return this.service.deleteProfileImage(auth);
+  }
+
+  @Delete(':id')
+  @Authenticated({ admin: true })
+  deleteUser(
+    @Auth() auth: AuthDto,
+    @Param() { id }: UUIDParamDto,
+    @Body() dto: DeleteUserDto,
+  ): Promise<UserResponseDto> {
+    return this.service.delete(auth, id, dto);
+  }
+
+  @Post(':id/restore')
+  @Authenticated({ admin: true })
+  restoreUser(@Auth() auth: AuthDto, @Param() { id }: UUIDParamDto): Promise<UserResponseDto> {
+    return this.service.restore(auth, id);
+  }
+
+  // TODO: replace with @Put(':id')
+  @Put()
+  @Authenticated()
+  updateUser(@Auth() auth: AuthDto, @Body() updateUserDto: UpdateUserDto): Promise<UserResponseDto> {
+    return this.service.update(auth, updateUserDto);
+  }
+
   @UseInterceptors(FileUploadInterceptor)
   @ApiConsumes('multipart/form-data')
   @ApiBody({ description: 'A new avatar for the user', type: CreateProfileImageDto })
@@ -70,13 +101,6 @@ export class UserController {
     return this.service.createProfileImage(auth, fileInfo);
   }
 
-  @Delete('profile-image')
-  @HttpCode(HttpStatus.NO_CONTENT)
-  @Authenticated()
-  deleteProfileImage(@Auth() auth: AuthDto): Promise<void> {
-    return this.service.deleteProfileImage(auth);
-  }
-
   @Get(':id/profile-image')
   @FileResponse()
   @Authenticated()

server/src/cores/user.core.ts

@@ -1,6 +1,7 @@
-import { BadRequestException } from '@nestjs/common';
+import { BadRequestException, ForbiddenException } from '@nestjs/common';
 import sanitize from 'sanitize-filename';
 import { SALT_ROUNDS } from 'src/constants';
+import { UserResponseDto } from 'src/dtos/user.dto';
 import { UserEntity } from 'src/entities/user.entity';
 import { ICryptoRepository } from 'src/interfaces/crypto.interface';
 import { IUserRepository } from 'src/interfaces/user.interface';
@@ -25,6 +26,46 @@ export class UserCore {
     instance = null;
   }
 
+  // TODO: move auth related checks to the service layer
+  async updateUser(user: UserEntity | UserResponseDto, id: string, dto: Partial<UserEntity>): Promise<UserEntity> {
+    if (!user.isAdmin && user.id !== id) {
+      throw new ForbiddenException('You are not allowed to update this user');
+    }
+
+    if (!user.isAdmin) {
+      // Users can never update the isAdmin property.
+      delete dto.isAdmin;
+      delete dto.storageLabel;
+    } else if (dto.isAdmin && user.id !== id) {
+      // Admin cannot create another admin.
+      throw new BadRequestException('The server already has an admin');
+    }
+
+    if (dto.email) {
+      const duplicate = await this.userRepository.getByEmail(dto.email);
+      if (duplicate && duplicate.id !== id) {
+        throw new BadRequestException('Email already in use by another account');
+      }
+    }
+
+    if (dto.storageLabel) {
+      const duplicate = await this.userRepository.getByStorageLabel(dto.storageLabel);
+      if (duplicate && duplicate.id !== id) {
+        throw new BadRequestException('Storage label already in use by another account');
+      }
+    }
+
+    if (dto.password) {
+      dto.password = await this.cryptoRepository.hashBcrypt(dto.password, SALT_ROUNDS);
+    }
+
+    if (dto.storageLabel === '') {
+      dto.storageLabel = null;
+    }
+
+    return this.userRepository.update(id, { ...dto, updatedAt: new Date() });
+  }
+
   async createUser(dto: Partial<UserEntity> & { email: string }): Promise<UserEntity> {
     const user = await this.userRepository.getByEmail(dto.email);
     if (user) {

server/src/dtos/activity.dto.ts

@@ -1,6 +1,6 @@
 import { ApiProperty } from '@nestjs/swagger';
 import { IsEnum, IsNotEmpty, IsString, ValidateIf } from 'class-validator';
-import { UserResponseDto, mapUser } from 'src/dtos/user.dto';
+import { UserDto, mapSimpleUser } from 'src/dtos/user.dto';
 import { ActivityEntity } from 'src/entities/activity.entity';
 import { Optional, ValidateUUID } from 'src/validation';
 
@@ -20,7 +20,7 @@ export class ActivityResponseDto {
   id!: string;
   createdAt!: Date;
   type!: ReactionType;
-  user!: UserResponseDto;
+  user!: UserDto;
   assetId!: string | null;
   comment?: string | null;
 }
@@ -73,6 +73,6 @@ export function mapActivity(activity: ActivityEntity): ActivityResponseDto {
     createdAt: activity.createdAt,
     comment: activity.comment,
     type: activity.isLiked ? ReactionType.LIKE : ReactionType.COMMENT,
-    user: mapUser(activity.user),
+    user: mapSimpleUser(activity.user),
   };
 }

server/src/dtos/user.dto.spec.ts

@@ -1,12 +1,12 @@
 import { plainToInstance } from 'class-transformer';
 import { validate } from 'class-validator';
-import { UserAdminCreateDto, UserUpdateMeDto } from 'src/dtos/user.dto';
+import { CreateUserDto, CreateUserOAuthDto, UpdateUserDto } from 'src/dtos/user.dto';
 
 describe('update user DTO', () => {
   it('should allow emails without a tld', async () => {
     const someEmail = 'test@test';
 
-    const dto = plainToInstance(UserUpdateMeDto, {
+    const dto = plainToInstance(UpdateUserDto, {
       email: someEmail,
       id: '3fe388e4-2078-44d7-b36c-39d9dee3a657',
     });
@@ -18,22 +18,22 @@ describe('update user DTO', () => {
 
 describe('create user DTO', () => {
   it('validates the email', async () => {
-    const params: Partial<UserAdminCreateDto> = {
+    const params: Partial<CreateUserDto> = {
       email: undefined,
       password: 'password',
       name: 'name',
     };
-    let dto: UserAdminCreateDto = plainToInstance(UserAdminCreateDto, params);
+    let dto: CreateUserDto = plainToInstance(CreateUserDto, params);
     let errors = await validate(dto);
     expect(errors).toHaveLength(1);
 
     params.email = 'invalid email';
-    dto = plainToInstance(UserAdminCreateDto, params);
+    dto = plainToInstance(CreateUserDto, params);
     errors = await validate(dto);
     expect(errors).toHaveLength(1);
 
     params.email = 'valid@email.com';
-    dto = plainToInstance(UserAdminCreateDto, params);
+    dto = plainToInstance(CreateUserDto, params);
     errors = await validate(dto);
     expect(errors).toHaveLength(0);
   });
@@ -41,7 +41,7 @@ describe('create user DTO', () => {
   it('should allow emails without a tld', async () => {
     const someEmail = 'test@test';
 
-    const dto = plainToInstance(UserAdminCreateDto, {
+    const dto = plainToInstance(CreateUserDto, {
       email: someEmail,
       password: 'some password',
       name: 'some name',
@@ -51,3 +51,18 @@ describe('create user DTO', () => {
     expect(dto.email).toEqual(someEmail);
   });
 });
+
+describe('create user oauth DTO', () => {
+  it('should allow emails without a tld', async () => {
+    const someEmail = 'test@test';
+
+    const dto = plainToInstance(CreateUserOAuthDto, {
+      email: someEmail,
+      oauthId: 'some oauth id',
+      name: 'some name',
+    });
+    const errors = await validate(dto);
+    expect(errors).toHaveLength(0);
+    expect(dto.email).toEqual(someEmail);
+  });
+});

server/src/dtos/user.dto.ts

@@ -1,63 +1,12 @@
 import { ApiProperty } from '@nestjs/swagger';
 import { Transform } from 'class-transformer';
-import { IsBoolean, IsEmail, IsEnum, IsNotEmpty, IsNumber, IsPositive, IsString } from 'class-validator';
+import { IsBoolean, IsEmail, IsEnum, IsNotEmpty, IsNumber, IsPositive, IsString, IsUUID } from 'class-validator';
 import { UserAvatarColor } from 'src/entities/user-metadata.entity';
 import { UserEntity, UserStatus } from 'src/entities/user.entity';
 import { getPreferences } from 'src/utils/preferences';
 import { Optional, ValidateBoolean, toEmail, toSanitized } from 'src/validation';
 
-export class UserUpdateMeDto {
+export class CreateUserDto {
-  @Optional()
-  @IsEmail({ require_tld: false })
-  @Transform(toEmail)
-  email?: string;
-
-  // TODO: migrate to the other change password endpoint
-  @Optional()
-  @IsNotEmpty()
-  @IsString()
-  password?: string;
-
-  @Optional()
-  @IsString()
-  @IsNotEmpty()
-  name?: string;
-
-  @ValidateBoolean({ optional: true })
-  memoriesEnabled?: boolean;
-
-  @Optional()
-  @IsEnum(UserAvatarColor)
-  @ApiProperty({ enumName: 'UserAvatarColor', enum: UserAvatarColor })
-  avatarColor?: UserAvatarColor;
-}
-
-export class UserResponseDto {
-  id!: string;
-  name!: string;
-  email!: string;
-  profileImagePath!: string;
-  @IsEnum(UserAvatarColor)
-  @ApiProperty({ enumName: 'UserAvatarColor', enum: UserAvatarColor })
-  avatarColor!: UserAvatarColor;
-}
-
-export const mapUser = (entity: UserEntity): UserResponseDto => {
-  return {
-    id: entity.id,
-    email: entity.email,
-    name: entity.name,
-    profileImagePath: entity.profileImagePath,
-    avatarColor: getPreferences(entity).avatar.color,
-  };
-};
-
-export class UserAdminSearchDto {
-  @ValidateBoolean({ optional: true })
-  withDeleted?: boolean;
-}
-
-export class UserAdminCreateDto {
   @IsEmail({ require_tld: false })
   @Transform(toEmail)
   email!: string;
@@ -92,7 +41,23 @@ export class UserAdminCreateDto {
   notify?: boolean;
 }
 
-export class UserAdminUpdateDto {
+export class CreateUserOAuthDto {
+  @IsEmail({ require_tld: false })
+  @Transform(({ value }) => value?.toLowerCase())
+  email!: string;
+
+  @IsNotEmpty()
+  oauthId!: string;
+
+  name?: string;
+}
+
+export class DeleteUserDto {
+  @ValidateBoolean({ optional: true })
+  force?: boolean;
+}
+
+export class UpdateUserDto {
   @Optional()
   @IsEmail({ require_tld: false })
   @Transform(toEmail)
@@ -108,10 +73,18 @@ export class UserAdminUpdateDto {
   @IsNotEmpty()
   name?: string;
 
-  @Optional({ nullable: true })
+  @Optional()
   @IsString()
   @Transform(toSanitized)
-  storageLabel?: string | null;
+  storageLabel?: string;
+
+  @IsNotEmpty()
+  @IsUUID('4')
+  @ApiProperty({ format: 'uuid' })
+  id!: string;
+
+  @ValidateBoolean({ optional: true })
+  isAdmin?: boolean;
 
   @ValidateBoolean({ optional: true })
   shouldChangePassword?: boolean;
@@ -131,12 +104,17 @@ export class UserAdminUpdateDto {
   quotaSizeInBytes?: number | null;
 }
 
-export class UserAdminDeleteDto {
+export class UserDto {
-  @ValidateBoolean({ optional: true })
+  id!: string;
-  force?: boolean;
+  name!: string;
+  email!: string;
+  profileImagePath!: string;
+  @IsEnum(UserAvatarColor)
+  @ApiProperty({ enumName: 'UserAvatarColor', enum: UserAvatarColor })
+  avatarColor!: UserAvatarColor;
 }
 
-export class UserAdminResponseDto extends UserResponseDto {
+export class UserResponseDto extends UserDto {
   storageLabel!: string | null;
   shouldChangePassword!: boolean;
   isAdmin!: boolean;
@@ -153,9 +131,19 @@ export class UserAdminResponseDto extends UserResponseDto {
   status!: string;
 }
 
-export function mapUserAdmin(entity: UserEntity): UserAdminResponseDto {
+export const mapSimpleUser = (entity: UserEntity): UserDto => {
   return {
-    ...mapUser(entity),
+    id: entity.id,
+    email: entity.email,
+    name: entity.name,
+    profileImagePath: entity.profileImagePath,
+    avatarColor: getPreferences(entity).avatar.color,
+  };
+};
+
+export function mapUser(entity: UserEntity): UserResponseDto {
+  return {
+    ...mapSimpleUser(entity),
     storageLabel: entity.storageLabel,
     shouldChangePassword: entity.shouldChangePassword,
     isAdmin: entity.isAdmin,

server/src/interfaces/media.interface.ts

@@ -53,7 +53,7 @@ export interface VideoInfo {
   audioStreams: AudioStreamInfo[];
 }
 
-export interface TranscodeCommand {
+export interface TranscodeOptions {
   inputOptions: string[];
   outputOptions: string[];
   twoPass: boolean;
@@ -67,7 +67,7 @@ export interface BitrateDistribution {
 }
 
 export interface VideoCodecSWConfig {
-  getCommand(target: TranscodeTarget, videoStream: VideoStreamInfo, audioStream: AudioStreamInfo): TranscodeCommand;
+  getOptions(target: TranscodeTarget, videoStream: VideoStreamInfo, audioStream: AudioStreamInfo): TranscodeOptions;
 }
 
 export interface VideoCodecHWConfig extends VideoCodecSWConfig {
@@ -83,5 +83,5 @@ export interface IMediaRepository {
 
   // video
   probe(input: string): Promise<VideoInfo>;
-  transcode(input: string, output: string | Writable, command: TranscodeCommand): Promise<void>;
+  transcode(input: string, output: string | Writable, options: TranscodeOptions): Promise<void>;
 }

server/src/interfaces/search.interface.ts

@@ -155,9 +155,8 @@ export interface FaceEmbeddingSearch extends SearchEmbeddingOptions {
 export interface AssetDuplicateSearch {
   assetId: string;
   embedding: Embedding;
-  maxDistance?: number;
-  type: AssetType;
   userIds: string[];
+  maxDistance?: number;
 }
 
 export interface FaceSearchResult {

server/src/queries/access.repository.sql

@@ -153,7 +153,6 @@ FROM
   AND ("asset"."deletedAt" IS NULL)
 WHERE
   "partner"."sharedWithId" = $1
-  AND "asset"."isArchived" = false
   AND "asset"."id" IN ($2)
 
 -- AccessRepository.asset.checkSharedLinkAccess

server/src/queries/api.key.repository.sql

@@ -22,17 +22,13 @@ FROM
       "APIKeyEntity__APIKeyEntity_user"."status" AS "APIKeyEntity__APIKeyEntity_user_status",
       "APIKeyEntity__APIKeyEntity_user"."updatedAt" AS "APIKeyEntity__APIKeyEntity_user_updatedAt",
       "APIKeyEntity__APIKeyEntity_user"."quotaSizeInBytes" AS "APIKeyEntity__APIKeyEntity_user_quotaSizeInBytes",
-      "APIKeyEntity__APIKeyEntity_user"."quotaUsageInBytes" AS "APIKeyEntity__APIKeyEntity_user_quotaUsageInBytes",
+      "APIKeyEntity__APIKeyEntity_user"."quotaUsageInBytes" AS "APIKeyEntity__APIKeyEntity_user_quotaUsageInBytes"
-      "7f5f7a38bf327bfbbf826778460704c9a50fe6f4"."userId" AS "7f5f7a38bf327bfbbf826778460704c9a50fe6f4_userId",
-      "7f5f7a38bf327bfbbf826778460704c9a50fe6f4"."key" AS "7f5f7a38bf327bfbbf826778460704c9a50fe6f4_key",
-      "7f5f7a38bf327bfbbf826778460704c9a50fe6f4"."value" AS "7f5f7a38bf327bfbbf826778460704c9a50fe6f4_value"
     FROM
       "api_keys" "APIKeyEntity"
       LEFT JOIN "users" "APIKeyEntity__APIKeyEntity_user" ON "APIKeyEntity__APIKeyEntity_user"."id" = "APIKeyEntity"."userId"
       AND (
         "APIKeyEntity__APIKeyEntity_user"."deletedAt" IS NULL
       )
-      LEFT JOIN "user_metadata" "7f5f7a38bf327bfbbf826778460704c9a50fe6f4" ON "7f5f7a38bf327bfbbf826778460704c9a50fe6f4"."userId" = "APIKeyEntity__APIKeyEntity_user"."id"
     WHERE
       (("APIKeyEntity"."key" = $1))
   ) "distinctAlias"

server/src/queries/search.repository.sql

@@ -204,7 +204,6 @@ WITH
         "asset"."ownerId" IN ($2)
         AND "asset"."id" != $3
         AND "asset"."isVisible" = $4
-        AND "asset"."type" = $5
       )
       AND ("asset"."deletedAt" IS NULL)
     ORDER BY
@@ -217,7 +216,7 @@ SELECT
 FROM
   "cte" "res"
 WHERE
-  res.distance <= $6
+  res.distance <= $5
 
 -- SearchRepository.searchFaces
 START TRANSACTION

server/src/queries/session.repository.sql

@@ -38,17 +38,13 @@ FROM
       "SessionEntity__SessionEntity_user"."status" AS "SessionEntity__SessionEntity_user_status",
       "SessionEntity__SessionEntity_user"."updatedAt" AS "SessionEntity__SessionEntity_user_updatedAt",
       "SessionEntity__SessionEntity_user"."quotaSizeInBytes" AS "SessionEntity__SessionEntity_user_quotaSizeInBytes",
-      "SessionEntity__SessionEntity_user"."quotaUsageInBytes" AS "SessionEntity__SessionEntity_user_quotaUsageInBytes",
+      "SessionEntity__SessionEntity_user"."quotaUsageInBytes" AS "SessionEntity__SessionEntity_user_quotaUsageInBytes"
-      "469e6aa7ff79eff78f8441f91ba15bb07d3634dd"."userId" AS "469e6aa7ff79eff78f8441f91ba15bb07d3634dd_userId",
-      "469e6aa7ff79eff78f8441f91ba15bb07d3634dd"."key" AS "469e6aa7ff79eff78f8441f91ba15bb07d3634dd_key",
-      "469e6aa7ff79eff78f8441f91ba15bb07d3634dd"."value" AS "469e6aa7ff79eff78f8441f91ba15bb07d3634dd_value"
     FROM
       "sessions" "SessionEntity"
       LEFT JOIN "users" "SessionEntity__SessionEntity_user" ON "SessionEntity__SessionEntity_user"."id" = "SessionEntity"."userId"
       AND (
         "SessionEntity__SessionEntity_user"."deletedAt" IS NULL
       )
-      LEFT JOIN "user_metadata" "469e6aa7ff79eff78f8441f91ba15bb07d3634dd" ON "469e6aa7ff79eff78f8441f91ba15bb07d3634dd"."userId" = "SessionEntity__SessionEntity_user"."id"
     WHERE
       (("SessionEntity"."token" = $1))
   ) "distinctAlias"

server/src/repositories/access.repository.ts

@@ -240,7 +240,6 @@ class AssetAccess implements IAssetAccess {
       .innerJoin('sharedBy.assets', 'asset')
       .select('asset.id', 'assetId')
       .where('partner.sharedWithId = :userId', { userId })
-      .andWhere('asset.isArchived = false')
       .andWhere('asset.id IN (:...assetIds)', { assetIds: [...assetIds] })
       .getRawMany()
       .then((rows) => new Set(rows.map((row) => row.assetId)));

server/src/repositories/api-key.repository.ts

@@ -34,9 +34,7 @@ export class ApiKeyRepository implements IKeyRepository {
       },
       where: { key: hashedToken },
       relations: {
-        user: {
+        user: true,
-          metadata: true,
-        },
       },
     });
   }

server/src/repositories/machine-learning.repository.ts

@@ -19,11 +19,9 @@ export class MachineLearningRepository implements IMachineLearningRepository {
   private async predict<T>(url: string, input: TextModelInput | VisionModelInput, config: ModelConfig): Promise<T> {
     const formData = await this.getFormData(input, config);
 
-    const res = await fetch(new URL('/predict', url), { method: 'POST', body: formData }).catch(
+    const res = await fetch(`${url}/predict`, { method: 'POST', body: formData }).catch((error: Error | any) => {
-      (error: Error | any) => {
+      throw new Error(`${errorPrefix} to "${url}" failed with ${error?.cause || error}`);
-        throw new Error(`${errorPrefix} to "${url}" failed with ${error?.cause || error}`);
+    });
-      },
-    );
 
     if (res.status >= 400) {
       const modelType = config.modelType ? ` for ${config.modelType.replace('-', ' ')}` : '';

server/src/repositories/media.repository.ts

@@ -11,7 +11,7 @@ import {
   IMediaRepository,
   ImageDimensions,
   ThumbnailOptions,
-  TranscodeCommand,
+  TranscodeOptions,
   VideoInfo,
 } from 'src/interfaces/media.interface';
 import { Instrumentation } from 'src/utils/instrumentation';
@@ -97,7 +97,7 @@ export class MediaRepository implements IMediaRepository {
     };
   }
 
-  transcode(input: string, output: string | Writable, options: TranscodeCommand): Promise<void> {
+  transcode(input: string, output: string | Writable, options: TranscodeOptions): Promise<void> {
     if (!options.twoPass) {
       return new Promise((resolve, reject) => {
         this.configureFfmpegCall(input, output, options).on('error', reject).on('end', resolve).run();
@@ -150,7 +150,7 @@ export class MediaRepository implements IMediaRepository {
     return { width, height };
   }
 
-  private configureFfmpegCall(input: string, output: string | Writable, options: TranscodeCommand) {
+  private configureFfmpegCall(input: string, output: string | Writable, options: TranscodeOptions) {
     return ffmpeg(input, { niceness: 10 })
       .inputOptions(options.inputOptions)
       .outputOptions(options.outputOptions)

server/src/repositories/search.repository.ts

@@ -160,7 +160,6 @@ export class SearchRepository implements ISearchRepository {
     assetId,
     embedding,
     maxDistance,
-    type,
     userIds,
   }: AssetDuplicateSearch): Promise<AssetDuplicateResult[]> {
     const cte = this.assetRepository.createQueryBuilder('asset');
@@ -172,22 +171,18 @@ export class SearchRepository implements ISearchRepository {
       .where('asset.ownerId IN (:...userIds )')
       .andWhere('asset.id != :assetId')
       .andWhere('asset.isVisible = :isVisible')
-      .andWhere('asset.type = :type')
       .orderBy('search.embedding <=> :embedding')
       .limit(64)
-      .setParameters({ assetId, embedding: asVector(embedding), isVisible: true, type, userIds });
+      .setParameters({ assetId, embedding: asVector(embedding), isVisible: true, userIds });
 
     const builder = this.assetRepository.manager
       .createQueryBuilder()
       .addCommonTableExpression(cte, 'cte')
       .from('cte', 'res')
-      .select('res.*');
+      .select('res.*')
+      .where('res.distance <= :maxDistance', { maxDistance });
 
-    if (maxDistance) {
+    return builder.getRawMany() as any as Promise<AssetDuplicateResult[]>;
-      builder.where('res.distance <= :maxDistance', { maxDistance });
-    }
-
-    return builder.getRawMany() as Promise<AssetDuplicateResult[]>;
   }
 
   @GenerateSql({

server/src/repositories/session.repository.ts

@@ -18,14 +18,7 @@ export class SessionRepository implements ISessionRepository {
 
   @GenerateSql({ params: [DummyValue.STRING] })
   getByToken(token: string): Promise<SessionEntity | null> {
-    return this.repository.findOne({
+    return this.repository.findOne({ where: { token }, relations: { user: true } });
-      where: { token },
-      relations: {
-        user: {
-          metadata: true,
-        },
-      },
-    });
   }
 
   getByUserId(userId: string): Promise<SessionEntity[]> {

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

@@ -138,7 +138,6 @@ describe('AuthService', () => {
         email: 'test@immich.com',
         password: 'hash-password',
       } as UserEntity);
-      userMock.update.mockResolvedValue(userStub.user1);
 
       await sut.changePassword(auth, dto);
 

server/src/services/auth.service.ts

@@ -11,7 +11,7 @@ import { DateTime } from 'luxon';
 import { IncomingHttpHeaders } from 'node:http';
 import { ClientMetadata, Issuer, UserinfoResponse, custom, generators } from 'openid-client';
 import { SystemConfig } from 'src/config';
-import { AuthType, LOGIN_URL, MOBILE_REDIRECT, SALT_ROUNDS } from 'src/constants';
+import { AuthType, LOGIN_URL, MOBILE_REDIRECT } from 'src/constants';
 import { SystemConfigCore } from 'src/cores/system-config.core';
 import { UserCore } from 'src/cores/user.core';
 import {
@@ -27,7 +27,7 @@ import {
   SignUpDto,
   mapLoginResponse,
 } from 'src/dtos/auth.dto';
-import { UserAdminResponseDto, mapUserAdmin } from 'src/dtos/user.dto';
+import { UserResponseDto, mapUser } from 'src/dtos/user.dto';
 import { UserEntity } from 'src/entities/user.entity';
 import { IKeyRepository } from 'src/interfaces/api-key.interface';
 import { ICryptoRepository } from 'src/interfaces/crypto.interface';
@@ -109,7 +109,7 @@ export class AuthService {
     };
   }
 
-  async changePassword(auth: AuthDto, dto: ChangePasswordDto): Promise<UserAdminResponseDto> {
+  async changePassword(auth: AuthDto, dto: ChangePasswordDto) {
     const { password, newPassword } = dto;
     const user = await this.userRepository.getByEmail(auth.user.email, true);
     if (!user) {
@@ -121,14 +121,10 @@ export class AuthService {
       throw new BadRequestException('Wrong password');
     }
 
-    const hashedPassword = await this.cryptoRepository.hashBcrypt(newPassword, SALT_ROUNDS);
+    return this.userCore.updateUser(auth.user, auth.user.id, { password: newPassword });
-
-    const updatedUser = await this.userRepository.update(user.id, { password: hashedPassword });
-
-    return mapUserAdmin(updatedUser);
   }
 
-  async adminSignUp(dto: SignUpDto): Promise<UserAdminResponseDto> {
+  async adminSignUp(dto: SignUpDto): Promise<UserResponseDto> {
     const adminUser = await this.userRepository.getAdmin();
     if (adminUser) {
       throw new BadRequestException('The server already has an admin');
@@ -142,7 +138,7 @@ export class AuthService {
       storageLabel: 'admin',
     });
 
-    return mapUserAdmin(admin);
+    return mapUser(admin);
   }
 
   async validate(headers: IncomingHttpHeaders, params: Record<string, string>): Promise<AuthDto> {
@@ -241,7 +237,7 @@ export class AuthService {
     return this.createLoginResponse(user, loginDetails);
   }
 
-  async link(auth: AuthDto, dto: OAuthCallbackDto): Promise<UserAdminResponseDto> {
+  async link(auth: AuthDto, dto: OAuthCallbackDto): Promise<UserResponseDto> {
     const config = await this.configCore.getConfig();
     const { sub: oauthId } = await this.getOAuthProfile(config, dto.url);
     const duplicate = await this.userRepository.getByOAuthId(oauthId);
@@ -249,14 +245,11 @@ export class AuthService {
       this.logger.warn(`OAuth link account failed: sub is already linked to another user (${duplicate.email}).`);
       throw new BadRequestException('This OAuth account has already been linked to another user.');
     }
-
+    return mapUser(await this.userRepository.update(auth.user.id, { oauthId }));
-    const user = await this.userRepository.update(auth.user.id, { oauthId });
-    return mapUserAdmin(user);
   }
 
-  async unlink(auth: AuthDto): Promise<UserAdminResponseDto> {
+  async unlink(auth: AuthDto): Promise<UserResponseDto> {
-    const user = await this.userRepository.update(auth.user.id, { oauthId: '' });
+    return mapUser(await this.userRepository.update(auth.user.id, { oauthId: '' }));
-    return mapUserAdmin(user);
   }
 
   private async getLogoutEndpoint(authType: AuthType): Promise<string> {

server/src/services/cli.service.ts

@@ -1,7 +1,7 @@
 import { Inject, Injectable } from '@nestjs/common';
-import { SALT_ROUNDS } from 'src/constants';
 import { SystemConfigCore } from 'src/cores/system-config.core';
-import { UserAdminResponseDto, mapUserAdmin } from 'src/dtos/user.dto';
+import { UserCore } from 'src/cores/user.core';
+import { UserResponseDto, mapUser } from 'src/dtos/user.dto';
 import { ICryptoRepository } from 'src/interfaces/crypto.interface';
 import { ILoggerRepository } from 'src/interfaces/logger.interface';
 import { ISystemMetadataRepository } from 'src/interfaces/system-metadata.interface';
@@ -10,6 +10,7 @@ import { IUserRepository } from 'src/interfaces/user.interface';
 @Injectable()
 export class CliService {
   private configCore: SystemConfigCore;
+  private userCore: UserCore;
 
   constructor(
     @Inject(ICryptoRepository) private cryptoRepository: ICryptoRepository,
@@ -17,26 +18,26 @@ export class CliService {
     @Inject(IUserRepository) private userRepository: IUserRepository,
     @Inject(ILoggerRepository) private logger: ILoggerRepository,
   ) {
+    this.userCore = UserCore.create(cryptoRepository, userRepository);
     this.logger.setContext(CliService.name);
     this.configCore = SystemConfigCore.create(systemMetadataRepository, this.logger);
   }
 
-  async listUsers(): Promise<UserAdminResponseDto[]> {
+  async listUsers(): Promise<UserResponseDto[]> {
     const users = await this.userRepository.getList({ withDeleted: true });
-    return users.map((user) => mapUserAdmin(user));
+    return users.map((user) => mapUser(user));
   }
 
-  async resetAdminPassword(ask: (admin: UserAdminResponseDto) => Promise<string | undefined>) {
+  async resetAdminPassword(ask: (admin: UserResponseDto) => Promise<string | undefined>) {
     const admin = await this.userRepository.getAdmin();
     if (!admin) {
       throw new Error('Admin account does not exist');
     }
 
-    const providedPassword = await ask(mapUserAdmin(admin));
+    const providedPassword = await ask(mapUser(admin));
     const password = providedPassword || this.cryptoRepository.newPassword(24);
-    const hashedPassword = await this.cryptoRepository.hashBcrypt(password, SALT_ROUNDS);
 
-    await this.userRepository.update(admin.id, { password: hashedPassword });
+    await this.userCore.updateUser(admin, admin.id, { password });
 
     return { admin, password, provided: !!providedPassword };
   }

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

@@ -214,8 +214,7 @@ describe(SearchService.name, () => {
       expect(searchMock.searchDuplicates).toHaveBeenCalledWith({
         assetId: assetStub.hasEmbedding.id,
         embedding: assetStub.hasEmbedding.smartSearch!.embedding,
-        maxDistance: 0.0155,
+        maxDistance: 0.03,
-        type: assetStub.hasEmbedding.type,
         userIds: [assetStub.hasEmbedding.ownerId],
       });
       expect(assetMock.updateDuplicates).toHaveBeenCalledWith({
@@ -240,8 +239,7 @@ describe(SearchService.name, () => {
       expect(searchMock.searchDuplicates).toHaveBeenCalledWith({
         assetId: assetStub.hasEmbedding.id,
         embedding: assetStub.hasEmbedding.smartSearch!.embedding,
-        maxDistance: 0.0155,
+        maxDistance: 0.03,
-        type: assetStub.hasEmbedding.type,
         userIds: [assetStub.hasEmbedding.ownerId],
       });
       expect(assetMock.updateDuplicates).toHaveBeenCalledWith({

server/src/services/duplicate.service.ts

@@ -94,7 +94,6 @@ export class DuplicateService {
       assetId: asset.id,
       embedding: asset.smartSearch.embedding,
       maxDistance: machineLearning.duplicateDetection.maxDistance,
-      type: asset.type,
       userIds: [asset.ownerId],
     });
 

server/src/services/index.ts

@@ -33,7 +33,6 @@ import { SystemMetadataService } from 'src/services/system-metadata.service';
 import { TagService } from 'src/services/tag.service';
 import { TimelineService } from 'src/services/timeline.service';
 import { TrashService } from 'src/services/trash.service';
-import { UserAdminService } from 'src/services/user-admin.service';
 import { UserService } from 'src/services/user.service';
 import { VersionService } from 'src/services/version.service';
 
@@ -74,6 +73,5 @@ export const services = [
   TimelineService,
   TrashService,
   UserService,
-  UserAdminService,
   VersionService,
 ];

server/src/services/media.service.ts

@@ -27,12 +27,25 @@ import {
   QueueName,
 } from 'src/interfaces/job.interface';
 import { ILoggerRepository } from 'src/interfaces/logger.interface';
-import { AudioStreamInfo, IMediaRepository, VideoStreamInfo } from 'src/interfaces/media.interface';
+import { AudioStreamInfo, IMediaRepository, VideoCodecHWConfig, VideoStreamInfo } from 'src/interfaces/media.interface';
 import { IMoveRepository } from 'src/interfaces/move.interface';
 import { IPersonRepository } from 'src/interfaces/person.interface';
 import { IStorageRepository } from 'src/interfaces/storage.interface';
 import { ISystemMetadataRepository } from 'src/interfaces/system-metadata.interface';
-import { BaseConfig, ThumbnailConfig } from 'src/utils/media';
+import {
+  AV1Config,
+  H264Config,
+  HEVCConfig,
+  NvencHwDecodeConfig,
+  NvencSwDecodeConfig,
+  QsvHwDecodeConfig,
+  QsvSwDecodeConfig,
+  RkmppHwDecodeConfig,
+  RkmppSwDecodeConfig,
+  ThumbnailConfig,
+  VAAPIConfig,
+  VP9Config,
+} from 'src/utils/media';
 import { mimeTypes } from 'src/utils/mime-types';
 import { usePagination } from 'src/utils/pagination';
 
@@ -40,8 +53,8 @@ import { usePagination } from 'src/utils/pagination';
 export class MediaService {
   private configCore: SystemConfigCore;
   private storageCore: StorageCore;
-  private maliOpenCL?: boolean;
+  private openCL: boolean | null = null;
-  private devices?: string[];
+  private devices: string[] | null = null;
 
   constructor(
     @Inject(IAssetRepository) private assetRepository: IAssetRepository,
@@ -188,7 +201,6 @@ export class MediaService {
     const { image, ffmpeg } = await this.configCore.getConfig();
     const size = type === AssetPathType.PREVIEW ? image.previewSize : image.thumbnailSize;
     const path = StorageCore.getImagePath(asset, type, format);
-    const tmpPath = `${StorageCore.getTempPathInDir(dirname(path))}.${format}`;
     this.storageCore.ensureFolders(path);
 
     switch (asset.type) {
@@ -202,11 +214,8 @@ export class MediaService {
           const colorspace = this.isSRGB(asset) ? Colorspace.SRGB : image.colorspace;
           const imageOptions = { format, size, colorspace, quality: image.quality };
 
-          const inputPath = useExtracted ? extractedPath : asset.originalPath;
+          const outputPath = useExtracted ? extractedPath : asset.originalPath;
-          await this.mediaRepository.generateThumbnail(inputPath, tmpPath, imageOptions);
+          await this.mediaRepository.generateThumbnail(outputPath, path, imageOptions);
-        } catch (error) {
-          await this.storageRepository.unlink(tmpPath);
-          throw error;
         } finally {
           if (didExtract) {
             await this.storageRepository.unlink(extractedPath);
@@ -223,14 +232,9 @@ export class MediaService {
           return;
         }
         const mainAudioStream = this.getMainStream(audioStreams);
-        const config = ThumbnailConfig.create({ ...ffmpeg, targetResolution: size.toString() });
+        const config = { ...ffmpeg, targetResolution: size.toString() };
-        const options = config.getCommand(TranscodeTarget.VIDEO, mainVideoStream, mainAudioStream);
+        const options = new ThumbnailConfig(config).getOptions(TranscodeTarget.VIDEO, mainVideoStream, mainAudioStream);
-        try {
+        await this.mediaRepository.transcode(asset.originalPath, path, options);
-          await this.mediaRepository.transcode(asset.originalPath, tmpPath, options);
-        } catch (error) {
-          await this.storageRepository.unlink(tmpPath);
-          throw error;
-        }
         break;
       }
 
@@ -238,9 +242,6 @@ export class MediaService {
         throw new UnsupportedMediaTypeException(`Unsupported asset type for thumbnail generation: ${asset.type}`);
       }
     }
-
-    await this.storageRepository.rename(tmpPath, path);
-
     this.logger.log(
       `Successfully generated ${format.toUpperCase()} ${asset.type.toLowerCase()} ${type} for asset ${asset.id}`,
     );
@@ -330,8 +331,8 @@ export class MediaService {
       return JobStatus.FAILED;
     }
 
-    const { ffmpeg } = await this.configCore.getConfig();
+    const { ffmpeg: config } = await this.configCore.getConfig();
-    const target = this.getTranscodeTarget(ffmpeg, mainVideoStream, mainAudioStream);
+    const target = this.getTranscodeTarget(config, mainVideoStream, mainAudioStream);
     if (target === TranscodeTarget.NONE) {
       if (asset.encodedVideoPath) {
         this.logger.log(`Transcoded video exists for asset ${asset.id}, but is no longer required. Deleting...`);
@@ -342,40 +343,32 @@ export class MediaService {
       return JobStatus.SKIPPED;
     }
 
-    let command;
+    let transcodeOptions;
     try {
-      const config = BaseConfig.create(ffmpeg, await this.getDevices(), await this.hasMaliOpenCL());
+      transcodeOptions = await this.getCodecConfig(config).then((c) =>
-      command = config.getCommand(target, mainVideoStream, mainAudioStream);
+        c.getOptions(target, mainVideoStream, mainAudioStream),
+      );
     } catch (error) {
       this.logger.error(`An error occurred while configuring transcoding options: ${error}`);
       return JobStatus.FAILED;
     }
 
-    this.logger.log(`Started encoding video ${asset.id} ${JSON.stringify(command)}`);
+    this.logger.log(`Started encoding video ${asset.id} ${JSON.stringify(transcodeOptions)}`);
-    const tmpPath = StorageCore.getTempPathInDir(dirname(output));
     try {
-      await this.mediaRepository.transcode(input, tmpPath, command);
+      await this.mediaRepository.transcode(input, output, transcodeOptions);
     } catch (error) {
       this.logger.error(error);
-      if (ffmpeg.accel !== TranscodeHWAccel.DISABLED) {
+      if (config.accel !== TranscodeHWAccel.DISABLED) {
         this.logger.error(
-          `Error occurred during transcoding. Retrying with ${ffmpeg.accel.toUpperCase()} acceleration disabled.`,
+          `Error occurred during transcoding. Retrying with ${config.accel.toUpperCase()} acceleration disabled.`,
         );
       }
-
+      transcodeOptions = await this.getCodecConfig({ ...config, accel: TranscodeHWAccel.DISABLED }).then((c) =>
-      try {
+        c.getOptions(target, mainVideoStream, mainAudioStream),
-        const config = BaseConfig.create({ ...ffmpeg, accel: TranscodeHWAccel.DISABLED });
+      );
-        command = config.getCommand(target, mainVideoStream, mainAudioStream);
+      await this.mediaRepository.transcode(input, output, transcodeOptions);
-        await this.mediaRepository.transcode(input, tmpPath, command);
-      } catch (error) {
-        this.logger.error(error);
-        await this.storageRepository.unlink(tmpPath);
-        return JobStatus.FAILED;
-      }
     }
 
-    await this.storageRepository.rename(tmpPath, output);
-
     this.logger.log(`Successfully encoded ${asset.id}`);
 
     await this.assetRepository.update({ id: asset.id, encodedVideoPath: output });
@@ -389,10 +382,10 @@ export class MediaService {
 
   private getTranscodeTarget(
     config: SystemConfigFFmpegDto,
-    videoStream?: VideoStreamInfo,
+    videoStream: VideoStreamInfo | null,
-    audioStream?: AudioStreamInfo,
+    audioStream: AudioStreamInfo | null,
   ): TranscodeTarget {
-    if (!videoStream && !audioStream) {
+    if (videoStream == null && audioStream == null) {
       return TranscodeTarget.NONE;
     }
 
@@ -414,8 +407,8 @@ export class MediaService {
     return TranscodeTarget.NONE;
   }
 
-  private isAudioTranscodeRequired(ffmpegConfig: SystemConfigFFmpegDto, stream?: AudioStreamInfo): boolean {
+  private isAudioTranscodeRequired(ffmpegConfig: SystemConfigFFmpegDto, stream: AudioStreamInfo | null): boolean {
-    if (!stream) {
+    if (stream == null) {
       return false;
     }
 
@@ -437,8 +430,8 @@ export class MediaService {
     }
   }
 
-  private isVideoTranscodeRequired(ffmpegConfig: SystemConfigFFmpegDto, stream?: VideoStreamInfo): boolean {
+  private isVideoTranscodeRequired(ffmpegConfig: SystemConfigFFmpegDto, stream: VideoStreamInfo | null): boolean {
-    if (!stream) {
+    if (stream == null) {
       return false;
     }
 
@@ -472,6 +465,70 @@ export class MediaService {
     }
   }
 
+  async getCodecConfig(config: SystemConfigFFmpegDto) {
+    if (config.accel === TranscodeHWAccel.DISABLED) {
+      return this.getSWCodecConfig(config);
+    }
+    return this.getHWCodecConfig(config);
+  }
+
+  private getSWCodecConfig(config: SystemConfigFFmpegDto) {
+    switch (config.targetVideoCodec) {
+      case VideoCodec.H264: {
+        return new H264Config(config);
+      }
+      case VideoCodec.HEVC: {
+        return new HEVCConfig(config);
+      }
+      case VideoCodec.VP9: {
+        return new VP9Config(config);
+      }
+      case VideoCodec.AV1: {
+        return new AV1Config(config);
+      }
+      default: {
+        throw new UnsupportedMediaTypeException(`Codec '${config.targetVideoCodec}' is unsupported`);
+      }
+    }
+  }
+
+  private async getHWCodecConfig(config: SystemConfigFFmpegDto) {
+    let handler: VideoCodecHWConfig;
+    switch (config.accel) {
+      case TranscodeHWAccel.NVENC: {
+        handler = config.accelDecode ? new NvencHwDecodeConfig(config) : new NvencSwDecodeConfig(config);
+        break;
+      }
+      case TranscodeHWAccel.QSV: {
+        handler = config.accelDecode
+          ? new QsvHwDecodeConfig(config, await this.getDevices())
+          : new QsvSwDecodeConfig(config, await this.getDevices());
+        break;
+      }
+      case TranscodeHWAccel.VAAPI: {
+        handler = new VAAPIConfig(config, await this.getDevices());
+        break;
+      }
+      case TranscodeHWAccel.RKMPP: {
+        handler =
+          config.accelDecode && (await this.hasOpenCL())
+            ? new RkmppHwDecodeConfig(config, await this.getDevices())
+            : new RkmppSwDecodeConfig(config, await this.getDevices());
+        break;
+      }
+      default: {
+        throw new UnsupportedMediaTypeException(`${config.accel.toUpperCase()} acceleration is unsupported`);
+      }
+    }
+    if (!handler.getSupportedCodecs().includes(config.targetVideoCodec)) {
+      throw new UnsupportedMediaTypeException(
+        `${config.accel.toUpperCase()} acceleration does not support codec '${config.targetVideoCodec.toUpperCase()}'. Supported codecs: ${handler.getSupportedCodecs()}`,
+      );
+    }
+
+    return handler;
+  }
+
   isSRGB(asset: AssetEntity): boolean {
     const { colorspace, profileDescription, bitsPerSample } = asset.exifInfo ?? {};
     if (colorspace || profileDescription) {
@@ -510,29 +567,24 @@ export class MediaService {
 
   private async getDevices() {
     if (!this.devices) {
-      try {
+      this.devices = await this.storageRepository.readdir('/dev/dri');
-        this.devices = await this.storageRepository.readdir('/dev/dri');
-      } catch {
-        this.logger.debug('No devices found in /dev/dri.');
-        this.devices = [];
-      }
     }
 
     return this.devices;
   }
 
-  private async hasMaliOpenCL() {
+  private async hasOpenCL() {
-    if (this.maliOpenCL === undefined) {
+    if (this.openCL === null) {
       try {
         const maliIcdStat = await this.storageRepository.stat('/etc/OpenCL/vendors/mali.icd');
         const maliDeviceStat = await this.storageRepository.stat('/dev/mali0');
-        this.maliOpenCL = maliIcdStat.isFile() && maliDeviceStat.isCharacterDevice();
+        this.openCL = maliIcdStat.isFile() && maliDeviceStat.isCharacterDevice();
       } catch {
-        this.logger.debug('OpenCL not available for transcoding, using CPU decoding instead.');
+        this.logger.warn('OpenCL not available for transcoding, using CPU instead.');
-        this.maliOpenCL = false;
+        this.openCL = false;
       }
     }
 
-    return this.maliOpenCL;
+    return this.openCL;
   }
 }

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

@@ -1,4 +1,6 @@
 import { BadRequestException } from '@nestjs/common';
+import { PartnerResponseDto } from 'src/dtos/partner.dto';
+import { UserAvatarColor } from 'src/entities/user-metadata.entity';
 import { IAccessRepository } from 'src/interfaces/access.interface';
 import { IPartnerRepository, PartnerDirection } from 'src/interfaces/partner.interface';
 import { PartnerService } from 'src/services/partner.service';
@@ -7,6 +9,45 @@ import { partnerStub } from 'test/fixtures/partner.stub';
 import { newPartnerRepositoryMock } from 'test/repositories/partner.repository.mock';
 import { Mocked } from 'vitest';
 
+const responseDto = {
+  admin: <PartnerResponseDto>{
+    email: 'admin@test.com',
+    name: 'admin_name',
+    id: 'admin_id',
+    isAdmin: true,
+    oauthId: '',
+    profileImagePath: '',
+    shouldChangePassword: false,
+    storageLabel: 'admin',
+    createdAt: new Date('2021-01-01'),
+    deletedAt: null,
+    updatedAt: new Date('2021-01-01'),
+    memoriesEnabled: true,
+    avatarColor: UserAvatarColor.GRAY,
+    quotaSizeInBytes: null,
+    inTimeline: true,
+    quotaUsageInBytes: 0,
+  },
+  user1: <PartnerResponseDto>{
+    email: 'immich@test.com',
+    name: 'immich_name',
+    id: 'user-id',
+    isAdmin: false,
+    oauthId: '',
+    profileImagePath: '',
+    shouldChangePassword: false,
+    storageLabel: null,
+    createdAt: new Date('2021-01-01'),
+    deletedAt: null,
+    updatedAt: new Date('2021-01-01'),
+    memoriesEnabled: true,
+    avatarColor: UserAvatarColor.PRIMARY,
+    inTimeline: true,
+    quotaSizeInBytes: null,
+    quotaUsageInBytes: 0,
+  },
+};
+
 describe(PartnerService.name, () => {
   let sut: PartnerService;
   let partnerMock: Mocked<IPartnerRepository>;
@@ -24,13 +65,13 @@ describe(PartnerService.name, () => {
   describe('getAll', () => {
     it("should return a list of partners with whom I've shared my library", async () => {
       partnerMock.getAll.mockResolvedValue([partnerStub.adminToUser1, partnerStub.user1ToAdmin1]);
-      await expect(sut.getAll(authStub.user1, PartnerDirection.SharedBy)).resolves.toBeDefined();
+      await expect(sut.getAll(authStub.user1, PartnerDirection.SharedBy)).resolves.toEqual([responseDto.admin]);
       expect(partnerMock.getAll).toHaveBeenCalledWith(authStub.user1.user.id);
     });
 
     it('should return a list of partners who have shared their libraries with me', async () => {
       partnerMock.getAll.mockResolvedValue([partnerStub.adminToUser1, partnerStub.user1ToAdmin1]);
-      await expect(sut.getAll(authStub.user1, PartnerDirection.SharedWith)).resolves.toBeDefined();
+      await expect(sut.getAll(authStub.user1, PartnerDirection.SharedWith)).resolves.toEqual([responseDto.admin]);
       expect(partnerMock.getAll).toHaveBeenCalledWith(authStub.user1.user.id);
     });
   });
@@ -40,7 +81,7 @@ describe(PartnerService.name, () => {
       partnerMock.get.mockResolvedValue(null);
       partnerMock.create.mockResolvedValue(partnerStub.adminToUser1);
 
-      await expect(sut.create(authStub.admin, authStub.user1.user.id)).resolves.toBeDefined();
+      await expect(sut.create(authStub.admin, authStub.user1.user.id)).resolves.toEqual(responseDto.user1);
 
       expect(partnerMock.create).toHaveBeenCalledWith({
         sharedById: authStub.admin.user.id,

server/src/services/partner.service.ts

@@ -25,7 +25,7 @@ export class PartnerService {
     }
 
     const partner = await this.repository.create(partnerId);
-    return this.mapPartner(partner, PartnerDirection.SharedBy);
+    return this.mapToPartnerEntity(partner, PartnerDirection.SharedBy);
   }
 
   async remove(auth: AuthDto, sharedWithId: string): Promise<void> {
@@ -44,7 +44,7 @@ export class PartnerService {
     return partners
       .filter((partner) => partner.sharedBy && partner.sharedWith) // Filter out soft deleted users
       .filter((partner) => partner[key] === auth.user.id)
-      .map((partner) => this.mapPartner(partner, direction));
+      .map((partner) => this.mapToPartnerEntity(partner, direction));
   }
 
   async update(auth: AuthDto, sharedById: string, dto: UpdatePartnerDto): Promise<PartnerResponseDto> {
@@ -52,10 +52,10 @@ export class PartnerService {
     const partnerId: PartnerIds = { sharedById, sharedWithId: auth.user.id };
 
     const entity = await this.repository.update({ ...partnerId, inTimeline: dto.inTimeline });
-    return this.mapPartner(entity, PartnerDirection.SharedWith);
+    return this.mapToPartnerEntity(entity, PartnerDirection.SharedWith);
   }
 
-  private mapPartner(partner: PartnerEntity, direction: PartnerDirection): PartnerResponseDto {
+  private mapToPartnerEntity(partner: PartnerEntity, direction: PartnerDirection): PartnerResponseDto {
     // this is opposite to return the non-me user of the "partner"
     const user = mapUser(
       direction === PartnerDirection.SharedBy ? partner.sharedWith : partner.sharedBy,

server/src/services/server-info.service.spec.ts

@@ -149,7 +149,7 @@ describe(ServerInfoService.name, () => {
     it('should respond the server features', async () => {
       await expect(sut.getFeatures()).resolves.toEqual({
         smartSearch: true,
-        duplicateDetection: true,
+        duplicateDetection: false,
         facialRecognition: true,
         map: true,
         reverseGeocoding: true,

server/src/services/system-config.service.spec.ts

@@ -81,8 +81,8 @@ const updatedConfig = Object.freeze<SystemConfig>({
       modelName: 'ViT-B-32__openai',
     },
     duplicateDetection: {
-      enabled: true,
+      enabled: false,
-      maxDistance: 0.0155,
+      maxDistance: 0.03,
     },
     facialRecognition: {
       enabled: true,

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

@@ -1,197 +0,0 @@
-import { BadRequestException, ForbiddenException } from '@nestjs/common';
-import { mapUserAdmin } from 'src/dtos/user.dto';
-import { UserStatus } from 'src/entities/user.entity';
-import { IAlbumRepository } from 'src/interfaces/album.interface';
-import { ICryptoRepository } from 'src/interfaces/crypto.interface';
-import { IJobRepository, JobName } from 'src/interfaces/job.interface';
-import { ILoggerRepository } from 'src/interfaces/logger.interface';
-import { IUserRepository } from 'src/interfaces/user.interface';
-import { UserAdminService } from 'src/services/user-admin.service';
-import { authStub } from 'test/fixtures/auth.stub';
-import { userStub } from 'test/fixtures/user.stub';
-import { newAlbumRepositoryMock } from 'test/repositories/album.repository.mock';
-import { newCryptoRepositoryMock } from 'test/repositories/crypto.repository.mock';
-import { newJobRepositoryMock } from 'test/repositories/job.repository.mock';
-import { newLoggerRepositoryMock } from 'test/repositories/logger.repository.mock';
-import { newUserRepositoryMock } from 'test/repositories/user.repository.mock';
-import { Mocked, describe } from 'vitest';
-
-describe(UserAdminService.name, () => {
-  let sut: UserAdminService;
-  let userMock: Mocked<IUserRepository>;
-  let cryptoRepositoryMock: Mocked<ICryptoRepository>;
-
-  let albumMock: Mocked<IAlbumRepository>;
-  let jobMock: Mocked<IJobRepository>;
-  let loggerMock: Mocked<ILoggerRepository>;
-
-  beforeEach(() => {
-    albumMock = newAlbumRepositoryMock();
-    cryptoRepositoryMock = newCryptoRepositoryMock();
-    jobMock = newJobRepositoryMock();
-    userMock = newUserRepositoryMock();
-    loggerMock = newLoggerRepositoryMock();
-
-    sut = new UserAdminService(albumMock, cryptoRepositoryMock, jobMock, userMock, loggerMock);
-
-    userMock.get.mockImplementation((userId) =>
-      Promise.resolve([userStub.admin, userStub.user1].find((user) => user.id === userId) ?? null),
-    );
-  });
-
-  describe('create', () => {
-    it('should not create a user if there is no local admin account', async () => {
-      userMock.getAdmin.mockResolvedValueOnce(null);
-
-      await expect(
-        sut.create({
-          email: 'john_smith@email.com',
-          name: 'John Smith',
-          password: 'password',
-        }),
-      ).rejects.toBeInstanceOf(BadRequestException);
-    });
-
-    it('should create user', async () => {
-      userMock.getAdmin.mockResolvedValue(userStub.admin);
-      userMock.create.mockResolvedValue(userStub.user1);
-
-      await expect(
-        sut.create({
-          email: userStub.user1.email,
-          name: userStub.user1.name,
-          password: 'password',
-          storageLabel: 'label',
-        }),
-      ).resolves.toEqual(mapUserAdmin(userStub.user1));
-
-      expect(userMock.getAdmin).toBeCalled();
-      expect(userMock.create).toBeCalledWith({
-        email: userStub.user1.email,
-        name: userStub.user1.name,
-        storageLabel: 'label',
-        password: expect.anything(),
-      });
-    });
-  });
-
-  describe('update', () => {
-    it('should update the user', async () => {
-      const update = {
-        shouldChangePassword: true,
-        email: 'immich@test.com',
-        storageLabel: 'storage_label',
-      };
-      userMock.getByEmail.mockResolvedValue(null);
-      userMock.getByStorageLabel.mockResolvedValue(null);
-      userMock.update.mockResolvedValue(userStub.user1);
-
-      await sut.update(authStub.user1, userStub.user1.id, update);
-
-      expect(userMock.getByEmail).toHaveBeenCalledWith(update.email);
-      expect(userMock.getByStorageLabel).toHaveBeenCalledWith(update.storageLabel);
-    });
-
-    it('should not set an empty string for storage label', async () => {
-      userMock.update.mockResolvedValue(userStub.user1);
-      await sut.update(authStub.admin, userStub.user1.id, { storageLabel: '' });
-      expect(userMock.update).toHaveBeenCalledWith(userStub.user1.id, {
-        storageLabel: null,
-        updatedAt: expect.any(Date),
-      });
-    });
-
-    it('should not change an email to one already in use', async () => {
-      const dto = { id: userStub.user1.id, email: 'updated@test.com' };
-
-      userMock.get.mockResolvedValue(userStub.user1);
-      userMock.getByEmail.mockResolvedValue(userStub.admin);
-
-      await expect(sut.update(authStub.admin, userStub.user1.id, dto)).rejects.toBeInstanceOf(BadRequestException);
-
-      expect(userMock.update).not.toHaveBeenCalled();
-    });
-
-    it('should not let the admin change the storage label to one already in use', async () => {
-      const dto = { id: userStub.user1.id, storageLabel: 'admin' };
-
-      userMock.get.mockResolvedValue(userStub.user1);
-      userMock.getByStorageLabel.mockResolvedValue(userStub.admin);
-
-      await expect(sut.update(authStub.admin, userStub.user1.id, dto)).rejects.toBeInstanceOf(BadRequestException);
-
-      expect(userMock.update).not.toHaveBeenCalled();
-    });
-
-    it('update user information should throw error if user not found', async () => {
-      userMock.get.mockResolvedValueOnce(null);
-
-      await expect(
-        sut.update(authStub.admin, userStub.user1.id, { shouldChangePassword: true }),
-      ).rejects.toBeInstanceOf(BadRequestException);
-    });
-  });
-
-  describe('delete', () => {
-    it('should throw error if user could not be found', async () => {
-      userMock.get.mockResolvedValue(null);
-
-      await expect(sut.delete(authStub.admin, userStub.admin.id, {})).rejects.toThrowError(BadRequestException);
-      expect(userMock.delete).not.toHaveBeenCalled();
-    });
-
-    it('cannot delete admin user', async () => {
-      await expect(sut.delete(authStub.admin, userStub.admin.id, {})).rejects.toBeInstanceOf(ForbiddenException);
-    });
-
-    it('should require the auth user be an admin', async () => {
-      await expect(sut.delete(authStub.user1, authStub.admin.user.id, {})).rejects.toBeInstanceOf(ForbiddenException);
-
-      expect(userMock.delete).not.toHaveBeenCalled();
-    });
-
-    it('should delete user', async () => {
-      userMock.get.mockResolvedValue(userStub.user1);
-      userMock.update.mockResolvedValue(userStub.user1);
-
-      await expect(sut.delete(authStub.admin, userStub.user1.id, {})).resolves.toEqual(mapUserAdmin(userStub.user1));
-      expect(userMock.update).toHaveBeenCalledWith(userStub.user1.id, {
-        status: UserStatus.DELETED,
-        deletedAt: expect.any(Date),
-      });
-    });
-
-    it('should force delete user', async () => {
-      userMock.get.mockResolvedValue(userStub.user1);
-      userMock.update.mockResolvedValue(userStub.user1);
-
-      await expect(sut.delete(authStub.admin, userStub.user1.id, { force: true })).resolves.toEqual(
-        mapUserAdmin(userStub.user1),
-      );
-
-      expect(userMock.update).toHaveBeenCalledWith(userStub.user1.id, {
-        status: UserStatus.REMOVING,
-        deletedAt: expect.any(Date),
-      });
-      expect(jobMock.queue).toHaveBeenCalledWith({
-        name: JobName.USER_DELETION,
-        data: { id: userStub.user1.id, force: true },
-      });
-    });
-  });
-
-  describe('restore', () => {
-    it('should throw error if user could not be found', async () => {
-      userMock.get.mockResolvedValue(null);
-      await expect(sut.restore(authStub.admin, userStub.admin.id)).rejects.toThrowError(BadRequestException);
-      expect(userMock.update).not.toHaveBeenCalled();
-    });
-
-    it('should restore an user', async () => {
-      userMock.get.mockResolvedValue(userStub.user1);
-      userMock.update.mockResolvedValue(userStub.user1);
-      await expect(sut.restore(authStub.admin, userStub.user1.id)).resolves.toEqual(mapUserAdmin(userStub.user1));
-      expect(userMock.update).toHaveBeenCalledWith(userStub.user1.id, { status: UserStatus.ACTIVE, deletedAt: null });
-    });
-  });
-});

server/src/services/user-admin.service.ts

@@ -1,154 +0,0 @@
-import { BadRequestException, ForbiddenException, Inject, Injectable } from '@nestjs/common';
-import { SALT_ROUNDS } from 'src/constants';
-import { UserCore } from 'src/cores/user.core';
-import { AuthDto } from 'src/dtos/auth.dto';
-import {
-  UserAdminCreateDto,
-  UserAdminDeleteDto,
-  UserAdminResponseDto,
-  UserAdminSearchDto,
-  UserAdminUpdateDto,
-  mapUserAdmin,
-} from 'src/dtos/user.dto';
-import { UserMetadataKey } from 'src/entities/user-metadata.entity';
-import { UserStatus } from 'src/entities/user.entity';
-import { IAlbumRepository } from 'src/interfaces/album.interface';
-import { ICryptoRepository } from 'src/interfaces/crypto.interface';
-import { IJobRepository, JobName } from 'src/interfaces/job.interface';
-import { ILoggerRepository } from 'src/interfaces/logger.interface';
-import { IUserRepository, UserFindOptions } from 'src/interfaces/user.interface';
-import { getPreferences, getPreferencesPartial } from 'src/utils/preferences';
-
-@Injectable()
-export class UserAdminService {
-  private userCore: UserCore;
-
-  constructor(
-    @Inject(IAlbumRepository) private albumRepository: IAlbumRepository,
-    @Inject(ICryptoRepository) private cryptoRepository: ICryptoRepository,
-    @Inject(IJobRepository) private jobRepository: IJobRepository,
-    @Inject(IUserRepository) private userRepository: IUserRepository,
-    @Inject(ILoggerRepository) private logger: ILoggerRepository,
-  ) {
-    this.userCore = UserCore.create(cryptoRepository, userRepository);
-    this.logger.setContext(UserAdminService.name);
-  }
-
-  async search(auth: AuthDto, dto: UserAdminSearchDto): Promise<UserAdminResponseDto[]> {
-    const users = await this.userRepository.getList({ withDeleted: dto.withDeleted });
-    return users.map((user) => mapUserAdmin(user));
-  }
-
-  async create(dto: UserAdminCreateDto): Promise<UserAdminResponseDto> {
-    const { memoriesEnabled, notify, ...rest } = dto;
-    let user = await this.userCore.createUser(rest);
-
-    // TODO remove and replace with entire dto.preferences config
-    if (memoriesEnabled === false) {
-      await this.userRepository.upsertMetadata(user.id, {
-        key: UserMetadataKey.PREFERENCES,
-        value: { memories: { enabled: false } },
-      });
-
-      user = await this.findOrFail(user.id, {});
-    }
-
-    const tempPassword = user.shouldChangePassword ? rest.password : undefined;
-    if (notify) {
-      await this.jobRepository.queue({ name: JobName.NOTIFY_SIGNUP, data: { id: user.id, tempPassword } });
-    }
-    return mapUserAdmin(user);
-  }
-
-  async get(auth: AuthDto, id: string): Promise<UserAdminResponseDto> {
-    const user = await this.findOrFail(id, { withDeleted: true });
-    return mapUserAdmin(user);
-  }
-
-  async update(auth: AuthDto, id: string, dto: UserAdminUpdateDto): Promise<UserAdminResponseDto> {
-    const user = await this.findOrFail(id, {});
-
-    if (dto.quotaSizeInBytes && user.quotaSizeInBytes !== dto.quotaSizeInBytes) {
-      await this.userRepository.syncUsage(id);
-    }
-
-    // TODO replace with entire preferences object
-    if (dto.memoriesEnabled !== undefined || dto.avatarColor) {
-      const newPreferences = getPreferences(user);
-      if (dto.memoriesEnabled !== undefined) {
-        newPreferences.memories.enabled = dto.memoriesEnabled;
-        delete dto.memoriesEnabled;
-      }
-
-      if (dto.avatarColor) {
-        newPreferences.avatar.color = dto.avatarColor;
-        delete dto.avatarColor;
-      }
-
-      await this.userRepository.upsertMetadata(id, {
-        key: UserMetadataKey.PREFERENCES,
-        value: getPreferencesPartial(user, newPreferences),
-      });
-    }
-
-    if (dto.email) {
-      const duplicate = await this.userRepository.getByEmail(dto.email);
-      if (duplicate && duplicate.id !== id) {
-        throw new BadRequestException('Email already in use by another account');
-      }
-    }
-
-    if (dto.storageLabel) {
-      const duplicate = await this.userRepository.getByStorageLabel(dto.storageLabel);
-      if (duplicate && duplicate.id !== id) {
-        throw new BadRequestException('Storage label already in use by another account');
-      }
-    }
-
-    if (dto.password) {
-      dto.password = await this.cryptoRepository.hashBcrypt(dto.password, SALT_ROUNDS);
-    }
-
-    if (dto.storageLabel === '') {
-      dto.storageLabel = null;
-    }
-
-    const updatedUser = await this.userRepository.update(id, { ...dto, updatedAt: new Date() });
-
-    return mapUserAdmin(updatedUser);
-  }
-
-  async delete(auth: AuthDto, id: string, dto: UserAdminDeleteDto): Promise<UserAdminResponseDto> {
-    const { force } = dto;
-    const { isAdmin } = await this.findOrFail(id, {});
-    if (isAdmin) {
-      throw new ForbiddenException('Cannot delete admin user');
-    }
-
-    await this.albumRepository.softDeleteAll(id);
-
-    const status = force ? UserStatus.REMOVING : UserStatus.DELETED;
-    const user = await this.userRepository.update(id, { status, deletedAt: new Date() });
-
-    if (force) {
-      await this.jobRepository.queue({ name: JobName.USER_DELETION, data: { id: user.id, force } });
-    }
-
-    return mapUserAdmin(user);
-  }
-
-  async restore(auth: AuthDto, id: string): Promise<UserAdminResponseDto> {
-    await this.findOrFail(id, { withDeleted: true });
-    await this.albumRepository.restoreAll(id);
-    const user = await this.userRepository.update(id, { deletedAt: null, status: UserStatus.ACTIVE });
-    return mapUserAdmin(user);
-  }
-
-  private async findOrFail(id: string, options: UserFindOptions) {
-    const user = await this.userRepository.get(id, options);
-    if (!user) {
-      throw new BadRequestException('User not found');
-    }
-    return user;
-  }
-}

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

@@ -1,5 +1,11 @@
-import { BadRequestException, InternalServerErrorException, NotFoundException } from '@nestjs/common';
+import {
-import { UserEntity } from 'src/entities/user.entity';
+  BadRequestException,
+  ForbiddenException,
+  InternalServerErrorException,
+  NotFoundException,
+} from '@nestjs/common';
+import { UpdateUserDto, mapUser } from 'src/dtos/user.dto';
+import { UserEntity, UserStatus } from 'src/entities/user.entity';
 import { IAlbumRepository } from 'src/interfaces/album.interface';
 import { ICryptoRepository } from 'src/interfaces/crypto.interface';
 import { IJobRepository, JobName } from 'src/interfaces/job.interface';
@@ -57,13 +63,13 @@ describe(UserService.name, () => {
   describe('getAll', () => {
     it('should get all users', async () => {
       userMock.getList.mockResolvedValue([userStub.admin]);
-      await expect(sut.search()).resolves.toEqual([
+      await expect(sut.getAll(authStub.admin, false)).resolves.toEqual([
         expect.objectContaining({
           id: authStub.admin.user.id,
           email: authStub.admin.user.email,
         }),
       ]);
-      expect(userMock.getList).toHaveBeenCalledWith({ withDeleted: false });
+      expect(userMock.getList).toHaveBeenCalledWith({ withDeleted: true });
     });
   });
 
@@ -76,17 +82,255 @@ describe(UserService.name, () => {
 
     it('should throw an error if a user is not found', async () => {
       userMock.get.mockResolvedValue(null);
-      await expect(sut.get(authStub.admin.user.id)).rejects.toBeInstanceOf(BadRequestException);
+      await expect(sut.get(authStub.admin.user.id)).rejects.toBeInstanceOf(NotFoundException);
       expect(userMock.get).toHaveBeenCalledWith(authStub.admin.user.id, { withDeleted: false });
     });
   });
 
   describe('getMe', () => {
-    it("should get the auth user's info", () => {
+    it("should get the auth user's info", async () => {
-      const user = authStub.admin.user;
+      userMock.get.mockResolvedValue(userStub.admin);
-      expect(sut.getMe(authStub.admin)).toMatchObject({
+      await sut.getMe(authStub.admin);
-        id: user.id,
+      expect(userMock.get).toHaveBeenCalledWith(authStub.admin.user.id, {});
-        email: user.email,
+    });
+
+    it('should throw an error if a user is not found', async () => {
+      userMock.get.mockResolvedValue(null);
+      await expect(sut.getMe(authStub.admin)).rejects.toBeInstanceOf(BadRequestException);
+      expect(userMock.get).toHaveBeenCalledWith(authStub.admin.user.id, {});
+    });
+  });
+
+  describe('update', () => {
+    it('should update user', async () => {
+      const update: UpdateUserDto = {
+        id: userStub.user1.id,
+        shouldChangePassword: true,
+        email: 'immich@test.com',
+        storageLabel: 'storage_label',
+      };
+      userMock.getByEmail.mockResolvedValue(null);
+      userMock.getByStorageLabel.mockResolvedValue(null);
+      userMock.update.mockResolvedValue(userStub.user1);
+
+      await sut.update({ user: { ...authStub.user1.user, isAdmin: true } }, update);
+
+      expect(userMock.getByEmail).toHaveBeenCalledWith(update.email);
+      expect(userMock.getByStorageLabel).toHaveBeenCalledWith(update.storageLabel);
+    });
+
+    it('should not set an empty string for storage label', async () => {
+      userMock.update.mockResolvedValue(userStub.user1);
+      await sut.update(authStub.admin, { id: userStub.user1.id, storageLabel: '' });
+      expect(userMock.update).toHaveBeenCalledWith(userStub.user1.id, {
+        id: userStub.user1.id,
+        storageLabel: null,
+        updatedAt: expect.any(Date),
+      });
+    });
+
+    it('should omit a storage label set by non-admin users', async () => {
+      userMock.update.mockResolvedValue(userStub.user1);
+      await sut.update({ user: userStub.user1 }, { id: userStub.user1.id, storageLabel: 'admin' });
+      expect(userMock.update).toHaveBeenCalledWith(userStub.user1.id, {
+        id: userStub.user1.id,
+        updatedAt: expect.any(Date),
+      });
+    });
+
+    it('user can only update its information', async () => {
+      userMock.get.mockResolvedValueOnce({
+        ...userStub.user1,
+        id: 'not_immich_auth_user_id',
+      });
+
+      const result = sut.update(
+        { user: userStub.user1 },
+        {
+          id: 'not_immich_auth_user_id',
+          password: 'I take over your account now',
+        },
+      );
+      await expect(result).rejects.toBeInstanceOf(ForbiddenException);
+    });
+
+    it('should let a user change their email', async () => {
+      const dto = { id: userStub.user1.id, email: 'updated@test.com' };
+
+      userMock.get.mockResolvedValue(userStub.user1);
+      userMock.update.mockResolvedValue(userStub.user1);
+
+      await sut.update({ user: userStub.user1 }, dto);
+
+      expect(userMock.update).toHaveBeenCalledWith(userStub.user1.id, {
+        id: 'user-id',
+        email: 'updated@test.com',
+        updatedAt: expect.any(Date),
+      });
+    });
+
+    it('should not let a user change their email to one already in use', async () => {
+      const dto = { id: userStub.user1.id, email: 'updated@test.com' };
+
+      userMock.get.mockResolvedValue(userStub.user1);
+      userMock.getByEmail.mockResolvedValue(userStub.admin);
+
+      await expect(sut.update({ user: userStub.user1 }, dto)).rejects.toBeInstanceOf(BadRequestException);
+
+      expect(userMock.update).not.toHaveBeenCalled();
+    });
+
+    it('should not let the admin change the storage label to one already in use', async () => {
+      const dto = { id: userStub.user1.id, storageLabel: 'admin' };
+
+      userMock.get.mockResolvedValue(userStub.user1);
+      userMock.getByStorageLabel.mockResolvedValue(userStub.admin);
+
+      await expect(sut.update(authStub.admin, dto)).rejects.toBeInstanceOf(BadRequestException);
+
+      expect(userMock.update).not.toHaveBeenCalled();
+    });
+
+    it('admin can update any user information', async () => {
+      const update: UpdateUserDto = {
+        id: userStub.user1.id,
+        shouldChangePassword: true,
+      };
+
+      userMock.update.mockResolvedValueOnce(userStub.user1);
+      await sut.update(authStub.admin, update);
+      expect(userMock.update).toHaveBeenCalledWith(userStub.user1.id, {
+        id: 'user-id',
+        shouldChangePassword: true,
+        updatedAt: expect.any(Date),
+      });
+    });
+
+    it('update user information should throw error if user not found', async () => {
+      userMock.get.mockResolvedValueOnce(null);
+
+      const result = sut.update(authStub.admin, {
+        id: userStub.user1.id,
+        shouldChangePassword: true,
+      });
+
+      await expect(result).rejects.toBeInstanceOf(BadRequestException);
+    });
+
+    it('should let the admin update himself', async () => {
+      const dto = { id: userStub.admin.id, shouldChangePassword: true, isAdmin: true };
+
+      userMock.update.mockResolvedValueOnce(userStub.admin);
+
+      await sut.update(authStub.admin, dto);
+
+      expect(userMock.update).toHaveBeenCalledWith(userStub.admin.id, { ...dto, updatedAt: expect.any(Date) });
+    });
+
+    it('should not let the another user become an admin', async () => {
+      const dto = { id: userStub.user1.id, shouldChangePassword: true, isAdmin: true };
+
+      userMock.get.mockResolvedValueOnce(userStub.user1);
+
+      await expect(sut.update(authStub.admin, dto)).rejects.toBeInstanceOf(BadRequestException);
+    });
+  });
+
+  describe('restore', () => {
+    it('should throw error if user could not be found', async () => {
+      userMock.get.mockResolvedValue(null);
+      await expect(sut.restore(authStub.admin, userStub.admin.id)).rejects.toThrowError(BadRequestException);
+      expect(userMock.update).not.toHaveBeenCalled();
+    });
+
+    it('should restore an user', async () => {
+      userMock.get.mockResolvedValue(userStub.user1);
+      userMock.update.mockResolvedValue(userStub.user1);
+      await expect(sut.restore(authStub.admin, userStub.user1.id)).resolves.toEqual(mapUser(userStub.user1));
+      expect(userMock.update).toHaveBeenCalledWith(userStub.user1.id, { status: UserStatus.ACTIVE, deletedAt: null });
+    });
+  });
+
+  describe('delete', () => {
+    it('should throw error if user could not be found', async () => {
+      userMock.get.mockResolvedValue(null);
+
+      await expect(sut.delete(authStub.admin, userStub.admin.id, {})).rejects.toThrowError(BadRequestException);
+      expect(userMock.delete).not.toHaveBeenCalled();
+    });
+
+    it('cannot delete admin user', async () => {
+      await expect(sut.delete(authStub.admin, userStub.admin.id, {})).rejects.toBeInstanceOf(ForbiddenException);
+    });
+
+    it('should require the auth user be an admin', async () => {
+      await expect(sut.delete(authStub.user1, authStub.admin.user.id, {})).rejects.toBeInstanceOf(ForbiddenException);
+
+      expect(userMock.delete).not.toHaveBeenCalled();
+    });
+
+    it('should delete user', async () => {
+      userMock.get.mockResolvedValue(userStub.user1);
+      userMock.update.mockResolvedValue(userStub.user1);
+
+      await expect(sut.delete(authStub.admin, userStub.user1.id, {})).resolves.toEqual(mapUser(userStub.user1));
+      expect(userMock.update).toHaveBeenCalledWith(userStub.user1.id, {
+        status: UserStatus.DELETED,
+        deletedAt: expect.any(Date),
+      });
+    });
+
+    it('should force delete user', async () => {
+      userMock.get.mockResolvedValue(userStub.user1);
+      userMock.update.mockResolvedValue(userStub.user1);
+
+      await expect(sut.delete(authStub.admin, userStub.user1.id, { force: true })).resolves.toEqual(
+        mapUser(userStub.user1),
+      );
+
+      expect(userMock.update).toHaveBeenCalledWith(userStub.user1.id, {
+        status: UserStatus.REMOVING,
+        deletedAt: expect.any(Date),
+      });
+      expect(jobMock.queue).toHaveBeenCalledWith({
+        name: JobName.USER_DELETION,
+        data: { id: userStub.user1.id, force: true },
+      });
+    });
+  });
+
+  describe('create', () => {
+    it('should not create a user if there is no local admin account', async () => {
+      userMock.getAdmin.mockResolvedValueOnce(null);
+
+      await expect(
+        sut.create({
+          email: 'john_smith@email.com',
+          name: 'John Smith',
+          password: 'password',
+        }),
+      ).rejects.toBeInstanceOf(BadRequestException);
+    });
+
+    it('should create user', async () => {
+      userMock.getAdmin.mockResolvedValue(userStub.admin);
+      userMock.create.mockResolvedValue(userStub.user1);
+
+      await expect(
+        sut.create({
+          email: userStub.user1.email,
+          name: userStub.user1.name,
+          password: 'password',
+          storageLabel: 'label',
+        }),
+      ).resolves.toEqual(mapUser(userStub.user1));
+
+      expect(userMock.getAdmin).toBeCalled();
+      expect(userMock.create).toBeCalledWith({
+        email: userStub.user1.email,
+        name: userStub.user1.name,
+        storageLabel: 'label',
+        password: expect.anything(),
       });
     });
   });

server/src/services/user.service.ts

@@ -1,13 +1,13 @@
-import { BadRequestException, Inject, Injectable, NotFoundException } from '@nestjs/common';
+import { BadRequestException, ForbiddenException, Inject, Injectable, NotFoundException } from '@nestjs/common';
 import { DateTime } from 'luxon';
-import { SALT_ROUNDS } from 'src/constants';
 import { StorageCore, StorageFolder } from 'src/cores/storage.core';
 import { SystemConfigCore } from 'src/cores/system-config.core';
+import { UserCore } from 'src/cores/user.core';
 import { AuthDto } from 'src/dtos/auth.dto';
 import { CreateProfileImageResponseDto, mapCreateProfileImageResponse } from 'src/dtos/user-profile.dto';
-import { UserAdminResponseDto, UserResponseDto, UserUpdateMeDto, mapUser, mapUserAdmin } from 'src/dtos/user.dto';
+import { CreateUserDto, DeleteUserDto, UpdateUserDto, UserResponseDto, mapUser } from 'src/dtos/user.dto';
 import { UserMetadataKey } from 'src/entities/user-metadata.entity';
-import { UserEntity } from 'src/entities/user.entity';
+import { UserEntity, UserStatus } from 'src/entities/user.entity';
 import { IAlbumRepository } from 'src/interfaces/album.interface';
 import { ICryptoRepository } from 'src/interfaces/crypto.interface';
 import { IEntityJob, IJobRepository, JobName, JobStatus } from 'src/interfaces/job.interface';
@@ -21,30 +21,73 @@ import { getPreferences, getPreferencesPartial } from 'src/utils/preferences';
 @Injectable()
 export class UserService {
   private configCore: SystemConfigCore;
+  private userCore: UserCore;
 
   constructor(
     @Inject(IAlbumRepository) private albumRepository: IAlbumRepository,
-    @Inject(ICryptoRepository) private cryptoRepository: ICryptoRepository,
+    @Inject(ICryptoRepository) cryptoRepository: ICryptoRepository,
     @Inject(IJobRepository) private jobRepository: IJobRepository,
     @Inject(IStorageRepository) private storageRepository: IStorageRepository,
     @Inject(ISystemMetadataRepository) systemMetadataRepository: ISystemMetadataRepository,
     @Inject(IUserRepository) private userRepository: IUserRepository,
     @Inject(ILoggerRepository) private logger: ILoggerRepository,
   ) {
+    this.userCore = UserCore.create(cryptoRepository, userRepository);
     this.logger.setContext(UserService.name);
     this.configCore = SystemConfigCore.create(systemMetadataRepository, this.logger);
   }
 
-  async search(): Promise<UserResponseDto[]> {
+  async listUsers(): Promise<UserResponseDto[]> {
-    const users = await this.userRepository.getList({ withDeleted: false });
+    const users = await this.userRepository.getList({ withDeleted: true });
     return users.map((user) => mapUser(user));
   }
 
-  getMe(auth: AuthDto): UserAdminResponseDto {
+  async getAll(auth: AuthDto, isAll: boolean): Promise<UserResponseDto[]> {
-    return mapUserAdmin(auth.user);
+    const users = await this.userRepository.getList({ withDeleted: !isAll });
+    return users.map((user) => mapUser(user));
   }
 
-  async updateMe({ user }: AuthDto, dto: UserUpdateMeDto): Promise<UserAdminResponseDto> {
+  async get(userId: string): Promise<UserResponseDto> {
+    const user = await this.userRepository.get(userId, { withDeleted: false });
+    if (!user) {
+      throw new NotFoundException('User not found');
+    }
+
+    return mapUser(user);
+  }
+
+  getMe(auth: AuthDto): Promise<UserResponseDto> {
+    return this.findOrFail(auth.user.id, {}).then(mapUser);
+  }
+
+  async create(dto: CreateUserDto): Promise<UserResponseDto> {
+    const { memoriesEnabled, notify, ...rest } = dto;
+    let user = await this.userCore.createUser(rest);
+
+    // TODO remove and replace with entire dto.preferences config
+    if (memoriesEnabled === false) {
+      await this.userRepository.upsertMetadata(user.id, {
+        key: UserMetadataKey.PREFERENCES,
+        value: { memories: { enabled: false } },
+      });
+
+      user = await this.findOrFail(user.id, {});
+    }
+
+    const tempPassword = user.shouldChangePassword ? rest.password : undefined;
+    if (notify) {
+      await this.jobRepository.queue({ name: JobName.NOTIFY_SIGNUP, data: { id: user.id, tempPassword } });
+    }
+    return mapUser(user);
+  }
+
+  async update(auth: AuthDto, dto: UpdateUserDto): Promise<UserResponseDto> {
+    const user = await this.findOrFail(dto.id, {});
+
+    if (dto.quotaSizeInBytes && user.quotaSizeInBytes !== dto.quotaSizeInBytes) {
+      await this.userRepository.syncUsage(dto.id);
+    }
+
     // TODO replace with entire preferences object
     if (dto.memoriesEnabled !== undefined || dto.avatarColor) {
       const newPreferences = getPreferences(user);
@@ -58,40 +101,42 @@ export class UserService {
         delete dto.avatarColor;
       }
 
-      await this.userRepository.upsertMetadata(user.id, {
+      await this.userRepository.upsertMetadata(dto.id, {
         key: UserMetadataKey.PREFERENCES,
         value: getPreferencesPartial(user, newPreferences),
       });
     }
 
-    if (dto.email) {
+    const updatedUser = await this.userCore.updateUser(auth.user, dto.id, dto);
-      const duplicate = await this.userRepository.getByEmail(dto.email);
-      if (duplicate && duplicate.id !== user.id) {
-        throw new BadRequestException('Email already in use by another account');
-      }
-    }
 
-    const update: Partial<UserEntity> = {
+    return mapUser(updatedUser);
-      email: dto.email,
-      name: dto.name,
-    };
-
-    if (dto.password) {
-      const hashedPassword = await this.cryptoRepository.hashBcrypt(dto.password, SALT_ROUNDS);
-      update.password = hashedPassword;
-      update.shouldChangePassword = false;
-    }
-
-    const updatedUser = await this.userRepository.update(user.id, update);
-
-    return mapUserAdmin(updatedUser);
   }
 
-  async get(id: string): Promise<UserResponseDto> {
+  async delete(auth: AuthDto, id: string, dto: DeleteUserDto): Promise<UserResponseDto> {
-    const user = await this.findOrFail(id, { withDeleted: false });
+    const { force } = dto;
+    const { isAdmin } = await this.findOrFail(id, {});
+    if (isAdmin) {
+      throw new ForbiddenException('Cannot delete admin user');
+    }
+
+    await this.albumRepository.softDeleteAll(id);
+
+    const status = force ? UserStatus.REMOVING : UserStatus.DELETED;
+    const user = await this.userRepository.update(id, { status, deletedAt: new Date() });
+
+    if (force) {
+      await this.jobRepository.queue({ name: JobName.USER_DELETION, data: { id: user.id, force } });
+    }
+
     return mapUser(user);
   }
 
+  async restore(auth: AuthDto, id: string): Promise<UserResponseDto> {
+    await this.findOrFail(id, { withDeleted: true });
+    await this.albumRepository.restoreAll(id);
+    return this.userRepository.update(id, { deletedAt: null, status: UserStatus.ACTIVE }).then(mapUser);
+  }
+
   async createProfileImage(auth: AuthDto, fileInfo: Express.Multer.File): Promise<CreateProfileImageResponseDto> {
     const { profileImagePath: oldpath } = await this.findOrFail(auth.user.id, { withDeleted: false });
     const updatedUser = await this.userRepository.update(auth.user.id, { profileImagePath: fileInfo.path });

server/src/utils/media.ts

@@ -3,84 +3,22 @@ import { SystemConfigFFmpegDto } from 'src/dtos/system-config.dto';
 import {
   AudioStreamInfo,
   BitrateDistribution,
-  TranscodeCommand,
+  TranscodeOptions,
   VideoCodecHWConfig,
   VideoCodecSWConfig,
   VideoStreamInfo,
 } from 'src/interfaces/media.interface';
 
-export class BaseConfig implements VideoCodecSWConfig {
+class BaseConfig implements VideoCodecSWConfig {
-  readonly presets = ['veryslow', 'slower', 'slow', 'medium', 'fast', 'faster', 'veryfast', 'superfast', 'ultrafast'];
+  presets = ['veryslow', 'slower', 'slow', 'medium', 'fast', 'faster', 'veryfast', 'superfast', 'ultrafast'];
-  protected constructor(protected config: SystemConfigFFmpegDto) {}
+  constructor(protected config: SystemConfigFFmpegDto) {}
 
-  static create(config: SystemConfigFFmpegDto, devices: string[] = [], hasMaliOpenCL = false): VideoCodecSWConfig {
+  getOptions(target: TranscodeTarget, videoStream: VideoStreamInfo, audioStream?: AudioStreamInfo) {
-    if (config.accel === TranscodeHWAccel.DISABLED) {
-      return this.getSWCodecConfig(config);
-    }
-    return this.getHWCodecConfig(config, devices, hasMaliOpenCL);
-  }
-
-  private static getSWCodecConfig(config: SystemConfigFFmpegDto) {
-    switch (config.targetVideoCodec) {
-      case VideoCodec.H264: {
-        return new H264Config(config);
-      }
-      case VideoCodec.HEVC: {
-        return new HEVCConfig(config);
-      }
-      case VideoCodec.VP9: {
-        return new VP9Config(config);
-      }
-      case VideoCodec.AV1: {
-        return new AV1Config(config);
-      }
-      default: {
-        throw new Error(`Codec '${config.targetVideoCodec}' is unsupported`);
-      }
-    }
-  }
-
-  private static getHWCodecConfig(config: SystemConfigFFmpegDto, devices: string[] = [], hasMaliOpenCL = false) {
-    let handler: VideoCodecHWConfig;
-    switch (config.accel) {
-      case TranscodeHWAccel.NVENC: {
-        handler = config.accelDecode ? new NvencHwDecodeConfig(config) : new NvencSwDecodeConfig(config);
-        break;
-      }
-      case TranscodeHWAccel.QSV: {
-        handler = config.accelDecode ? new QsvHwDecodeConfig(config, devices) : new QsvSwDecodeConfig(config, devices);
-        break;
-      }
-      case TranscodeHWAccel.VAAPI: {
-        handler = new VAAPIConfig(config, devices);
-        break;
-      }
-      case TranscodeHWAccel.RKMPP: {
-        handler =
-          config.accelDecode && hasMaliOpenCL
-            ? new RkmppHwDecodeConfig(config, devices)
-            : new RkmppSwDecodeConfig(config, devices);
-        break;
-      }
-      default: {
-        throw new Error(`${config.accel.toUpperCase()} acceleration is unsupported`);
-      }
-    }
-    if (!handler.getSupportedCodecs().includes(config.targetVideoCodec)) {
-      throw new Error(
-        `${config.accel.toUpperCase()} acceleration does not support codec '${config.targetVideoCodec.toUpperCase()}'. Supported codecs: ${handler.getSupportedCodecs()}`,
-      );
-    }
-
-    return handler;
-  }
-
-  getCommand(target: TranscodeTarget, videoStream: VideoStreamInfo, audioStream?: AudioStreamInfo) {
     const options = {
       inputOptions: this.getBaseInputOptions(videoStream),
       outputOptions: [...this.getBaseOutputOptions(target, videoStream, audioStream), '-v verbose'],
       twoPass: this.eligibleForTwoPass(),
-    } as TranscodeCommand;
+    } as TranscodeOptions;
     if ([TranscodeTarget.ALL, TranscodeTarget.VIDEO].includes(target)) {
       const filters = this.getFilterOptions(videoStream);
       if (filters.length > 0) {
@@ -380,20 +318,11 @@ export class BaseHWConfig extends BaseConfig implements VideoCodecHWConfig {
 }
 
 export class ThumbnailConfig extends BaseConfig {
-  static create(config: SystemConfigFFmpegDto): VideoCodecSWConfig {
-    return new ThumbnailConfig(config);
-  }
-
   getBaseInputOptions(): string[] {
-    return ['-skip_frame nokey', '-sws_flags accurate_rnd+full_chroma_int'];
+    return ['-ss 00:00:00', '-sws_flags accurate_rnd+bitexact+full_chroma_int'];
   }
-
   getBaseOutputOptions() {
-    return ['-fps_mode vfr', '-frames:v 1', '-update 1'];
+    return ['-frames:v 1'];
-  }
-
-  getFilterOptions(videoStream: VideoStreamInfo): string[] {
-    return ['fps=12', 'thumbnail=12', `select=gt(scene\\,0.1)+gt(n\\,20)`, ...super.getFilterOptions(videoStream)];
   }
 
   getPresetOptions() {
@@ -409,7 +338,8 @@ export class ThumbnailConfig extends BaseConfig {
   }
 
   getScaling(videoStream: VideoStreamInfo) {
-    let options = super.getScaling(videoStream) + ':flags=lanczos+accurate_rnd+full_chroma_int';
+    let options = super.getScaling(videoStream);
+    options += ':flags=lanczos+accurate_rnd+bitexact+full_chroma_int';
     if (!this.shouldToneMap(videoStream)) {
       options += ':out_color_matrix=601:out_range=pc';
     }
@@ -604,6 +534,8 @@ export class NvencHwDecodeConfig extends NvencSwDecodeConfig {
     options.push(...this.getToneMapping(videoStream));
     if (options.length > 0) {
       options[options.length - 1] += ':format=nv12';
+    } else {
+      options.push('format=nv12');
     }
     return options;
   }
@@ -627,7 +559,7 @@ export class NvencHwDecodeConfig extends NvencSwDecodeConfig {
   }
 
   getInputThreadOptions() {
-    return [`-threads 1`];
+    return [`-threads ${this.config.threads <= 0 ? 1 : this.config.threads}`];
   }
 
   getOutputThreadOptions() {
@@ -717,7 +649,7 @@ export class QsvHwDecodeConfig extends QsvSwDecodeConfig {
       throw new Error('No QSV device found');
     }
 
-    const options = ['-hwaccel qsv', '-hwaccel_output_format qsv', '-async_depth 4', ...this.getInputThreadOptions()];
+    const options = ['-hwaccel qsv', '-hwaccel_output_format qsv', '-async_depth 4', '-threads 1'];
     const hwDevice = this.getPreferredHardwareDevice();
     if (hwDevice) {
       options.push(`-qsv_device ${hwDevice}`);
@@ -762,10 +694,6 @@ export class QsvHwDecodeConfig extends QsvSwDecodeConfig {
       'hwmap=derive_device=qsv:reverse=1,format=qsv',
     ];
   }
-
-  getInputThreadOptions() {
-    return [`-threads 1`];
-  }
 }
 
 export class VAAPIConfig extends BaseHWConfig {

server/src/validation.ts

@@ -154,7 +154,7 @@ export function validateCronExpression(expression: string) {
 
 type IValue = { value: string };
 
-export const toEmail = ({ value }: IValue) => (value ? value.toLowerCase() : value);
+export const toEmail = ({ value }: IValue) => value?.toLowerCase();
 
 export const toSanitized = ({ value }: IValue) => sanitize((value || '').replaceAll('.', ''));
 

web/.eslintrc.cjs

@@ -51,7 +51,6 @@ module.exports = {
     'unicorn/consistent-function-scoping': 'off',
     'unicorn/prefer-top-level-await': 'off',
     'unicorn/import-style': 'off',
-    'svelte/button-has-type': 'error',
     // TODO: set recommended-type-checked and remove these rules
     '@typescript-eslint/await-thenable': 'error',
     '@typescript-eslint/no-floating-promises': 'error',

web/src/lib/actions/focus.ts

@@ -1,3 +1,3 @@
-export const initInput = (element: HTMLInputElement) => {
+export const initInput = (element: HTMLInputElement, timeout: number = 0) => {
-  element.focus();
+  setTimeout(() => element.focus(), timeout);
 };

web/src/lib/components/admin-page/delete-confirm-dialogue.svelte

@@ -1,7 +1,7 @@
 <script lang="ts">
   import ConfirmDialogue from '$lib/components/shared-components/confirm-dialogue.svelte';
   import { handleError } from '$lib/utils/handle-error';
-  import { deleteUserAdmin, type UserResponseDto } from '@immich/sdk';
+  import { deleteUser, type UserResponseDto } from '@immich/sdk';
   import { serverConfig } from '$lib/stores/server-config.store';
   import { createEventDispatcher } from 'svelte';
   import Checkbox from '$lib/components/elements/checkbox.svelte';
@@ -20,9 +20,9 @@
 
   const handleDeleteUser = async () => {
     try {
-      const { deletedAt } = await deleteUserAdmin({
+      const { deletedAt } = await deleteUser({
         id: user.id,
-        userAdminDeleteDto: { force: forceDelete },
+        deleteUserDto: { force: forceDelete },
       });
 
       if (deletedAt == undefined) {

web/src/lib/components/admin-page/jobs/job-tile-button.svelte

@@ -17,7 +17,6 @@
 </script>
 
 <button
-  type="button"
   {disabled}
   class="flex h-full w-full flex-col place-content-center place-items-center gap-2 px-8 py-2 text-xs text-gray-600 transition-colors dark:text-gray-200 {colorClasses[
     color

web/src/lib/components/admin-page/restore-dialogue.svelte

@@ -1,7 +1,7 @@
 <script lang="ts">
   import ConfirmDialogue from '$lib/components/shared-components/confirm-dialogue.svelte';
   import { handleError } from '$lib/utils/handle-error';
-  import { restoreUserAdmin, type UserResponseDto } from '@immich/sdk';
+  import { restoreUser, type UserResponseDto } from '@immich/sdk';
   import { createEventDispatcher } from 'svelte';
 
   export let user: UserResponseDto;
@@ -14,7 +14,7 @@
 
   const handleRestoreUser = async () => {
     try {
-      const { deletedAt } = await restoreUserAdmin({ id: user.id });
+      const { deletedAt } = await restoreUser({ id: user.id });
       if (deletedAt == undefined) {
         dispatch('success');
       } else {

web/src/lib/components/admin-page/settings/machine-learning-settings/machine-learning-settings.svelte

@@ -102,7 +102,7 @@
             min={0.001}
             max={0.1}
             desc="Maximum distance between two images to consider them duplicates, ranging from 0.001-0.1. Higher values will detect more duplicates, but may result in false positives."
-            disabled={disabled || !$featureFlags.duplicateDetection}
+            disabled={disabled || $featureFlags.duplicateDetection}
             isEdited={config.machineLearning.duplicateDetection.maxDistance !==
               savedConfig.machineLearning.duplicateDetection.maxDistance}
           />

web/src/lib/components/album-page/album-card-group.svelte

@@ -30,7 +30,6 @@
 {#if group}
   <div class="grid">
     <button
-      type="button"
       on:click={() => toggleAlbumGroupCollapsing(group.id)}
       class="w-fit mt-2 pt-2 pr-2 mb-2 dark:text-immich-dark-fg"
       aria-expanded={!isCollapsed}

web/src/lib/components/album-page/album-options.svelte

@@ -75,7 +75,7 @@
     <div class="py-2">
       <div class="text-gray text-sm mb-3">PEOPLE</div>
       <div class="p-2">
-        <button type="button" class="flex items-center gap-2" on:click={() => dispatch('showSelectSharedUser')}>
+        <button class="flex items-center gap-2" on:click={() => dispatch('showSelectSharedUser')}>
           <div class="rounded-full w-10 h-10 border border-gray-500 flex items-center justify-center">
             <div><Icon path={mdiPlus} size="25" /></div>
           </div>

web/src/lib/components/album-page/albums-table-header.svelte

@@ -16,7 +16,6 @@
 
 <th class="text-sm font-medium {option.columnStyle}">
   <button
-    type="button"
     class="rounded-lg p-2 hover:bg-immich-dark-primary hover:dark:bg-immich-dark-primary/50"
     on:click={handleSort}
   >

web/src/lib/components/album-page/albums-table.svelte

@@ -41,7 +41,6 @@
       {@const isCollapsed = isAlbumGroupCollapsed($albumViewSettings, albumGroup.id)}
       {@const iconRotation = isCollapsed ? 'rotate-0' : 'rotate-90'}
       <button
-        type="button"
         on:click={() => toggleAlbumGroupCollapsing(albumGroup.id)}
         class="flex w-full mt-4 rounded-md"
         aria-expanded={!isCollapsed}

web/src/lib/components/album-page/share-info-modal.svelte

@@ -1,6 +1,6 @@
 <script lang="ts">
   import {
-    getMyUser,
+    getMyUserInfo,
     removeUserFromAlbum,
     type AlbumResponseDto,
     type UserResponseDto,
@@ -36,7 +36,7 @@
 
   onMount(async () => {
     try {
-      currentUser = await getMyUser();
+      currentUser = await getMyUserInfo();
     } catch (error) {
       handleError(error, 'Unable to refresh user');
     }
@@ -141,7 +141,6 @@
               </div>
             {:else if user.id == currentUser?.id}
               <button
-                type="button"
                 on:click={() => (selectedRemoveUser = user)}
                 class="text-sm font-medium text-immich-primary transition-colors hover:text-immich-primary/75 dark:text-immich-dark-primary"
                 >Leave</button

web/src/lib/components/album-page/user-selection-modal.svelte

@@ -1,4 +1,5 @@
 <script lang="ts">
+  import { goto } from '$app/navigation';
   import Dropdown from '$lib/components/elements/dropdown.svelte';
   import Icon from '$lib/components/elements/icon.svelte';
   import FullScreenModal from '$lib/components/shared-components/full-screen-modal.svelte';
@@ -6,7 +7,7 @@
   import {
     AlbumUserRole,
     getAllSharedLinks,
-    searchUsers,
+    getAllUsers,
     type AlbumResponseDto,
     type AlbumUserAddDto,
     type SharedLinkResponseDto,
@@ -35,10 +36,10 @@
   let sharedLinks: SharedLinkResponseDto[] = [];
   onMount(async () => {
     await getSharedLinks();
-    const data = await searchUsers();
+    const data = await getAllUsers({ isAll: false });
 
-    // remove album owner
+    // remove invalid users
-    users = data.filter((user) => user.id !== album.ownerId);
+    users = data.filter((user) => !(user.deletedAt || user.id === album.ownerId));
 
     // Remove the existed shared users from the album
     for (const sharedUser of album.albumUsers) {
@@ -121,11 +122,7 @@
         {#each users as user}
           {#if !Object.keys(selectedUsers).includes(user.id)}
             <div class="flex place-items-center transition-all hover:bg-gray-200 dark:hover:bg-gray-700 rounded-xl">
-              <button
+              <button on:click={() => handleToggle(user)} class="flex w-full place-items-center gap-4 p-4">
-                type="button"
-                on:click={() => handleToggle(user)}
-                class="flex w-full place-items-center gap-4 p-4"
-              >
                 <UserAvatar {user} size="md" />
                 <div class="text-left flex-grow">
                   <p class="text-immich-fg dark:text-immich-dark-fg">
@@ -163,7 +160,6 @@
 
   <div id="shared-buttons" class="mt-4 flex place-content-center place-items-center justify-around">
     <button
-      type="button"
       class="flex flex-col place-content-center place-items-center gap-2 hover:cursor-pointer"
       on:click={() => dispatch('share')}
     >
@@ -172,13 +168,13 @@
     </button>
 
     {#if sharedLinks.length}
-      <a
+      <button
-        href={AppRoute.SHARED_LINKS}
         class="flex flex-col place-content-center place-items-center gap-2 hover:cursor-pointer"
+        on:click={() => goto(AppRoute.SHARED_LINKS)}
       >
         <Icon path={mdiShareCircle} size={24} />
         <p class="text-sm">View links</p>
-      </a>
+      </button>
     {/if}
   </div>
 </FullScreenModal>

web/src/lib/components/asset-viewer/activity-status.svelte

@@ -18,12 +18,12 @@
 <div
   class="w-full h-14 flex p-4 text-white items-center justify-center rounded-full gap-4 bg-immich-dark-bg bg-opacity-60"
 >
-  <button type="button" class={disabled ? 'cursor-not-allowed' : ''} on:click={() => dispatch('favorite')} {disabled}>
+  <button class={disabled ? 'cursor-not-allowed' : ''} on:click={() => dispatch('favorite')} {disabled}>
     <div class="items-center justify-center">
       <Icon path={isLiked ? mdiHeart : mdiHeartOutline} size={24} />
     </div>
   </button>
-  <button type="button" on:click={() => dispatch('openActivityTab')}>
+  <button on:click={() => dispatch('openActivityTab')}>
     <div class="flex gap-2 items-center justify-center">
       <Icon path={mdiCommentOutline} class="scale-x-[-1]" size={24} />
       {#if numberOfComments}

web/src/lib/components/asset-viewer/activity-viewer.svelte

@@ -200,7 +200,6 @@
               <div>
                 {#if showDeleteReaction[index]}
                   <button
-                    type="button"
                     class="absolute right-6 rounded-xl items-center bg-gray-300 dark:bg-slate-100 py-3 px-6 text-left text-sm font-medium text-immich-fg hover:bg-red-300 focus:outline-none focus:ring-2 focus:ring-inset dark:text-immich-dark-bg dark:hover:bg-red-100 transition-colors"
                     use:clickOutside
                     on:outclick={() => (showDeleteReaction[index] = false)}
@@ -253,7 +252,6 @@
                 <div>
                   {#if showDeleteReaction[index]}
                     <button
-                      type="button"
                       class="absolute right-6 rounded-xl items-center bg-gray-300 dark:bg-slate-100 py-3 px-6 text-left text-sm font-medium text-immich-fg hover:bg-red-300 focus:outline-none focus:ring-2 focus:ring-inset dark:text-immich-dark-bg dark:hover:bg-red-100 transition-colors"
                       use:clickOutside
                       on:outclick={() => (showDeleteReaction[index] = false)}

web/src/lib/components/asset-viewer/album-list-item.svelte

@@ -28,7 +28,6 @@
 </script>
 
 <button
-  type="button"
   on:click={() => dispatch('album')}
   class="flex w-full gap-4 px-6 py-2 text-left transition-colors hover:bg-gray-200 dark:hover:bg-gray-700 rounded-xl"
 >