Modern Docker Management, Designed for Everyone
Go composecontainer-managementcontainersdockerdocker-composedocker-managementgoself-hostedsveltekittypescriptweb-ui
fix: refactor user creation logic to use CreateUser type and improve type safety
Kyle Mendell6ccb106795f9
diff --git a/frontend/src/lib/services/api/user-api-service.ts b/frontend/src/lib/services/api/user-api-service.tsindex 5eafc677e..d01ad12df 100644--- a/frontend/src/lib/services/api/user-api-service.ts+++ b/frontend/src/lib/services/api/user-api-service.ts@@ -1,6 +1,10 @@import BaseAPIService from './api-service';-import type { User } from '$lib/types/user.type';-import type { PaginationRequest, SortRequest, PaginatedApiResponse } from '$lib/types/pagination.type';+import type { User, CreateUser } from '$lib/types/user.type';+import type {+ PaginationRequest,+ SortRequest,+ PaginatedApiResponse+} from '$lib/types/pagination.type';export interface Role {id: string;@@ -20,38 +24,42 @@ export default class UserAPIService extends BaseAPIService {}async getUsers(- pagination?: PaginationRequest,- sort?: SortRequest,- search?: string,- filters?: Record<string, string>-): Promise<any[] | PaginatedApiResponse<any>> {- if (!pagination) {- const response = await this.handleResponse<{ users?: any[] }>(this.api.get('/users'));- return Array.isArray(response.users) ? response.users : Array.isArray(response) ? response : [];- }-- const params: any = {- 'pagination[page]': pagination.page,- 'pagination[limit]': pagination.limit- };-- if (sort) {- params['sort[column]'] = sort.column;- params['sort[direction]'] = sort.direction;- }-- if (search) {- params.search = search;- }-- if (filters) {- Object.entries(filters).forEach(([key, value]) => {- params[key] = value;- });- }-- return this.handleResponse(this.api.get('/users', { params }));-}+ pagination?: PaginationRequest,+ sort?: SortRequest,+ search?: string,+ filters?: Record<string, string>+ ): Promise<any[] | PaginatedApiResponse<any>> {+ if (!pagination) {+ const response = await this.handleResponse<{ users?: any[] }>(this.api.get('/users'));+ return Array.isArray(response.users)+ ? response.users+ : Array.isArray(response)+ ? response+ : [];+ }++ const params: any = {+ 'pagination[page]': pagination.page,+ 'pagination[limit]': pagination.limit+ };++ if (sort) {+ params['sort[column]'] = sort.column;+ params['sort[direction]'] = sort.direction;+ }++ if (search) {+ params.search = search;+ }++ if (filters) {+ Object.entries(filters).forEach(([key, value]) => {+ params[key] = value;+ });+ }++ return this.handleResponse(this.api.get('/users', { params }));+ }async get(id: string): Promise<User> {return this.handleResponse(this.api.get(`/users/${id}`)) as Promise<User>;@@ -61,7 +69,7 @@ export default class UserAPIService extends BaseAPIService {return this.handleResponse(this.api.get(`/auth/me`)) as Promise<User>;}- async create(user: Omit<User, 'id' | 'createdAt' | 'updatedAt'>): Promise<User> {+ async create(user: CreateUser): Promise<User> {return this.handleResponse(this.api.post('/users', user)) as Promise<User>;}@@ -94,11 +102,15 @@ export default class UserAPIService extends BaseAPIService {}async getByUsername(username: string): Promise<User> {- return this.handleResponse(this.api.get(`/users/by-username/${encodeURIComponent(username)}`)) as Promise<User>;+ return this.handleResponse(+ this.api.get(`/users/by-username/${encodeURIComponent(username)}`)+ ) as Promise<User>;}async getByOidcSubjectId(oidcSubjectId: string): Promise<User> {- return this.handleResponse(this.api.get(`/users/by-oidc-subject/${encodeURIComponent(oidcSubjectId)}`)) as Promise<User>;+ return this.handleResponse(+ this.api.get(`/users/by-oidc-subject/${encodeURIComponent(oidcSubjectId)}`)+ ) as Promise<User>;}async getRoles(): Promise<Role[]> {@@ -122,11 +134,15 @@ export default class UserAPIService extends BaseAPIService {}async assignRole(userId: string, roleId: string): Promise<void> {- return this.handleResponse(this.api.post(`/users/${userId}/roles`, { roleId })) as Promise<void>;+ return this.handleResponse(+ this.api.post(`/users/${userId}/roles`, { roleId })+ ) as Promise<void>;}async removeRole(userId: string, roleId: string): Promise<void> {- return this.handleResponse(this.api.delete(`/users/${userId}/roles/${roleId}`)) as Promise<void>;+ return this.handleResponse(+ this.api.delete(`/users/${userId}/roles/${roleId}`)+ ) as Promise<void>;}async getUserRoles(userId: string): Promise<Role[]> {diff --git a/frontend/src/lib/types/user.type.ts b/frontend/src/lib/types/user.type.tsindex db1f61ee1..12fa119a5 100644--- a/frontend/src/lib/types/user.type.ts+++ b/frontend/src/lib/types/user.type.ts@@ -46,3 +46,18 @@ export interface NotificationPreferences {deployments: boolean;systemAlerts: boolean;}++export type CreateUser = Omit<+ User,+ | 'id'+ | 'createdAt'+ | 'updatedAt'+ | 'lastLogin'+ | 'oidcSubjectId'+ | 'passwordHash'+ | 'requirePasswordChange'+ | 'roles'+> & {+ password: string;+ roles?: string[];+};diff --git a/frontend/src/routes/settings/users/+page.svelte b/frontend/src/routes/settings/users/+page.svelteindex 6f899cd5c..a34fcabd8 100644--- a/frontend/src/routes/settings/users/+page.svelte+++ b/frontend/src/routes/settings/users/+page.svelte@@ -11,6 +11,7 @@import UserFormSheet from '$lib/components/sheets/user-form-sheet.svelte';import type { SearchPaginationSortRequest } from '$lib/types/pagination.type';import type { User } from '$lib/types/user.type';+ import type { CreateUser } from '$lib/types/user.type';let { data } = $props();@@ -125,13 +126,12 @@return;}- const createUser: Omit<User, 'id' | 'createdAt' | 'updatedAt'> = {- username: user.username,+ const createUser: CreateUser = {+ username: user.username!,displayName: user.displayName,email: user.email,- roles: user.roles || ['user'],- passwordHash: user.password,- requirePasswordChange: false+ password: user.password!,+ roles: user.roles ?? ['user']};const result = await tryCatch(userAPI.create(createUser));