Reimplement invitations

Signed-off-by: Émile Ré <emile@getprobo.com>
This commit is contained in:
Émile Ré
2026-02-17 00:26:22 +04:00
parent a42fc4fa61
commit 47aba96b69
43 changed files with 1651 additions and 4550 deletions

View File

@@ -1,5 +1,5 @@
/**
* @generated SignedSource<<59df18257cc2bae52aefd576c20f03cf>>
* @generated SignedSource<<e920b2bbd380e12014a100bfb963c8f7>>
* @lightSyntaxTransform
* @nogrep
*/
@@ -9,24 +9,23 @@
// @ts-nocheck
import { ConcreteRequest } from 'relay-runtime';
export type SignUpFromInvitationInput = {
fullName: string;
export type ActivateAccountInput = {
password: string;
token: string;
};
export type SignUpFromInvitationPageMutation$variables = {
input: SignUpFromInvitationInput;
export type ActivateAccountPageMutation$variables = {
input: ActivateAccountInput;
};
export type SignUpFromInvitationPageMutation$data = {
readonly signUpFromInvitation: {
readonly identity: {
export type ActivateAccountPageMutation$data = {
readonly activateAccount: {
readonly profile: {
readonly id: string;
} | null | undefined;
} | null | undefined;
};
export type SignUpFromInvitationPageMutation = {
response: SignUpFromInvitationPageMutation$data;
variables: SignUpFromInvitationPageMutation$variables;
export type ActivateAccountPageMutation = {
response: ActivateAccountPageMutation$data;
variables: ActivateAccountPageMutation$variables;
};
const node: ConcreteRequest = (function(){
@@ -47,17 +46,17 @@ v1 = [
"variableName": "input"
}
],
"concreteType": "SignUpFromInvitationPayload",
"concreteType": "ActivateAccountPayload",
"kind": "LinkedField",
"name": "signUpFromInvitation",
"name": "activateAccount",
"plural": false,
"selections": [
{
"alias": null,
"args": null,
"concreteType": "Identity",
"concreteType": "Profile",
"kind": "LinkedField",
"name": "identity",
"name": "profile",
"plural": false,
"selections": [
{
@@ -79,7 +78,7 @@ return {
"argumentDefinitions": (v0/*: any*/),
"kind": "Fragment",
"metadata": null,
"name": "SignUpFromInvitationPageMutation",
"name": "ActivateAccountPageMutation",
"selections": (v1/*: any*/),
"type": "Mutation",
"abstractKey": null
@@ -88,20 +87,20 @@ return {
"operation": {
"argumentDefinitions": (v0/*: any*/),
"kind": "Operation",
"name": "SignUpFromInvitationPageMutation",
"name": "ActivateAccountPageMutation",
"selections": (v1/*: any*/)
},
"params": {
"cacheID": "9bdca3bd56cb86a2e9c0627379f7f58f",
"cacheID": "57d92d0ae2a6220af84fbd9fe27f7aa3",
"id": null,
"metadata": {},
"name": "SignUpFromInvitationPageMutation",
"name": "ActivateAccountPageMutation",
"operationKind": "mutation",
"text": "mutation SignUpFromInvitationPageMutation(\n $input: SignUpFromInvitationInput!\n) {\n signUpFromInvitation(input: $input) {\n identity {\n id\n }\n }\n}\n"
"text": "mutation ActivateAccountPageMutation(\n $input: ActivateAccountInput!\n) {\n activateAccount(input: $input) {\n profile {\n id\n }\n }\n}\n"
}
};
})();
(node as any).hash = "418fe53fbdc92e4ce5d2256062f08322";
(node as any).hash = "0e073ce00eb7c435a875b5797f3e6db0";
export default node;

View File

@@ -1,89 +0,0 @@
/**
* @generated SignedSource<<d4c36c6798ea000539ef714721fd514f>>
* @lightSyntaxTransform
* @nogrep
*/
/* tslint:disable */
/* eslint-disable */
// @ts-nocheck
import { ReaderFragment } from 'relay-runtime';
export type MembershipRole = "ADMIN" | "AUDITOR" | "EMPLOYEE" | "OWNER" | "VIEWER";
import { FragmentRefs } from "relay-runtime";
export type InvitationCardFragment$data = {
readonly createdAt: string;
readonly id: string;
readonly organization: {
readonly id: string;
readonly name: string;
};
readonly role: MembershipRole;
readonly " $fragmentType": "InvitationCardFragment";
};
export type InvitationCardFragment$key = {
readonly " $data"?: InvitationCardFragment$data;
readonly " $fragmentSpreads": FragmentRefs<"InvitationCardFragment">;
};
const node: ReaderFragment = (function(){
var v0 = {
"alias": null,
"args": null,
"kind": "ScalarField",
"name": "id",
"storageKey": null
};
return {
"argumentDefinitions": [],
"kind": "Fragment",
"metadata": null,
"name": "InvitationCardFragment",
"selections": [
(v0/*: any*/),
{
"alias": null,
"args": null,
"kind": "ScalarField",
"name": "role",
"storageKey": null
},
{
"alias": null,
"args": null,
"kind": "ScalarField",
"name": "createdAt",
"storageKey": null
},
{
"kind": "RequiredField",
"field": {
"alias": null,
"args": null,
"concreteType": "Organization",
"kind": "LinkedField",
"name": "organization",
"plural": false,
"selections": [
(v0/*: any*/),
{
"alias": null,
"args": null,
"kind": "ScalarField",
"name": "name",
"storageKey": null
}
],
"storageKey": null
},
"action": "THROW"
}
],
"type": "Invitation",
"abstractKey": null
};
})();
(node as any).hash = "57aedeabc62e474c6e5b995af1d31888";
export default node;

View File

@@ -1,205 +0,0 @@
/**
* @generated SignedSource<<8369cd1e8f928481ea43a4e09f11a3f4>>
* @lightSyntaxTransform
* @nogrep
*/
/* tslint:disable */
/* eslint-disable */
// @ts-nocheck
import { ConcreteRequest } from 'relay-runtime';
import { FragmentRefs } from "relay-runtime";
export type AcceptInvitationInput = {
invitationId: string;
};
export type InvitationCardMutation$variables = {
input: AcceptInvitationInput;
pendingInvitationConnections: ReadonlyArray<string>;
};
export type InvitationCardMutation$data = {
readonly acceptInvitation: {
readonly invitation: {
readonly id: string;
};
readonly membership: {
readonly id: string;
readonly " $fragmentSpreads": FragmentRefs<"MembershipCardFragment">;
};
} | null | undefined;
};
export type InvitationCardMutation = {
response: InvitationCardMutation$data;
variables: InvitationCardMutation$variables;
};
const node: ConcreteRequest = (function(){
var v0 = [
{
"defaultValue": null,
"kind": "LocalArgument",
"name": "input"
},
{
"defaultValue": null,
"kind": "LocalArgument",
"name": "pendingInvitationConnections"
}
],
v1 = [
{
"kind": "Variable",
"name": "input",
"variableName": "input"
}
],
v2 = {
"alias": null,
"args": null,
"kind": "ScalarField",
"name": "id",
"storageKey": null
};
return {
"fragment": {
"argumentDefinitions": (v0/*: any*/),
"kind": "Fragment",
"metadata": null,
"name": "InvitationCardMutation",
"selections": [
{
"alias": null,
"args": (v1/*: any*/),
"concreteType": "AcceptInvitationPayload",
"kind": "LinkedField",
"name": "acceptInvitation",
"plural": false,
"selections": [
{
"alias": null,
"args": null,
"concreteType": "Invitation",
"kind": "LinkedField",
"name": "invitation",
"plural": false,
"selections": [
(v2/*: any*/)
],
"storageKey": null
},
{
"alias": null,
"args": null,
"concreteType": "Membership",
"kind": "LinkedField",
"name": "membership",
"plural": false,
"selections": [
(v2/*: any*/),
{
"args": null,
"kind": "FragmentSpread",
"name": "MembershipCardFragment"
}
],
"storageKey": null
}
],
"storageKey": null
}
],
"type": "Mutation",
"abstractKey": null
},
"kind": "Request",
"operation": {
"argumentDefinitions": (v0/*: any*/),
"kind": "Operation",
"name": "InvitationCardMutation",
"selections": [
{
"alias": null,
"args": (v1/*: any*/),
"concreteType": "AcceptInvitationPayload",
"kind": "LinkedField",
"name": "acceptInvitation",
"plural": false,
"selections": [
{
"alias": null,
"args": null,
"concreteType": "Invitation",
"kind": "LinkedField",
"name": "invitation",
"plural": false,
"selections": [
(v2/*: any*/),
{
"alias": null,
"args": null,
"filters": null,
"handle": "deleteEdge",
"key": "",
"kind": "ScalarHandle",
"name": "id",
"handleArgs": [
{
"kind": "Variable",
"name": "connections",
"variableName": "pendingInvitationConnections"
}
]
}
],
"storageKey": null
},
{
"alias": null,
"args": null,
"concreteType": "Membership",
"kind": "LinkedField",
"name": "membership",
"plural": false,
"selections": [
(v2/*: any*/),
{
"alias": null,
"args": null,
"concreteType": "Session",
"kind": "LinkedField",
"name": "lastSession",
"plural": false,
"selections": [
(v2/*: any*/),
{
"alias": null,
"args": null,
"kind": "ScalarField",
"name": "expiresAt",
"storageKey": null
}
],
"storageKey": null
}
],
"storageKey": null
}
],
"storageKey": null
}
]
},
"params": {
"cacheID": "bebfc1241803845587648eaad4988fcb",
"id": null,
"metadata": {},
"name": "InvitationCardMutation",
"operationKind": "mutation",
"text": "mutation InvitationCardMutation(\n $input: AcceptInvitationInput!\n) {\n acceptInvitation(input: $input) {\n invitation {\n id\n }\n membership {\n id\n ...MembershipCardFragment\n }\n }\n}\n\nfragment MembershipCardFragment on Membership {\n lastSession {\n id\n expiresAt\n }\n}\n"
}
};
})();
(node as any).hash = "32d7fb0d26660c95e87012d3b31068e8";
export default node;

View File

@@ -1,236 +0,0 @@
/**
* @generated SignedSource<<86ac079914ad21b757e635e4e68fc382>>
* @lightSyntaxTransform
* @nogrep
*/
/* tslint:disable */
/* eslint-disable */
// @ts-nocheck
import { ReaderFragment } from 'relay-runtime';
import { FragmentRefs } from "relay-runtime";
export type InvitationListFragment$data = {
readonly id: string;
readonly invitations: {
readonly __id: string;
readonly edges: ReadonlyArray<{
readonly node: {
readonly id: string;
readonly " $fragmentSpreads": FragmentRefs<"InvitationListItemFragment">;
};
}>;
};
readonly " $fragmentType": "InvitationListFragment";
};
export type InvitationListFragment$key = {
readonly " $data"?: InvitationListFragment$data;
readonly " $fragmentSpreads": FragmentRefs<"InvitationListFragment">;
};
import InvitationListFragment_RefetchQuery_graphql from './InvitationListFragment_RefetchQuery.graphql';
const node: ReaderFragment = (function(){
var v0 = [
"invitations"
],
v1 = {
"alias": null,
"args": null,
"kind": "ScalarField",
"name": "id",
"storageKey": null
};
return {
"argumentDefinitions": [
{
"defaultValue": null,
"kind": "LocalArgument",
"name": "after"
},
{
"defaultValue": null,
"kind": "LocalArgument",
"name": "before"
},
{
"defaultValue": 20,
"kind": "LocalArgument",
"name": "first"
},
{
"defaultValue": null,
"kind": "LocalArgument",
"name": "last"
},
{
"defaultValue": {
"direction": "DESC",
"field": "CREATED_AT"
},
"kind": "LocalArgument",
"name": "order"
}
],
"kind": "Fragment",
"metadata": {
"connection": [
{
"count": null,
"cursor": null,
"direction": "bidirectional",
"path": (v0/*: any*/)
}
],
"refetch": {
"connection": {
"forward": {
"count": "first",
"cursor": "after"
},
"backward": {
"count": "last",
"cursor": "before"
},
"path": (v0/*: any*/)
},
"fragmentPathInResult": [
"node"
],
"operation": InvitationListFragment_RefetchQuery_graphql,
"identifierInfo": {
"identifierField": "id",
"identifierQueryVariableName": "id"
}
}
},
"name": "InvitationListFragment",
"selections": [
{
"kind": "RequiredField",
"field": {
"alias": "invitations",
"args": [
{
"kind": "Variable",
"name": "orderBy",
"variableName": "order"
}
],
"concreteType": "InvitationConnection",
"kind": "LinkedField",
"name": "__InvitationListFragment_invitations_connection",
"plural": false,
"selections": [
{
"kind": "RequiredField",
"field": {
"alias": null,
"args": null,
"concreteType": "InvitationEdge",
"kind": "LinkedField",
"name": "edges",
"plural": true,
"selections": [
{
"alias": null,
"args": null,
"concreteType": "Invitation",
"kind": "LinkedField",
"name": "node",
"plural": false,
"selections": [
(v1/*: any*/),
{
"args": null,
"kind": "FragmentSpread",
"name": "InvitationListItemFragment"
},
{
"alias": null,
"args": null,
"kind": "ScalarField",
"name": "__typename",
"storageKey": null
}
],
"storageKey": null
},
{
"alias": null,
"args": null,
"kind": "ScalarField",
"name": "cursor",
"storageKey": null
}
],
"storageKey": null
},
"action": "THROW"
},
{
"alias": null,
"args": null,
"concreteType": "PageInfo",
"kind": "LinkedField",
"name": "pageInfo",
"plural": false,
"selections": [
{
"alias": null,
"args": null,
"kind": "ScalarField",
"name": "endCursor",
"storageKey": null
},
{
"alias": null,
"args": null,
"kind": "ScalarField",
"name": "hasNextPage",
"storageKey": null
},
{
"alias": null,
"args": null,
"kind": "ScalarField",
"name": "hasPreviousPage",
"storageKey": null
},
{
"alias": null,
"args": null,
"kind": "ScalarField",
"name": "startCursor",
"storageKey": null
}
],
"storageKey": null
},
{
"kind": "ClientExtension",
"selections": [
{
"alias": null,
"args": null,
"kind": "ScalarField",
"name": "__id",
"storageKey": null
}
]
}
],
"storageKey": null
},
"action": "THROW"
},
(v1/*: any*/)
],
"type": "Organization",
"abstractKey": null
};
})();
(node as any).hash = "5ff19da7145701e33a81275e009c56f7";
export default node;

View File

@@ -1,374 +0,0 @@
/**
* @generated SignedSource<<ed684165adeff8bdea5a363804ec858f>>
* @lightSyntaxTransform
* @nogrep
*/
/* tslint:disable */
/* eslint-disable */
// @ts-nocheck
import { ConcreteRequest } from 'relay-runtime';
import { FragmentRefs } from "relay-runtime";
export type InvitationOrderField = "ACCEPTED_AT" | "CREATED_AT" | "EMAIL" | "EXPIRES_AT" | "FULL_NAME" | "ROLE";
export type OrderDirection = "ASC" | "DESC";
export type InvitationOrder = {
direction: OrderDirection;
field: InvitationOrderField;
};
export type InvitationListFragment_RefetchQuery$variables = {
after?: string | null | undefined;
before?: string | null | undefined;
first?: number | null | undefined;
id: string;
last?: number | null | undefined;
order?: InvitationOrder | null | undefined;
};
export type InvitationListFragment_RefetchQuery$data = {
readonly node: {
readonly " $fragmentSpreads": FragmentRefs<"InvitationListFragment">;
} | null | undefined;
};
export type InvitationListFragment_RefetchQuery = {
response: InvitationListFragment_RefetchQuery$data;
variables: InvitationListFragment_RefetchQuery$variables;
};
const node: ConcreteRequest = (function(){
var v0 = {
"defaultValue": null,
"kind": "LocalArgument",
"name": "after"
},
v1 = {
"defaultValue": null,
"kind": "LocalArgument",
"name": "before"
},
v2 = {
"defaultValue": 20,
"kind": "LocalArgument",
"name": "first"
},
v3 = {
"defaultValue": null,
"kind": "LocalArgument",
"name": "id"
},
v4 = {
"defaultValue": null,
"kind": "LocalArgument",
"name": "last"
},
v5 = {
"defaultValue": {
"direction": "DESC",
"field": "CREATED_AT"
},
"kind": "LocalArgument",
"name": "order"
},
v6 = [
{
"kind": "Variable",
"name": "id",
"variableName": "id"
}
],
v7 = {
"kind": "Variable",
"name": "after",
"variableName": "after"
},
v8 = {
"kind": "Variable",
"name": "before",
"variableName": "before"
},
v9 = {
"kind": "Variable",
"name": "first",
"variableName": "first"
},
v10 = {
"kind": "Variable",
"name": "last",
"variableName": "last"
},
v11 = {
"alias": null,
"args": null,
"kind": "ScalarField",
"name": "__typename",
"storageKey": null
},
v12 = {
"alias": null,
"args": null,
"kind": "ScalarField",
"name": "id",
"storageKey": null
},
v13 = [
(v7/*: any*/),
(v8/*: any*/),
(v9/*: any*/),
(v10/*: any*/),
{
"kind": "Variable",
"name": "orderBy",
"variableName": "order"
}
];
return {
"fragment": {
"argumentDefinitions": [
(v0/*: any*/),
(v1/*: any*/),
(v2/*: any*/),
(v3/*: any*/),
(v4/*: any*/),
(v5/*: any*/)
],
"kind": "Fragment",
"metadata": null,
"name": "InvitationListFragment_RefetchQuery",
"selections": [
{
"alias": null,
"args": (v6/*: any*/),
"concreteType": null,
"kind": "LinkedField",
"name": "node",
"plural": false,
"selections": [
{
"args": [
(v7/*: any*/),
(v8/*: any*/),
(v9/*: any*/),
(v10/*: any*/),
{
"kind": "Variable",
"name": "order",
"variableName": "order"
}
],
"kind": "FragmentSpread",
"name": "InvitationListFragment"
}
],
"storageKey": null
}
],
"type": "Query",
"abstractKey": null
},
"kind": "Request",
"operation": {
"argumentDefinitions": [
(v0/*: any*/),
(v1/*: any*/),
(v2/*: any*/),
(v4/*: any*/),
(v5/*: any*/),
(v3/*: any*/)
],
"kind": "Operation",
"name": "InvitationListFragment_RefetchQuery",
"selections": [
{
"alias": null,
"args": (v6/*: any*/),
"concreteType": null,
"kind": "LinkedField",
"name": "node",
"plural": false,
"selections": [
(v11/*: any*/),
(v12/*: any*/),
{
"kind": "InlineFragment",
"selections": [
{
"alias": null,
"args": (v13/*: any*/),
"concreteType": "InvitationConnection",
"kind": "LinkedField",
"name": "invitations",
"plural": false,
"selections": [
{
"alias": null,
"args": null,
"concreteType": "InvitationEdge",
"kind": "LinkedField",
"name": "edges",
"plural": true,
"selections": [
{
"alias": null,
"args": null,
"concreteType": "Invitation",
"kind": "LinkedField",
"name": "node",
"plural": false,
"selections": [
(v12/*: any*/),
{
"alias": null,
"args": null,
"kind": "ScalarField",
"name": "fullName",
"storageKey": null
},
{
"alias": null,
"args": null,
"kind": "ScalarField",
"name": "email",
"storageKey": null
},
{
"alias": null,
"args": null,
"kind": "ScalarField",
"name": "role",
"storageKey": null
},
{
"alias": null,
"args": null,
"kind": "ScalarField",
"name": "status",
"storageKey": null
},
{
"alias": null,
"args": null,
"kind": "ScalarField",
"name": "createdAt",
"storageKey": null
},
{
"alias": null,
"args": null,
"kind": "ScalarField",
"name": "acceptedAt",
"storageKey": null
},
{
"alias": "canDelete",
"args": [
{
"kind": "Literal",
"name": "action",
"value": "iam:invitation:delete"
}
],
"kind": "ScalarField",
"name": "permission",
"storageKey": "permission(action:\"iam:invitation:delete\")"
},
(v11/*: any*/)
],
"storageKey": null
},
{
"alias": null,
"args": null,
"kind": "ScalarField",
"name": "cursor",
"storageKey": null
}
],
"storageKey": null
},
{
"alias": null,
"args": null,
"concreteType": "PageInfo",
"kind": "LinkedField",
"name": "pageInfo",
"plural": false,
"selections": [
{
"alias": null,
"args": null,
"kind": "ScalarField",
"name": "endCursor",
"storageKey": null
},
{
"alias": null,
"args": null,
"kind": "ScalarField",
"name": "hasNextPage",
"storageKey": null
},
{
"alias": null,
"args": null,
"kind": "ScalarField",
"name": "hasPreviousPage",
"storageKey": null
},
{
"alias": null,
"args": null,
"kind": "ScalarField",
"name": "startCursor",
"storageKey": null
}
],
"storageKey": null
},
{
"kind": "ClientExtension",
"selections": [
{
"alias": null,
"args": null,
"kind": "ScalarField",
"name": "__id",
"storageKey": null
}
]
}
],
"storageKey": null
},
{
"alias": null,
"args": (v13/*: any*/),
"filters": [
"orderBy"
],
"handle": "connection",
"key": "InvitationListFragment_invitations",
"kind": "LinkedHandle",
"name": "invitations"
}
],
"type": "Organization",
"abstractKey": null
}
],
"storageKey": null
}
]
},
"params": {
"cacheID": "fa35a507d94c15f0839f276dc42dfd89",
"id": null,
"metadata": {},
"name": "InvitationListFragment_RefetchQuery",
"operationKind": "query",
"text": "query InvitationListFragment_RefetchQuery(\n $after: CursorKey = null\n $before: CursorKey = null\n $first: Int = 20\n $last: Int = null\n $order: InvitationOrder = {direction: DESC, field: CREATED_AT}\n $id: ID!\n) {\n node(id: $id) {\n __typename\n ...InvitationListFragment_16fISc\n id\n }\n}\n\nfragment InvitationListFragment_16fISc on Organization {\n invitations(first: $first, after: $after, last: $last, before: $before, orderBy: $order) {\n edges {\n node {\n id\n ...InvitationListItemFragment\n __typename\n }\n cursor\n }\n pageInfo {\n endCursor\n hasNextPage\n hasPreviousPage\n startCursor\n }\n }\n id\n}\n\nfragment InvitationListItemFragment on Invitation {\n id\n fullName\n email\n role\n status\n createdAt\n acceptedAt\n canDelete: permission(action: \"iam:invitation:delete\")\n}\n"
}
};
})();
(node as any).hash = "5ff19da7145701e33a81275e009c56f7";
export default node;

View File

@@ -1,106 +0,0 @@
/**
* @generated SignedSource<<0ea0836cf3619cc6dc1017ed5dd24cb0>>
* @lightSyntaxTransform
* @nogrep
*/
/* tslint:disable */
/* eslint-disable */
// @ts-nocheck
import { ReaderFragment } from 'relay-runtime';
export type InvitationStatus = "ACCEPTED" | "EXPIRED" | "PENDING";
export type MembershipRole = "ADMIN" | "AUDITOR" | "EMPLOYEE" | "OWNER" | "VIEWER";
import { FragmentRefs } from "relay-runtime";
export type InvitationListItemFragment$data = {
readonly acceptedAt: string | null | undefined;
readonly canDelete: boolean;
readonly createdAt: string;
readonly email: string;
readonly fullName: string;
readonly id: string;
readonly role: MembershipRole;
readonly status: InvitationStatus;
readonly " $fragmentType": "InvitationListItemFragment";
};
export type InvitationListItemFragment$key = {
readonly " $data"?: InvitationListItemFragment$data;
readonly " $fragmentSpreads": FragmentRefs<"InvitationListItemFragment">;
};
const node: ReaderFragment = {
"argumentDefinitions": [],
"kind": "Fragment",
"metadata": null,
"name": "InvitationListItemFragment",
"selections": [
{
"alias": null,
"args": null,
"kind": "ScalarField",
"name": "id",
"storageKey": null
},
{
"alias": null,
"args": null,
"kind": "ScalarField",
"name": "fullName",
"storageKey": null
},
{
"alias": null,
"args": null,
"kind": "ScalarField",
"name": "email",
"storageKey": null
},
{
"alias": null,
"args": null,
"kind": "ScalarField",
"name": "role",
"storageKey": null
},
{
"alias": null,
"args": null,
"kind": "ScalarField",
"name": "status",
"storageKey": null
},
{
"alias": null,
"args": null,
"kind": "ScalarField",
"name": "createdAt",
"storageKey": null
},
{
"alias": null,
"args": null,
"kind": "ScalarField",
"name": "acceptedAt",
"storageKey": null
},
{
"alias": "canDelete",
"args": [
{
"kind": "Literal",
"name": "action",
"value": "iam:invitation:delete"
}
],
"kind": "ScalarField",
"name": "permission",
"storageKey": "permission(action:\"iam:invitation:delete\")"
}
],
"type": "Invitation",
"abstractKey": null
};
(node as any).hash = "07748312ae877349e46cc169e5473408";
export default node;

View File

@@ -1,133 +0,0 @@
/**
* @generated SignedSource<<a46996c5fe127b005124bc79ea88fea4>>
* @lightSyntaxTransform
* @nogrep
*/
/* tslint:disable */
/* eslint-disable */
// @ts-nocheck
import { ConcreteRequest } from 'relay-runtime';
export type DeleteInvitationInput = {
invitationId: string;
organizationId: string;
};
export type InvitationListItem_DeleteInvitationMutation$variables = {
connections: ReadonlyArray<string>;
input: DeleteInvitationInput;
};
export type InvitationListItem_DeleteInvitationMutation$data = {
readonly deleteInvitation: {
readonly deletedInvitationId: string;
} | null | undefined;
};
export type InvitationListItem_DeleteInvitationMutation = {
response: InvitationListItem_DeleteInvitationMutation$data;
variables: InvitationListItem_DeleteInvitationMutation$variables;
};
const node: ConcreteRequest = (function(){
var v0 = {
"defaultValue": null,
"kind": "LocalArgument",
"name": "connections"
},
v1 = {
"defaultValue": null,
"kind": "LocalArgument",
"name": "input"
},
v2 = [
{
"kind": "Variable",
"name": "input",
"variableName": "input"
}
],
v3 = {
"alias": null,
"args": null,
"kind": "ScalarField",
"name": "deletedInvitationId",
"storageKey": null
};
return {
"fragment": {
"argumentDefinitions": [
(v0/*: any*/),
(v1/*: any*/)
],
"kind": "Fragment",
"metadata": null,
"name": "InvitationListItem_DeleteInvitationMutation",
"selections": [
{
"alias": null,
"args": (v2/*: any*/),
"concreteType": "DeleteInvitationPayload",
"kind": "LinkedField",
"name": "deleteInvitation",
"plural": false,
"selections": [
(v3/*: any*/)
],
"storageKey": null
}
],
"type": "Mutation",
"abstractKey": null
},
"kind": "Request",
"operation": {
"argumentDefinitions": [
(v1/*: any*/),
(v0/*: any*/)
],
"kind": "Operation",
"name": "InvitationListItem_DeleteInvitationMutation",
"selections": [
{
"alias": null,
"args": (v2/*: any*/),
"concreteType": "DeleteInvitationPayload",
"kind": "LinkedField",
"name": "deleteInvitation",
"plural": false,
"selections": [
(v3/*: any*/),
{
"alias": null,
"args": null,
"filters": null,
"handle": "deleteEdge",
"key": "",
"kind": "ScalarHandle",
"name": "deletedInvitationId",
"handleArgs": [
{
"kind": "Variable",
"name": "connections",
"variableName": "connections"
}
]
}
],
"storageKey": null
}
]
},
"params": {
"cacheID": "35736b4156c15bb9eeb863b4d40fc4e6",
"id": null,
"metadata": {},
"name": "InvitationListItem_DeleteInvitationMutation",
"operationKind": "mutation",
"text": "mutation InvitationListItem_DeleteInvitationMutation(\n $input: DeleteInvitationInput!\n) {\n deleteInvitation(input: $input) {\n deletedInvitationId\n }\n}\n"
}
};
})();
(node as any).hash = "2191c08f6c6bf5bace0d70a6481124bb";
export default node;

View File

@@ -1,63 +0,0 @@
/**
* @generated SignedSource<<842fffc896db6311ff3c5901eae70176>>
* @lightSyntaxTransform
* @nogrep
*/
/* tslint:disable */
/* eslint-disable */
// @ts-nocheck
import { ReaderFragment } from 'relay-runtime';
import { FragmentRefs } from "relay-runtime";
export type MembershipsDropdown_viewerFragment$data = {
readonly pendingInvitations: {
readonly totalCount: number;
};
readonly " $fragmentType": "MembershipsDropdown_viewerFragment";
};
export type MembershipsDropdown_viewerFragment$key = {
readonly " $data"?: MembershipsDropdown_viewerFragment$data;
readonly " $fragmentSpreads": FragmentRefs<"MembershipsDropdown_viewerFragment">;
};
const node: ReaderFragment = {
"argumentDefinitions": [],
"kind": "Fragment",
"metadata": null,
"name": "MembershipsDropdown_viewerFragment",
"selections": [
{
"kind": "RequiredField",
"field": {
"alias": null,
"args": null,
"concreteType": "InvitationConnection",
"kind": "LinkedField",
"name": "pendingInvitations",
"plural": false,
"selections": [
{
"kind": "RequiredField",
"field": {
"alias": null,
"args": null,
"kind": "ScalarField",
"name": "totalCount",
"storageKey": null
},
"action": "THROW"
}
],
"storageKey": null
},
"action": "THROW"
}
],
"type": "Identity",
"abstractKey": null
};
(node as any).hash = "96b64fbc2481273728051e42d74bc8b5";
export default node;

View File

@@ -1,5 +1,5 @@
/**
* @generated SignedSource<<d7b957d5b207e241e695d6592091dc2d>>
* @generated SignedSource<<68acd1fa60fc1efe40e3983441ae01da>>
* @lightSyntaxTransform
* @nogrep
*/
@@ -13,17 +13,7 @@ import { FragmentRefs } from "relay-runtime";
export type MembershipsPageQuery$variables = Record<PropertyKey, never>;
export type MembershipsPageQuery$data = {
readonly viewer: {
readonly pendingInvitations: {
readonly __id: string;
readonly edges: ReadonlyArray<{
readonly node: {
readonly id: string;
readonly " $fragmentSpreads": FragmentRefs<"InvitationCardFragment">;
};
}>;
};
readonly profiles: {
readonly __id: string;
readonly edges: ReadonlyArray<{
readonly node: {
readonly id: string;
@@ -106,41 +96,13 @@ v5 = {
],
"storageKey": null
},
v6 = {
"kind": "ClientExtension",
"selections": [
{
"alias": null,
"args": null,
"kind": "ScalarField",
"name": "__id",
"storageKey": null
}
]
},
v7 = {
"kind": "Literal",
"name": "orderBy",
"value": {
"direction": "DESC",
"field": "CREATED_AT"
}
},
v8 = {
"kind": "Literal",
"name": "first",
"value": 1000
},
v9 = [
(v8/*: any*/),
v6 = [
{
"kind": "Literal",
"name": "first",
"value": 1000
},
(v0/*: any*/)
],
v10 = [
"orderBy"
],
v11 = [
(v8/*: any*/),
(v7/*: any*/)
];
return {
"fragment": {
@@ -241,65 +203,11 @@ return {
},
"action": "THROW"
},
(v5/*: any*/),
(v6/*: any*/)
(v5/*: any*/)
],
"storageKey": "__MembershipsPage_profiles_connection(orderBy:{\"direction\":\"ASC\",\"field\":\"ORGANIZATION_NAME\"})"
},
"action": "THROW"
},
{
"kind": "RequiredField",
"field": {
"alias": "pendingInvitations",
"args": [
(v7/*: any*/)
],
"concreteType": "InvitationConnection",
"kind": "LinkedField",
"name": "__MembershipsPage_pendingInvitations_connection",
"plural": false,
"selections": [
{
"kind": "RequiredField",
"field": {
"alias": null,
"args": null,
"concreteType": "InvitationEdge",
"kind": "LinkedField",
"name": "edges",
"plural": true,
"selections": [
{
"alias": null,
"args": null,
"concreteType": "Invitation",
"kind": "LinkedField",
"name": "node",
"plural": false,
"selections": [
(v1/*: any*/),
{
"args": null,
"kind": "FragmentSpread",
"name": "InvitationCardFragment"
},
(v3/*: any*/)
],
"storageKey": null
},
(v4/*: any*/)
],
"storageKey": null
},
"action": "THROW"
},
(v5/*: any*/),
(v6/*: any*/)
],
"storageKey": "__MembershipsPage_pendingInvitations_connection(orderBy:{\"direction\":\"DESC\",\"field\":\"CREATED_AT\"})"
},
"action": "THROW"
}
],
"storageKey": null
@@ -326,7 +234,7 @@ return {
"selections": [
{
"alias": null,
"args": (v9/*: any*/),
"args": (v6/*: any*/),
"concreteType": "ProfileConnection",
"kind": "LinkedField",
"name": "profiles",
@@ -408,94 +316,21 @@ return {
],
"storageKey": null
},
(v5/*: any*/),
(v6/*: any*/)
(v5/*: any*/)
],
"storageKey": "profiles(first:1000,orderBy:{\"direction\":\"ASC\",\"field\":\"ORGANIZATION_NAME\"})"
},
{
"alias": null,
"args": (v9/*: any*/),
"filters": (v10/*: any*/),
"args": (v6/*: any*/),
"filters": [
"orderBy"
],
"handle": "connection",
"key": "MembershipsPage_profiles",
"kind": "LinkedHandle",
"name": "profiles"
},
{
"alias": null,
"args": (v11/*: any*/),
"concreteType": "InvitationConnection",
"kind": "LinkedField",
"name": "pendingInvitations",
"plural": false,
"selections": [
{
"alias": null,
"args": null,
"concreteType": "InvitationEdge",
"kind": "LinkedField",
"name": "edges",
"plural": true,
"selections": [
{
"alias": null,
"args": null,
"concreteType": "Invitation",
"kind": "LinkedField",
"name": "node",
"plural": false,
"selections": [
(v1/*: any*/),
{
"alias": null,
"args": null,
"kind": "ScalarField",
"name": "role",
"storageKey": null
},
{
"alias": null,
"args": null,
"kind": "ScalarField",
"name": "createdAt",
"storageKey": null
},
{
"alias": null,
"args": null,
"concreteType": "Organization",
"kind": "LinkedField",
"name": "organization",
"plural": false,
"selections": [
(v1/*: any*/),
(v2/*: any*/)
],
"storageKey": null
},
(v3/*: any*/)
],
"storageKey": null
},
(v4/*: any*/)
],
"storageKey": null
},
(v5/*: any*/),
(v6/*: any*/)
],
"storageKey": "pendingInvitations(first:1000,orderBy:{\"direction\":\"DESC\",\"field\":\"CREATED_AT\"})"
},
{
"alias": null,
"args": (v11/*: any*/),
"filters": (v10/*: any*/),
"handle": "connection",
"key": "MembershipsPage_pendingInvitations",
"kind": "LinkedHandle",
"name": "pendingInvitations"
},
(v1/*: any*/)
],
"storageKey": null
@@ -503,7 +338,7 @@ return {
]
},
"params": {
"cacheID": "7bcb990f0e847ce0528d9df9ef6c1c94",
"cacheID": "d3ee4e9e305c7a2f57179cf540f4cd6c",
"id": null,
"metadata": {
"connection": [
@@ -515,25 +350,16 @@ return {
"viewer",
"profiles"
]
},
{
"count": null,
"cursor": null,
"direction": "forward",
"path": [
"viewer",
"pendingInvitations"
]
}
]
},
"name": "MembershipsPageQuery",
"operationKind": "query",
"text": "query MembershipsPageQuery {\n viewer {\n profiles(first: 1000, orderBy: {direction: ASC, field: ORGANIZATION_NAME}) {\n edges {\n node {\n id\n membership {\n ...MembershipCardFragment\n id\n }\n organization {\n name\n ...MembershipCard_organizationFragment\n id\n }\n __typename\n }\n cursor\n }\n pageInfo {\n endCursor\n hasNextPage\n }\n }\n pendingInvitations(first: 1000, orderBy: {direction: DESC, field: CREATED_AT}) {\n edges {\n node {\n id\n ...InvitationCardFragment\n __typename\n }\n cursor\n }\n pageInfo {\n endCursor\n hasNextPage\n }\n }\n id\n }\n}\n\nfragment InvitationCardFragment on Invitation {\n id\n role\n createdAt\n organization {\n id\n name\n }\n}\n\nfragment MembershipCardFragment on Membership {\n lastSession {\n id\n expiresAt\n }\n}\n\nfragment MembershipCard_organizationFragment on Organization {\n id\n name\n logoUrl\n}\n"
"text": "query MembershipsPageQuery {\n viewer {\n profiles(first: 1000, orderBy: {direction: ASC, field: ORGANIZATION_NAME}) {\n edges {\n node {\n id\n membership {\n ...MembershipCardFragment\n id\n }\n organization {\n name\n ...MembershipCard_organizationFragment\n id\n }\n __typename\n }\n cursor\n }\n pageInfo {\n endCursor\n hasNextPage\n }\n }\n id\n }\n}\n\nfragment MembershipCardFragment on Membership {\n lastSession {\n id\n expiresAt\n }\n}\n\nfragment MembershipCard_organizationFragment on Organization {\n id\n name\n logoUrl\n}\n"
}
};
})();
(node as any).hash = "84f5ab240bec94caf75e9ae163117e3d";
(node as any).hash = "c87fe091011b4d5e5bffe0309eb4211f";
export default node;

View File

@@ -1,5 +1,5 @@
/**
* @generated SignedSource<<d8cb4fb18045bbd1eb91c3dba7c99a79>>
* @generated SignedSource<<c5c251783bc35aea15dec0c06f6ef1fb>>
* @lightSyntaxTransform
* @nogrep
*/
@@ -119,6 +119,64 @@ v13 = [
"name": "orderBy",
"variableName": "order"
}
],
v14 = [
{
"kind": "Literal",
"name": "first",
"value": 1
},
{
"kind": "Literal",
"name": "orderBy",
"value": {
"direction": "DESC",
"field": "CREATED_AT"
}
}
],
v15 = {
"alias": null,
"args": null,
"kind": "ScalarField",
"name": "createdAt",
"storageKey": null
},
v16 = {
"alias": null,
"args": null,
"kind": "ScalarField",
"name": "cursor",
"storageKey": null
},
v17 = {
"alias": null,
"args": null,
"kind": "ScalarField",
"name": "endCursor",
"storageKey": null
},
v18 = {
"alias": null,
"args": null,
"kind": "ScalarField",
"name": "hasNextPage",
"storageKey": null
},
v19 = {
"kind": "ClientExtension",
"selections": [
{
"alias": null,
"args": null,
"kind": "ScalarField",
"name": "__id",
"storageKey": null
}
]
},
v20 = [
"orderBy"
];
return {
"fragment": {
@@ -243,20 +301,6 @@ return {
"name": "fullName",
"storageKey": null
},
{
"alias": null,
"args": null,
"kind": "ScalarField",
"name": "kind",
"storageKey": null
},
{
"alias": null,
"args": null,
"kind": "ScalarField",
"name": "position",
"storageKey": null
},
{
"alias": null,
"args": null,
@@ -285,19 +329,6 @@ return {
"kind": "ScalarField",
"name": "permission",
"storageKey": "permission(action:\"iam:membership:update\")"
},
{
"alias": "canDelete",
"args": [
{
"kind": "Literal",
"name": "action",
"value": "iam:membership-profile:delete"
}
],
"kind": "ScalarField",
"name": "permission",
"storageKey": "permission(action:\"iam:membership-profile:delete\")"
}
],
"storageKey": null
@@ -322,12 +353,80 @@ return {
"storageKey": null
},
{
"alias": null,
"args": null,
"kind": "ScalarField",
"name": "createdAt",
"storageKey": null
"alias": "lastInvitation",
"args": (v14/*: any*/),
"concreteType": "InvitationConnection",
"kind": "LinkedField",
"name": "pendingInvitations",
"plural": false,
"selections": [
{
"alias": null,
"args": null,
"concreteType": "InvitationEdge",
"kind": "LinkedField",
"name": "edges",
"plural": true,
"selections": [
{
"alias": null,
"args": null,
"concreteType": "Invitation",
"kind": "LinkedField",
"name": "node",
"plural": false,
"selections": [
(v12/*: any*/),
{
"alias": null,
"args": null,
"kind": "ScalarField",
"name": "expiresAt",
"storageKey": null
},
{
"alias": null,
"args": null,
"kind": "ScalarField",
"name": "acceptedAt",
"storageKey": null
},
(v15/*: any*/),
(v11/*: any*/)
],
"storageKey": null
},
(v16/*: any*/)
],
"storageKey": null
},
{
"alias": null,
"args": null,
"concreteType": "PageInfo",
"kind": "LinkedField",
"name": "pageInfo",
"plural": false,
"selections": [
(v17/*: any*/),
(v18/*: any*/)
],
"storageKey": null
},
(v19/*: any*/)
],
"storageKey": "pendingInvitations(first:1,orderBy:{\"direction\":\"DESC\",\"field\":\"CREATED_AT\"})"
},
{
"alias": "lastInvitation",
"args": (v14/*: any*/),
"filters": (v20/*: any*/),
"handle": "connection",
"key": "PeopleListItem_lastInvitation",
"kind": "LinkedHandle",
"name": "pendingInvitations"
},
(v15/*: any*/),
{
"alias": "canUpdate",
"args": [
@@ -341,17 +440,37 @@ return {
"name": "permission",
"storageKey": "permission(action:\"iam:membership-profile:update\")"
},
{
"alias": "canInvite",
"args": [
{
"kind": "Literal",
"name": "action",
"value": "iam:invitation:create"
}
],
"kind": "ScalarField",
"name": "permission",
"storageKey": "permission(action:\"iam:invitation:create\")"
},
{
"alias": "canDelete",
"args": [
{
"kind": "Literal",
"name": "action",
"value": "iam:membership-profile:delete"
}
],
"kind": "ScalarField",
"name": "permission",
"storageKey": "permission(action:\"iam:membership-profile:delete\")"
},
(v11/*: any*/)
],
"storageKey": null
},
{
"alias": null,
"args": null,
"kind": "ScalarField",
"name": "cursor",
"storageKey": null
}
(v16/*: any*/)
],
"storageKey": null
},
@@ -363,20 +482,8 @@ return {
"name": "pageInfo",
"plural": false,
"selections": [
{
"alias": null,
"args": null,
"kind": "ScalarField",
"name": "endCursor",
"storageKey": null
},
{
"alias": null,
"args": null,
"kind": "ScalarField",
"name": "hasNextPage",
"storageKey": null
},
(v17/*: any*/),
(v18/*: any*/),
{
"alias": null,
"args": null,
@@ -394,27 +501,14 @@ return {
],
"storageKey": null
},
{
"kind": "ClientExtension",
"selections": [
{
"alias": null,
"args": null,
"kind": "ScalarField",
"name": "__id",
"storageKey": null
}
]
}
(v19/*: any*/)
],
"storageKey": null
},
{
"alias": null,
"args": (v13/*: any*/),
"filters": [
"orderBy"
],
"filters": (v20/*: any*/),
"handle": "connection",
"key": "PeopleListFragment_profiles",
"kind": "LinkedHandle",
@@ -430,12 +524,12 @@ return {
]
},
"params": {
"cacheID": "cc77d44877ae736c858e7458b525d75a",
"cacheID": "f25ca8641478e79fb2ccf6fa825fe042",
"id": null,
"metadata": {},
"name": "PeopleListFragment_RefetchQuery",
"operationKind": "query",
"text": "query PeopleListFragment_RefetchQuery(\n $after: CursorKey = null\n $before: CursorKey = null\n $first: Int = 20\n $last: Int = null\n $order: ProfileOrder = {direction: ASC, field: FULL_NAME}\n $id: ID!\n) {\n node(id: $id) {\n __typename\n ...PeopleListFragment_16fISc\n id\n }\n}\n\nfragment PeopleListFragment_16fISc on Organization {\n profiles(first: $first, after: $after, last: $last, before: $before, orderBy: $order) {\n totalCount\n edges {\n node {\n id\n ...PeopleListItemFragment\n __typename\n }\n cursor\n }\n pageInfo {\n endCursor\n hasNextPage\n hasPreviousPage\n startCursor\n }\n }\n id\n}\n\nfragment PeopleListItemFragment on Profile {\n id\n source\n state\n fullName\n kind\n position\n membership {\n id\n role\n canUpdate: permission(action: \"iam:membership:update\")\n canDelete: permission(action: \"iam:membership-profile:delete\")\n }\n identity {\n email\n id\n }\n createdAt\n canUpdate: permission(action: \"iam:membership-profile:update\")\n}\n"
"text": "query PeopleListFragment_RefetchQuery(\n $after: CursorKey = null\n $before: CursorKey = null\n $first: Int = 20\n $last: Int = null\n $order: ProfileOrder = {direction: ASC, field: FULL_NAME}\n $id: ID!\n) {\n node(id: $id) {\n __typename\n ...PeopleListFragment_16fISc\n id\n }\n}\n\nfragment PeopleListFragment_16fISc on Organization {\n profiles(first: $first, after: $after, last: $last, before: $before, orderBy: $order) {\n totalCount\n edges {\n node {\n id\n ...PeopleListItemFragment\n __typename\n }\n cursor\n }\n pageInfo {\n endCursor\n hasNextPage\n hasPreviousPage\n startCursor\n }\n }\n id\n}\n\nfragment PeopleListItemFragment on Profile {\n id\n source\n state\n fullName\n membership {\n id\n role\n canUpdate: permission(action: \"iam:membership:update\")\n }\n identity {\n email\n id\n }\n lastInvitation: pendingInvitations(first: 1, orderBy: {field: CREATED_AT, direction: DESC}) {\n edges {\n node {\n id\n expiresAt\n acceptedAt\n createdAt\n __typename\n }\n cursor\n }\n pageInfo {\n endCursor\n hasNextPage\n }\n }\n createdAt\n canUpdate: permission(action: \"iam:membership-profile:update\")\n canInvite: permission(action: \"iam:invitation:create\")\n canDelete: permission(action: \"iam:membership-profile:delete\")\n}\n"
}
};
})();

View File

@@ -1,5 +1,5 @@
/**
* @generated SignedSource<<67410bc0aa6e9426f4534a0938429b6e>>
* @generated SignedSource<<91bec60a40a9170868272814635ea3fa>>
* @lightSyntaxTransform
* @nogrep
*/
@@ -10,10 +10,11 @@
import { ReaderFragment } from 'relay-runtime';
export type MembershipRole = "ADMIN" | "AUDITOR" | "EMPLOYEE" | "OWNER" | "VIEWER";
export type ProfileKind = "CONTRACTOR" | "EMPLOYEE" | "SERVICE_ACCOUNT";
export type ProfileState = "ACTIVE" | "INACTIVE";
import { FragmentRefs } from "relay-runtime";
export type PeopleListItemFragment$data = {
readonly canDelete: boolean;
readonly canInvite: boolean;
readonly canUpdate: boolean;
readonly createdAt: string;
readonly fullName: string;
@@ -21,14 +22,22 @@ export type PeopleListItemFragment$data = {
readonly identity: {
readonly email: string;
};
readonly kind: ProfileKind;
readonly lastInvitation: {
readonly __id: string;
readonly edges: ReadonlyArray<{
readonly node: {
readonly acceptedAt: string | null | undefined;
readonly createdAt: string;
readonly expiresAt: string;
readonly id: string;
};
}>;
};
readonly membership: {
readonly canDelete: boolean;
readonly canUpdate: boolean;
readonly id: string;
readonly role: MembershipRole;
};
readonly position: string | null | undefined;
readonly source: string;
readonly state: ProfileState;
readonly " $fragmentType": "PeopleListItemFragment";
@@ -45,11 +54,29 @@ var v0 = {
"kind": "ScalarField",
"name": "id",
"storageKey": null
},
v1 = {
"alias": null,
"args": null,
"kind": "ScalarField",
"name": "createdAt",
"storageKey": null
};
return {
"argumentDefinitions": [],
"kind": "Fragment",
"metadata": null,
"metadata": {
"connection": [
{
"count": null,
"cursor": null,
"direction": "forward",
"path": [
"lastInvitation"
]
}
]
},
"name": "PeopleListItemFragment",
"selections": [
(v0/*: any*/),
@@ -74,20 +101,6 @@ return {
"name": "fullName",
"storageKey": null
},
{
"alias": null,
"args": null,
"kind": "ScalarField",
"name": "kind",
"storageKey": null
},
{
"alias": null,
"args": null,
"kind": "ScalarField",
"name": "position",
"storageKey": null
},
{
"kind": "RequiredField",
"field": {
@@ -118,19 +131,6 @@ return {
"kind": "ScalarField",
"name": "permission",
"storageKey": "permission(action:\"iam:membership:update\")"
},
{
"alias": "canDelete",
"args": [
{
"kind": "Literal",
"name": "action",
"value": "iam:membership-profile:delete"
}
],
"kind": "ScalarField",
"name": "permission",
"storageKey": "permission(action:\"iam:membership-profile:delete\")"
}
],
"storageKey": null
@@ -160,12 +160,119 @@ return {
"action": "THROW"
},
{
"alias": null,
"args": null,
"kind": "ScalarField",
"name": "createdAt",
"storageKey": null
"kind": "RequiredField",
"field": {
"alias": "lastInvitation",
"args": [
{
"kind": "Literal",
"name": "orderBy",
"value": {
"direction": "DESC",
"field": "CREATED_AT"
}
}
],
"concreteType": "InvitationConnection",
"kind": "LinkedField",
"name": "__PeopleListItem_lastInvitation_connection",
"plural": false,
"selections": [
{
"alias": null,
"args": null,
"concreteType": "InvitationEdge",
"kind": "LinkedField",
"name": "edges",
"plural": true,
"selections": [
{
"alias": null,
"args": null,
"concreteType": "Invitation",
"kind": "LinkedField",
"name": "node",
"plural": false,
"selections": [
(v0/*: any*/),
{
"alias": null,
"args": null,
"kind": "ScalarField",
"name": "expiresAt",
"storageKey": null
},
{
"alias": null,
"args": null,
"kind": "ScalarField",
"name": "acceptedAt",
"storageKey": null
},
(v1/*: any*/),
{
"alias": null,
"args": null,
"kind": "ScalarField",
"name": "__typename",
"storageKey": null
}
],
"storageKey": null
},
{
"alias": null,
"args": null,
"kind": "ScalarField",
"name": "cursor",
"storageKey": null
}
],
"storageKey": null
},
{
"alias": null,
"args": null,
"concreteType": "PageInfo",
"kind": "LinkedField",
"name": "pageInfo",
"plural": false,
"selections": [
{
"alias": null,
"args": null,
"kind": "ScalarField",
"name": "endCursor",
"storageKey": null
},
{
"alias": null,
"args": null,
"kind": "ScalarField",
"name": "hasNextPage",
"storageKey": null
}
],
"storageKey": null
},
{
"kind": "ClientExtension",
"selections": [
{
"alias": null,
"args": null,
"kind": "ScalarField",
"name": "__id",
"storageKey": null
}
]
}
],
"storageKey": "__PeopleListItem_lastInvitation_connection(orderBy:{\"direction\":\"DESC\",\"field\":\"CREATED_AT\"})"
},
"action": "THROW"
},
(v1/*: any*/),
{
"alias": "canUpdate",
"args": [
@@ -178,6 +285,32 @@ return {
"kind": "ScalarField",
"name": "permission",
"storageKey": "permission(action:\"iam:membership-profile:update\")"
},
{
"alias": "canInvite",
"args": [
{
"kind": "Literal",
"name": "action",
"value": "iam:invitation:create"
}
],
"kind": "ScalarField",
"name": "permission",
"storageKey": "permission(action:\"iam:invitation:create\")"
},
{
"alias": "canDelete",
"args": [
{
"kind": "Literal",
"name": "action",
"value": "iam:membership-profile:delete"
}
],
"kind": "ScalarField",
"name": "permission",
"storageKey": "permission(action:\"iam:membership-profile:delete\")"
}
],
"type": "Profile",
@@ -185,6 +318,6 @@ return {
};
})();
(node as any).hash = "ad9ed05edf606ec084c6f53462530b8b";
(node as any).hash = "b276a06948260a9d89947b386c6392d1";
export default node;

View File

@@ -1,5 +1,5 @@
/**
* @generated SignedSource<<dd59cf57f55eff8458d1481b25e38991>>
* @generated SignedSource<<5c890fa68733de0a9a1b5475cd45b1a1>>
* @lightSyntaxTransform
* @nogrep
*/
@@ -9,34 +9,29 @@
// @ts-nocheck
import { ConcreteRequest } from 'relay-runtime';
export type MembershipRole = "ADMIN" | "AUDITOR" | "EMPLOYEE" | "OWNER" | "VIEWER";
export type InviteUserInput = {
organizationId: string;
profileId: string;
};
export type InviteUserDialogMutation$variables = {
export type PeopleListItem_inviteMutation$variables = {
connections: ReadonlyArray<string>;
input: InviteUserInput;
};
export type InviteUserDialogMutation$data = {
export type PeopleListItem_inviteMutation$data = {
readonly inviteUser: {
readonly invitationEdge: {
readonly node: {
readonly acceptedAt: string | null | undefined;
readonly canDelete: boolean;
readonly createdAt: string;
readonly email: string;
readonly expiresAt: string;
readonly fullName: string;
readonly id: string;
readonly role: MembershipRole;
};
};
} | null | undefined;
};
export type InviteUserDialogMutation = {
response: InviteUserDialogMutation$data;
variables: InviteUserDialogMutation$variables;
export type PeopleListItem_inviteMutation = {
response: PeopleListItem_inviteMutation$data;
variables: PeopleListItem_inviteMutation$variables;
};
const node: ConcreteRequest = (function(){
@@ -80,27 +75,6 @@ v3 = {
"name": "id",
"storageKey": null
},
{
"alias": null,
"args": null,
"kind": "ScalarField",
"name": "email",
"storageKey": null
},
{
"alias": null,
"args": null,
"kind": "ScalarField",
"name": "fullName",
"storageKey": null
},
{
"alias": null,
"args": null,
"kind": "ScalarField",
"name": "role",
"storageKey": null
},
{
"alias": null,
"args": null,
@@ -121,19 +95,6 @@ v3 = {
"kind": "ScalarField",
"name": "createdAt",
"storageKey": null
},
{
"alias": "canDelete",
"args": [
{
"kind": "Literal",
"name": "action",
"value": "iam:invitation:delete"
}
],
"kind": "ScalarField",
"name": "permission",
"storageKey": "permission(action:\"iam:invitation:delete\")"
}
],
"storageKey": null
@@ -149,7 +110,7 @@ return {
],
"kind": "Fragment",
"metadata": null,
"name": "InviteUserDialogMutation",
"name": "PeopleListItem_inviteMutation",
"selections": [
{
"alias": null,
@@ -174,7 +135,7 @@ return {
(v0/*: any*/)
],
"kind": "Operation",
"name": "InviteUserDialogMutation",
"name": "PeopleListItem_inviteMutation",
"selections": [
{
"alias": null,
@@ -207,16 +168,16 @@ return {
]
},
"params": {
"cacheID": "685e0bc12871b33065d1fe03334110b6",
"cacheID": "adf65c15aebb17087c5701c9b83e6711",
"id": null,
"metadata": {},
"name": "InviteUserDialogMutation",
"name": "PeopleListItem_inviteMutation",
"operationKind": "mutation",
"text": "mutation InviteUserDialogMutation(\n $input: InviteUserInput!\n) {\n inviteUser(input: $input) {\n invitationEdge {\n node {\n id\n email\n fullName\n role\n expiresAt\n acceptedAt\n createdAt\n canDelete: permission(action: \"iam:invitation:delete\")\n }\n }\n }\n}\n"
"text": "mutation PeopleListItem_inviteMutation(\n $input: InviteUserInput!\n) {\n inviteUser(input: $input) {\n invitationEdge {\n node {\n id\n expiresAt\n acceptedAt\n createdAt\n }\n }\n }\n}\n"
}
};
})();
(node as any).hash = "70766e9b81d0ade0f128fae2e15aac62";
(node as any).hash = "7ce62bafa9a5ec7a965c048fe7ef1763";
export default node;

View File

@@ -1,5 +1,5 @@
/**
* @generated SignedSource<<a9d41020a1c8eb8c673aa59fa2772468>>
* @generated SignedSource<<e32759f25b173edfe9c63fb659d7e75e>>
* @lightSyntaxTransform
* @nogrep
*/
@@ -17,15 +17,7 @@ export type PeoplePageQuery$data = {
readonly organization: {
readonly __typename: "Organization";
readonly canCreateUser: boolean;
readonly canInviteUser: boolean;
readonly invitations: {
readonly $updatableFragmentSpreads: FragmentRefs<"PeoplePage_invitationsTotalCountFragment">;
readonly totalCount: number | null | undefined;
};
readonly profiles: {
readonly totalCount: number | null | undefined;
};
readonly " $fragmentSpreads": FragmentRefs<"InvitationListFragment" | "PeopleListFragment">;
readonly " $fragmentSpreads": FragmentRefs<"PeopleListFragment">;
} | {
// This will never be '%other', but we need some
// value in case none of the concrete values match.
@@ -73,136 +65,73 @@ v3 = {
"storageKey": "permission(action:\"iam:membership-profile:create\")"
},
v4 = {
"alias": "canInviteUser",
"args": [
{
"kind": "Literal",
"name": "action",
"value": "iam:invitation:create"
}
],
"kind": "ScalarField",
"name": "permission",
"storageKey": "permission(action:\"iam:invitation:create\")"
},
v5 = {
"kind": "Literal",
"name": "first",
"value": 20
},
v6 = {
v5 = {
"direction": "ASC",
"field": "FULL_NAME"
},
v7 = [
(v5/*: any*/),
{
"kind": "Literal",
"name": "orderBy",
"value": (v6/*: any*/)
}
],
v8 = {
"alias": null,
"args": null,
"kind": "ScalarField",
"name": "totalCount",
"storageKey": null
},
v9 = {
"direction": "DESC",
"field": "CREATED_AT"
},
v10 = [
(v5/*: any*/),
{
"kind": "Literal",
"name": "orderBy",
"value": (v9/*: any*/)
}
],
v11 = {
v6 = {
"alias": null,
"args": null,
"kind": "ScalarField",
"name": "id",
"storageKey": null
},
v12 = {
"alias": null,
"args": null,
"kind": "ScalarField",
"name": "fullName",
"storageKey": null
},
v13 = {
"alias": null,
"args": null,
"kind": "ScalarField",
"name": "role",
"storageKey": null
},
v14 = {
"alias": null,
"args": null,
"kind": "ScalarField",
"name": "email",
"storageKey": null
},
v15 = {
v7 = [
(v4/*: any*/),
{
"kind": "Literal",
"name": "orderBy",
"value": (v5/*: any*/)
}
],
v8 = [
{
"kind": "Literal",
"name": "first",
"value": 1
},
{
"kind": "Literal",
"name": "orderBy",
"value": {
"direction": "DESC",
"field": "CREATED_AT"
}
}
],
v9 = {
"alias": null,
"args": null,
"kind": "ScalarField",
"name": "createdAt",
"storageKey": null
},
v16 = {
v10 = {
"alias": null,
"args": null,
"kind": "ScalarField",
"name": "cursor",
"storageKey": null
},
v17 = {
v11 = {
"alias": null,
"args": null,
"concreteType": "PageInfo",
"kind": "LinkedField",
"name": "pageInfo",
"plural": false,
"selections": [
{
"alias": null,
"args": null,
"kind": "ScalarField",
"name": "endCursor",
"storageKey": null
},
{
"alias": null,
"args": null,
"kind": "ScalarField",
"name": "hasNextPage",
"storageKey": null
},
{
"alias": null,
"args": null,
"kind": "ScalarField",
"name": "hasPreviousPage",
"storageKey": null
},
{
"alias": null,
"args": null,
"kind": "ScalarField",
"name": "startCursor",
"storageKey": null
}
],
"kind": "ScalarField",
"name": "endCursor",
"storageKey": null
},
v18 = {
v12 = {
"alias": null,
"args": null,
"kind": "ScalarField",
"name": "hasNextPage",
"storageKey": null
},
v13 = {
"kind": "ClientExtension",
"selections": [
{
@@ -214,7 +143,7 @@ v18 = {
}
]
},
v19 = [
v14 = [
"orderBy"
];
return {
@@ -239,67 +168,17 @@ return {
"kind": "InlineFragment",
"selections": [
(v3/*: any*/),
(v4/*: any*/),
{
"kind": "RequiredField",
"field": {
"alias": null,
"args": (v7/*: any*/),
"concreteType": "ProfileConnection",
"kind": "LinkedField",
"name": "profiles",
"plural": false,
"selections": [
(v8/*: any*/)
],
"storageKey": "profiles(first:20,orderBy:{\"direction\":\"ASC\",\"field\":\"FULL_NAME\"})"
},
"action": "THROW"
},
{
"args": [
(v5/*: any*/),
(v4/*: any*/),
{
"kind": "Literal",
"name": "order",
"value": (v6/*: any*/)
"value": (v5/*: any*/)
}
],
"kind": "FragmentSpread",
"name": "PeopleListFragment"
},
{
"kind": "RequiredField",
"field": {
"alias": null,
"args": (v10/*: any*/),
"concreteType": "InvitationConnection",
"kind": "LinkedField",
"name": "invitations",
"plural": false,
"selections": [
(v8/*: any*/),
{
"args": null,
"kind": "FragmentSpread",
"name": "PeoplePage_invitationsTotalCountFragment"
}
],
"storageKey": "invitations(first:20,orderBy:{\"direction\":\"DESC\",\"field\":\"CREATED_AT\"})"
},
"action": "THROW"
},
{
"args": [
(v5/*: any*/),
{
"kind": "Literal",
"name": "order",
"value": (v9/*: any*/)
}
],
"kind": "FragmentSpread",
"name": "InvitationListFragment"
}
],
"type": "Organization",
@@ -329,12 +208,11 @@ return {
"plural": false,
"selections": [
(v2/*: any*/),
(v11/*: any*/),
(v6/*: any*/),
{
"kind": "InlineFragment",
"selections": [
(v3/*: any*/),
(v4/*: any*/),
{
"alias": null,
"args": (v7/*: any*/),
@@ -343,7 +221,13 @@ return {
"name": "profiles",
"plural": false,
"selections": [
(v8/*: any*/),
{
"alias": null,
"args": null,
"kind": "ScalarField",
"name": "totalCount",
"storageKey": null
},
{
"alias": null,
"args": null,
@@ -360,7 +244,7 @@ return {
"name": "node",
"plural": false,
"selections": [
(v11/*: any*/),
(v6/*: any*/),
{
"alias": null,
"args": null,
@@ -375,19 +259,11 @@ return {
"name": "state",
"storageKey": null
},
(v12/*: any*/),
{
"alias": null,
"args": null,
"kind": "ScalarField",
"name": "kind",
"storageKey": null
},
{
"alias": null,
"args": null,
"kind": "ScalarField",
"name": "position",
"name": "fullName",
"storageKey": null
},
{
@@ -398,8 +274,14 @@ return {
"name": "membership",
"plural": false,
"selections": [
(v11/*: any*/),
(v13/*: any*/),
(v6/*: any*/),
{
"alias": null,
"args": null,
"kind": "ScalarField",
"name": "role",
"storageKey": null
},
{
"alias": "canUpdate",
"args": [
@@ -412,19 +294,6 @@ return {
"kind": "ScalarField",
"name": "permission",
"storageKey": "permission(action:\"iam:membership:update\")"
},
{
"alias": "canDelete",
"args": [
{
"kind": "Literal",
"name": "action",
"value": "iam:membership-profile:delete"
}
],
"kind": "ScalarField",
"name": "permission",
"storageKey": "permission(action:\"iam:membership-profile:delete\")"
}
],
"storageKey": null
@@ -437,12 +306,92 @@ return {
"name": "identity",
"plural": false,
"selections": [
(v14/*: any*/),
(v11/*: any*/)
{
"alias": null,
"args": null,
"kind": "ScalarField",
"name": "email",
"storageKey": null
},
(v6/*: any*/)
],
"storageKey": null
},
(v15/*: any*/),
{
"alias": "lastInvitation",
"args": (v8/*: any*/),
"concreteType": "InvitationConnection",
"kind": "LinkedField",
"name": "pendingInvitations",
"plural": false,
"selections": [
{
"alias": null,
"args": null,
"concreteType": "InvitationEdge",
"kind": "LinkedField",
"name": "edges",
"plural": true,
"selections": [
{
"alias": null,
"args": null,
"concreteType": "Invitation",
"kind": "LinkedField",
"name": "node",
"plural": false,
"selections": [
(v6/*: any*/),
{
"alias": null,
"args": null,
"kind": "ScalarField",
"name": "expiresAt",
"storageKey": null
},
{
"alias": null,
"args": null,
"kind": "ScalarField",
"name": "acceptedAt",
"storageKey": null
},
(v9/*: any*/),
(v2/*: any*/)
],
"storageKey": null
},
(v10/*: any*/)
],
"storageKey": null
},
{
"alias": null,
"args": null,
"concreteType": "PageInfo",
"kind": "LinkedField",
"name": "pageInfo",
"plural": false,
"selections": [
(v11/*: any*/),
(v12/*: any*/)
],
"storageKey": null
},
(v13/*: any*/)
],
"storageKey": "pendingInvitations(first:1,orderBy:{\"direction\":\"DESC\",\"field\":\"CREATED_AT\"})"
},
{
"alias": "lastInvitation",
"args": (v8/*: any*/),
"filters": (v14/*: any*/),
"handle": "connection",
"key": "PeopleListItem_lastInvitation",
"kind": "LinkedHandle",
"name": "pendingInvitations"
},
(v9/*: any*/),
{
"alias": "canUpdate",
"args": [
@@ -456,72 +405,18 @@ return {
"name": "permission",
"storageKey": "permission(action:\"iam:membership-profile:update\")"
},
(v2/*: any*/)
],
"storageKey": null
},
(v16/*: any*/)
],
"storageKey": null
},
(v17/*: any*/),
(v18/*: any*/)
],
"storageKey": "profiles(first:20,orderBy:{\"direction\":\"ASC\",\"field\":\"FULL_NAME\"})"
},
{
"alias": null,
"args": (v7/*: any*/),
"filters": (v19/*: any*/),
"handle": "connection",
"key": "PeopleListFragment_profiles",
"kind": "LinkedHandle",
"name": "profiles"
},
{
"alias": null,
"args": (v10/*: any*/),
"concreteType": "InvitationConnection",
"kind": "LinkedField",
"name": "invitations",
"plural": false,
"selections": [
(v8/*: any*/),
(v2/*: any*/),
{
"alias": null,
"args": null,
"concreteType": "InvitationEdge",
"kind": "LinkedField",
"name": "edges",
"plural": true,
"selections": [
{
"alias": null,
"args": null,
"concreteType": "Invitation",
"kind": "LinkedField",
"name": "node",
"plural": false,
"selections": [
(v11/*: any*/),
(v12/*: any*/),
(v14/*: any*/),
(v13/*: any*/),
{
"alias": null,
"args": null,
"alias": "canInvite",
"args": [
{
"kind": "Literal",
"name": "action",
"value": "iam:invitation:create"
}
],
"kind": "ScalarField",
"name": "status",
"storageKey": null
},
(v15/*: any*/),
{
"alias": null,
"args": null,
"kind": "ScalarField",
"name": "acceptedAt",
"storageKey": null
"name": "permission",
"storageKey": "permission(action:\"iam:invitation:create\")"
},
{
"alias": "canDelete",
@@ -529,34 +424,60 @@ return {
{
"kind": "Literal",
"name": "action",
"value": "iam:invitation:delete"
"value": "iam:membership-profile:delete"
}
],
"kind": "ScalarField",
"name": "permission",
"storageKey": "permission(action:\"iam:invitation:delete\")"
"storageKey": "permission(action:\"iam:membership-profile:delete\")"
},
(v2/*: any*/)
],
"storageKey": null
},
(v16/*: any*/)
(v10/*: any*/)
],
"storageKey": null
},
(v17/*: any*/),
(v18/*: any*/)
{
"alias": null,
"args": null,
"concreteType": "PageInfo",
"kind": "LinkedField",
"name": "pageInfo",
"plural": false,
"selections": [
(v11/*: any*/),
(v12/*: any*/),
{
"alias": null,
"args": null,
"kind": "ScalarField",
"name": "hasPreviousPage",
"storageKey": null
},
{
"alias": null,
"args": null,
"kind": "ScalarField",
"name": "startCursor",
"storageKey": null
}
],
"storageKey": null
},
(v13/*: any*/)
],
"storageKey": "invitations(first:20,orderBy:{\"direction\":\"DESC\",\"field\":\"CREATED_AT\"})"
"storageKey": "profiles(first:20,orderBy:{\"direction\":\"ASC\",\"field\":\"FULL_NAME\"})"
},
{
"alias": null,
"args": (v10/*: any*/),
"filters": (v19/*: any*/),
"args": (v7/*: any*/),
"filters": (v14/*: any*/),
"handle": "connection",
"key": "InvitationListFragment_invitations",
"key": "PeopleListFragment_profiles",
"kind": "LinkedHandle",
"name": "invitations"
"name": "profiles"
}
],
"type": "Organization",
@@ -568,16 +489,16 @@ return {
]
},
"params": {
"cacheID": "3aef3e0e345bd04d2432c7167c87aa8d",
"cacheID": "a5d551184b2abe39feea3dfb05bfe21d",
"id": null,
"metadata": {},
"name": "PeoplePageQuery",
"operationKind": "query",
"text": "query PeoplePageQuery(\n $organizationId: ID!\n) {\n organization: node(id: $organizationId) {\n __typename\n ... on Organization {\n canCreateUser: permission(action: \"iam:membership-profile:create\")\n canInviteUser: permission(action: \"iam:invitation:create\")\n profiles(first: 20, orderBy: {direction: ASC, field: FULL_NAME}) {\n totalCount\n }\n ...PeopleListFragment_8lnpd\n invitations(first: 20, orderBy: {direction: DESC, field: CREATED_AT}) {\n totalCount\n __typename\n }\n ...InvitationListFragment_1PypFi\n }\n id\n }\n}\n\nfragment InvitationListFragment_1PypFi on Organization {\n invitations(first: 20, orderBy: {direction: DESC, field: CREATED_AT}) {\n edges {\n node {\n id\n ...InvitationListItemFragment\n __typename\n }\n cursor\n }\n pageInfo {\n endCursor\n hasNextPage\n hasPreviousPage\n startCursor\n }\n }\n id\n}\n\nfragment InvitationListItemFragment on Invitation {\n id\n fullName\n email\n role\n status\n createdAt\n acceptedAt\n canDelete: permission(action: \"iam:invitation:delete\")\n}\n\nfragment PeopleListFragment_8lnpd on Organization {\n profiles(first: 20, orderBy: {direction: ASC, field: FULL_NAME}) {\n totalCount\n edges {\n node {\n id\n ...PeopleListItemFragment\n __typename\n }\n cursor\n }\n pageInfo {\n endCursor\n hasNextPage\n hasPreviousPage\n startCursor\n }\n }\n id\n}\n\nfragment PeopleListItemFragment on Profile {\n id\n source\n state\n fullName\n kind\n position\n membership {\n id\n role\n canUpdate: permission(action: \"iam:membership:update\")\n canDelete: permission(action: \"iam:membership-profile:delete\")\n }\n identity {\n email\n id\n }\n createdAt\n canUpdate: permission(action: \"iam:membership-profile:update\")\n}\n"
"text": "query PeoplePageQuery(\n $organizationId: ID!\n) {\n organization: node(id: $organizationId) {\n __typename\n ... on Organization {\n canCreateUser: permission(action: \"iam:membership-profile:create\")\n ...PeopleListFragment_8lnpd\n }\n id\n }\n}\n\nfragment PeopleListFragment_8lnpd on Organization {\n profiles(first: 20, orderBy: {direction: ASC, field: FULL_NAME}) {\n totalCount\n edges {\n node {\n id\n ...PeopleListItemFragment\n __typename\n }\n cursor\n }\n pageInfo {\n endCursor\n hasNextPage\n hasPreviousPage\n startCursor\n }\n }\n id\n}\n\nfragment PeopleListItemFragment on Profile {\n id\n source\n state\n fullName\n membership {\n id\n role\n canUpdate: permission(action: \"iam:membership:update\")\n }\n identity {\n email\n id\n }\n lastInvitation: pendingInvitations(first: 1, orderBy: {field: CREATED_AT, direction: DESC}) {\n edges {\n node {\n id\n expiresAt\n acceptedAt\n createdAt\n __typename\n }\n cursor\n }\n pageInfo {\n endCursor\n hasNextPage\n }\n }\n createdAt\n canUpdate: permission(action: \"iam:membership-profile:update\")\n canInvite: permission(action: \"iam:invitation:create\")\n canDelete: permission(action: \"iam:membership-profile:delete\")\n}\n"
}
};
})();
(node as any).hash = "a89fa762bef0dcc31d05543a782f9aaf";
(node as any).hash = "096ed215c8310f05d842827b5f3aec68";
export default node;

View File

@@ -1,42 +0,0 @@
/**
* @generated SignedSource<<8e60217d0397fc8690fc79915bdfdc6c>>
* @lightSyntaxTransform
* @nogrep
*/
/* tslint:disable */
/* eslint-disable */
// @ts-nocheck
import { ReaderFragment } from 'relay-runtime';
import { FragmentRefs } from "relay-runtime";
export type PeoplePage_invitationsTotalCountFragment$data = {
totalCount: number | null | undefined;
readonly " $fragmentType": "PeoplePage_invitationsTotalCountFragment";
};
export type PeoplePage_invitationsTotalCountFragment$key = {
readonly " $data"?: PeoplePage_invitationsTotalCountFragment$data;
readonly $updatableFragmentSpreads: FragmentRefs<"PeoplePage_invitationsTotalCountFragment">;
};
const node: ReaderFragment = {
"argumentDefinitions": [],
"kind": "Fragment",
"metadata": null,
"name": "PeoplePage_invitationsTotalCountFragment",
"selections": [
{
"alias": null,
"args": null,
"kind": "ScalarField",
"name": "totalCount",
"storageKey": null
}
],
"type": "InvitationConnection",
"abstractKey": null
};
(node as any).hash = "8881fd3459c738d64d70370fd317fe5d";
export default node;

View File

@@ -1,5 +1,5 @@
/**
* @generated SignedSource<<5148e84724d7649be7a0ccf0fe813893>>
* @generated SignedSource<<85bf3907699ac605e0603c8d1ae6ef8b>>
* @lightSyntaxTransform
* @nogrep
*/
@@ -65,6 +65,28 @@ v3 = {
"kind": "ScalarField",
"name": "id",
"storageKey": null
},
v4 = [
{
"kind": "Literal",
"name": "first",
"value": 1
},
{
"kind": "Literal",
"name": "orderBy",
"value": {
"direction": "DESC",
"field": "CREATED_AT"
}
}
],
v5 = {
"alias": null,
"args": null,
"kind": "ScalarField",
"name": "createdAt",
"storageKey": null
};
return {
"fragment": {
@@ -173,20 +195,6 @@ return {
"name": "fullName",
"storageKey": null
},
{
"alias": null,
"args": null,
"kind": "ScalarField",
"name": "kind",
"storageKey": null
},
{
"alias": null,
"args": null,
"kind": "ScalarField",
"name": "position",
"storageKey": null
},
{
"alias": null,
"args": null,
@@ -215,19 +223,6 @@ return {
"kind": "ScalarField",
"name": "permission",
"storageKey": "permission(action:\"iam:membership:update\")"
},
{
"alias": "canDelete",
"args": [
{
"kind": "Literal",
"name": "action",
"value": "iam:membership-profile:delete"
}
],
"kind": "ScalarField",
"name": "permission",
"storageKey": "permission(action:\"iam:membership-profile:delete\")"
}
],
"storageKey": null
@@ -252,12 +247,117 @@ return {
"storageKey": null
},
{
"alias": null,
"args": null,
"kind": "ScalarField",
"name": "createdAt",
"storageKey": null
"alias": "lastInvitation",
"args": (v4/*: any*/),
"concreteType": "InvitationConnection",
"kind": "LinkedField",
"name": "pendingInvitations",
"plural": false,
"selections": [
{
"alias": null,
"args": null,
"concreteType": "InvitationEdge",
"kind": "LinkedField",
"name": "edges",
"plural": true,
"selections": [
{
"alias": null,
"args": null,
"concreteType": "Invitation",
"kind": "LinkedField",
"name": "node",
"plural": false,
"selections": [
(v3/*: any*/),
{
"alias": null,
"args": null,
"kind": "ScalarField",
"name": "expiresAt",
"storageKey": null
},
{
"alias": null,
"args": null,
"kind": "ScalarField",
"name": "acceptedAt",
"storageKey": null
},
(v5/*: any*/),
{
"alias": null,
"args": null,
"kind": "ScalarField",
"name": "__typename",
"storageKey": null
}
],
"storageKey": null
},
{
"alias": null,
"args": null,
"kind": "ScalarField",
"name": "cursor",
"storageKey": null
}
],
"storageKey": null
},
{
"alias": null,
"args": null,
"concreteType": "PageInfo",
"kind": "LinkedField",
"name": "pageInfo",
"plural": false,
"selections": [
{
"alias": null,
"args": null,
"kind": "ScalarField",
"name": "endCursor",
"storageKey": null
},
{
"alias": null,
"args": null,
"kind": "ScalarField",
"name": "hasNextPage",
"storageKey": null
}
],
"storageKey": null
},
{
"kind": "ClientExtension",
"selections": [
{
"alias": null,
"args": null,
"kind": "ScalarField",
"name": "__id",
"storageKey": null
}
]
}
],
"storageKey": "pendingInvitations(first:1,orderBy:{\"direction\":\"DESC\",\"field\":\"CREATED_AT\"})"
},
{
"alias": "lastInvitation",
"args": (v4/*: any*/),
"filters": [
"orderBy"
],
"handle": "connection",
"key": "PeopleListItem_lastInvitation",
"kind": "LinkedHandle",
"name": "pendingInvitations"
},
(v5/*: any*/),
{
"alias": "canUpdate",
"args": [
@@ -270,6 +370,32 @@ return {
"kind": "ScalarField",
"name": "permission",
"storageKey": "permission(action:\"iam:membership-profile:update\")"
},
{
"alias": "canInvite",
"args": [
{
"kind": "Literal",
"name": "action",
"value": "iam:invitation:create"
}
],
"kind": "ScalarField",
"name": "permission",
"storageKey": "permission(action:\"iam:invitation:create\")"
},
{
"alias": "canDelete",
"args": [
{
"kind": "Literal",
"name": "action",
"value": "iam:membership-profile:delete"
}
],
"kind": "ScalarField",
"name": "permission",
"storageKey": "permission(action:\"iam:membership-profile:delete\")"
}
],
"storageKey": null
@@ -299,12 +425,12 @@ return {
]
},
"params": {
"cacheID": "ff3f29c40614a067d108d55df828f7c0",
"cacheID": "afbd8ffc5b5ae7156a108a2d1b25440b",
"id": null,
"metadata": {},
"name": "PersonForm_createMutation",
"operationKind": "mutation",
"text": "mutation PersonForm_createMutation(\n $input: CreateUserInput!\n) {\n createUser(input: $input) {\n profileEdge {\n node {\n ...PeopleListItemFragment\n id\n }\n }\n }\n}\n\nfragment PeopleListItemFragment on Profile {\n id\n source\n state\n fullName\n kind\n position\n membership {\n id\n role\n canUpdate: permission(action: \"iam:membership:update\")\n canDelete: permission(action: \"iam:membership-profile:delete\")\n }\n identity {\n email\n id\n }\n createdAt\n canUpdate: permission(action: \"iam:membership-profile:update\")\n}\n"
"text": "mutation PersonForm_createMutation(\n $input: CreateUserInput!\n) {\n createUser(input: $input) {\n profileEdge {\n node {\n ...PeopleListItemFragment\n id\n }\n }\n }\n}\n\nfragment PeopleListItemFragment on Profile {\n id\n source\n state\n fullName\n membership {\n id\n role\n canUpdate: permission(action: \"iam:membership:update\")\n }\n identity {\n email\n id\n }\n lastInvitation: pendingInvitations(first: 1, orderBy: {field: CREATED_AT, direction: DESC}) {\n edges {\n node {\n id\n expiresAt\n acceptedAt\n createdAt\n __typename\n }\n cursor\n }\n pageInfo {\n endCursor\n hasNextPage\n }\n }\n createdAt\n canUpdate: permission(action: \"iam:membership-profile:update\")\n canInvite: permission(action: \"iam:invitation:create\")\n canDelete: permission(action: \"iam:membership-profile:delete\")\n}\n"
}
};
})();

View File

@@ -1,5 +1,5 @@
/**
* @generated SignedSource<<bb127fea9cdcaddd0cf0a0a3db90ff14>>
* @generated SignedSource<<6bcbc60c4f6fe80fc82937a5f53ee509>>
* @lightSyntaxTransform
* @nogrep
*/
@@ -32,10 +32,6 @@ export type ViewerMembershipLayoutQuery$data = {
};
readonly viewer: {
readonly email: string;
readonly pendingInvitations: {
readonly totalCount: number;
};
readonly " $fragmentSpreads": FragmentRefs<"MembershipsDropdown_viewerFragment">;
};
};
export type ViewerMembershipLayoutQuery = {
@@ -90,13 +86,6 @@ v6 = {
"storageKey": null
},
v7 = {
"alias": null,
"args": null,
"kind": "ScalarField",
"name": "totalCount",
"storageKey": null
},
v8 = {
"alias": null,
"args": null,
"kind": "ScalarField",
@@ -200,32 +189,7 @@ return {
"name": "viewer",
"plural": false,
"selections": [
(v6/*: any*/),
{
"args": null,
"kind": "FragmentSpread",
"name": "MembershipsDropdown_viewerFragment"
},
{
"kind": "RequiredField",
"field": {
"alias": null,
"args": null,
"concreteType": "InvitationConnection",
"kind": "LinkedField",
"name": "pendingInvitations",
"plural": false,
"selections": [
{
"kind": "RequiredField",
"field": (v7/*: any*/),
"action": "THROW"
}
],
"storageKey": null
},
"action": "THROW"
}
(v6/*: any*/)
],
"storageKey": null
},
@@ -294,11 +258,11 @@ return {
"name": "permission",
"storageKey": "permission(action:\"iam:personal-api-key:list\")"
},
(v8/*: any*/)
(v7/*: any*/)
],
"storageKey": null
},
(v8/*: any*/),
(v7/*: any*/),
{
"alias": null,
"args": null,
@@ -308,7 +272,7 @@ return {
"plural": false,
"selections": [
(v5/*: any*/),
(v8/*: any*/)
(v7/*: any*/)
],
"storageKey": null
}
@@ -586,7 +550,7 @@ return {
"type": "Organization",
"abstractKey": null
},
(v8/*: any*/)
(v7/*: any*/)
],
"storageKey": null
},
@@ -599,35 +563,23 @@ return {
"plural": false,
"selections": [
(v6/*: any*/),
{
"alias": null,
"args": null,
"concreteType": "InvitationConnection",
"kind": "LinkedField",
"name": "pendingInvitations",
"plural": false,
"selections": [
(v7/*: any*/)
],
"storageKey": null
},
(v8/*: any*/)
(v7/*: any*/)
],
"storageKey": null
}
]
},
"params": {
"cacheID": "63f113e3848e77978d2caee55ca07ed4",
"cacheID": "4f0eae19e470f2dd64ac495cb2612a19",
"id": null,
"metadata": {},
"name": "ViewerMembershipLayoutQuery",
"operationKind": "query",
"text": "query ViewerMembershipLayoutQuery(\n $organizationId: ID!\n $hideSidebar: Boolean!\n) {\n organization: node(id: $organizationId) {\n __typename\n ... on Organization {\n ...MembershipsDropdown_organizationFragment\n ...ViewerMembershipDropdownFragment\n ...SidebarFragment @skip(if: $hideSidebar)\n viewer {\n fullName\n membership {\n role\n id\n }\n id\n }\n }\n id\n }\n viewer {\n email\n ...MembershipsDropdown_viewerFragment\n pendingInvitations {\n totalCount\n }\n id\n }\n}\n\nfragment MembershipsDropdown_organizationFragment on Organization {\n name\n}\n\nfragment MembershipsDropdown_viewerFragment on Identity {\n pendingInvitations {\n totalCount\n }\n}\n\nfragment SidebarFragment on Organization {\n canListMeetings: permission(action: \"core:meeting:list\")\n canListTasks: permission(action: \"core:task:list\")\n canListMeasures: permission(action: \"core:measure:list\")\n canListRisks: permission(action: \"core:risk:list\")\n canListFrameworks: permission(action: \"core:framework:list\")\n canListMembers: permission(action: \"iam:membership:list\")\n canListVendors: permission(action: \"core:vendor:list\")\n canListDocuments: permission(action: \"core:document:list\")\n canListAssets: permission(action: \"core:asset:list\")\n canListData: permission(action: \"core:datum:list\")\n canListAudits: permission(action: \"core:audit:list\")\n canListNonconformities: permission(action: \"core:nonconformity:list\")\n canListObligations: permission(action: \"core:obligation:list\")\n canListContinualImprovements: permission(action: \"core:continual-improvement:list\")\n canListProcessingActivities: permission(action: \"core:processing-activity:list\")\n canListRightsRequests: permission(action: \"core:rights-request:list\")\n canListSnapshots: permission(action: \"core:snapshot:list\")\n canGetTrustCenter: permission(action: \"core:trust-center:get\")\n canUpdateOrganization: permission(action: \"iam:organization:update\")\n canListStatesOfApplicability: permission(action: \"core:state-of-applicability:list\")\n}\n\nfragment ViewerMembershipDropdownFragment on Organization {\n viewer {\n fullName\n identity {\n email\n canListAPIKeys: permission(action: \"iam:personal-api-key:list\")\n id\n }\n id\n }\n}\n"
"text": "query ViewerMembershipLayoutQuery(\n $organizationId: ID!\n $hideSidebar: Boolean!\n) {\n organization: node(id: $organizationId) {\n __typename\n ... on Organization {\n ...MembershipsDropdown_organizationFragment\n ...ViewerMembershipDropdownFragment\n ...SidebarFragment @skip(if: $hideSidebar)\n viewer {\n fullName\n membership {\n role\n id\n }\n id\n }\n }\n id\n }\n viewer {\n email\n id\n }\n}\n\nfragment MembershipsDropdown_organizationFragment on Organization {\n name\n}\n\nfragment SidebarFragment on Organization {\n canListMeetings: permission(action: \"core:meeting:list\")\n canListTasks: permission(action: \"core:task:list\")\n canListMeasures: permission(action: \"core:measure:list\")\n canListRisks: permission(action: \"core:risk:list\")\n canListFrameworks: permission(action: \"core:framework:list\")\n canListMembers: permission(action: \"iam:membership:list\")\n canListVendors: permission(action: \"core:vendor:list\")\n canListDocuments: permission(action: \"core:document:list\")\n canListAssets: permission(action: \"core:asset:list\")\n canListData: permission(action: \"core:datum:list\")\n canListAudits: permission(action: \"core:audit:list\")\n canListNonconformities: permission(action: \"core:nonconformity:list\")\n canListObligations: permission(action: \"core:obligation:list\")\n canListContinualImprovements: permission(action: \"core:continual-improvement:list\")\n canListProcessingActivities: permission(action: \"core:processing-activity:list\")\n canListRightsRequests: permission(action: \"core:rights-request:list\")\n canListSnapshots: permission(action: \"core:snapshot:list\")\n canGetTrustCenter: permission(action: \"core:trust-center:get\")\n canUpdateOrganization: permission(action: \"iam:organization:update\")\n canListStatesOfApplicability: permission(action: \"core:state-of-applicability:list\")\n}\n\nfragment ViewerMembershipDropdownFragment on Organization {\n viewer {\n fullName\n identity {\n email\n canListAPIKeys: permission(action: \"iam:personal-api-key:list\")\n id\n }\n id\n }\n}\n"
}
};
})();
(node as any).hash = "1ca4734452833d75388f7409315cf715";
(node as any).hash = "00ae11d725a9aacd5389ef00381faf98";
export default node;

View File

@@ -7,14 +7,15 @@ import { Link, useNavigate, useSearchParams } from "react-router";
import { graphql } from "relay-runtime";
import { z } from "zod";
import type { ActivateAccountPageMutation } from "#/__generated__/iam/ActivateAccountPageMutation.graphql";
import { useFormWithSchema } from "#/hooks/useFormWithSchema";
const signUpFromIvitationMutation = graphql`
mutation SignUpFromInvitationPageMutation(
$input: SignUpFromInvitationInput!
const activateAccountMutation = graphql`
mutation ActivateAccountPageMutation(
$input: ActivateAccountInput!
) {
signUpFromInvitation(input: $input) {
identity {
activateAccount(input: $input) {
profile {
id
}
}
@@ -28,7 +29,7 @@ const schema = z.object({
type FormData = z.infer<typeof schema>;
export default function SignUpFromInvitationPage() {
export default function ActivateAccountPage() {
const { __ } = useTranslate();
const { toast } = useToast();
const navigate = useNavigate();
@@ -44,7 +45,7 @@ export default function SignUpFromInvitationPage() {
},
});
const [signUpFromInvitation] = useMutation(signUpFromIvitationMutation);
const [activateAccount] = useMutation<ActivateAccountPageMutation>(activateAccountMutation);
const onSubmit = (data: FormData) => {
const token = searchParams.get("token");
@@ -57,7 +58,7 @@ export default function SignUpFromInvitationPage() {
return;
}
signUpFromInvitation({
activateAccount({
variables: {
input: {
token,

View File

@@ -12,7 +12,6 @@ import { graphql, type PreloadedQuery, usePreloadedQuery } from "react-relay";
import type { MembershipsPageQuery } from "#/__generated__/iam/MembershipsPageQuery.graphql";
import { InvitationCard } from "./_components/InvitationCard";
import { MembershipCard } from "./_components/MembershipCard";
export const membershipsPageQuery = graphql`
@@ -24,7 +23,6 @@ export const membershipsPageQuery = graphql`
)
@connection(key: "MembershipsPage_profiles")
@required(action: THROW) {
__id
edges @required(action: THROW) {
node {
id
@@ -38,20 +36,6 @@ export const membershipsPageQuery = graphql`
}
}
}
pendingInvitations(
first: 1000
orderBy: { direction: DESC, field: CREATED_AT }
)
@connection(key: "MembershipsPage_pendingInvitations")
@required(action: THROW) {
__id
edges @required(action: THROW) {
node {
id
...InvitationCardFragment
}
}
}
}
}
`;
@@ -68,10 +52,6 @@ export function MembershipsPage(props: {
const {
viewer: {
profiles: { edges: initialProfiles },
pendingInvitations: {
__id: pendingInvitationsConnectionId,
edges: invitations,
},
},
} = usePreloadedQuery<MembershipsPageQuery>(membershipsPageQuery, queryRef);
@@ -91,22 +71,6 @@ export function MembershipsPage(props: {
{__("Select an organization")}
</h1>
<div className="space-y-4 w-full">
{invitations.length > 0 && (
<div className="space-y-3">
<h2 className="text-xl font-semibold">
{__("Pending invitations")}
</h2>
{invitations.map(({ node }) => (
<InvitationCard
pendingInvitationsConnectionId={
pendingInvitationsConnectionId
}
key={node.id}
fKey={node}
/>
))}
</div>
)}
{initialProfiles.length > 0 && (
<div className="space-y-3">
<h2 className="text-xl font-semibold">

View File

@@ -1,110 +0,0 @@
import { formatDate, formatError } from "@probo/helpers";
import { useTranslate } from "@probo/i18n";
import { Button, Card, useToast } from "@probo/ui";
import { useFragment, useMutation } from "react-relay";
import { type DataID, graphql } from "relay-runtime";
import type { InvitationCardFragment$key } from "#/__generated__/iam/InvitationCardFragment.graphql";
import type { InvitationCardMutation } from "#/__generated__/iam/InvitationCardMutation.graphql";
const fragment = graphql`
fragment InvitationCardFragment on Invitation {
id
role
createdAt
organization @required(action: THROW) {
id
name
}
}
`;
const acceptMutation = graphql`
mutation InvitationCardMutation(
$input: AcceptInvitationInput!
# FIXME: profiles
# $membershipConnections: [ID!]!
$pendingInvitationConnections: [ID!]!
) {
acceptInvitation(input: $input) {
invitation {
id @deleteEdge(connections: $pendingInvitationConnections)
}
membership {
id
...MembershipCardFragment
}
}
}
`;
interface InvitationCardProps {
pendingInvitationsConnectionId: DataID;
fKey: InvitationCardFragment$key;
}
export function InvitationCard(props: InvitationCardProps) {
const { pendingInvitationsConnectionId, fKey }
= props;
const { __ } = useTranslate();
const { toast } = useToast();
const invitation = useFragment<InvitationCardFragment$key>(fragment, fKey);
const [acceptInvitation, isAccepting]
= useMutation<InvitationCardMutation>(acceptMutation);
const handleAccept = () => {
acceptInvitation({
variables: {
input: {
invitationId: invitation.id,
},
pendingInvitationConnections: [pendingInvitationsConnectionId],
},
onCompleted: (_, e) => {
if (e) {
toast({
title: __("Request failed"),
description: formatError(__("Cannot accept invitation"), e),
variant: "error",
});
return;
}
},
onError: (e) => {
toast({
title: __("Request failed"),
description: e.message,
variant: "error",
});
},
});
};
return (
<Card padded className="w-full">
<div className="flex items-start justify-between gap-4">
<div className="flex-1 space-y-1">
<h3 className="text-lg font-semibold">
{invitation.organization.name}
</h3>
<p className="text-sm text-txt-secondary">
{__("Role")}
:
<span className="font-medium">{invitation.role}</span>
</p>
<p className="text-xs text-txt-tertiary">
{__("Invited on")}
{" "}
{formatDate(invitation.createdAt)}
</p>
</div>
<Button onClick={handleAccept} disabled={isAccepting}>
{isAccepting ? __("Accepting...") : __("Accept invitation")}
</Button>
</div>
</Card>
);
}

View File

@@ -1,8 +1,8 @@
import { useTranslate } from "@probo/i18n";
import { Badge, Button, IconPeopleAdd, Layout, Skeleton } from "@probo/ui";
import { Layout, Skeleton } from "@probo/ui";
import { Suspense } from "react";
import { graphql, type PreloadedQuery, usePreloadedQuery } from "react-relay";
import { Link, Outlet } from "react-router";
import { Outlet } from "react-router";
import type { ViewerMembershipLayoutQuery } from "#/__generated__/iam/ViewerMembershipLayoutQuery.graphql";
import { CoreRelayProvider } from "#/providers/CoreRelayProvider";
@@ -33,10 +33,6 @@ export const viewerMembershipLayoutQuery = graphql`
}
viewer @required(action: THROW) {
email
...MembershipsDropdown_viewerFragment
pendingInvitations @required(action: THROW) {
totalCount @required(action: THROW)
}
}
}
`;
@@ -61,24 +57,7 @@ export function ViewerMembershipLayout(props: {
return (
<Layout
headerLeading={(
<>
<MembershipsDropdown
organizationFKey={organization}
viewerFKey={viewer}
/>
{viewer.pendingInvitations.totalCount > 0 && (
<Link to="/" className="relative" title={__("Invitations")}>
<Button variant="tertiary" icon={IconPeopleAdd} />
<Badge
variant="info"
size="sm"
className="absolute -top-1 -right-1 min-w-[20px] h-5 flex items-center justify-center"
>
{viewer.pendingInvitations.totalCount}
</Badge>
</Link>
)}
</>
<MembershipsDropdown organizationFKey={organization} />
)}
headerTrailing={(
<Suspense fallback={<Skeleton className="w-32 h-8" />}>

View File

@@ -1,13 +1,11 @@
import { useTranslate } from "@probo/i18n";
import {
Badge,
Button,
Dropdown,
DropdownItem,
DropdownSeparator,
IconChevronGrabberVertical,
IconMagnifyingGlass,
IconPeopleAdd,
IconPlusLarge,
Input,
} from "@probo/ui";
@@ -17,7 +15,6 @@ import { Link, useLocation } from "react-router";
import { graphql } from "relay-runtime";
import type { MembershipsDropdown_organizationFragment$key } from "#/__generated__/iam/MembershipsDropdown_organizationFragment.graphql";
import type { MembershipsDropdown_viewerFragment$key } from "#/__generated__/iam/MembershipsDropdown_viewerFragment.graphql";
import type { MembershipsDropdownMenuQuery } from "#/__generated__/iam/MembershipsDropdownMenuQuery.graphql";
import {
@@ -30,19 +27,11 @@ const organizationFragment = graphql`
name
}
`;
const viewerFragment = graphql`
fragment MembershipsDropdown_viewerFragment on Identity {
pendingInvitations @required(action: THROW) {
totalCount @required(action: THROW)
}
}
`;
export function MembershipsDropdown(props: {
organizationFKey: MembershipsDropdown_organizationFragment$key;
viewerFKey: MembershipsDropdown_viewerFragment$key;
}) {
const { organizationFKey, viewerFKey } = props;
const { organizationFKey } = props;
const location = useLocation();
const { __ } = useTranslate();
@@ -53,12 +42,6 @@ export function MembershipsDropdown(props: {
organizationFragment,
organizationFKey,
);
const {
pendingInvitations: { totalCount: pendingInvitationCount },
} = useFragment<MembershipsDropdown_viewerFragment$key>(
viewerFragment,
viewerFKey,
);
const [queryRef, loadQuery] = useQueryLoader<MembershipsDropdownMenuQuery>(
membershipsDropdownMenuQuery,
);
@@ -110,17 +93,6 @@ export function MembershipsDropdown(props: {
)}
</div>
<DropdownSeparator />
{pendingInvitationCount > 0 && (
<DropdownItem asChild>
<Link to="/">
<IconPeopleAdd size={16} />
<span className="flex-1">{__("Invitations")}</span>
<Badge variant="info" size="sm">
{pendingInvitationCount}
</Badge>
</Link>
</DropdownItem>
)}
<DropdownItem asChild>
<Link to="/organizations/new" state={{ from: location.pathname }}>
<IconPlusLarge size={16} />

View File

@@ -1,5 +1,5 @@
import { useTranslate } from "@probo/i18n";
import { Button, PageHeader, TabBadge, TabItem, Tabs } from "@probo/ui";
import { Button, PageHeader } from "@probo/ui";
import { useState } from "react";
import { type PreloadedQuery, usePreloadedQuery } from "react-relay";
import { ConnectionHandler, type DataID, graphql } from "relay-runtime";
@@ -8,8 +8,6 @@ import type { PeoplePageQuery } from "#/__generated__/iam/PeoplePageQuery.graphq
import { useOrganizationId } from "#/hooks/useOrganizationId";
import { AddPersonDialog } from "./_components/AddPersonDialog";
import { InvitationList } from "./_components/InvitationList";
import { InviteUserDialog } from "./_components/InviteUserDialog";
import { PeopleList } from "./_components/PeopleList";
export const peoplePageQuery = graphql`
@@ -18,32 +16,13 @@ export const peoplePageQuery = graphql`
__typename
... on Organization {
canCreateUser: permission(action: "iam:membership-profile:create")
canInviteUser: permission(action: "iam:invitation:create")
profiles(first: 20, orderBy: { direction: ASC, field: FULL_NAME })
@required(action: THROW) {
totalCount
}
...PeopleListFragment
@arguments(first: 20, order: { direction: ASC, field: FULL_NAME })
invitations(first: 20, orderBy: { direction: DESC, field: CREATED_AT })
@required(action: THROW) {
totalCount
...PeoplePage_invitationsTotalCountFragment
}
...InvitationListFragment
@arguments(first: 20, order: { direction: DESC, field: CREATED_AT })
}
}
}
`;
export const invitationCountFragment = graphql`
fragment PeoplePage_invitationsTotalCountFragment on InvitationConnection
@updatable {
totalCount
}
`;
export function PeoplePage(props: {
queryRef: PreloadedQuery<PeoplePageQuery>;
}) {
@@ -52,14 +31,11 @@ export function PeoplePage(props: {
const organizationId = useOrganizationId();
const { __ } = useTranslate();
const [activeTab, setActiveTab] = useState<"people" | "invitations">(
"people",
);
const [connectionId, setConnectionId] = useState<DataID>(
ConnectionHandler.getConnectionID(
organizationId,
"PeopleListFragment_profiles",
{ orderBy: { direction: "ASC", field: "CREATED_AT" } },
{ orderBy: { direction: "ASC", field: "FULL_NAME" } },
),
);
@@ -71,14 +47,6 @@ export function PeoplePage(props: {
throw new Error("node is of invalid type");
}
const [invitationListConnectionId, setInvitationListConnectionId] = useState(
ConnectionHandler.getConnectionID(
organizationId,
"InvitationListFragment_invitations",
{ orderBy: { direction: "ASC", field: "CREATED_AT" } },
),
);
return (
<div className="space-y-6">
<PageHeader title={__("People")}>
@@ -88,53 +56,13 @@ export function PeoplePage(props: {
<Button variant="secondary">{__("Add Person")}</Button>
</AddPersonDialog>
)}
{organization.canInviteUser && (
<InviteUserDialog
connectionId={invitationListConnectionId}
fKey={organization.invitations}
>
<Button variant="secondary">{__("Invite member")}</Button>
</InviteUserDialog>
)}
</PageHeader>
<Tabs>
<TabItem
active={activeTab === "people"}
onClick={() => setActiveTab("people")}
>
{__("People")}
{(organization.profiles.totalCount ?? 0) > 0 && (
<TabBadge>{organization.profiles.totalCount}</TabBadge>
)}
</TabItem>
<TabItem
active={activeTab === "invitations"}
onClick={() => setActiveTab("invitations")}
>
{__("Invitations")}
{(organization.invitations.totalCount ?? 0) > 0 && (
<TabBadge>{organization.invitations.totalCount}</TabBadge>
)}
</TabItem>
</Tabs>
<div className="pb-6 pt-6">
{activeTab === "people" && (
<PeopleList
fKey={organization}
onConnectionIdChange={setConnectionId}
/>
)}
{activeTab === "invitations" && (
<InvitationList
fKey={organization}
totalCount={organization.invitations.totalCount ?? 0}
totalCountFKey={organization.invitations}
onConnectionIdChange={setInvitationListConnectionId}
/>
)}
<PeopleList
fKey={organization}
onConnectionIdChange={setConnectionId}
/>
</div>
</div>
);

View File

@@ -1,140 +0,0 @@
import { useTranslate } from "@probo/i18n";
import { Tbody, Td, Th, Thead, Tr } from "@probo/ui";
import { type ComponentProps } from "react";
import { ConnectionHandler, graphql, usePaginationFragment } from "react-relay";
import type { InvitationListFragment$key } from "#/__generated__/iam/InvitationListFragment.graphql";
import type { InvitationListFragment_RefetchQuery } from "#/__generated__/iam/InvitationListFragment_RefetchQuery.graphql";
import type { PeoplePage_invitationsTotalCountFragment$key } from "#/__generated__/iam/PeoplePage_invitationsTotalCountFragment.graphql";
import {
type Order,
SortableTable,
SortableTh,
} from "#/components/SortableTable";
import { useOrganizationId } from "#/hooks/useOrganizationId";
import { InvitationListItem } from "./InvitationListItem";
const fragment = graphql`
fragment InvitationListFragment on Organization
@refetchable(queryName: "InvitationListFragment_RefetchQuery")
@argumentDefinitions(
first: { type: "Int", defaultValue: 20 }
order: {
type: "InvitationOrder"
defaultValue: { direction: DESC, field: CREATED_AT }
}
after: { type: "CursorKey", defaultValue: null }
before: { type: "CursorKey", defaultValue: null }
last: { type: "Int", defaultValue: null }
) {
invitations(
first: $first
after: $after
last: $last
before: $before
orderBy: $order
)
@connection(
key: "InvitationListFragment_invitations"
filters: ["orderBy"]
)
@required(action: THROW) {
__id
edges @required(action: THROW) {
node {
id
...InvitationListItemFragment
}
}
}
}
`;
export function InvitationList(props: {
fKey: InvitationListFragment$key;
onConnectionIdChange: (connectionId: string) => void;
totalCount: number;
totalCountFKey: PeoplePage_invitationsTotalCountFragment$key;
}) {
const { fKey, onConnectionIdChange, totalCount, totalCountFKey } = props;
const organizationId = useOrganizationId();
const { __ } = useTranslate();
const invitationsPagination = usePaginationFragment<
InvitationListFragment_RefetchQuery,
InvitationListFragment$key
>(fragment, fKey);
const refetchInvitations = () => {
invitationsPagination.refetch({}, { fetchPolicy: "network-only" });
};
const handleOrderChange = (order: Order) => {
onConnectionIdChange(
ConnectionHandler.getConnectionID(
organizationId,
"InvitationListFragment_invitations",
{ orderBy: order },
),
);
};
return (
<SortableTable
{...invitationsPagination}
refetch={
invitationsPagination.refetch as ComponentProps<
typeof SortableTable
>["refetch"]
}
pageSize={20}
>
<Thead>
<Tr>
<SortableTh field="FULL_NAME" onOrderChange={handleOrderChange}>
{__("Name")}
</SortableTh>
<SortableTh field="EMAIL" onOrderChange={handleOrderChange}>
{__("Email")}
</SortableTh>
<SortableTh field="ROLE" onOrderChange={handleOrderChange}>
{__("Role")}
</SortableTh>
<SortableTh field="CREATED_AT" onOrderChange={handleOrderChange}>
{__("Invited")}
</SortableTh>
<Th>{__("Status")}</Th>
<SortableTh field="ACCEPTED_AT" onOrderChange={handleOrderChange}>
{__("Accepted at")}
</SortableTh>
<Th></Th>
</Tr>
</Thead>
<Tbody>
{totalCount === 0
? (
<Tr>
<Td colSpan={7} className="text-center text-txt-secondary">
{__("No invitations")}
</Td>
</Tr>
)
: (
invitationsPagination.data.invitations.edges.map(
({ node: invitation }) => (
<InvitationListItem
connectionId={invitationsPagination.data.invitations.__id}
key={invitation.id}
fKey={invitation}
onRefetch={refetchInvitations}
totalCountFKey={totalCountFKey}
/>
),
)
)}
</Tbody>
</SortableTable>
);
}

View File

@@ -1,158 +0,0 @@
import { sprintf } from "@probo/helpers";
import { useTranslate } from "@probo/i18n";
import {
Badge,
Button,
IconTrashCan,
Spinner,
Td,
Tr,
useConfirm,
} from "@probo/ui";
import { clsx } from "clsx";
import { useFragment } from "react-relay";
import { graphql } from "relay-runtime";
import type { InvitationListItemFragment$key } from "#/__generated__/iam/InvitationListItemFragment.graphql";
import type { PeoplePage_invitationsTotalCountFragment$key } from "#/__generated__/iam/PeoplePage_invitationsTotalCountFragment.graphql";
import { useMutationWithToasts } from "#/hooks/useMutationWithToasts";
import { useOrganizationId } from "#/hooks/useOrganizationId";
import { invitationCountFragment } from "../PeoplePage";
const fragment = graphql`
fragment InvitationListItemFragment on Invitation {
id
fullName
email
role
status
createdAt
acceptedAt
canDelete: permission(action: "iam:invitation:delete")
}
`;
const deleteInvitationMutation = graphql`
mutation InvitationListItem_DeleteInvitationMutation(
$input: DeleteInvitationInput!
$connections: [ID!]!
) {
deleteInvitation(input: $input) {
deletedInvitationId @deleteEdge(connections: $connections)
}
}
`;
export function InvitationListItem(props: {
connectionId: string;
fKey: InvitationListItemFragment$key;
totalCountFKey: PeoplePage_invitationsTotalCountFragment$key;
onRefetch: () => void;
}) {
const { connectionId, fKey, totalCountFKey } = props;
const organizationId = useOrganizationId();
const { __ } = useTranslate();
const confirm = useConfirm();
const invitation = useFragment<InvitationListItemFragment$key>(
fragment,
fKey,
);
const [deleteInvitation, isDeleting] = useMutationWithToasts(
deleteInvitationMutation,
{
successMessage: __("Invitation deleted successfully"),
errorMessage: __("Failed to delete invitation"),
},
);
const handleDelete = () => {
confirm(
() => {
return deleteInvitation({
variables: {
input: {
organizationId,
invitationId: invitation.id,
},
connections: [connectionId],
},
updater: (store) => {
const { updatableData }
= store.readUpdatableFragment<PeoplePage_invitationsTotalCountFragment$key>(
invitationCountFragment,
totalCountFKey,
);
if (typeof updatableData.totalCount === "number") {
updatableData.totalCount -= 1;
}
},
});
},
{
message: sprintf(
__("Are you sure you want to delete the invitation for %s?"),
invitation.fullName,
),
},
);
};
return (
<Tr className={clsx(isDeleting && "opacity-60 pointer-events-none")}>
<Td>
<div className="font-semibold">{invitation.fullName}</div>
</Td>
<Td>{invitation.email}</Td>
<Td>
<Badge>{invitation.role}</Badge>
</Td>
<Td>{new Date(invitation.createdAt).toLocaleDateString()}</Td>
<Td>
{invitation.status === "ACCEPTED"
? (
<Badge variant="success">{__("Accepted")}</Badge>
)
: invitation.status === "EXPIRED"
? (
<Badge variant="danger">{__("Expired")}</Badge>
)
: (
<Badge variant="warning">{__("Pending")}</Badge>
)}
</Td>
<Td>
{invitation.acceptedAt
? new Date(invitation.acceptedAt).toLocaleDateString()
: "-"}
</Td>
<Td noLink width={80} className="text-end">
<div
className="flex gap-2 justify-end"
onClick={e => e.stopPropagation()}
>
{isDeleting
? (
<Spinner size={16} />
)
: (
invitation.canDelete
&& invitation.status !== "ACCEPTED" && (
<Button
variant="danger"
onClick={handleDelete}
disabled={isDeleting}
icon={IconTrashCan}
aria-label={__("Delete invitation")}
/>
)
)}
</div>
</Td>
</Tr>
);
}

View File

@@ -1,206 +0,0 @@
import { getAssignableRoles } from "@probo/helpers";
import { useTranslate } from "@probo/i18n";
import {
Button,
Dialog,
DialogContent,
DialogFooter,
Field,
Option,
Select,
useDialogRef,
} from "@probo/ui";
import { type PropsWithChildren, use } from "react";
import { Controller } from "react-hook-form";
import { graphql } from "relay-runtime";
import { z } from "zod";
import type { InviteUserDialogMutation } from "#/__generated__/iam/InviteUserDialogMutation.graphql";
import type { PeoplePage_invitationsTotalCountFragment$key } from "#/__generated__/iam/PeoplePage_invitationsTotalCountFragment.graphql";
import { useFormWithSchema } from "#/hooks/useFormWithSchema";
import { useMutationWithToasts } from "#/hooks/useMutationWithToasts";
import { useOrganizationId } from "#/hooks/useOrganizationId";
import { CurrentUser } from "#/providers/CurrentUser";
import { invitationCountFragment } from "../PeoplePage";
const inviteMutation = graphql`
mutation InviteUserDialogMutation(
$input: InviteUserInput!
$connections: [ID!]!
) {
inviteUser(input: $input) {
invitationEdge @prependEdge(connections: $connections) {
node {
id
email
fullName
role
expiresAt
acceptedAt
createdAt
canDelete: permission(action: "iam:invitation:delete")
}
}
}
}
`;
// const totalCountFragment = graphql`
// fragment InviteUserDialog_totalCountFragment on InvitationConnection
// @updatable {
// totalCount
// }
// `;
const schema = z.object({
email: z.string().email(),
fullName: z.string(),
role: z
.enum(["OWNER", "ADMIN", "VIEWER", "AUDITOR", "EMPLOYEE"])
.default("VIEWER"),
});
type InviteUserDialogProps = PropsWithChildren<{
connectionId: string;
fKey: PeoplePage_invitationsTotalCountFragment$key;
}>;
export function InviteUserDialog(props: InviteUserDialogProps) {
const { children, connectionId, fKey } = props;
const organizationId = useOrganizationId();
const { __ } = useTranslate();
const dialogRef = useDialogRef();
const { role } = use(CurrentUser);
const [inviteUser, isInviting]
= useMutationWithToasts<InviteUserDialogMutation>(inviteMutation, {
successMessage: __("Invitation sent successfully"),
errorMessage: __("Failed to send invitation"),
});
const assignableRoles = getAssignableRoles(role);
const { register, handleSubmit, formState, reset, control }
= useFormWithSchema(schema, {
defaultValues: { role: "VIEWER" },
});
const onSubmit = async (data: z.infer<typeof schema>) => {
await inviteUser({
variables: {
input: {
organizationId,
email: data.email,
fullName: data.fullName,
role: data.role,
},
connections: [connectionId],
},
onCompleted: () => {
reset();
dialogRef.current?.close();
},
updater: (store) => {
const { updatableData }
= store.readUpdatableFragment<PeoplePage_invitationsTotalCountFragment$key>(
invitationCountFragment,
fKey,
);
if (typeof updatableData.totalCount === "number") {
updatableData.totalCount += 1;
}
},
});
};
return (
<Dialog
title={__("Invite member")}
trigger={children}
className="max-w-lg"
ref={dialogRef}
>
<form onSubmit={e => void handleSubmit(onSubmit)(e)}>
<DialogContent padded className="space-y-4">
<p className="text-txt-secondary text-sm">
Send an invitation to join your workspace.
</p>
<Field
type="email"
label={__("Email")}
placeholder={__("Email")}
{...register("email")}
error={formState.errors.email?.message}
/>
<Field
type="text"
label={__("Full name")}
placeholder={__("Full name")}
{...register("fullName")}
error={formState.errors.fullName?.message}
/>
<Field label={__("Role")} required>
<Controller
name="role"
control={control}
render={({ field }) => (
<>
<Select value={field.value} onValueChange={field.onChange}>
{assignableRoles.includes("OWNER") && (
<Option value="OWNER">{__("Owner")}</Option>
)}
{assignableRoles.includes("ADMIN") && (
<Option value="ADMIN">{__("Admin")}</Option>
)}
{assignableRoles.includes("VIEWER") && (
<Option value="VIEWER">{__("Viewer")}</Option>
)}
{assignableRoles.includes("AUDITOR") && (
<Option value="AUDITOR">{__("Auditor")}</Option>
)}
{assignableRoles.includes("EMPLOYEE") && (
<Option value="EMPLOYEE">{__("Employee")}</Option>
)}
</Select>
<div className="mt-2 text-sm text-txt-tertiary">
{field.value === "OWNER" && (
<p>{__("Full access to everything")}</p>
)}
{field.value === "ADMIN" && (
<p>
{__(
"Full access except organization setup and API keys",
)}
</p>
)}
{field.value === "VIEWER" && (
<p>{__("Read-only access")}</p>
)}
{field.value === "AUDITOR" && (
<p>
{__(
"Read-only access without settings, tasks and meetings",
)}
</p>
)}
{field.value === "EMPLOYEE" && (
<p>{__("Access to employee page")}</p>
)}
</div>
</>
)}
/>
</Field>
</DialogContent>
<DialogFooter>
<Button type="submit" disabled={isInviting}>
{__("Invite user")}
</Button>
</DialogFooter>
</form>
</Dialog>
);
}

View File

@@ -43,8 +43,8 @@ const fragment = graphql`
`;
export function PeopleList(props: {
onConnectionIdChange: (connectionId: string) => void;
fKey: PeopleListFragment$key;
onConnectionIdChange: (connectionId: string) => void;
}) {
const { fKey, onConnectionIdChange } = props;
@@ -83,11 +83,10 @@ export function PeopleList(props: {
<Thead>
<Tr>
<SortableTh field="FULL_NAME" onOrderChange={handleOrderChange}>{__("Name")}</SortableTh>
<SortableTh field="STATUS">{__("Status")}</SortableTh>
<SortableTh field="EMAIL_ADDRESS" onOrderChange={handleOrderChange}>{__("Email")}</SortableTh>
<Th>{__("Type")}</Th>
<SortableTh field="ROLE" onOrderChange={handleOrderChange}>{__("Role")}</SortableTh>
<SortableTh field="CREATED_AT" onOrderChange={handleOrderChange}>{__("Joined")}</SortableTh>
<Th>{__("Position")}</Th>
<SortableTh field="CREATED_AT" onOrderChange={handleOrderChange}>{__("Created on")}</SortableTh>
<Th></Th>
</Tr>
</Thead>

View File

@@ -1,12 +1,14 @@
import { getAssignableRoles, sprintf } from "@probo/helpers";
import { useTranslate } from "@probo/i18n";
import {
ActionDropdown,
Badge,
Button,
DropdownItem,
IconMail,
IconTrashCan,
Option,
Select,
Spinner,
Td,
Tr,
useConfirm,
@@ -16,6 +18,7 @@ import { use } from "react";
import { useFragment } from "react-relay";
import { type DataID, graphql } from "relay-runtime";
import type { PeopleListItem_inviteMutation } from "#/__generated__/iam/PeopleListItem_inviteMutation.graphql";
import type { PeopleListItemFragment$key } from "#/__generated__/iam/PeopleListItemFragment.graphql";
import { useMutationWithToasts } from "#/hooks/useMutationWithToasts";
import { useOrganizationId } from "#/hooks/useOrganizationId";
@@ -27,19 +30,49 @@ const fragment = graphql`
source
state
fullName
kind
position
membership @required(action: THROW) {
id
role
canUpdate: permission(action: "iam:membership:update")
canDelete: permission(action: "iam:membership-profile:delete")
}
identity @required(action: THROW) {
email
}
lastInvitation: pendingInvitations(first: 1, orderBy: { field: CREATED_AT, direction: DESC })
@required(action: THROW)
@connection(key: "PeopleListItem_lastInvitation") {
__id
edges {
node {
id
expiresAt
acceptedAt
createdAt
}
}
}
createdAt
canUpdate: permission(action: "iam:membership-profile:update")
canInvite: permission(action: "iam:invitation:create")
canDelete: permission(action: "iam:membership-profile:delete")
}
`;
const inviteUserMutation = graphql`
mutation PeopleListItem_inviteMutation(
$input: InviteUserInput!
$connections: [ID!]!
) {
inviteUser(input: $input) {
invitationEdge @prependEdge(connections: $connections) {
node {
id
expiresAt
acceptedAt
createdAt
}
}
}
}
`;
@@ -73,16 +106,22 @@ export function PeopleListItem(props: {
const { fKey, connectionId } = props;
const organizationId = useOrganizationId();
const { __ } = useTranslate();
const { __, dateTimeFormat } = useTranslate();
const confirm = useConfirm();
const { role } = use(CurrentUser);
const availableRoles = getAssignableRoles(role);
const profile = useFragment<PeopleListItemFragment$key>(fragment, fKey);
const lastInvitation = profile.lastInvitation.edges[0]?.node;
const isInactive = profile.state === "INACTIVE";
const [inviteUser, isInviting]
= useMutationWithToasts<PeopleListItem_inviteMutation>(inviteUserMutation, {
successMessage: __("Invitation sent successfully"),
errorMessage: __("Failed to send invitation"),
});
const [updateMembership, isUpdatingRole] = useMutationWithToasts(
updateRoleMutation,
{
@@ -98,6 +137,29 @@ export function PeopleListItem(props: {
},
);
const handleInvite = () => {
confirm(
() => {
return inviteUser({
variables: {
input: {
organizationId,
profileId: profile.id,
},
connections: [profile.lastInvitation.__id],
},
});
},
{
label: __("Send"),
variant: "primary",
message: sprintf(
__("Send the activation email to %s?"),
profile.fullName,
),
},
);
};
const handleUpdateRole = async (role: string) => {
await updateMembership({
variables: {
@@ -109,7 +171,6 @@ export function PeopleListItem(props: {
},
});
};
const handleRemove = () => {
confirm(
() => {
@@ -134,27 +195,35 @@ export function PeopleListItem(props: {
return (
<>
<Tr
className={clsx(
<Tr to={`/organizations/${organizationId}/people/${profile.id}`}>
<Td className={clsx(
isRemoving && "opacity-60 pointer-events-none",
isInactive && "opacity-50",
)}
to={`/organizations/${organizationId}/people/${profile.id}`}
>
<Td>
<div className="flex items-center gap-2">
<span className="font-semibold">{profile.fullName}</span>
{isInactive && <Badge variant="neutral">{__("Inactive")}</Badge>}
</div>
>
<span className="font-semibold">{profile.fullName}</span>
</Td>
<Td>
<Badge variant={profile.state === "INACTIVE" ? "neutral" : "success"}>{profile.state}</Badge>
</Td>
<Td className={clsx(
isRemoving && "opacity-60 pointer-events-none",
isInactive && "opacity-50",
)}
>
<div className="flex items-center gap-2">
{profile.identity.email}
<Badge variant="info">{profile.source}</Badge>
</div>
</Td>
<Td>{profile.kind}</Td>
<Td noLink className="pr-4">
<Td
noLink
className={clsx(
"pr-4",
isRemoving && "opacity-60 pointer-events-none",
isInactive && "opacity-50",
)}
>
<Select
disabled={!profile.membership.canUpdate || isUpdatingRole}
value={profile.membership.role}
@@ -177,31 +246,33 @@ export function PeopleListItem(props: {
)}
</Select>
</Td>
<Td>{new Date(profile.createdAt).toLocaleDateString()}</Td>
<Td>{profile.position}</Td>
<Td className={clsx(
isRemoving && "opacity-60 pointer-events-none",
isInactive && "opacity-50",
)}
>
{new Date(profile.createdAt).toLocaleDateString()}
</Td>
<Td noLink width={160} className="text-end">
{!isInactive && (
<div
className="flex gap-2 justify-end"
onClick={e => e.stopPropagation()}
>
{isRemoving
? (
<Spinner size={16} />
)
: (
profile.membership.canDelete && (
<Button
variant="danger"
onClick={handleRemove}
disabled={isRemoving}
icon={IconTrashCan}
aria-label={__("Remove member")}
/>
)
)}
</div>
)}
<ActionDropdown>
{isInactive && (
<DropdownItem
onClick={handleInvite}
icon={IconMail}
>
{lastInvitation ? __("Resend activation mail") : __("Send activation mail")}
</DropdownItem>
)}
{profile.canDelete && (
<DropdownItem
onClick={handleRemove}
variant="danger"
icon={IconTrashCan}
>
{__("Remove person")}
</DropdownItem>
)}
</ActionDropdown>
</Td>
</Tr>
</>

View File

@@ -56,16 +56,16 @@ const routes = [
},
{
path: "register",
Component: lazy(() => import("./pages/iam/auth/sign-up/SignUpPage")),
Component: lazy(() => import("./pages/iam/auth/SignUpPage")),
},
{
path: "verify-email",
Component: lazy(() => import("./pages/iam/auth/VerifyEmailPage")),
},
{
path: "signup-from-invitation",
path: "activate-account",
Component: lazy(
() => import("./pages/iam/auth/sign-up/SignUpFromInvitationPage"),
() => import("./pages/iam/auth/ActivateAccountPage"),
),
},
{

View File

@@ -24,17 +24,14 @@ import (
"github.com/jackc/pgx/v5"
"go.gearno.de/kit/pg"
"go.probo.inc/probo/pkg/gid"
"go.probo.inc/probo/pkg/mail"
"go.probo.inc/probo/pkg/page"
)
type (
Invitation struct {
ID gid.GID `db:"id"`
OrganizationID gid.GID `db:"organization_id"`
Email mail.Addr `db:"email"`
FullName string `db:"full_name"`
Role MembershipRole `db:"role"`
OrganizationID gid.GID `fb:"organization_id"`
UserID gid.GID `db:"user_id"`
Status InvitationStatus `db:"status"`
ExpiresAt time.Time `db:"expires_at"`
AcceptedAt *time.Time `db:"accepted_at"`
@@ -46,22 +43,8 @@ type (
func (i Invitation) CursorKey(orderBy InvitationOrderField) page.CursorKey {
switch orderBy {
case InvitationOrderFieldFullName:
return page.NewCursorKey(i.ID, i.FullName)
case InvitationOrderFieldEmail:
return page.NewCursorKey(i.ID, i.Email)
case InvitationOrderFieldRole:
return page.NewCursorKey(i.ID, i.Role)
case InvitationOrderFieldCreatedAt:
return page.NewCursorKey(i.ID, i.CreatedAt)
case InvitationOrderFieldExpiresAt:
return page.NewCursorKey(i.ID, i.ExpiresAt)
case InvitationOrderFieldAcceptedAt:
acceptedAt := time.Time{}
if i.AcceptedAt != nil {
acceptedAt = *i.AcceptedAt
}
return page.NewCursorKey(i.ID, acceptedAt)
}
panic(fmt.Sprintf("unsupported order by: %s", orderBy))
@@ -72,21 +55,17 @@ func (i *Invitation) Insert(ctx context.Context, conn pg.Conn, scope Scoper) err
INSERT INTO
iam_invitations (
tenant_id,
organization_id,
user_id,
id,
organization_id,
email,
full_name,
role,
expires_at,
created_at
)
VALUES (
@tenant_id,
@organization_id,
@user_id,
@id,
@organization_id,
@email,
@full_name,
@role,
@expires_at,
@created_at
);
@@ -94,11 +73,9 @@ VALUES (
args := pgx.StrictNamedArgs{
"tenant_id": scope.GetTenantID(),
"id": i.ID,
"organization_id": i.OrganizationID,
"email": i.Email,
"full_name": i.FullName,
"role": i.Role,
"id": i.ID,
"user_id": i.UserID,
"expires_at": i.ExpiresAt,
"created_at": i.CreatedAt,
}
@@ -120,10 +97,8 @@ func (i *Invitation) LoadByID(
query := `
SELECT
id,
organization_id,
email,
full_name,
role,
organization_id,
user_id,
CASE
WHEN accepted_at IS NOT NULL THEN 'ACCEPTED'
WHEN expires_at < NOW() THEN 'EXPIRED'
@@ -164,49 +139,12 @@ WHERE
return nil
}
func (i *Invitations) ExpireByEmailAndOrganization(
ctx context.Context,
conn pg.Conn,
scope Scoper,
email mail.Addr,
organizationID gid.GID,
filter *InvitationFilter,
) error {
q := `
UPDATE
iam_invitations
SET
expires_at = NOW()
WHERE
email = @email
AND organization_id = @organization_id
AND %s
AND %s
`
q = fmt.Sprintf(q, scope.SQLFragment(), filter.SQLFragment())
args := pgx.StrictNamedArgs{
"email": email,
"organization_id": organizationID,
}
maps.Copy(args, scope.SQLArguments())
maps.Copy(args, filter.SQLArguments())
if _, err := conn.Exec(ctx, q, args); err != nil {
return fmt.Errorf("cannot expire invitations: %w", err)
}
return nil
}
// AuthorizationAttributes loads the minimal authorization attributes for policy condition evaluation.
// It is intentionally lightweight and does not populate the Invitation struct.
func (i *Invitation) AuthorizationAttributes(ctx context.Context, conn pg.Conn) (map[string]string, error) {
q := `
SELECT
email
, organization_id
email, organization_id
FROM
iam_invitations
WHERE
@@ -288,11 +226,11 @@ WHERE
return nil
}
func (i *Invitations) LoadByIdentityID(
func (i *Invitations) LoadByUserID(
ctx context.Context,
conn pg.Conn,
scope Scoper,
email mail.Addr,
userID gid.GID,
cursor *page.Cursor[InvitationOrderField],
filter *InvitationFilter,
) error {
@@ -300,9 +238,7 @@ func (i *Invitations) LoadByIdentityID(
SELECT
id,
organization_id,
email,
full_name,
role,
user_id,
CASE
WHEN accepted_at IS NOT NULL THEN 'ACCEPTED'
WHEN expires_at < NOW() THEN 'EXPIRED'
@@ -314,60 +250,7 @@ SELECT
FROM
iam_invitations
WHERE
email = @email
AND %s
AND %s
`
query = fmt.Sprintf(query, filter.SQLFragment(), cursor.SQLFragment())
args := pgx.StrictNamedArgs{
"email": email,
}
maps.Copy(args, filter.SQLArguments())
maps.Copy(args, cursor.SQLArguments())
rows, err := conn.Query(ctx, query, args)
if err != nil {
return fmt.Errorf("cannot query invitations: %w", err)
}
invitations, err := pgx.CollectRows(rows, pgx.RowToAddrOfStructByName[Invitation])
if err != nil {
return fmt.Errorf("cannot collect invitations: %w", err)
}
*i = invitations
return nil
}
func (i *Invitations) LoadByOrganizationID(
ctx context.Context,
conn pg.Conn,
scope Scoper,
orgID gid.GID,
cursor *page.Cursor[InvitationOrderField],
filter *InvitationFilter,
) error {
query := `
SELECT
id,
organization_id,
email,
full_name,
role,
CASE
WHEN accepted_at IS NOT NULL THEN 'ACCEPTED'
WHEN expires_at < NOW() THEN 'EXPIRED'
ELSE 'PENDING'
END as status,
expires_at,
accepted_at,
created_at
FROM
iam_invitations
WHERE
organization_id = @organization_id
user_id = @user_id
AND %s
AND %s
AND %s
@@ -376,7 +259,7 @@ WHERE
query = fmt.Sprintf(query, scope.SQLFragment(), filter.SQLFragment(), cursor.SQLFragment())
args := pgx.StrictNamedArgs{
"organization_id": orgID,
"user_id": userID,
}
maps.Copy(args, scope.SQLArguments())
maps.Copy(args, filter.SQLArguments())
@@ -396,73 +279,36 @@ WHERE
return nil
}
func (i *Invitations) CountByOrganizationID(
func (i *Invitations) ExpireByUserID(
ctx context.Context,
conn pg.Conn,
scope Scoper,
orgID gid.GID,
userID gid.GID,
filter *InvitationFilter,
) (int, error) {
) error {
q := `
SELECT
COUNT(*)
FROM
iam_invitations
WHERE
organization_id = @organization_id AND %s AND %s
`
UPDATE
iam_invitations
SET
expires_at = NOW()
WHERE
user_id = @user_id
AND organization_id = @organization_id
AND %s
AND %s
`
q = fmt.Sprintf(q, scope.SQLFragment(), filter.SQLFragment())
args := pgx.StrictNamedArgs{
"organization_id": orgID,
"user_id": userID,
}
maps.Copy(args, scope.SQLArguments())
maps.Copy(args, filter.SQLArguments())
row := conn.QueryRow(ctx, q, args)
var count int
err := row.Scan(&count)
if err != nil {
return 0, fmt.Errorf("cannot count invitations: %w", err)
if _, err := conn.Exec(ctx, q, args); err != nil {
return fmt.Errorf("cannot expire invitations: %w", err)
}
return count, nil
}
// Tenant scope is not applied because this is used to count invitations across all tenants
// for a user who doesn't have tenant access yet (before accepting an invitation).
func (i *Invitations) CountByEmail(
ctx context.Context,
conn pg.Conn,
email mail.Addr,
filter *InvitationFilter,
) (int, error) {
q := `
SELECT
COUNT(*)
FROM
iam_invitations
WHERE
email = @email
AND %s
`
q = fmt.Sprintf(q, filter.SQLFragment())
args := pgx.StrictNamedArgs{
"email": email,
}
maps.Copy(args, filter.SQLArguments())
row := conn.QueryRow(ctx, q, args)
var count int
err := row.Scan(&count)
if err != nil {
return 0, fmt.Errorf("cannot count invitations: %w", err)
}
return count, nil
return nil
}

View File

@@ -21,28 +21,13 @@ type InvitationOrderField string
// InvitationOrderField constants
const (
InvitationOrderFieldFullName InvitationOrderField = "FULL_NAME"
InvitationOrderFieldEmail InvitationOrderField = "EMAIL"
InvitationOrderFieldRole InvitationOrderField = "ROLE"
InvitationOrderFieldCreatedAt InvitationOrderField = "CREATED_AT"
InvitationOrderFieldExpiresAt InvitationOrderField = "EXPIRES_AT"
InvitationOrderFieldAcceptedAt InvitationOrderField = "ACCEPTED_AT"
InvitationOrderFieldCreatedAt InvitationOrderField = "CREATED_AT"
)
func (p InvitationOrderField) Column() string {
switch p {
case InvitationOrderFieldFullName:
return "full_name"
case InvitationOrderFieldEmail:
return "email"
case InvitationOrderFieldRole:
return "role"
case InvitationOrderFieldCreatedAt:
return "created_at"
case InvitationOrderFieldExpiresAt:
return "expires_at"
case InvitationOrderFieldAcceptedAt:
return "accepted_at"
}
panic(fmt.Sprintf("unsupported order by: %s", p))
@@ -50,7 +35,7 @@ func (p InvitationOrderField) Column() string {
func (e InvitationOrderField) IsValid() bool {
switch e {
case InvitationOrderFieldFullName, InvitationOrderFieldEmail, InvitationOrderFieldRole, InvitationOrderFieldCreatedAt, InvitationOrderFieldExpiresAt, InvitationOrderFieldAcceptedAt:
case InvitationOrderFieldCreatedAt:
return true
}
return false

View File

@@ -49,3 +49,152 @@ ALTER TABLE
iam_scim_events
ALTER COLUMN
user_name DROP DEFAULT;
-- Convert invitations to identities / profiles / memberships
-- Create missing identities (one row per email to avoid "cannot affect row a second time")
INSERT INTO
identities (
id,
created_at,
updated_at,
email_address,
email_address_verified,
full_name
)
SELECT
generate_gid('\x0000000000000000' :: bytea, 11),
NOW(),
NOW(),
i.email,
FALSE,
i.full_name
FROM
(
SELECT
DISTINCT ON (email) email,
full_name
FROM
iam_invitations
WHERE
accepted_at IS NULL
ORDER BY
email
) i ON CONFLICT (email_address) DO
UPDATE
SET
full_name = EXCLUDED.full_name;
-- Create missing profiles
WITH invitation_identities AS (
SELECT
i.id AS identity_id,
inv.tenant_id AS tenant_id,
inv.organization_id AS organization_id,
inv.full_name AS full_name
FROM
iam_invitations inv
INNER JOIN identities i ON i.email_address = inv.email
WHERE
inv.accepted_at IS NULL
)
INSERT INTO
iam_membership_profiles (
id,
tenant_id,
identity_id,
organization_id,
full_name,
kind,
additional_email_addresses,
source,
state,
created_at,
updated_at
)
SELECT
generate_gid(decode_base64_unpadded(ii.tenant_id), 51),
ii.tenant_id,
ii.identity_id,
ii.organization_id,
ii.full_name,
'EMPLOYEE',
'{}' :: CITEXT [],
'MANUAL',
'INACTIVE',
NOW(),
NOW()
FROM
invitation_identities ii ON CONFLICT DO NOTHING;
-- Create missing memberships
WITH invitation_identities AS (
SELECT
i.id AS identity_id,
inv.tenant_id AS tenant_id,
inv.organization_id AS organization_id,
inv.role AS role
FROM
iam_invitations inv
INNER JOIN identities i ON i.email_address = inv.email
WHERE
inv.accepted_at IS NULL
)
INSERT INTO
iam_memberships (
id,
tenant_id,
identity_id,
organization_id,
role,
created_at,
updated_at
)
SELECT
generate_gid(decode_base64_unpadded(ii.tenant_id), 39),
ii.tenant_id,
ii.identity_id,
ii.organization_id,
ii.role,
NOW(),
NOW()
FROM
invitation_identities ii ON CONFLICT DO NOTHING;
ALTER TABLE
iam_invitations
ADD
COLUMN user_id TEXT REFERENCES iam_membership_profiles(id);
WITH profile_identities AS (
SELECT
p.id AS profile_id,
i.email_address,
p.organization_id
FROM
iam_membership_profiles p
INNER JOIN identities i ON i.id = p.identity_id
)
UPDATE
iam_invitations i
SET
user_id = pi.profile_id
FROM
profile_identities pi
WHERE
pi.organization_id = i.organization_id
AND pi.email_address = i.email;
ALTER TABLE
iam_invitations
ALTER COLUMN
user_id
SET
NOT NULL,
ALTER COLUMN
email DROP NOT NULL,
ALTER COLUMN
role TYPE TEXT USING role :: text,
ALTER COLUMN
role DROP NOT NULL,
ALTER COLUMN
full_name DROP NOT NULL;

View File

@@ -181,176 +181,24 @@ func (s AccountService) VerifyEmail(ctx context.Context, token string) error {
)
}
func (s *AccountService) AcceptInvitation(
ctx context.Context,
identityID gid.GID,
invitationID gid.GID,
) (*coredata.Invitation, *coredata.Membership, error) {
var (
now = time.Now()
profile = &coredata.MembershipProfile{}
membership = &coredata.Membership{}
invitation = &coredata.Invitation{}
)
err := s.pg.WithTx(
ctx,
func(tx pg.Conn) error {
identity := coredata.Identity{}
if err := identity.LoadByID(ctx, tx, identityID); err != nil {
if err == coredata.ErrResourceNotFound {
return NewIdentityNotFoundError(identityID)
}
return fmt.Errorf("cannot load identity: %w", err)
}
if err := invitation.LoadByID(ctx, tx, coredata.NewNoScope(), invitationID); err != nil {
if err == coredata.ErrResourceNotFound {
return NewInvitationNotFoundError(invitationID)
}
return fmt.Errorf("cannot load invitation: %w", err)
}
if invitation.Email != identity.EmailAddress {
return NewInvitationNotFoundError(invitationID)
}
if invitation.AcceptedAt != nil {
return NewInvitationAlreadyAcceptedError(invitationID)
}
if invitation.ExpiresAt.Before(now) {
return NewInvitationExpiredError(invitationID)
}
tenantID := invitation.OrganizationID.TenantID()
scope := coredata.NewScope(invitation.OrganizationID.TenantID())
existingProfile := &coredata.MembershipProfile{}
if err := existingProfile.LoadByIdentityIDAndOrganizationID(
ctx,
tx,
scope,
identityID,
invitation.OrganizationID,
); err != nil {
if !errors.Is(err, coredata.ErrResourceNotFound) {
return fmt.Errorf("cannot load existing profile: %w", err)
}
profile = &coredata.MembershipProfile{
ID: gid.New(tenantID, coredata.MembershipProfileEntityType),
IdentityID: identity.ID,
OrganizationID: invitation.OrganizationID,
Source: coredata.ProfileSourceManual,
State: coredata.ProfileStateActive,
FullName: identity.FullName,
CreatedAt: now,
UpdatedAt: now,
}
if err := profile.Insert(ctx, tx); err != nil {
return fmt.Errorf("cannot insert profile: %w", err)
}
} else {
if existingProfile.State == coredata.ProfileStateInactive {
existingProfile.State = coredata.ProfileStateActive
if err := existingProfile.Update(ctx, tx, scope); err != nil {
return fmt.Errorf("cannot reactivate profile: %w", err)
}
}
profile = existingProfile
}
existingMembership := &coredata.Membership{}
if err := existingMembership.LoadByIdentityIDAndOrganizationID(
ctx,
tx,
scope,
identityID,
invitation.OrganizationID,
); err != nil {
if !errors.Is(err, coredata.ErrResourceNotFound) {
return fmt.Errorf("cannot load existing membership: %w", err)
}
membership = &coredata.Membership{
ID: gid.New(tenantID, coredata.MembershipEntityType),
IdentityID: identityID,
OrganizationID: invitation.OrganizationID,
Role: invitation.Role,
CreatedAt: now,
UpdatedAt: now,
}
if err := membership.Insert(ctx, tx, scope); err != nil {
return fmt.Errorf("cannot create membership: %w", err)
}
} else {
existingMembership.Role = invitation.Role
existingMembership.UpdatedAt = now
if err := existingMembership.Update(ctx, tx, scope); err != nil {
return fmt.Errorf("cannot assign membership role: %w", err)
}
membership = existingMembership
}
invitation.AcceptedAt = &now
if err := invitation.Update(ctx, tx, scope); err != nil {
if err == coredata.ErrResourceNotFound {
return NewInvitationNotFoundError(invitationID)
}
return fmt.Errorf("cannot update invitation: %w", err)
}
// Expire other pending invitations for email in organization
invitations := &coredata.Invitations{}
onlyPending := coredata.NewInvitationFilter([]coredata.InvitationStatus{coredata.InvitationStatusPending})
if err := invitations.ExpireByEmailAndOrganization(
ctx,
tx,
coredata.NewScopeFromObjectID(invitation.OrganizationID),
invitation.Email,
invitation.OrganizationID,
onlyPending,
); err != nil {
return fmt.Errorf("cannot expire pending invitations by email: %w", err)
}
return nil
},
)
if err != nil {
return nil, nil, err
}
return invitation, membership, nil
}
func (s *AccountService) ListPendingInvitations(
ctx context.Context,
identityID gid.GID,
userID gid.GID,
cursor *page.Cursor[coredata.InvitationOrderField],
) (*page.Page[*coredata.Invitation, coredata.InvitationOrderField], error) {
var invitations coredata.Invitations
var (
scope = coredata.NewScopeFromObjectID(userID)
invitations coredata.Invitations
)
err := s.pg.WithConn(
ctx,
func(conn pg.Conn) error {
identity := coredata.Identity{}
err := identity.LoadByID(ctx, conn, identityID)
profile := coredata.MembershipProfile{}
err := profile.LoadByID(ctx, conn, scope, userID)
if err != nil {
if err == coredata.ErrResourceNotFound {
return NewIdentityNotFoundError(identityID)
return NewIdentityNotFoundError(userID)
}
return fmt.Errorf("cannot load identity: %w", err)
@@ -358,7 +206,7 @@ func (s *AccountService) ListPendingInvitations(
onlyPending := coredata.NewInvitationFilter([]coredata.InvitationStatus{coredata.InvitationStatusPending})
err = invitations.LoadByIdentityID(ctx, conn, coredata.NewNoScope(), identity.EmailAddress, cursor, onlyPending)
err = invitations.LoadByUserID(ctx, conn, scope, userID, cursor, onlyPending)
if err != nil {
return fmt.Errorf("cannot load invitations: %w", err)
}
@@ -374,39 +222,6 @@ func (s *AccountService) ListPendingInvitations(
return page.NewPage(invitations, cursor), nil
}
func (s *AccountService) CountPendingInvitations(
ctx context.Context,
identityID gid.GID,
) (int, error) {
var count int
err := s.pg.WithConn(
ctx,
func(conn pg.Conn) error {
identity := coredata.Identity{}
err := identity.LoadByID(ctx, conn, identityID)
if err != nil {
return fmt.Errorf("cannot load identity: %w", err)
}
invitations := coredata.Invitations{}
onlyPending := coredata.NewInvitationFilter([]coredata.InvitationStatus{coredata.InvitationStatusPending})
count, err = invitations.CountByEmail(ctx, conn, identity.EmailAddress, onlyPending)
if err != nil {
return fmt.Errorf("cannot count pending invitations: %w", err)
}
return nil
},
)
if err != nil {
return 0, err
}
return count, nil
}
func (s AccountService) ChangePassword(ctx context.Context, identityID gid.GID, req *ChangePasswordRequest) error {
if err := req.Validate(); err != nil {
return fmt.Errorf("invalid request: %w", err)

View File

@@ -48,7 +48,6 @@ type (
CreateIdentityFromInvitationRequest struct {
InvitationToken string
Password string
FullName string
}
LoadOrCreateIdentityRequest struct {
@@ -93,7 +92,6 @@ func (req CreateIdentityFromInvitationRequest) Validate() error {
v := validator.New()
v.Check(req.InvitationToken, "invitationToken", validator.NotEmpty())
v.Check(req.FullName, "fullName", validator.NotEmpty(), validator.MinLen(1), validator.MaxLen(255))
v.Check(req.Password, "password", PasswordValidator())
return v.Error()
@@ -134,10 +132,10 @@ func (req CreateIdentityWithPasswordRequest) Validate() error {
return v.Error()
}
func (s *AuthService) CreateIdentityFromInvitation(
func (s *AuthService) ActivateAccount(
ctx context.Context,
req *CreateIdentityFromInvitationRequest,
) (*coredata.Identity, *coredata.Session, error) {
) (*coredata.MembershipProfile, *coredata.Session, error) {
if err := req.Validate(); err != nil {
return nil, nil, fmt.Errorf("invalid request: %w", err)
}
@@ -150,8 +148,8 @@ func (s *AuthService) CreateIdentityFromInvitation(
var (
scope = coredata.NewScopeFromObjectID(payload.Data.InvitationID)
invitation = &coredata.Invitation{}
identity = &coredata.Identity{}
session = &coredata.Session{}
profile *coredata.MembershipProfile
session *coredata.Session
now = time.Now()
)
@@ -180,23 +178,54 @@ func (s *AuthService) CreateIdentityFromInvitation(
return NewInvitationExpiredError(payload.Data.InvitationID)
}
identity = &coredata.Identity{
ID: gid.New(gid.NilTenant, coredata.IdentityEntityType),
EmailAddress: invitation.Email,
FullName: invitation.FullName,
HashedPassword: hashedPassword,
EmailAddressVerified: true,
CreatedAt: now,
UpdatedAt: now,
profile = &coredata.MembershipProfile{}
if err := profile.LoadByID(ctx, tx, scope, invitation.UserID); err != nil {
return fmt.Errorf("cannot load user: %w", err)
}
err = identity.Insert(ctx, tx)
if profile.State == coredata.ProfileStateInactive {
profile.State = coredata.ProfileStateActive
profile.UpdatedAt = now
if err := profile.Update(ctx, tx, scope); err != nil {
return fmt.Errorf("cannot update user: %w", err)
}
}
identity := &coredata.Identity{}
if err := identity.LoadByID(ctx, tx, profile.IdentityID); err != nil {
return fmt.Errorf("cannot load identity: %w", err)
}
identity.HashedPassword = hashedPassword
identity.EmailAddressVerified = true
identity.UpdatedAt = now
err = identity.Update(ctx, tx)
if err != nil {
if err == coredata.ErrResourceAlreadyExists {
return NewIdentityAlreadyExistsError(invitation.Email)
return fmt.Errorf("cannot update identity: %w", err)
}
invitation.AcceptedAt = &now
if err := invitation.Update(ctx, tx, scope); err != nil {
if err == coredata.ErrResourceNotFound {
return NewInvitationNotFoundError(payload.Data.InvitationID)
}
return fmt.Errorf("cannot insert identity: %w", err)
return fmt.Errorf("cannot update invitation: %w", err)
}
// Expire other pending invitations for user
invitations := &coredata.Invitations{}
onlyPending := coredata.NewInvitationFilter([]coredata.InvitationStatus{coredata.InvitationStatusPending})
if err := invitations.ExpireByUserID(
ctx,
tx,
coredata.NewScopeFromObjectID(invitation.OrganizationID),
invitation.UserID,
onlyPending,
); err != nil {
return fmt.Errorf("cannot expire pending invitations: %w", err)
}
session = coredata.NewRootSession(identity.ID, coredata.AuthMethodPassword, s.sessionDuration)
@@ -213,7 +242,7 @@ func (s *AuthService) CreateIdentityFromInvitation(
return nil, nil, err
}
return identity, session, nil
return profile, session, nil
}
func (s AuthService) ResetPassword(

View File

@@ -333,99 +333,6 @@ func (s *OrganizationService) RemoveUser(
)
}
func (s *OrganizationService) DeleteInvitation(
ctx context.Context,
organizationID gid.GID,
invitationID gid.GID,
) error {
scope := coredata.NewScopeFromObjectID(organizationID)
return s.pg.WithTx(
ctx,
func(tx pg.Conn) error {
invitation := coredata.Invitation{}
err := invitation.LoadByID(ctx, tx, scope, invitationID)
if err != nil {
if err == coredata.ErrResourceNotFound {
return NewInvitationNotFoundError(invitationID)
}
return fmt.Errorf("cannot load invitation: %w", err)
}
switch invitation.Status {
case coredata.InvitationStatusAccepted:
return NewInvitationNotDeletedError(invitationID, invitation.Status.String())
case coredata.InvitationStatusPending, coredata.InvitationStatusExpired:
}
err = invitation.Delete(ctx, tx, scope, invitationID)
if err != nil {
return fmt.Errorf("cannot delete invitation: %w", err)
}
return nil
},
)
}
func (s *OrganizationService) ListInvitations(
ctx context.Context,
organizationID gid.GID,
cursor *page.Cursor[coredata.InvitationOrderField],
filter *coredata.InvitationFilter,
) (*page.Page[*coredata.Invitation, coredata.InvitationOrderField], error) {
var (
invitations coredata.Invitations
scope = coredata.NewScopeFromObjectID(organizationID)
)
err := s.pg.WithConn(
ctx,
func(conn pg.Conn) error {
err := invitations.LoadByOrganizationID(ctx, conn, scope, organizationID, cursor, filter)
if err != nil {
return fmt.Errorf("cannot load invitations: %w", err)
}
return nil
},
)
if err != nil {
return nil, err
}
return page.NewPage(invitations, cursor), nil
}
func (s *OrganizationService) CountInvitations(
ctx context.Context,
organizationID gid.GID,
filter *coredata.InvitationFilter,
) (int, error) {
var (
count int
scope = coredata.NewScopeFromObjectID(organizationID)
)
err := s.pg.WithConn(
ctx,
func(conn pg.Conn) (err error) {
invitations := coredata.Invitations{}
count, err = invitations.CountByOrganizationID(ctx, conn, scope, organizationID, filter)
if err != nil {
return fmt.Errorf("cannot count invitations: %w", err)
}
return nil
},
)
if err != nil {
return 0, err
}
return count, nil
}
func (s *OrganizationService) InviteUser(
ctx context.Context,
req *CreateInvitationRequest,
@@ -436,6 +343,7 @@ func (s *OrganizationService) InviteUser(
invitation = &coredata.Invitation{
ID: gid.New(req.OrganizationID.TenantID(), coredata.InvitationEntityType),
OrganizationID: req.OrganizationID,
UserID: req.ProfileID,
Status: coredata.InvitationStatusPending,
ExpiresAt: now.Add(s.invitationTokenValidity),
CreatedAt: now,
@@ -483,7 +391,7 @@ func (s *OrganizationService) InviteUser(
subject, textBody, htmlBody, err := emailPresenter.RenderInvitation(
ctx,
"/auth/signup-from-invitation",
"/auth/activate-account",
invitationToken,
organization.Name,
)

View File

@@ -352,20 +352,6 @@ func (s *Service) HandleAssertion(
if err != nil {
return fmt.Errorf("cannot insert membership: %w", err)
}
// Expire all pending invitations for email in organization
invitations := &coredata.Invitations{}
onlyPending := coredata.NewInvitationFilter([]coredata.InvitationStatus{coredata.InvitationStatusPending})
if err := invitations.ExpireByEmailAndOrganization(
ctx,
tx,
coredata.NewScopeFromObjectID(config.OrganizationID),
email,
config.OrganizationID,
onlyPending,
); err != nil {
return fmt.Errorf("cannot expire pending invitations by email: %w", err)
}
}
if profile.Source != coredata.ProfileSourceSCIM {

View File

@@ -235,22 +235,6 @@ func (s *Service) CreateUser(
if err != nil {
return fmt.Errorf("cannot insert membership: %w", err)
}
// Expire all pending invitations for email in organization
invitations := &coredata.Invitations{}
onlyPending := coredata.NewInvitationFilter([]coredata.InvitationStatus{coredata.InvitationStatusPending})
err := invitations.ExpireByEmailAndOrganization(
ctx,
tx,
coredata.NewScopeFromObjectID(config.OrganizationID),
emailAddr,
config.OrganizationID,
onlyPending,
)
if err != nil {
return fmt.Errorf("cannot expire pending invitations by email")
}
} else {
return fmt.Errorf("cannot load membership: %w", err)
}
@@ -476,33 +460,6 @@ func (s *Service) updateUser(
if shouldReactivate {
membership.Role = coredata.MembershipRoleEmployee
// Expire all pending invitations for email in organization
invitations := &coredata.Invitations{}
onlyPending := coredata.NewInvitationFilter([]coredata.InvitationStatus{coredata.InvitationStatusPending})
if err := invitations.ExpireByEmailAndOrganization(
ctx,
tx,
coredata.NewScopeFromObjectID(config.OrganizationID),
identity.EmailAddress,
config.OrganizationID,
onlyPending,
); err != nil {
return fmt.Errorf("cannot expire pending invitations by email: %w", err)
}
} else if shouldDeactivate {
// Expire all pending invitations for email in organization
invitations := &coredata.Invitations{}
onlyPending := coredata.NewInvitationFilter([]coredata.InvitationStatus{coredata.InvitationStatusPending})
if err := invitations.ExpireByEmailAndOrganization(
ctx,
tx,
coredata.NewScopeFromObjectID(config.OrganizationID),
identity.EmailAddress,
config.OrganizationID,
onlyPending,
); err != nil {
return fmt.Errorf("cannot expire pending invitations: %w", err)
}
}
}
@@ -552,24 +509,6 @@ func (s *Service) DeleteUser(
return fmt.Errorf("cannot delete membership: %w", err)
}
// Expire all pending invitations for email in organization
identity := &coredata.Identity{}
if err := identity.LoadByID(ctx, tx, membership.IdentityID); err != nil {
return fmt.Errorf("cannot load identity: %w", err)
}
invitations := &coredata.Invitations{}
onlyPending := coredata.NewInvitationFilter([]coredata.InvitationStatus{coredata.InvitationStatusPending})
if err := invitations.ExpireByEmailAndOrganization(
ctx,
tx,
coredata.NewScopeFromObjectID(config.OrganizationID),
identity.EmailAddress,
config.OrganizationID,
onlyPending,
); err != nil {
return fmt.Errorf("cannot expire pending invitations: %w", err)
}
return nil
},
)

View File

@@ -53,9 +53,9 @@ type Mutation {
signIn(input: SignInInput!): SignInPayload @session(required: OPTIONAL)
signUp(input: SignUpInput!): SignUpPayload @session(required: NONE)
signOut: SignOutPayload @session(required: PRESENT)
signUpFromInvitation(
input: SignUpFromInvitationInput!
): SignUpFromInvitationPayload @session(required: NONE)
activateAccount(
input: ActivateAccountInput!
): ActivateAccountPayload @session(required: NONE)
forgotPassword(input: ForgotPasswordInput!): ForgotPasswordPayload
@session(required: NONE)
resetPassword(input: ResetPasswordInput!): ResetPasswordPayload
@@ -98,16 +98,11 @@ type Mutation {
@session(required: PRESENT)
inviteUser(input: InviteUserInput!): InviteUserPayload
@session(required: PRESENT)
deleteInvitation(input: DeleteInvitationInput!): DeleteInvitationPayload
@session(required: PRESENT)
updateUser(input: UpdateUserInput!): UpdateUserPayload!
updateMembership(input: UpdateMembershipInput!): UpdateMembershipPayload!
removeUser(input: RemoveUserInput!): RemoveUserPayload
@session(required: PRESENT)
acceptInvitation(input: AcceptInvitationInput!): AcceptInvitationPayload
@session(required: PRESENT)
createSAMLConfiguration(
input: CreateSAMLConfigurationInput!
): CreateSAMLConfigurationPayload @session(required: PRESENT)
@@ -148,14 +143,6 @@ type Identity implements Node {
orderBy: ProfileOrder
): ProfileConnection @goField(forceResolver: true)
pendingInvitations(
first: Int
after: CursorKey
last: Int
before: CursorKey
orderBy: InvitationOrder
): InvitationConnection @goField(forceResolver: true)
sessions(
first: Int
after: CursorKey
@@ -197,6 +184,13 @@ type Profile implements Node {
identity: Identity @goField(forceResolver: true)
organization: Organization @goField(forceResolver: true)
membership: Membership @goField(forceResolver: true)
pendingInvitations(
first: Int
after: CursorKey
last: Int
before: CursorKey
orderBy: InvitationOrder
): InvitationConnection @goField(forceResolver: true)
permission(action: String!): Boolean!
@goField(forceResolver: true)
@@ -249,15 +243,6 @@ type Organization implements Node {
orderBy: ProfileOrder
): ProfileConnection @goField(forceResolver: true)
invitations(
first: Int
after: CursorKey
last: Int
before: CursorKey
status: InvitationStatus
orderBy: InvitationOrder
): InvitationConnection @goField(forceResolver: true)
samlConfigurations(
first: Int
after: CursorKey
@@ -299,13 +284,12 @@ type Membership implements Node {
type Invitation implements Node {
id: ID!
email: EmailAddr!
fullName: String!
role: MembershipRole!
expiresAt: Datetime!
acceptedAt: Datetime
createdAt: Datetime!
status: InvitationStatus!
user: Profile @goField(forceResolver: true)
organization: Organization @goField(forceResolver: true)
permission(action: String!): Boolean!
@@ -483,26 +467,10 @@ enum ReauthenticationReason {
enum InvitationOrderField
@goModel(model: "go.probo.inc/probo/pkg/coredata.InvitationOrderField") {
FULL_NAME
@goEnum(
value: "go.probo.inc/probo/pkg/coredata.InvitationOrderFieldFullName"
)
EMAIL
@goEnum(value: "go.probo.inc/probo/pkg/coredata.InvitationOrderFieldEmail")
ROLE
@goEnum(value: "go.probo.inc/probo/pkg/coredata.InvitationOrderFieldRole")
CREATED_AT
@goEnum(
value: "go.probo.inc/probo/pkg/coredata.InvitationOrderFieldCreatedAt"
)
EXPIRES_AT
@goEnum(
value: "go.probo.inc/probo/pkg/coredata.InvitationOrderFieldExpiresAt"
)
ACCEPTED_AT
@goEnum(
value: "go.probo.inc/probo/pkg/coredata.InvitationOrderFieldAcceptedAt"
)
}
input InvitationOrder
@@ -658,10 +626,9 @@ input SignUpInput {
fullName: String!
}
input SignUpFromInvitationInput {
input ActivateAccountInput {
token: String!
password: String!
fullName: String!
}
input ForgotPasswordInput {
@@ -823,8 +790,8 @@ type SignOutPayload {
success: Boolean!
}
type SignUpFromInvitationPayload {
identity: Identity
type ActivateAccountPayload {
profile: Profile
}
type ForgotPasswordPayload {

File diff suppressed because it is too large Load Diff

View File

@@ -65,13 +65,13 @@ func NewInvitationEdge(invitation *coredata.Invitation, orderField coredata.Invi
func NewInvitation(invitation *coredata.Invitation) *Invitation {
return &Invitation{
ID: invitation.ID,
Email: invitation.Email,
Role: invitation.Role,
FullName: invitation.FullName,
ExpiresAt: invitation.ExpiresAt,
AcceptedAt: invitation.AcceptedAt,
CreatedAt: invitation.CreatedAt,
Status: invitation.Status,
User: &Profile{
ID: invitation.UserID,
},
Organization: &Organization{
ID: invitation.OrganizationID,
},

View File

@@ -34,6 +34,15 @@ type AcceptInvitationPayload struct {
Invitation *Invitation `json:"invitation"`
}
type ActivateAccountInput struct {
Token string `json:"token"`
Password string `json:"password"`
}
type ActivateAccountPayload struct {
Profile *Profile `json:"profile,omitempty"`
}
type AssumeOrganizationSessionInput struct {
OrganizationID gid.GID `json:"organizationId"`
Continue string `json:"continue"`
@@ -186,18 +195,16 @@ type ForgotPasswordPayload struct {
}
type Identity struct {
ID gid.GID `json:"id"`
Email mail.Addr `json:"email"`
FullName string `json:"fullName"`
EmailVerified bool `json:"emailVerified"`
CreatedAt time.Time `json:"createdAt"`
UpdatedAt time.Time `json:"updatedAt"`
Profiles *ProfileConnection `json:"profiles,omitempty"`
PendingInvitations *InvitationConnection `json:"pendingInvitations,omitempty"`
Sessions *SessionConnection `json:"sessions,omitempty"`
PersonalAPIKeys *PersonalAPIKeyConnection `json:"personalAPIKeys,omitempty"`
SsoLoginURL *string `json:"ssoLoginURL,omitempty"`
Permission bool `json:"permission"`
ID gid.GID `json:"id"`
Email mail.Addr `json:"email"`
FullName string `json:"fullName"`
EmailVerified bool `json:"emailVerified"`
CreatedAt time.Time `json:"createdAt"`
UpdatedAt time.Time `json:"updatedAt"`
Profiles *ProfileConnection `json:"profiles,omitempty"`
Sessions *SessionConnection `json:"sessions,omitempty"`
PersonalAPIKeys *PersonalAPIKeyConnection `json:"personalAPIKeys,omitempty"`
Permission bool `json:"permission"`
}
func (Identity) IsNode() {}
@@ -205,13 +212,11 @@ func (this Identity) GetID() gid.GID { return this.ID }
type Invitation struct {
ID gid.GID `json:"id"`
Email mail.Addr `json:"email"`
FullName string `json:"fullName"`
Role coredata.MembershipRole `json:"role"`
ExpiresAt time.Time `json:"expiresAt"`
AcceptedAt *time.Time `json:"acceptedAt,omitempty"`
CreatedAt time.Time `json:"createdAt"`
Status coredata.InvitationStatus `json:"status"`
User *Profile `json:"user,omitempty"`
Organization *Organization `json:"organization,omitempty"`
Permission bool `json:"permission"`
}
@@ -259,7 +264,6 @@ type Organization struct {
CreatedAt time.Time `json:"createdAt"`
UpdatedAt time.Time `json:"updatedAt"`
Profiles *ProfileConnection `json:"profiles,omitempty"`
Invitations *InvitationConnection `json:"invitations,omitempty"`
SamlConfigurations *SAMLConfigurationConnection `json:"samlConfigurations,omitempty"`
ScimConfiguration *SCIMConfiguration `json:"scimConfiguration,omitempty"`
Viewer *Profile `json:"viewer,omitempty"`
@@ -323,6 +327,7 @@ type Profile struct {
Identity *Identity `json:"identity,omitempty"`
Organization *Organization `json:"organization,omitempty"`
Membership *Membership `json:"membership,omitempty"`
PendingInvitations *InvitationConnection `json:"pendingInvitations,omitempty"`
Permission bool `json:"permission"`
}
@@ -520,16 +525,6 @@ type SignOutPayload struct {
Success bool `json:"success"`
}
type SignUpFromInvitationInput struct {
Token string `json:"token"`
Password string `json:"password"`
FullName string `json:"fullName"`
}
type SignUpFromInvitationPayload struct {
Identity *Identity `json:"identity,omitempty"`
}
type SignUpInput struct {
Email mail.Addr `json:"email"`
Password string `json:"password"`

View File

@@ -69,35 +69,6 @@ func (r *identityResolver) Profiles(ctx context.Context, obj *types.Identity, fi
return types.NewProfileConnection(page, r, obj.ID), nil
}
// PendingInvitations is the resolver for the pendingInvitations field.
func (r *identityResolver) PendingInvitations(ctx context.Context, obj *types.Identity, first *int, after *page.CursorKey, last *int, before *page.CursorKey, orderBy *types.InvitationOrderBy) (*types.InvitationConnection, error) {
if err := r.authorize(ctx, obj.ID, iam.ActionInvitationList); err != nil {
return nil, err
}
if gqlutils.OnlyTotalCountSelected(ctx) {
return &types.InvitationConnection{
Resolver: r,
ParentID: obj.ID,
}, nil
}
pageOrderBy := page.OrderBy[coredata.InvitationOrderField]{
Field: coredata.InvitationOrderFieldCreatedAt,
Direction: page.OrderDirectionDesc,
}
cursor := cursor.NewCursor(first, after, last, before, pageOrderBy)
page, err := r.iam.AccountService.ListPendingInvitations(ctx, obj.ID, cursor)
if err != nil {
r.logger.ErrorCtx(ctx, "cannot list pending invitations", log.Error(err))
return nil, gqlutils.Internal(ctx)
}
return types.NewInvitationConnection(page, r, obj.ID, nil), nil
}
// Sessions is the resolver for the sessions field.
func (r *identityResolver) Sessions(ctx context.Context, obj *types.Identity, first *int, after *page.CursorKey, last *int, before *page.CursorKey, orderBy *types.SessionOrder) (*types.SessionConnection, error) {
if err := r.authorize(ctx, obj.ID, iam.ActionSessionList); err != nil {
@@ -211,6 +182,11 @@ func (r *identityResolver) Permission(ctx context.Context, obj *types.Identity,
return r.Resolver.Permission(ctx, obj, action)
}
// User is the resolver for the user field.
func (r *invitationResolver) User(ctx context.Context, obj *types.Invitation) (*types.Profile, error) {
panic(fmt.Errorf("not implemented: User - user"))
}
// Organization is the resolver for the organization field.
func (r *invitationResolver) Organization(ctx context.Context, obj *types.Invitation) (*types.Organization, error) {
if err := r.authorize(ctx, obj.Organization.ID, iam.ActionOrganizationGet, authz.WithSkipAssumptionCheck()); err != nil {
@@ -239,34 +215,7 @@ func (r *invitationResolver) Permission(ctx context.Context, obj *types.Invitati
// TotalCount is the resolver for the totalCount field.
func (r *invitationConnectionResolver) TotalCount(ctx context.Context, obj *types.InvitationConnection) (*int, error) {
switch obj.Resolver.(type) {
case *organizationResolver:
if err := r.authorize(ctx, obj.ParentID, iam.ActionInvitationList); err != nil {
return nil, err
}
count, err := r.iam.OrganizationService.CountInvitations(ctx, obj.ParentID, obj.Filters)
if err != nil {
r.logger.ErrorCtx(ctx, "cannot count invitations", log.Error(err))
return nil, gqlutils.Internal(ctx)
}
return &count, nil
case *identityResolver:
if err := r.authorize(ctx, obj.ParentID, iam.ActionInvitationList); err != nil {
return nil, err
}
count, err := r.iam.AccountService.CountPendingInvitations(ctx, obj.ParentID)
if err != nil {
r.logger.ErrorCtx(ctx, "cannot count invitations", log.Error(err))
return nil, gqlutils.Internal(ctx)
}
return &count, nil
}
r.logger.ErrorCtx(ctx, "unsupported resolver", log.Any("resolver", obj.Resolver))
return nil, gqlutils.Internal(ctx)
panic(fmt.Errorf("not implemented: TotalCount - totalCount"))
}
// LastSession is the resolver for the lastSession field.
@@ -426,14 +375,13 @@ func (r *mutationResolver) SignOut(ctx context.Context) (*types.SignOutPayload,
return &types.SignOutPayload{Success: true}, nil
}
// SignUpFromInvitation is the resolver for the signUpFromInvitation field.
func (r *mutationResolver) SignUpFromInvitation(ctx context.Context, input types.SignUpFromInvitationInput) (*types.SignUpFromInvitationPayload, error) {
identity, session, err := r.iam.AuthService.CreateIdentityFromInvitation(
// ActivateAccount is the resolver for the signUpFromInvitation field.
func (r *mutationResolver) ActivateAccount(ctx context.Context, input types.ActivateAccountInput) (*types.ActivateAccountPayload, error) {
user, session, err := r.iam.AuthService.ActivateAccount(
ctx,
&iam.CreateIdentityFromInvitationRequest{
InvitationToken: input.Token,
Password: input.Password,
FullName: input.FullName,
},
)
if err != nil {
@@ -442,7 +390,6 @@ func (r *mutationResolver) SignUpFromInvitation(ctx context.Context, input types
errInvitationNotFound *iam.ErrInvitationNotFound
errInvitationAlreadyAccepted *iam.ErrInvitationAlreadyAccepted
errInvitationExpired *iam.ErrInvitationExpired
errIdentityAlreadyExists *iam.ErrIdentityAlreadyExists
isInvalidErr = errors.As(err, &errInvalidToken) ||
errors.As(err, &errInvitationNotFound) ||
@@ -454,25 +401,15 @@ func (r *mutationResolver) SignUpFromInvitation(ctx context.Context, input types
return nil, gqlutils.Invalid(ctx, err)
}
if errors.As(err, &errIdentityAlreadyExists) {
return nil, gqlutils.Conflict(ctx, err)
}
r.logger.ErrorCtx(ctx, "cannot create identity from invitation", log.Error(err))
r.logger.ErrorCtx(ctx, "cannot activate account from invitation", log.Error(err))
return nil, gqlutils.Internal(ctx)
}
w := gqlutils.HTTPResponseWriterFromContext(ctx)
r.sessionCookie.Set(w, session)
return &types.SignUpFromInvitationPayload{
Identity: &types.Identity{
ID: identity.ID,
Email: identity.EmailAddress,
EmailVerified: identity.EmailAddressVerified,
CreatedAt: identity.CreatedAt,
UpdatedAt: identity.UpdatedAt,
},
return &types.ActivateAccountPayload{
Profile: types.NewProfile(user),
}, nil
}
@@ -942,32 +879,6 @@ func (r *mutationResolver) InviteUser(ctx context.Context, input types.InviteUse
}, nil
}
// DeleteInvitation is the resolver for the deleteInvitation field.
func (r *mutationResolver) DeleteInvitation(ctx context.Context, input types.DeleteInvitationInput) (*types.DeleteInvitationPayload, error) {
if err := r.authorize(ctx, input.OrganizationID, iam.ActionInvitationDelete); err != nil {
return nil, err
}
err := r.iam.OrganizationService.DeleteInvitation(ctx, input.OrganizationID, input.InvitationID)
if err != nil {
var errInvitationNotFound *iam.ErrInvitationNotFound
var errInvitationNotDeleted *iam.ErrInvitationNotDeleted
if errors.As(err, &errInvitationNotFound) {
return nil, gqlutils.NotFound(ctx, err)
}
if errors.As(err, &errInvitationNotDeleted) {
return nil, gqlutils.Invalid(ctx, err)
}
r.logger.ErrorCtx(ctx, "cannot delete invitation", log.Error(err))
return nil, gqlutils.Internal(ctx)
}
return &types.DeleteInvitationPayload{DeletedInvitationID: input.InvitationID}, nil
}
// UpdateUser is the resolver for the updateUser field.
func (r *mutationResolver) UpdateUser(ctx context.Context, input types.UpdateUserInput) (*types.UpdateUserPayload, error) {
if err := r.authorize(ctx, input.ID, iam.ActionMembershipProfileUpdate); err != nil {
@@ -1045,26 +956,6 @@ func (r *mutationResolver) RemoveUser(ctx context.Context, input types.RemoveUse
return &types.RemoveUserPayload{DeletedProfileID: input.ProfileID}, nil
}
// AcceptInvitation is the resolver for the acceptInvitation field.
func (r *mutationResolver) AcceptInvitation(ctx context.Context, input types.AcceptInvitationInput) (*types.AcceptInvitationPayload, error) {
if err := r.authorize(ctx, input.InvitationID, iam.ActionInvitationAccept); err != nil {
return nil, err
}
identity := authn.IdentityFromContext(ctx)
invitation, membership, err := r.iam.AccountService.AcceptInvitation(ctx, identity.ID, input.InvitationID)
if err != nil {
r.logger.ErrorCtx(ctx, "cannot accept invitation", log.Error(err))
return nil, gqlutils.Internal(ctx)
}
return &types.AcceptInvitationPayload{
Membership: types.NewMembership(membership),
Invitation: types.NewInvitation(invitation),
}, nil
}
// CreateSAMLConfiguration is the resolver for the createSAMLConfiguration field.
func (r *mutationResolver) CreateSAMLConfiguration(ctx context.Context, input types.CreateSAMLConfigurationInput) (*types.CreateSAMLConfigurationPayload, error) {
if err := r.authorize(ctx, input.OrganizationID, iam.ActionSAMLConfigurationCreate); err != nil {
@@ -1311,47 +1202,6 @@ func (r *organizationResolver) Profiles(ctx context.Context, obj *types.Organiza
return types.NewProfileConnection(page, r, obj.ID), nil
}
// Invitations is the resolver for the invitations field.
func (r *organizationResolver) Invitations(ctx context.Context, obj *types.Organization, first *int, after *page.CursorKey, last *int, before *page.CursorKey, status *coredata.InvitationStatus, orderBy *types.InvitationOrderBy) (*types.InvitationConnection, error) {
if err := r.authorize(ctx, obj.ID, iam.ActionInvitationList); err != nil {
return nil, err
}
filters := coredata.NewInvitationFilter(nil)
if status != nil {
filters = coredata.NewInvitationFilter([]coredata.InvitationStatus{*status})
}
if gqlutils.OnlyTotalCountSelected(ctx) {
return &types.InvitationConnection{
Resolver: r,
ParentID: obj.ID,
Filters: filters,
}, nil
}
pageOrderBy := page.OrderBy[coredata.InvitationOrderField]{
Field: coredata.InvitationOrderFieldCreatedAt,
Direction: page.OrderDirectionDesc,
}
if orderBy != nil {
pageOrderBy = page.OrderBy[coredata.InvitationOrderField]{
Field: orderBy.Field,
Direction: orderBy.Direction,
}
}
cursor := cursor.NewCursor(first, after, last, before, pageOrderBy)
page, err := r.iam.OrganizationService.ListInvitations(ctx, obj.ID, cursor, filters)
if err != nil {
r.logger.ErrorCtx(ctx, "cannot list invitations", log.Error(err))
return nil, gqlutils.Internal(ctx)
}
return types.NewInvitationConnection(page, r, obj.ID, filters), nil
}
// SamlConfigurations is the resolver for the samlConfigurations field.
func (r *organizationResolver) SamlConfigurations(ctx context.Context, obj *types.Organization, first *int, after *page.CursorKey, last *int, before *page.CursorKey) (*types.SAMLConfigurationConnection, error) {
if err := r.authorize(ctx, obj.ID, iam.ActionSAMLConfigurationList); err != nil {
@@ -1536,6 +1386,35 @@ func (r *profileResolver) Membership(ctx context.Context, obj *types.Profile) (*
return types.NewMembership(membership), nil
}
// PendingInvitations is the resolver for the pendingInvitations field.
func (r *profileResolver) PendingInvitations(ctx context.Context, obj *types.Profile, first *int, after *page.CursorKey, last *int, before *page.CursorKey, orderBy *types.InvitationOrderBy) (*types.InvitationConnection, error) {
if err := r.authorize(ctx, obj.ID, iam.ActionInvitationList); err != nil {
return nil, err
}
if gqlutils.OnlyTotalCountSelected(ctx) {
return &types.InvitationConnection{
Resolver: r,
ParentID: obj.ID,
}, nil
}
pageOrderBy := page.OrderBy[coredata.InvitationOrderField]{
Field: coredata.InvitationOrderFieldCreatedAt,
Direction: page.OrderDirectionDesc,
}
cursor := cursor.NewCursor(first, after, last, before, pageOrderBy)
page, err := r.iam.AccountService.ListPendingInvitations(ctx, obj.ID, cursor)
if err != nil {
r.logger.ErrorCtx(ctx, "cannot list pending invitations", log.Error(err))
return nil, gqlutils.Internal(ctx)
}
return types.NewInvitationConnection(page, r, obj.ID, nil), nil
}
// Permission is the resolver for the permission field.
func (r *profileResolver) Permission(ctx context.Context, obj *types.Profile, action string) (bool, error) {
return r.Resolver.Permission(ctx, obj, action)

View File

@@ -7,12 +7,10 @@ package mcp_v1
import (
"context"
"fmt"
"time"
"github.com/modelcontextprotocol/go-sdk/mcp"
"go.probo.inc/probo/pkg/coredata"
"go.probo.inc/probo/pkg/gid"
"go.probo.inc/probo/pkg/iam"
"go.probo.inc/probo/pkg/page"
"go.probo.inc/probo/pkg/probo"
"go.probo.inc/probo/pkg/server/api/authn"