KevinMidboe/immich
1
0
Fork 0
mirror of https://github.com/KevinMidboe/immich.git synced 2025-10-29 17:40:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor(server): standardize user controller (#3501)

Browse Source 
* chore: remove redundant sortint

* chore: standardize user controller

* chore: open api

* fix: web dtos
This commit is contained in:
Jason Rasmussen
2023-08-03 14:17:38 -04:00
committed by GitHub
parent fa03ed7dd7
commit b44f8d52ee
17 changed files with 242 additions and 255 deletions
Download Patch File Download Diff File Expand all files Collapse all files

112
web/src/api/open-api/api.ts generated
View File

@@ -12180,15 +12180,15 @@ export const UserApiAxiosParamCreator = function (configuration?: Configuration)
},
/**
*
* @param {string} userId
* @param {string} id
* @param {*} [options] Override http request option.
* @throws {RequiredError}
*/
deleteUser: async (userId: string, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
// verify required parameter 'userId' is not null or undefined
assertParamExists('deleteUser', 'userId', userId)
const localVarPath = `/user/{userId}`
.replace(`{${"userId"}}`, encodeURIComponent(String(userId)));
deleteUser: async (id: string, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
// verify required parameter 'id' is not null or undefined
assertParamExists('deleteUser', 'id', id)
const localVarPath = `/user/{id}`
.replace(`{${"id"}}`, encodeURIComponent(String(id)));
// use dummy base URL string because the URL constructor only accepts absolute URLs.
const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
let baseOptions;
@@ -12305,15 +12305,15 @@ export const UserApiAxiosParamCreator = function (configuration?: Configuration)
},
/**
*
* @param {string} userId
* @param {string} id
* @param {*} [options] Override http request option.
* @throws {RequiredError}
*/
getProfileImage: async (userId: string, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
// verify required parameter 'userId' is not null or undefined
assertParamExists('getProfileImage', 'userId', userId)
const localVarPath = `/user/profile-image/{userId}`
.replace(`{${"userId"}}`, encodeURIComponent(String(userId)));
getProfileImage: async (id: string, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
// verify required parameter 'id' is not null or undefined
assertParamExists('getProfileImage', 'id', id)
const localVarPath = `/user/profile-image/{id}`
.replace(`{${"id"}}`, encodeURIComponent(String(id)));
// use dummy base URL string because the URL constructor only accepts absolute URLs.
const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
let baseOptions;
@@ -12347,15 +12347,15 @@ export const UserApiAxiosParamCreator = function (configuration?: Configuration)
},
/**
*
* @param {string} userId
* @param {string} id
* @param {*} [options] Override http request option.
* @throws {RequiredError}
*/
getUserById: async (userId: string, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
// verify required parameter 'userId' is not null or undefined
assertParamExists('getUserById', 'userId', userId)
const localVarPath = `/user/info/{userId}`
.replace(`{${"userId"}}`, encodeURIComponent(String(userId)));
getUserById: async (id: string, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
// verify required parameter 'id' is not null or undefined
assertParamExists('getUserById', 'id', id)
const localVarPath = `/user/info/{id}`
.replace(`{${"id"}}`, encodeURIComponent(String(id)));
// use dummy base URL string because the URL constructor only accepts absolute URLs.
const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
let baseOptions;
@@ -12423,15 +12423,15 @@ export const UserApiAxiosParamCreator = function (configuration?: Configuration)
},
/**
*
* @param {string} userId
* @param {string} id
* @param {*} [options] Override http request option.
* @throws {RequiredError}
*/
restoreUser: async (userId: string, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
// verify required parameter 'userId' is not null or undefined
assertParamExists('restoreUser', 'userId', userId)
const localVarPath = `/user/{userId}/restore`
.replace(`{${"userId"}}`, encodeURIComponent(String(userId)));
restoreUser: async (id: string, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
// verify required parameter 'id' is not null or undefined
assertParamExists('restoreUser', 'id', id)
const localVarPath = `/user/{id}/restore`
.replace(`{${"id"}}`, encodeURIComponent(String(id)));
// use dummy base URL string because the URL constructor only accepts absolute URLs.
const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
let baseOptions;
@@ -12539,12 +12539,12 @@ export const UserApiFp = function(configuration?: Configuration) {
},
/**
*
* @param {string} userId
* @param {string} id
* @param {*} [options] Override http request option.
* @throws {RequiredError}
*/
async deleteUser(userId: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<UserResponseDto>> {
const localVarAxiosArgs = await localVarAxiosParamCreator.deleteUser(userId, options);
async deleteUser(id: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<UserResponseDto>> {
const localVarAxiosArgs = await localVarAxiosParamCreator.deleteUser(id, options);
return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
},
/**
@@ -12568,22 +12568,22 @@ export const UserApiFp = function(configuration?: Configuration) {
},
/**
*
* @param {string} userId
* @param {string} id
* @param {*} [options] Override http request option.
* @throws {RequiredError}
*/
async getProfileImage(userId: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<object>> {
const localVarAxiosArgs = await localVarAxiosParamCreator.getProfileImage(userId, options);
async getProfileImage(id: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<object>> {
const localVarAxiosArgs = await localVarAxiosParamCreator.getProfileImage(id, options);
return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
},
/**
*
* @param {string} userId
* @param {string} id
* @param {*} [options] Override http request option.
* @throws {RequiredError}
*/
async getUserById(userId: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<UserResponseDto>> {
const localVarAxiosArgs = await localVarAxiosParamCreator.getUserById(userId, options);
async getUserById(id: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<UserResponseDto>> {
const localVarAxiosArgs = await localVarAxiosParamCreator.getUserById(id, options);
return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
},
/**
@@ -12598,12 +12598,12 @@ export const UserApiFp = function(configuration?: Configuration) {
},
/**
*
* @param {string} userId
* @param {string} id
* @param {*} [options] Override http request option.
* @throws {RequiredError}
*/
async restoreUser(userId: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<UserResponseDto>> {
const localVarAxiosArgs = await localVarAxiosParamCreator.restoreUser(userId, options);
async restoreUser(id: string, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<UserResponseDto>> {
const localVarAxiosArgs = await localVarAxiosParamCreator.restoreUser(id, options);
return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
},
/**
@@ -12646,12 +12646,12 @@ export const UserApiFactory = function (configuration?: Configuration, basePath?
},
/**
*
* @param {string} userId
* @param {string} id
* @param {*} [options] Override http request option.
* @throws {RequiredError}
*/
deleteUser(userId: string, options?: any): AxiosPromise<UserResponseDto> {
return localVarFp.deleteUser(userId, options).then((request) => request(axios, basePath));
deleteUser(id: string, options?: any): AxiosPromise<UserResponseDto> {
return localVarFp.deleteUser(id, options).then((request) => request(axios, basePath));
},
/**
*
@@ -12672,21 +12672,21 @@ export const UserApiFactory = function (configuration?: Configuration, basePath?
},
/**
*
* @param {string} userId
* @param {string} id
* @param {*} [options] Override http request option.
* @throws {RequiredError}
*/
getProfileImage(userId: string, options?: any): AxiosPromise<object> {
return localVarFp.getProfileImage(userId, options).then((request) => request(axios, basePath));
getProfileImage(id: string, options?: any): AxiosPromise<object> {
return localVarFp.getProfileImage(id, options).then((request) => request(axios, basePath));
},
/**
*
* @param {string} userId
* @param {string} id
* @param {*} [options] Override http request option.
* @throws {RequiredError}
*/
getUserById(userId: string, options?: any): AxiosPromise<UserResponseDto> {
return localVarFp.getUserById(userId, options).then((request) => request(axios, basePath));
getUserById(id: string, options?: any): AxiosPromise<UserResponseDto> {
return localVarFp.getUserById(id, options).then((request) => request(axios, basePath));
},
/**
*
@@ -12699,12 +12699,12 @@ export const UserApiFactory = function (configuration?: Configuration, basePath?
},
/**
*
* @param {string} userId
* @param {string} id
* @param {*} [options] Override http request option.
* @throws {RequiredError}
*/
restoreUser(userId: string, options?: any): AxiosPromise<UserResponseDto> {
return localVarFp.restoreUser(userId, options).then((request) => request(axios, basePath));
restoreUser(id: string, options?: any): AxiosPromise<UserResponseDto> {
return localVarFp.restoreUser(id, options).then((request) => request(axios, basePath));
},
/**
*
@@ -12757,7 +12757,7 @@ export interface UserApiDeleteUserRequest {
* @type {string}
* @memberof UserApiDeleteUser
*/
readonly userId: string
readonly id: string
}
/**
@@ -12785,7 +12785,7 @@ export interface UserApiGetProfileImageRequest {
* @type {string}
* @memberof UserApiGetProfileImage
*/
readonly userId: string
readonly id: string
}
/**
@@ -12799,7 +12799,7 @@ export interface UserApiGetUserByIdRequest {
* @type {string}
* @memberof UserApiGetUserById
*/
readonly userId: string
readonly id: string
}
/**
@@ -12827,7 +12827,7 @@ export interface UserApiRestoreUserRequest {
* @type {string}
* @memberof UserApiRestoreUser
*/
readonly userId: string
readonly id: string
}
/**
@@ -12881,7 +12881,7 @@ export class UserApi extends BaseAPI {
* @memberof UserApi
*/
public deleteUser(requestParameters: UserApiDeleteUserRequest, options?: AxiosRequestConfig) {
return UserApiFp(this.configuration).deleteUser(requestParameters.userId, options).then((request) => request(this.axios, this.basePath));
return UserApiFp(this.configuration).deleteUser(requestParameters.id, options).then((request) => request(this.axios, this.basePath));
}
/**
@@ -12913,7 +12913,7 @@ export class UserApi extends BaseAPI {
* @memberof UserApi
*/
public getProfileImage(requestParameters: UserApiGetProfileImageRequest, options?: AxiosRequestConfig) {
return UserApiFp(this.configuration).getProfileImage(requestParameters.userId, options).then((request) => request(this.axios, this.basePath));
return UserApiFp(this.configuration).getProfileImage(requestParameters.id, options).then((request) => request(this.axios, this.basePath));
}
/**
@@ -12924,7 +12924,7 @@ export class UserApi extends BaseAPI {
* @memberof UserApi
*/
public getUserById(requestParameters: UserApiGetUserByIdRequest, options?: AxiosRequestConfig) {
return UserApiFp(this.configuration).getUserById(requestParameters.userId, options).then((request) => request(this.axios, this.basePath));
return UserApiFp(this.configuration).getUserById(requestParameters.id, options).then((request) => request(this.axios, this.basePath));
}
/**
@@ -12946,7 +12946,7 @@ export class UserApi extends BaseAPI {
* @memberof UserApi
*/
public restoreUser(requestParameters: UserApiRestoreUserRequest, options?: AxiosRequestConfig) {
return UserApiFp(this.configuration).restoreUser(requestParameters.userId, options).then((request) => request(this.axios, this.basePath));
return UserApiFp(this.configuration).restoreUser(requestParameters.id, options).then((request) => request(this.axios, this.basePath));
}
/**

2
web/src/lib/components/admin-page/delete-confirm-dialoge.svelte
View File

@@ -10,7 +10,7 @@
const deleteUser = async () => {
try {
const deletedUser = await api.userApi.deleteUser({ userId: user.id });
const deletedUser = await api.userApi.deleteUser({ id: user.id });
if (deletedUser.data.deletedAt != null) {
dispatch('user-delete-success');
} else {

2
web/src/lib/components/admin-page/restore-dialoge.svelte
View File

@@ -8,7 +8,7 @@
const dispatch = createEventDispatcher();
const restoreUser = async () => {
const restoredUser = await api.userApi.restoreUser({ userId: user.id });
const restoredUser = await api.userApi.restoreUser({ id: user.id });
if (restoredUser.data.deletedAt == null) dispatch('user-restore-success');
else dispatch('user-restore-fail');
};

2
web/src/lib/components/album-page/album-card.svelte
View File

@@ -52,7 +52,7 @@
});
const getAlbumOwnerInfo = async (): Promise<UserResponseDto> => {
const { data } = await api.userApi.getUserById({ userId: album.ownerId });
const { data } = await api.userApi.getUserById({ id: album.ownerId });
return data;
};

2
web/src/routes/(user)/partners/[userId]/+page.server.ts
View File

@@ -9,7 +9,7 @@ export const load: PageServerLoad = async ({ params, parent, locals: { api } })
throw redirect(302, AppRoute.AUTH_LOGIN);
}
const { data: partner } = await api.userApi.getUserById({ userId: params['userId'] });
const { data: partner } = await api.userApi.getUserById({ id: params['userId'] });
return {
user,