mudhorn/n8n
1
0
Fork 0
mirror of https://github.com/n8n-io/n8n.git synced 2025-03-05 20:50:17 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

refactor: Update typings of /me/settings and /users/:id/settings endpoints (no-changelog) (#9620)

Browse source
This commit is contained in:
Tomi Turtiainen 2024-06-05 09:35:43 +03:00 committed by GitHub
parent 5322802992
commit d6a046b8ad
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
packages/cli/src/requests.ts
View file

@ -47,7 +47,7 @@ export class UserSettingsUpdatePayload {
@Expose() @Expose()
@IsBoolean({ message: 'userActivated should be a boolean' }) @IsBoolean({ message: 'userActivated should be a boolean' })
@IsOptional() @IsOptional()
userActivated: boolean; userActivated?: boolean;
@Expose() @Expose()
@IsBoolean({ message: 'allowSSOManualLogin should be a boolean' }) @IsBoolean({ message: 'allowSSOManualLogin should be a boolean' })

26
packages/editor-ui/src/api/users.ts
View file

@ -5,9 +5,14 @@ import type {
IUserResponse, IUserResponse,
InvitableRoleName, InvitableRoleName,
} from '@/Interface'; } from '@/Interface';
import type { IDataObject } from 'n8n-workflow'; import type { IDataObject, IUserSettings } from 'n8n-workflow';
import { makeRestApiRequest } from '@/utils/apiUtils'; import { makeRestApiRequest } from '@/utils/apiUtils';
export interface IUpdateUserSettingsReqPayload {
allowSSOManualLogin?: boolean;
userActivated?: boolean;
}
export async function loginCurrentUser( export async function loginCurrentUser(
context: IRestApiContext, context: IRestApiContext,
): Promise<CurrentUserResponse | null> { ): Promise<CurrentUserResponse | null> {
@ -93,27 +98,22 @@ export async function updateCurrentUser(
email: string; email: string;
}, },
): Promise<IUserResponse> { ): Promise<IUserResponse> {
return await makeRestApiRequest(context, 'PATCH', '/me', params as unknown as IDataObject); return await makeRestApiRequest(context, 'PATCH', '/me', params);
} }
export async function updateCurrentUserSettings( export async function updateCurrentUserSettings(
context: IRestApiContext, context: IRestApiContext,
settings: IUserResponse['settings'], settings: IUpdateUserSettingsReqPayload,
): Promise<IUserResponse['settings']> { ): Promise<IUserSettings> {
return await makeRestApiRequest(context, 'PATCH', '/me/settings', settings as IDataObject); return await makeRestApiRequest(context, 'PATCH', '/me/settings', settings);
} }
export async function updateOtherUserSettings( export async function updateOtherUserSettings(
context: IRestApiContext, context: IRestApiContext,
userId: string, userId: string,
settings: IUserResponse['settings'], settings: IUpdateUserSettingsReqPayload,
): Promise<IUserResponse['settings']> { ): Promise<IUserSettings> {
return await makeRestApiRequest( return await makeRestApiRequest(context, 'PATCH', `/users/${userId}/settings`, settings);
context,
'PATCH',
`/users/${userId}/settings`,
settings as IDataObject,
);
} }
export async function updateCurrentUserPassword( export async function updateCurrentUserPassword(

6
packages/editor-ui/src/stores/users.store.ts
View file

@ -1,4 +1,4 @@
import type { UpdateGlobalRolePayload } from '@/api/users'; import type { IUpdateUserSettingsReqPayload, UpdateGlobalRolePayload } from '@/api/users';
import { import {
changePassword, changePassword,
deleteUser, deleteUser,
@ -246,7 +246,7 @@ export const useUsersStore = defineStore(STORES.USERS, {
const user = await updateCurrentUser(rootStore.getRestApiContext, params); const user = await updateCurrentUser(rootStore.getRestApiContext, params);
this.addUsers([user]); this.addUsers([user]);
}, },
async updateUserSettings(settings: IUserResponse['settings']): Promise<void> { async updateUserSettings(settings: IUpdateUserSettingsReqPayload): Promise<void> {
const rootStore = useRootStore(); const rootStore = useRootStore();
const updatedSettings = await updateCurrentUserSettings( const updatedSettings = await updateCurrentUserSettings(
rootStore.getRestApiContext, rootStore.getRestApiContext,
@ -259,7 +259,7 @@ export const useUsersStore = defineStore(STORES.USERS, {
}, },
async updateOtherUserSettings( async updateOtherUserSettings(
userId: string, userId: string,
settings: IUserResponse['settings'], settings: IUpdateUserSettingsReqPayload,
): Promise<void> { ): Promise<void> {
const rootStore = useRootStore(); const rootStore = useRootStore();
const updatedSettings = await updateOtherUserSettings( const updatedSettings = await updateOtherUserSettings(