fix: Resend invite operation on users list (#11351)

Co-authored-by: Danny Martini <[email protected]>

packages/cli/src/requests.ts

@@ -244,7 +244,13 @@ export declare namespace UserRequest {
 	>;
 
 	export type InviteResponse = {
-		user: { id: string; email: string; inviteAcceptUrl?: string; emailSent: boolean };
+		user: {
+			id: string;
+			email: string;
+			inviteAcceptUrl?: string;
+			emailSent: boolean;
+			role: AssignableRole;
+		};
 		error?: string;
 	};
 

packages/cli/src/services/user.service.ts

@@ -130,6 +130,7 @@ export class UserService {
 						email,
 						inviteAcceptUrl,
 						emailSent: false,
+						role,
 					},
 					error: '',
 				};

packages/cli/test/integration/controllers/invitation/invitation.controller.integration.test.ts

@@ -246,6 +246,7 @@ describe('InvitationController', () => {
 			const { user } = response.body.data[0];
 
 			expect(user.inviteAcceptUrl).toBeDefined();
+			expect(user).toHaveProperty('role', 'global:member');
 
 			const inviteUrl = new URL(user.inviteAcceptUrl);
 

packages/editor-ui/src/Interface.ts

@@ -1189,6 +1189,7 @@ export interface IInviteResponse {
 		email: string;
 		emailSent: boolean;
 		inviteAcceptUrl: string;
+		role: IRole;
 	};
 	error?: string;
 }

packages/editor-ui/src/stores/users.store.test.ts

@@ -2,17 +2,22 @@ import type { CurrentUserResponse } from '@/Interface';
 import { useUsersStore } from './users.store';
 import { createPinia, setActivePinia } from 'pinia';
 
-const { loginCurrentUser, identify } = vi.hoisted(() => {
+const { loginCurrentUser, identify, inviteUsers } = vi.hoisted(() => {
 	return {
 		loginCurrentUser: vi.fn(),
 		identify: vi.fn(),
+		inviteUsers: vi.fn(),
 	};
 });
 
 vi.mock('@/api/users', () => ({
 	loginCurrentUser,
 }));
 
+vi.mock('@/api/invitation', () => ({
+	inviteUsers,
+}));
+
 vi.mock('@/composables/useTelemetry', () => ({
 	useTelemetry: vi.fn(() => ({
 		identify,
@@ -58,4 +63,31 @@ describe('users.store', () => {
 			expect(identify).toHaveBeenCalledWith('test-instance-id', mockUser.id);
 		});
 	});
+
+	describe('inviteUsers', () => {
+		it('should add pending user to the store', async () => {
+			const usersStore = useUsersStore();
+
+			inviteUsers.mockResolvedValueOnce([
+				{
+					user: { id: 'random-id', email: '[email protected]', emailSent: true, role: 'global:member' },
+				},
+			]);
+
+			await usersStore.inviteUsers([{ email: '[email protected]', role: 'global:member' }]);
+
+			expect(usersStore.allUsers[0]).toMatchObject(
+				expect.objectContaining({
+					id: 'random-id',
+					email: '[email protected]',
+					role: 'global:member',
+					isPending: true,
+					isDefaultUser: false,
+					isPendingUser: true,
+					fullName: undefined,
+					emailSent: true,
+				}),
+			);
+		});
+	});
 });

packages/editor-ui/src/stores/users.store.ts

@@ -278,9 +278,8 @@ export const useUsersStore = defineStore(STORES.USERS, () => {
 	const inviteUsers = async (params: Array<{ email: string; role: InvitableRoleName }>) => {
 		const invitedUsers = await invitationsApi.inviteUsers(rootStore.restApiContext, params);
 		addUsers(
-			invitedUsers.map(({ user }, index) => ({
+			invitedUsers.map(({ user }) => ({
 				isPending: true,
-				globalRole: { name: params[index].role },
 				...user,
 			})),
 		);