Sync user archive across all interfaces

Align user-removal UX and API surface semantics with the new archive\nbehavior for manually managed users.\n\nFrontend copy and actions now use archive wording, and list rows are\nrefetched after the mutation so archived users reappear as inactive.\n\nMCP removeUser now documents and returns archived_user_id, n8n labels\nand response mapping now use archive semantics, and the CLI gains a\nuser archive command backed by the same mutation.

Signed-off-by: Cursor Agent <cursoragent@cursor.com>
This commit is contained in:
Cursor Agent
2026-05-27 00:50:28 +00:00
committed by Bryan Frimin
parent ebe9cc0e65
commit 23070b18b5
9 changed files with 152 additions and 31 deletions

View File

@@ -67,8 +67,8 @@ export function PersonPage(props: { queryRef: PreloadedQuery<PersonPageQuery> })
const [removeUser, isRemoving] = useMutationWithToasts(
removeUserMutation,
{
successMessage: __("Person removed successfully"),
errorMessage: __("Failed to remove person"),
successMessage: __("Person archived successfully"),
errorMessage: __("Failed to archive person"),
},
);
@@ -89,13 +89,15 @@ export function PersonPage(props: { queryRef: PreloadedQuery<PersonPageQuery> })
},
{
message: sprintf(
__("Are you sure you want to remove %s?"),
__("Are you sure you want to archive %s?"),
person.fullName,
),
},
);
};
const canArchive = person.canDelete && person.source !== "SCIM";
return (
<div className="space-y-6">
<Breadcrumb
@@ -120,7 +122,7 @@ export function PersonPage(props: { queryRef: PreloadedQuery<PersonPageQuery> })
<div className="text-lg text-txt-secondary">{person.emailAddress}</div>
</div>
</div>
{person.canDelete && person.source !== "SCIM" && (
{canArchive && (
<ActionDropdown variant="secondary">
<DropdownItem
variant="danger"
@@ -128,7 +130,7 @@ export function PersonPage(props: { queryRef: PreloadedQuery<PersonPageQuery> })
onClick={handleRemove}
disabled={isRemoving}
>
{__("Delete")}
{__("Archive")}
</DropdownItem>
</ActionDropdown>
)}

View File

@@ -112,7 +112,7 @@ export function PeopleListItem(props: {
fKey: PeopleListItemFragment$key;
onRefetch: () => void;
}) {
const { fKey, connectionId } = props;
const { fKey, connectionId, onRefetch } = props;
const organizationId = useOrganizationId();
const { __ } = useTranslate();
@@ -127,7 +127,7 @@ export function PeopleListItem(props: {
const isInactive = profile.state === "INACTIVE";
const canSendActivationMail = isInactive && profile.source !== "SCIM" && profile.canInvite;
const canDelete = profile.canDelete && profile.source !== "SCIM";
const canArchive = profile.canDelete && profile.source !== "SCIM" && profile.state !== "INACTIVE";
const [inviteUser]
= useMutationWithToasts<PeopleListItem_inviteMutation>(inviteUserMutation, {
@@ -144,8 +144,8 @@ export function PeopleListItem(props: {
const [removeUser, isRemoving] = useMutationWithToasts(
removeUserMutation,
{
successMessage: __("Person removed successfully"),
errorMessage: __("Failed to remove person"),
successMessage: __("Person archived successfully"),
errorMessage: __("Failed to archive person"),
},
);
@@ -194,11 +194,14 @@ export function PeopleListItem(props: {
},
connections: [connectionId],
},
onCompleted: () => {
onRefetch();
},
});
},
{
message: sprintf(
__("Are you sure you want to remove %s?"),
__("Are you sure you want to archive %s?"),
profile.fullName,
),
},
@@ -267,7 +270,7 @@ export function PeopleListItem(props: {
{new Date(profile.createdAt).toLocaleDateString()}
</Td>
<Td noLink width={160} className="text-end">
{(canSendActivationMail || canDelete) && (
{(canSendActivationMail || canArchive) && (
<ActionDropdown>
{canSendActivationMail && (
<DropdownItem
@@ -277,13 +280,13 @@ export function PeopleListItem(props: {
{lastInvitation ? __("Resend activation mail") : __("Send activation mail")}
</DropdownItem>
)}
{canDelete && (
{canArchive && (
<DropdownItem
onClick={handleRemove}
variant="danger"
icon={IconTrashCan}
>
{__("Remove person")}
{__("Archive person")}
</DropdownItem>
)}
</ActionDropdown>

View File

@@ -58,10 +58,10 @@ export const description: INodeProperties[] = [
action: 'List users',
},
{
name: 'Remove',
name: 'Archive',
value: 'removeUser',
description: 'Remove a user from the organization',
action: 'Remove a user',
description: 'Archive a user in the organization',
action: 'Archive a user',
},
{
name: 'Update',

View File

@@ -41,7 +41,7 @@ export const description: INodeProperties[] = [
},
},
default: '',
description: 'The ID of the user (profile) to remove from the organization',
description: 'The ID of the user (profile) to archive in the organization',
required: true,
},
];
@@ -56,7 +56,7 @@ export async function execute(
const query = `
mutation RemoveUser($input: RemoveUserInput!) {
removeUser(input: $input) {
deletedProfileId
archivedProfileId: deletedProfileId
}
}
`;

View File

@@ -0,0 +1,114 @@
// Copyright (c) 2026 Probo Inc <hello@getprobo.com>.
//
// Permission to use, copy, modify, and/or distribute this software for any
// purpose with or without fee is hereby granted, provided that the above
// copyright notice and this permission notice appear in all copies.
//
// THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
// REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
// AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
// INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
// LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
// OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
// PERFORMANCE OF THIS SOFTWARE.
package archive
import (
"fmt"
"github.com/charmbracelet/huh"
"github.com/spf13/cobra"
"go.probo.inc/probo/pkg/cli/api"
"go.probo.inc/probo/pkg/cmd/cmdutil"
)
const archiveMutation = `
mutation($input: RemoveUserInput!) {
removeUser(input: $input) {
deletedProfileId
}
}
`
func NewCmdArchive(f *cmdutil.Factory) *cobra.Command {
var (
flagOrg string
flagYes bool
)
cmd := &cobra.Command{
Use: "archive <id>",
Short: "Archive a user",
Args: cobra.ExactArgs(1),
RunE: func(cmd *cobra.Command, args []string) error {
if !flagYes {
if !f.IOStreams.IsInteractive() {
return fmt.Errorf("cannot archive user: confirmation required, use --yes to confirm")
}
var confirmed bool
err := huh.NewConfirm().
Title(fmt.Sprintf("Archive user %s?", args[0])).
Value(&confirmed).
Run()
if err != nil {
return err
}
if !confirmed {
return nil
}
}
cfg, err := f.Config()
if err != nil {
return err
}
host, hc, err := cfg.DefaultHost()
if err != nil {
return err
}
if flagOrg == "" {
flagOrg = hc.Organization
}
if flagOrg == "" {
return fmt.Errorf("organization is required; pass --org or set a default with 'prb auth login'")
}
client := api.NewClient(
host,
hc.Token,
"/api/console/v1/graphql",
cfg.HTTPTimeoutDuration(),
cmdutil.TokenRefreshOption(cfg, host, hc),
)
_, err = client.Do(
archiveMutation,
map[string]any{
"input": map[string]any{
"organizationId": flagOrg,
"profileId": args[0],
},
},
)
if err != nil {
return err
}
_, _ = fmt.Fprintf(f.IOStreams.Out, "Archived user %s\n", args[0])
return nil
},
}
cmd.Flags().StringVar(&flagOrg, "org", "", "Organization ID")
cmd.Flags().BoolVarP(&flagYes, "yes", "y", false, "Skip confirmation prompt")
return cmd
}

View File

@@ -17,6 +17,7 @@ package user
import (
"github.com/spf13/cobra"
"go.probo.inc/probo/pkg/cmd/cmdutil"
"go.probo.inc/probo/pkg/cmd/user/archive"
"go.probo.inc/probo/pkg/cmd/user/list"
"go.probo.inc/probo/pkg/cmd/user/view"
)
@@ -29,6 +30,7 @@ func NewCmdUser(f *cmdutil.Factory) *cobra.Command {
cmd.AddCommand(list.NewCmdList(f))
cmd.AddCommand(view.NewCmdView(f))
cmd.AddCommand(archive.NewCmdArchive(f))
return cmd
}

View File

@@ -113,15 +113,15 @@ func (r *mutationResolver) RemoveUser(ctx context.Context, input types.RemoveUse
err := r.iam.OrganizationService.RemoveUser(ctx, input.OrganizationID, input.ProfileID)
if err != nil {
if _, ok := errors.AsType[*iam.ErrUserManagedBySCIM](err); ok {
return nil, gqlutils.Conflict(ctx, err)
return nil, gqlutils.Conflictf(ctx, "user is managed by SCIM and cannot be archived")
}
if _, ok := errors.AsType[*iam.ErrLastActiveOwner](err); ok {
return nil, gqlutils.Conflict(ctx, err)
return nil, gqlutils.Conflictf(ctx, "cannot archive last active owner")
}
if errors.Is(err, coredata.ErrResourceInUse) {
return nil, gqlutils.Conflict(ctx, err)
return nil, gqlutils.Conflictf(ctx, "cannot archive user")
}
r.logger.ErrorCtx(ctx, "cannot remove user from organization", log.Error(err))

View File

@@ -2923,21 +2923,21 @@ func (r *Resolver) RemoveUserTool(ctx context.Context, req *mcp.CallToolRequest,
err := r.iamSvc.OrganizationService.RemoveUser(ctx, input.OrganizationID, input.ProfileID)
if err != nil {
if _, ok := errors.AsType[*iam.ErrUserManagedBySCIM](err); ok {
return nil, types.RemoveUserOutput{}, fmt.Errorf("user is managed by SCIM and cannot be removed: %w", err)
return nil, types.RemoveUserOutput{}, fmt.Errorf("user is managed by SCIM and cannot be archived: %w", err)
}
if _, ok := errors.AsType[*iam.ErrLastActiveOwner](err); ok {
return nil, types.RemoveUserOutput{}, fmt.Errorf("cannot remove last active owner: %w", err)
return nil, types.RemoveUserOutput{}, fmt.Errorf("cannot archive last active owner: %w", err)
}
if errors.Is(err, coredata.ErrResourceInUse) {
return nil, types.RemoveUserOutput{}, fmt.Errorf("cannot remove user: %w", err)
return nil, types.RemoveUserOutput{}, fmt.Errorf("cannot archive user: %w", err)
}
return nil, types.RemoveUserOutput{}, fmt.Errorf("remove user: %w", err)
return nil, types.RemoveUserOutput{}, fmt.Errorf("archive user: %w", err)
}
return nil, types.RemoveUserOutput{DeletedUserID: input.ProfileID}, nil
return nil, types.RemoveUserOutput{ArchivedUserID: input.ProfileID}, nil
}
func (r *Resolver) DeleteDataProtectionImpactAssessmentTool(ctx context.Context, req *mcp.CallToolRequest, input *types.DeleteDataProtectionImpactAssessmentInput) (*mcp.CallToolResult, types.DeleteDataProtectionImpactAssessmentOutput, error) {

View File

@@ -1709,16 +1709,16 @@ components:
description: Organization ID
profile_id:
$ref: "#/components/schemas/GID"
description: User (profile) ID to remove
description: User (profile) ID to archive
RemoveUserOutput:
type: object
required:
- deleted_user_id
- archived_user_id
properties:
deleted_user_id:
archived_user_id:
$ref: "#/components/schemas/GID"
description: Deleted user (profile) ID
description: Archived user (profile) ID
GetProfileInput:
type: object
@@ -11934,7 +11934,7 @@ tools:
outputSchema:
$ref: "#/components/schemas/UpdateMembershipOutput"
- name: removeUser
description: Remove a user from the organization
description: Archive a user in the organization
hints:
readonly: false
inputSchema: