rohit/probo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update graphql schema

Browse Source 
Signed-off-by: Émile Ré <emile@getprobo.com>
This commit is contained in:
Émile Ré
2026-02-13 10:07:52 +04:00
parent 108e9cb85d
commit c115e2c9dc
23 changed files with 2259 additions and 2749 deletions
Download Patch File Download Diff File Expand all files Collapse all files

102
apps/console/src/__generated__/iam/InvitationCardMutation.graphql.ts generated
View File

@@ -1,5 +1,5 @@
/** /**
* @generated SignedSource<<2d970c5558233522bbd695a075469cad>> * @generated SignedSource<<8369cd1e8f928481ea43a4e09f11a3f4>>
* @lightSyntaxTransform * @lightSyntaxTransform
* @nogrep * @nogrep
*/ */
@@ -15,7 +15,6 @@ export type AcceptInvitationInput = {
}; };
export type InvitationCardMutation$variables = { export type InvitationCardMutation$variables = {
input: AcceptInvitationInput; input: AcceptInvitationInput;
membershipConnections: ReadonlyArray<string>;
pendingInvitationConnections: ReadonlyArray<string>; pendingInvitationConnections: ReadonlyArray<string>;
}; };
export type InvitationCardMutation$data = { export type InvitationCardMutation$data = {
@@ -23,15 +22,10 @@ export type InvitationCardMutation$data = {
readonly invitation: { readonly invitation: {
readonly id: string; readonly id: string;
}; };
readonly membershipEdge: { readonly membership: {
readonly node: {
readonly id: string; readonly id: string;
readonly organization: {
readonly name: string;
} | null | undefined;
readonly " $fragmentSpreads": FragmentRefs<"MembershipCardFragment">; readonly " $fragmentSpreads": FragmentRefs<"MembershipCardFragment">;
}; };
};
} | null | undefined; } | null | undefined;
}; };
export type InvitationCardMutation = { export type InvitationCardMutation = {
@@ -46,11 +40,6 @@ var v0 = [
"kind": "LocalArgument", "kind": "LocalArgument",
"name": "input" "name": "input"
}, },
{
"defaultValue": null,
"kind": "LocalArgument",
"name": "membershipConnections"
},
{ {
"defaultValue": null, "defaultValue": null,
"kind": "LocalArgument", "kind": "LocalArgument",
@@ -70,13 +59,6 @@ v2 = {
"kind": "ScalarField", "kind": "ScalarField",
"name": "id", "name": "id",
"storageKey": null "storageKey": null
},
v3 = {
"alias": null,
"args": null,
"kind": "ScalarField",
"name": "name",
"storageKey": null
}; };
return { return {
"fragment": { "fragment": {
@@ -105,20 +87,12 @@ return {
], ],
"storageKey": null "storageKey": null
}, },
{
"alias": null,
"args": null,
"concreteType": "MembershipEdge",
"kind": "LinkedField",
"name": "membershipEdge",
"plural": false,
"selections": [
{ {
"alias": null, "alias": null,
"args": null, "args": null,
"concreteType": "Membership", "concreteType": "Membership",
"kind": "LinkedField", "kind": "LinkedField",
"name": "node", "name": "membership",
"plural": false, "plural": false,
"selections": [ "selections": [
(v2/*: any*/), (v2/*: any*/),
@@ -126,21 +100,6 @@ return {
"args": null, "args": null,
"kind": "FragmentSpread", "kind": "FragmentSpread",
"name": "MembershipCardFragment" "name": "MembershipCardFragment"
},
{
"alias": null,
"args": null,
"concreteType": "Organization",
"kind": "LinkedField",
"name": "organization",
"plural": false,
"selections": [
(v3/*: any*/)
],
"storageKey": null
}
],
"storageKey": null
} }
], ],
"storageKey": null "storageKey": null
@@ -194,20 +153,12 @@ return {
], ],
"storageKey": null "storageKey": null
}, },
{
"alias": null,
"args": null,
"concreteType": "MembershipEdge",
"kind": "LinkedField",
"name": "membershipEdge",
"plural": false,
"selections": [
{ {
"alias": null, "alias": null,
"args": null, "args": null,
"concreteType": "Membership", "concreteType": "Membership",
"kind": "LinkedField", "kind": "LinkedField",
"name": "node", "name": "membership",
"plural": false, "plural": false,
"selections": [ "selections": [
(v2/*: any*/), (v2/*: any*/),
@@ -229,23 +180,6 @@ return {
} }
], ],
"storageKey": null "storageKey": null
},
{
"alias": null,
"args": null,
"concreteType": "Organization",
"kind": "LinkedField",
"name": "organization",
"plural": false,
"selections": [
(v2/*: any*/),
(v3/*: any*/),
{
"alias": null,
"args": null,
"kind": "ScalarField",
"name": "logoUrl",
"storageKey": null
} }
], ],
"storageKey": null "storageKey": null
@@ -253,41 +187,19 @@ return {
], ],
"storageKey": null "storageKey": null
} }
],
"storageKey": null
},
{
"alias": null,
"args": null,
"filters": null,
"handle": "prependEdge",
"key": "",
"kind": "LinkedHandle",
"name": "membershipEdge",
"handleArgs": [
{
"kind": "Variable",
"name": "connections",
"variableName": "membershipConnections"
}
]
}
],
"storageKey": null
}
] ]
}, },
"params": { "params": {
"cacheID": "15ed0089d35b0163252ef542a4b1b667", "cacheID": "bebfc1241803845587648eaad4988fcb",
"id": null, "id": null,
"metadata": {}, "metadata": {},
"name": "InvitationCardMutation", "name": "InvitationCardMutation",
"operationKind": "mutation", "operationKind": "mutation",
"text": "mutation InvitationCardMutation(\n $input: AcceptInvitationInput!\n) {\n acceptInvitation(input: $input) {\n invitation {\n id\n }\n membershipEdge {\n node {\n id\n ...MembershipCardFragment\n organization {\n name\n id\n }\n }\n }\n }\n}\n\nfragment MembershipCardFragment on Membership {\n lastSession {\n id\n expiresAt\n }\n organization {\n id\n name\n logoUrl\n }\n}\n" "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 = "587f3fc115f88830e5ee49759f3ab7b5"; (node as any).hash = "32d7fb0d26660c95e87012d3b31068e8";
export default node; export default node;

65
apps/console/src/__generated__/iam/MembershipsDropdownMenuQuery.graphql.ts generated
View File

@@ -1,5 +1,5 @@
/** /**
* @generated SignedSource<<a7fb3832b9c9d3830ceff389237da093>> * @generated SignedSource<<beba83081139a0721dd1ca6e169c56f2>>
* @lightSyntaxTransform * @lightSyntaxTransform
* @nogrep * @nogrep
*/ */
@@ -13,14 +13,17 @@ import { FragmentRefs } from "relay-runtime";
export type MembershipsDropdownMenuQuery$variables = Record<PropertyKey, never>; export type MembershipsDropdownMenuQuery$variables = Record<PropertyKey, never>;
export type MembershipsDropdownMenuQuery$data = { export type MembershipsDropdownMenuQuery$data = {
readonly viewer: { readonly viewer: {
readonly memberships: { readonly profiles: {
readonly edges: ReadonlyArray<{ readonly edges: ReadonlyArray<{
readonly node: { readonly node: {
readonly id: string; readonly id: string;
readonly membership: {
readonly " $fragmentSpreads": FragmentRefs<"MembershipsDropdownMenuItemFragment">;
} | null | undefined;
readonly organization: { readonly organization: {
readonly name: string; readonly name: string;
readonly " $fragmentSpreads": FragmentRefs<"MembershipsDropdownMenuItem_organizationFragment">;
}; };
readonly " $fragmentSpreads": FragmentRefs<"MembershipsDropdownMenuItemFragment">;
}; };
}>; }>;
}; };
@@ -83,9 +86,9 @@ return {
"field": { "field": {
"alias": null, "alias": null,
"args": (v0/*: any*/), "args": (v0/*: any*/),
"concreteType": "MembershipConnection", "concreteType": "ProfileConnection",
"kind": "LinkedField", "kind": "LinkedField",
"name": "memberships", "name": "profiles",
"plural": false, "plural": false,
"selections": [ "selections": [
{ {
@@ -93,7 +96,7 @@ return {
"field": { "field": {
"alias": null, "alias": null,
"args": null, "args": null,
"concreteType": "MembershipEdge", "concreteType": "ProfileEdge",
"kind": "LinkedField", "kind": "LinkedField",
"name": "edges", "name": "edges",
"plural": true, "plural": true,
@@ -103,7 +106,7 @@ return {
"field": { "field": {
"alias": null, "alias": null,
"args": null, "args": null,
"concreteType": "Membership", "concreteType": "Profile",
"kind": "LinkedField", "kind": "LinkedField",
"name": "node", "name": "node",
"plural": false, "plural": false,
@@ -119,12 +122,25 @@ return {
"name": "organization", "name": "organization",
"plural": false, "plural": false,
"selections": [ "selections": [
(v2/*: any*/) (v2/*: any*/),
{
"args": null,
"kind": "FragmentSpread",
"name": "MembershipsDropdownMenuItem_organizationFragment"
}
], ],
"storageKey": null "storageKey": null
}, },
"action": "THROW" "action": "THROW"
}, },
{
"alias": null,
"args": null,
"concreteType": "Membership",
"kind": "LinkedField",
"name": "membership",
"plural": false,
"selections": [
{ {
"args": null, "args": null,
"kind": "FragmentSpread", "kind": "FragmentSpread",
@@ -132,6 +148,9 @@ return {
} }
], ],
"storageKey": null "storageKey": null
}
],
"storageKey": null
}, },
"action": "THROW" "action": "THROW"
} }
@@ -141,7 +160,7 @@ return {
"action": "THROW" "action": "THROW"
} }
], ],
"storageKey": "memberships(first:1000,orderBy:{\"direction\":\"ASC\",\"field\":\"ORGANIZATION_NAME\"})" "storageKey": "profiles(first:1000,orderBy:{\"direction\":\"ASC\",\"field\":\"ORGANIZATION_NAME\"})"
}, },
"action": "THROW" "action": "THROW"
} }
@@ -171,15 +190,15 @@ return {
{ {
"alias": null, "alias": null,
"args": (v0/*: any*/), "args": (v0/*: any*/),
"concreteType": "MembershipConnection", "concreteType": "ProfileConnection",
"kind": "LinkedField", "kind": "LinkedField",
"name": "memberships", "name": "profiles",
"plural": false, "plural": false,
"selections": [ "selections": [
{ {
"alias": null, "alias": null,
"args": null, "args": null,
"concreteType": "MembershipEdge", "concreteType": "ProfileEdge",
"kind": "LinkedField", "kind": "LinkedField",
"name": "edges", "name": "edges",
"plural": true, "plural": true,
@@ -187,7 +206,7 @@ return {
{ {
"alias": null, "alias": null,
"args": null, "args": null,
"concreteType": "Membership", "concreteType": "Profile",
"kind": "LinkedField", "kind": "LinkedField",
"name": "node", "name": "node",
"plural": false, "plural": false,
@@ -213,6 +232,15 @@ return {
], ],
"storageKey": null "storageKey": null
}, },
{
"alias": null,
"args": null,
"concreteType": "Membership",
"kind": "LinkedField",
"name": "membership",
"plural": false,
"selections": [
(v1/*: any*/),
{ {
"alias": null, "alias": null,
"args": null, "args": null,
@@ -239,7 +267,10 @@ return {
"storageKey": null "storageKey": null
} }
], ],
"storageKey": "memberships(first:1000,orderBy:{\"direction\":\"ASC\",\"field\":\"ORGANIZATION_NAME\"})" "storageKey": null
}
],
"storageKey": "profiles(first:1000,orderBy:{\"direction\":\"ASC\",\"field\":\"ORGANIZATION_NAME\"})"
}, },
(v1/*: any*/) (v1/*: any*/)
], ],
@@ -248,16 +279,16 @@ return {
] ]
}, },
"params": { "params": {
"cacheID": "9295fb9d95666f4b397645e143b7e774", "cacheID": "aaad8b2150ade721cdcbd9c3eb35318d",
"id": null, "id": null,
"metadata": {}, "metadata": {},
"name": "MembershipsDropdownMenuQuery", "name": "MembershipsDropdownMenuQuery",
"operationKind": "query", "operationKind": "query",
"text": "query MembershipsDropdownMenuQuery {\n viewer {\n memberships(first: 1000, orderBy: {direction: ASC, field: ORGANIZATION_NAME}) {\n edges {\n node {\n id\n organization {\n name\n id\n }\n ...MembershipsDropdownMenuItemFragment\n }\n }\n }\n id\n }\n}\n\nfragment MembershipsDropdownMenuItemFragment on Membership {\n id\n lastSession {\n id\n expiresAt\n }\n organization {\n id\n logoUrl\n name\n }\n}\n" "text": "query MembershipsDropdownMenuQuery {\n viewer {\n profiles(first: 1000, orderBy: {direction: ASC, field: ORGANIZATION_NAME}) {\n edges {\n node {\n id\n organization {\n name\n ...MembershipsDropdownMenuItem_organizationFragment\n id\n }\n membership {\n ...MembershipsDropdownMenuItemFragment\n id\n }\n }\n }\n }\n id\n }\n}\n\nfragment MembershipsDropdownMenuItemFragment on Membership {\n id\n lastSession {\n id\n expiresAt\n }\n}\n\nfragment MembershipsDropdownMenuItem_organizationFragment on Organization {\n id\n name\n logoUrl\n}\n"
} }
}; };
})(); })();
(node as any).hash = "cd47570a10588c0e1c68240817141fd8"; (node as any).hash = "14dbd79243ffb6104ff7315b78aa7990";
export default node; export default node;

95
apps/console/src/__generated__/iam/MembershipsPageQuery.graphql.ts generated
View File

@@ -1,5 +1,5 @@
/** /**
* @generated SignedSource<<3a268aba389df25968eb44b454150288>> * @generated SignedSource<<e639ada9f797274b710cc71198ec4089>>
* @lightSyntaxTransform * @lightSyntaxTransform
* @nogrep * @nogrep
*/ */
@@ -13,18 +13,6 @@ import { FragmentRefs } from "relay-runtime";
export type MembershipsPageQuery$variables = Record<PropertyKey, never>; export type MembershipsPageQuery$variables = Record<PropertyKey, never>;
export type MembershipsPageQuery$data = { export type MembershipsPageQuery$data = {
readonly viewer: { readonly viewer: {
readonly memberships: {
readonly __id: string;
readonly edges: ReadonlyArray<{
readonly node: {
readonly id: string;
readonly organization: {
readonly name: string;
};
readonly " $fragmentSpreads": FragmentRefs<"MembershipCardFragment">;
};
}>;
};
readonly pendingInvitations: { readonly pendingInvitations: {
readonly __id: string; readonly __id: string;
readonly edges: ReadonlyArray<{ readonly edges: ReadonlyArray<{
@@ -34,6 +22,21 @@ export type MembershipsPageQuery$data = {
}; };
}>; }>;
}; };
readonly profiles: {
readonly __id: string;
readonly edges: ReadonlyArray<{
readonly node: {
readonly id: string;
readonly membership: {
readonly " $fragmentSpreads": FragmentRefs<"MembershipCardFragment">;
} | null | undefined;
readonly organization: {
readonly name: string;
readonly " $fragmentSpreads": FragmentRefs<"MembershipCard_organizationFragment">;
};
};
}>;
};
}; };
}; };
export type MembershipsPageQuery = { export type MembershipsPageQuery = {
@@ -159,13 +162,13 @@ return {
{ {
"kind": "RequiredField", "kind": "RequiredField",
"field": { "field": {
"alias": "memberships", "alias": "profiles",
"args": [ "args": [
(v0/*: any*/) (v0/*: any*/)
], ],
"concreteType": "MembershipConnection", "concreteType": "ProfileConnection",
"kind": "LinkedField", "kind": "LinkedField",
"name": "__MembershipsPage_memberships_connection", "name": "__MembershipsPage_profiles_connection",
"plural": false, "plural": false,
"selections": [ "selections": [
{ {
@@ -173,7 +176,7 @@ return {
"field": { "field": {
"alias": null, "alias": null,
"args": null, "args": null,
"concreteType": "MembershipEdge", "concreteType": "ProfileEdge",
"kind": "LinkedField", "kind": "LinkedField",
"name": "edges", "name": "edges",
"plural": true, "plural": true,
@@ -181,16 +184,27 @@ return {
{ {
"alias": null, "alias": null,
"args": null, "args": null,
"concreteType": "Membership", "concreteType": "Profile",
"kind": "LinkedField", "kind": "LinkedField",
"name": "node", "name": "node",
"plural": false, "plural": false,
"selections": [ "selections": [
(v1/*: any*/), (v1/*: any*/),
{
"alias": null,
"args": null,
"concreteType": "Membership",
"kind": "LinkedField",
"name": "membership",
"plural": false,
"selections": [
{ {
"args": null, "args": null,
"kind": "FragmentSpread", "kind": "FragmentSpread",
"name": "MembershipCardFragment" "name": "MembershipCardFragment"
}
],
"storageKey": null
}, },
{ {
"kind": "RequiredField", "kind": "RequiredField",
@@ -202,7 +216,12 @@ return {
"name": "organization", "name": "organization",
"plural": false, "plural": false,
"selections": [ "selections": [
(v2/*: any*/) (v2/*: any*/),
{
"args": null,
"kind": "FragmentSpread",
"name": "MembershipCard_organizationFragment"
}
], ],
"storageKey": null "storageKey": null
}, },
@@ -221,7 +240,7 @@ return {
(v5/*: any*/), (v5/*: any*/),
(v6/*: any*/) (v6/*: any*/)
], ],
"storageKey": "__MembershipsPage_memberships_connection(orderBy:{\"direction\":\"ASC\",\"field\":\"ORGANIZATION_NAME\"})" "storageKey": "__MembershipsPage_profiles_connection(orderBy:{\"direction\":\"ASC\",\"field\":\"ORGANIZATION_NAME\"})"
}, },
"action": "THROW" "action": "THROW"
}, },
@@ -304,15 +323,15 @@ return {
{ {
"alias": null, "alias": null,
"args": (v9/*: any*/), "args": (v9/*: any*/),
"concreteType": "MembershipConnection", "concreteType": "ProfileConnection",
"kind": "LinkedField", "kind": "LinkedField",
"name": "memberships", "name": "profiles",
"plural": false, "plural": false,
"selections": [ "selections": [
{ {
"alias": null, "alias": null,
"args": null, "args": null,
"concreteType": "MembershipEdge", "concreteType": "ProfileEdge",
"kind": "LinkedField", "kind": "LinkedField",
"name": "edges", "name": "edges",
"plural": true, "plural": true,
@@ -320,12 +339,20 @@ return {
{ {
"alias": null, "alias": null,
"args": null, "args": null,
"concreteType": "Membership", "concreteType": "Profile",
"kind": "LinkedField", "kind": "LinkedField",
"name": "node", "name": "node",
"plural": false, "plural": false,
"selections": [ "selections": [
(v1/*: any*/), (v1/*: any*/),
{
"alias": null,
"args": null,
"concreteType": "Membership",
"kind": "LinkedField",
"name": "membership",
"plural": false,
"selections": [
{ {
"alias": null, "alias": null,
"args": null, "args": null,
@@ -345,6 +372,10 @@ return {
], ],
"storageKey": null "storageKey": null
}, },
(v1/*: any*/)
],
"storageKey": null
},
{ {
"alias": null, "alias": null,
"args": null, "args": null,
@@ -353,8 +384,8 @@ return {
"name": "organization", "name": "organization",
"plural": false, "plural": false,
"selections": [ "selections": [
(v1/*: any*/),
(v2/*: any*/), (v2/*: any*/),
(v1/*: any*/),
{ {
"alias": null, "alias": null,
"args": null, "args": null,
@@ -376,16 +407,16 @@ return {
(v5/*: any*/), (v5/*: any*/),
(v6/*: any*/) (v6/*: any*/)
], ],
"storageKey": "memberships(first:1000,orderBy:{\"direction\":\"ASC\",\"field\":\"ORGANIZATION_NAME\"})" "storageKey": "profiles(first:1000,orderBy:{\"direction\":\"ASC\",\"field\":\"ORGANIZATION_NAME\"})"
}, },
{ {
"alias": null, "alias": null,
"args": (v9/*: any*/), "args": (v9/*: any*/),
"filters": (v10/*: any*/), "filters": (v10/*: any*/),
"handle": "connection", "handle": "connection",
"key": "MembershipsPage_memberships", "key": "MembershipsPage_profiles",
"kind": "LinkedHandle", "kind": "LinkedHandle",
"name": "memberships" "name": "profiles"
}, },
{ {
"alias": null, "alias": null,
@@ -468,7 +499,7 @@ return {
] ]
}, },
"params": { "params": {
"cacheID": "9807cdf4aa713babb1639e4effd96e54", "cacheID": "7bcb990f0e847ce0528d9df9ef6c1c94",
"id": null, "id": null,
"metadata": { "metadata": {
"connection": [ "connection": [
@@ -478,7 +509,7 @@ return {
"direction": "forward", "direction": "forward",
"path": [ "path": [
"viewer", "viewer",
"memberships" "profiles"
] ]
}, },
{ {
@@ -494,11 +525,11 @@ return {
}, },
"name": "MembershipsPageQuery", "name": "MembershipsPageQuery",
"operationKind": "query", "operationKind": "query",
"text": "query MembershipsPageQuery {\n viewer {\n memberships(first: 1000, orderBy: {direction: ASC, field: ORGANIZATION_NAME}) {\n edges {\n node {\n id\n ...MembershipCardFragment\n organization {\n name\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 organization {\n id\n name\n logoUrl\n }\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 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"
} }
}; };
})(); })();
(node as any).hash = "7956b20535004550c271e1a520c95fe4"; (node as any).hash = "05ac7c8fa236be3a01eeb28fc14ceb9d";
export default node; export default node;

101
apps/console/src/__generated__/iam/PeopleListFragment_RefetchQuery.graphql.ts generated
View File

@@ -1,5 +1,5 @@
/** /**
* @generated SignedSource<<2fcd3cca1f1b02c835d906b3b2ebdcea>> * @generated SignedSource<<5916f4df5b8113a300774131759cb218>>
* @lightSyntaxTransform * @lightSyntaxTransform
* @nogrep * @nogrep
*/ */
@@ -10,11 +10,11 @@
import { ConcreteRequest } from 'relay-runtime'; import { ConcreteRequest } from 'relay-runtime';
import { FragmentRefs } from "relay-runtime"; import { FragmentRefs } from "relay-runtime";
export type MembershipOrderField = "CREATED_AT" | "EMAIL_ADDRESS" | "FULL_NAME" | "ORGANIZATION_NAME" | "ROLE";
export type OrderDirection = "ASC" | "DESC"; export type OrderDirection = "ASC" | "DESC";
export type MembershipOrder = { export type ProfileOrderField = "CREATED_AT" | "FULL_NAME" | "KIND" | "ORGANIZATION_NAME";
export type ProfileOrder = {
direction: OrderDirection; direction: OrderDirection;
field: MembershipOrderField; field: ProfileOrderField;
}; };
export type PeopleListFragment_RefetchQuery$variables = { export type PeopleListFragment_RefetchQuery$variables = {
after?: string | null | undefined; after?: string | null | undefined;
@@ -22,7 +22,7 @@ export type PeopleListFragment_RefetchQuery$variables = {
first?: number | null | undefined; first?: number | null | undefined;
id: string; id: string;
last?: number | null | undefined; last?: number | null | undefined;
order?: MembershipOrder | null | undefined; order?: ProfileOrder | null | undefined;
}; };
export type PeopleListFragment_RefetchQuery$data = { export type PeopleListFragment_RefetchQuery$data = {
readonly node: { readonly node: {
@@ -193,9 +193,9 @@ return {
{ {
"alias": null, "alias": null,
"args": (v13/*: any*/), "args": (v13/*: any*/),
"concreteType": "MembershipConnection", "concreteType": "ProfileConnection",
"kind": "LinkedField", "kind": "LinkedField",
"name": "members", "name": "profiles",
"plural": false, "plural": false,
"selections": [ "selections": [
{ {
@@ -208,7 +208,7 @@ return {
{ {
"alias": null, "alias": null,
"args": null, "args": null,
"concreteType": "MembershipEdge", "concreteType": "ProfileEdge",
"kind": "LinkedField", "kind": "LinkedField",
"name": "edges", "name": "edges",
"plural": true, "plural": true,
@@ -216,10 +216,40 @@ return {
{ {
"alias": null, "alias": null,
"args": null, "args": null,
"concreteType": "Membership", "concreteType": "Profile",
"kind": "LinkedField", "kind": "LinkedField",
"name": "node", "name": "node",
"plural": false, "plural": false,
"selections": [
(v12/*: any*/),
{
"alias": null,
"args": null,
"kind": "ScalarField",
"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,
"concreteType": "Membership",
"kind": "LinkedField",
"name": "membership",
"plural": false,
"selections": [ "selections": [
(v12/*: any*/), (v12/*: any*/),
{ {
@@ -244,34 +274,17 @@ return {
"storageKey": null "storageKey": null
}, },
{ {
"alias": null, "alias": "canUpdate",
"args": null, "args": [
"concreteType": "MembershipProfile",
"kind": "LinkedField",
"name": "profile",
"plural": false,
"selections": [
(v12/*: any*/),
{ {
"alias": null, "kind": "Literal",
"args": null, "name": "action",
"value": "iam:membership:update"
}
],
"kind": "ScalarField", "kind": "ScalarField",
"name": "fullName", "name": "permission",
"storageKey": null "storageKey": "permission(action:\"iam:membership:update\")"
},
{
"alias": null,
"args": null,
"kind": "ScalarField",
"name": "kind",
"storageKey": null
},
{
"alias": null,
"args": null,
"kind": "ScalarField",
"name": "position",
"storageKey": null
} }
], ],
"storageKey": null "storageKey": null
@@ -308,12 +321,12 @@ return {
{ {
"kind": "Literal", "kind": "Literal",
"name": "action", "name": "action",
"value": "iam:membership:update" "value": "iam:membership-profile:update"
} }
], ],
"kind": "ScalarField", "kind": "ScalarField",
"name": "permission", "name": "permission",
"storageKey": "permission(action:\"iam:membership:update\")" "storageKey": "permission(action:\"iam:membership-profile:update\")"
}, },
{ {
"alias": "canDelete", "alias": "canDelete",
@@ -321,12 +334,12 @@ return {
{ {
"kind": "Literal", "kind": "Literal",
"name": "action", "name": "action",
"value": "iam:membership:delete" "value": "iam:membership-profile:delete"
} }
], ],
"kind": "ScalarField", "kind": "ScalarField",
"name": "permission", "name": "permission",
"storageKey": "permission(action:\"iam:membership:delete\")" "storageKey": "permission(action:\"iam:membership-profile:delete\")"
}, },
(v11/*: any*/) (v11/*: any*/)
], ],
@@ -403,9 +416,9 @@ return {
"orderBy" "orderBy"
], ],
"handle": "connection", "handle": "connection",
"key": "PeopleListFragment_members", "key": "PeopleListFragment_profiles",
"kind": "LinkedHandle", "kind": "LinkedHandle",
"name": "members" "name": "profiles"
} }
], ],
"type": "Organization", "type": "Organization",
@@ -417,16 +430,16 @@ return {
] ]
}, },
"params": { "params": {
"cacheID": "7b0c4eff8642cc6d595afdd01f4a643e", "cacheID": "3ed525921615d7910d784222c189566a",
"id": null, "id": null,
"metadata": {}, "metadata": {},
"name": "PeopleListFragment_RefetchQuery", "name": "PeopleListFragment_RefetchQuery",
"operationKind": "query", "operationKind": "query",
"text": "query PeopleListFragment_RefetchQuery(\n $after: CursorKey = null\n $before: CursorKey = null\n $first: Int = 20\n $last: Int = null\n $order: MembershipOrder = {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 members(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 Membership {\n id\n role\n source\n state\n profile {\n id\n fullName\n kind\n position\n }\n identity {\n email\n id\n }\n createdAt\n canUpdate: permission(action: \"iam:membership:update\")\n canDelete: permission(action: \"iam:membership:delete\")\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 fullName\n kind\n position\n membership {\n id\n role\n source\n state\n canUpdate: permission(action: \"iam:membership:update\")\n }\n identity {\n email\n id\n }\n createdAt\n canUpdate: permission(action: \"iam:membership-profile:update\")\n canDelete: permission(action: \"iam:membership-profile:delete\")\n}\n"
} }
}; };
})(); })();
(node as any).hash = "c62c77bc2ef0e36b7eaf4553cc721e0c"; (node as any).hash = "ee3aeca404063a0660eeb9ff27592e86";
export default node; export default node;

101
apps/console/src/__generated__/iam/PeoplePageQuery.graphql.ts generated
View File

@@ -1,5 +1,5 @@
/** /**
* @generated SignedSource<<06a60a60cf7ca339c25395a94906774a>> * @generated SignedSource<<f4e0f213a6bd3df7841650d2f57fd254>>
* @lightSyntaxTransform * @lightSyntaxTransform
* @nogrep * @nogrep
*/ */
@@ -21,8 +21,8 @@ export type PeoplePageQuery$data = {
readonly $updatableFragmentSpreads: FragmentRefs<"PeoplePage_invitationsTotalCountFragment">; readonly $updatableFragmentSpreads: FragmentRefs<"PeoplePage_invitationsTotalCountFragment">;
readonly totalCount: number | null | undefined; readonly totalCount: number | null | undefined;
}; };
readonly members: { readonly profiles: {
readonly totalCount: number | null | undefined; readonly totalCount: number;
}; };
readonly " $fragmentSpreads": FragmentRefs<"InvitationListFragment" | "PeopleListFragment">; readonly " $fragmentSpreads": FragmentRefs<"InvitationListFragment" | "PeopleListFragment">;
} | { } | {
@@ -118,14 +118,14 @@ v11 = {
"alias": null, "alias": null,
"args": null, "args": null,
"kind": "ScalarField", "kind": "ScalarField",
"name": "role", "name": "fullName",
"storageKey": null "storageKey": null
}, },
v12 = { v12 = {
"alias": null, "alias": null,
"args": null, "args": null,
"kind": "ScalarField", "kind": "ScalarField",
"name": "fullName", "name": "role",
"storageKey": null "storageKey": null
}, },
v13 = { v13 = {
@@ -230,14 +230,14 @@ return {
"field": { "field": {
"alias": null, "alias": null,
"args": (v6/*: any*/), "args": (v6/*: any*/),
"concreteType": "MembershipConnection", "concreteType": "ProfileConnection",
"kind": "LinkedField", "kind": "LinkedField",
"name": "members", "name": "profiles",
"plural": false, "plural": false,
"selections": [ "selections": [
(v7/*: any*/) (v7/*: any*/)
], ],
"storageKey": "members(first:20,orderBy:{\"direction\":\"ASC\",\"field\":\"FULL_NAME\"})" "storageKey": "profiles(first:20,orderBy:{\"direction\":\"ASC\",\"field\":\"FULL_NAME\"})"
}, },
"action": "THROW" "action": "THROW"
}, },
@@ -322,16 +322,16 @@ return {
{ {
"alias": null, "alias": null,
"args": (v6/*: any*/), "args": (v6/*: any*/),
"concreteType": "MembershipConnection", "concreteType": "ProfileConnection",
"kind": "LinkedField", "kind": "LinkedField",
"name": "members", "name": "profiles",
"plural": false, "plural": false,
"selections": [ "selections": [
(v7/*: any*/), (v7/*: any*/),
{ {
"alias": null, "alias": null,
"args": null, "args": null,
"concreteType": "MembershipEdge", "concreteType": "ProfileEdge",
"kind": "LinkedField", "kind": "LinkedField",
"name": "edges", "name": "edges",
"plural": true, "plural": true,
@@ -339,13 +339,37 @@ return {
{ {
"alias": null, "alias": null,
"args": null, "args": null,
"concreteType": "Membership", "concreteType": "Profile",
"kind": "LinkedField", "kind": "LinkedField",
"name": "node", "name": "node",
"plural": false, "plural": false,
"selections": [ "selections": [
(v10/*: any*/), (v10/*: any*/),
(v11/*: any*/), (v11/*: any*/),
{
"alias": null,
"args": null,
"kind": "ScalarField",
"name": "kind",
"storageKey": null
},
{
"alias": null,
"args": null,
"kind": "ScalarField",
"name": "position",
"storageKey": null
},
{
"alias": null,
"args": null,
"concreteType": "Membership",
"kind": "LinkedField",
"name": "membership",
"plural": false,
"selections": [
(v10/*: any*/),
(v12/*: any*/),
{ {
"alias": null, "alias": null,
"args": null, "args": null,
@@ -361,28 +385,17 @@ return {
"storageKey": null "storageKey": null
}, },
{ {
"alias": null, "alias": "canUpdate",
"args": null, "args": [
"concreteType": "MembershipProfile",
"kind": "LinkedField",
"name": "profile",
"plural": false,
"selections": [
(v10/*: any*/),
(v12/*: any*/),
{ {
"alias": null, "kind": "Literal",
"args": null, "name": "action",
"value": "iam:membership:update"
}
],
"kind": "ScalarField", "kind": "ScalarField",
"name": "kind", "name": "permission",
"storageKey": null "storageKey": "permission(action:\"iam:membership:update\")"
},
{
"alias": null,
"args": null,
"kind": "ScalarField",
"name": "position",
"storageKey": null
} }
], ],
"storageKey": null "storageKey": null
@@ -407,12 +420,12 @@ return {
{ {
"kind": "Literal", "kind": "Literal",
"name": "action", "name": "action",
"value": "iam:membership:update" "value": "iam:membership-profile:update"
} }
], ],
"kind": "ScalarField", "kind": "ScalarField",
"name": "permission", "name": "permission",
"storageKey": "permission(action:\"iam:membership:update\")" "storageKey": "permission(action:\"iam:membership-profile:update\")"
}, },
{ {
"alias": "canDelete", "alias": "canDelete",
@@ -420,12 +433,12 @@ return {
{ {
"kind": "Literal", "kind": "Literal",
"name": "action", "name": "action",
"value": "iam:membership:delete" "value": "iam:membership-profile:delete"
} }
], ],
"kind": "ScalarField", "kind": "ScalarField",
"name": "permission", "name": "permission",
"storageKey": "permission(action:\"iam:membership:delete\")" "storageKey": "permission(action:\"iam:membership-profile:delete\")"
}, },
(v2/*: any*/) (v2/*: any*/)
], ],
@@ -438,16 +451,16 @@ return {
(v16/*: any*/), (v16/*: any*/),
(v17/*: any*/) (v17/*: any*/)
], ],
"storageKey": "members(first:20,orderBy:{\"direction\":\"ASC\",\"field\":\"FULL_NAME\"})" "storageKey": "profiles(first:20,orderBy:{\"direction\":\"ASC\",\"field\":\"FULL_NAME\"})"
}, },
{ {
"alias": null, "alias": null,
"args": (v6/*: any*/), "args": (v6/*: any*/),
"filters": (v18/*: any*/), "filters": (v18/*: any*/),
"handle": "connection", "handle": "connection",
"key": "PeopleListFragment_members", "key": "PeopleListFragment_profiles",
"kind": "LinkedHandle", "kind": "LinkedHandle",
"name": "members" "name": "profiles"
}, },
{ {
"alias": null, "alias": null,
@@ -476,9 +489,9 @@ return {
"plural": false, "plural": false,
"selections": [ "selections": [
(v10/*: any*/), (v10/*: any*/),
(v12/*: any*/),
(v13/*: any*/),
(v11/*: any*/), (v11/*: any*/),
(v13/*: any*/),
(v12/*: any*/),
{ {
"alias": null, "alias": null,
"args": null, "args": null,
@@ -539,16 +552,16 @@ return {
] ]
}, },
"params": { "params": {
"cacheID": "425e73a84c96979c3b380c17512c744a", "cacheID": "d13993ce884669894f65925a714aeaa6",
"id": null, "id": null,
"metadata": {}, "metadata": {},
"name": "PeoplePageQuery", "name": "PeoplePageQuery",
"operationKind": "query", "operationKind": "query",
"text": "query PeoplePageQuery(\n $organizationId: ID!\n) {\n organization: node(id: $organizationId) {\n __typename\n ... on Organization {\n canInviteUser: permission(action: \"iam:invitation:create\")\n members(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 members(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 Membership {\n id\n role\n source\n state\n profile {\n id\n fullName\n kind\n position\n }\n identity {\n email\n id\n }\n createdAt\n canUpdate: permission(action: \"iam:membership:update\")\n canDelete: permission(action: \"iam:membership:delete\")\n}\n" "text": "query PeoplePageQuery(\n $organizationId: ID!\n) {\n organization: node(id: $organizationId) {\n __typename\n ... on Organization {\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 fullName\n kind\n position\n membership {\n id\n role\n source\n state\n canUpdate: permission(action: \"iam:membership:update\")\n }\n identity {\n email\n id\n }\n createdAt\n canUpdate: permission(action: \"iam:membership-profile:update\")\n canDelete: permission(action: \"iam:membership-profile:delete\")\n}\n"
} }
}; };
})(); })();
(node as any).hash = "9ab9d1a720b23dd78bdb82530a30b6f3"; (node as any).hash = "4cb0d9ec65b3a55eb1decb4de36ac2d8";
export default node; export default node;

4
apps/console/src/__generated__/iam/PersonFormMutation.graphql.ts generated
View File

@@ -1,5 +1,5 @@
/** /**
* @generated SignedSource<<fa83e89c2c59e37853ab5efafb00287b>> * @generated SignedSource<<d1d8e96af7def93da24f32d96697106d>>
* @lightSyntaxTransform * @lightSyntaxTransform
* @nogrep * @nogrep
*/ */
@@ -60,7 +60,7 @@ v1 = [
{ {
"alias": null, "alias": null,
"args": null, "args": null,
"concreteType": "MembershipProfile", "concreteType": "Profile",
"kind": "LinkedField", "kind": "LinkedField",
"name": "profile", "name": "profile",
"plural": false, "plural": false,

57
apps/console/src/__generated__/iam/PersonPageQuery.graphql.ts generated
View File

@@ -1,5 +1,5 @@
/** /**
* @generated SignedSource<<a809c0ce9c8f1fdb68a0b2835be99b05>> * @generated SignedSource<<405fdde1b279cf7336ca395457041b93>>
* @lightSyntaxTransform * @lightSyntaxTransform
* @nogrep * @nogrep
*/ */
@@ -15,13 +15,15 @@ export type PersonPageQuery$variables = {
}; };
export type PersonPageQuery$data = { export type PersonPageQuery$data = {
readonly person: { readonly person: {
readonly __typename: "MembershipProfile"; readonly __typename: "Profile";
readonly canDelete: boolean; readonly canDelete: boolean;
readonly fullName: string; readonly fullName: string;
readonly identity: { readonly identity: {
readonly email: string; readonly email: string;
}; };
readonly membershipId: string; readonly membership: {
readonly id: string;
} | null | undefined;
readonly " $fragmentSpreads": FragmentRefs<"PersonFormFragment">; readonly " $fragmentSpreads": FragmentRefs<"PersonFormFragment">;
} | { } | {
// This will never be '%other', but we need some // This will never be '%other', but we need some
@@ -67,17 +69,29 @@ v4 = {
"alias": null, "alias": null,
"args": null, "args": null,
"kind": "ScalarField", "kind": "ScalarField",
"name": "membershipId", "name": "id",
"storageKey": null "storageKey": null
}, },
v5 = { v5 = {
"alias": null,
"args": null,
"concreteType": "Membership",
"kind": "LinkedField",
"name": "membership",
"plural": false,
"selections": [
(v4/*: any*/)
],
"storageKey": null
},
v6 = {
"alias": null, "alias": null,
"args": null, "args": null,
"kind": "ScalarField", "kind": "ScalarField",
"name": "email", "name": "email",
"storageKey": null "storageKey": null
}, },
v6 = { v7 = {
"alias": "canDelete", "alias": "canDelete",
"args": [ "args": [
{ {
@@ -89,13 +103,6 @@ v6 = {
"kind": "ScalarField", "kind": "ScalarField",
"name": "permission", "name": "permission",
"storageKey": "permission(action:\"iam:membership-profile:delete\")" "storageKey": "permission(action:\"iam:membership-profile:delete\")"
},
v7 = {
"alias": null,
"args": null,
"kind": "ScalarField",
"name": "id",
"storageKey": null
}; };
return { return {
"fragment": { "fragment": {
@@ -119,7 +126,7 @@ return {
"kind": "InlineFragment", "kind": "InlineFragment",
"selections": [ "selections": [
(v3/*: any*/), (v3/*: any*/),
(v4/*: any*/), (v5/*: any*/),
{ {
"kind": "RequiredField", "kind": "RequiredField",
"field": { "field": {
@@ -130,20 +137,20 @@ return {
"name": "identity", "name": "identity",
"plural": false, "plural": false,
"selections": [ "selections": [
(v5/*: any*/) (v6/*: any*/)
], ],
"storageKey": null "storageKey": null
}, },
"action": "THROW" "action": "THROW"
}, },
(v6/*: any*/), (v7/*: any*/),
{ {
"args": null, "args": null,
"kind": "FragmentSpread", "kind": "FragmentSpread",
"name": "PersonFormFragment" "name": "PersonFormFragment"
} }
], ],
"type": "MembershipProfile", "type": "Profile",
"abstractKey": null "abstractKey": null
} }
], ],
@@ -170,12 +177,12 @@ return {
"plural": false, "plural": false,
"selections": [ "selections": [
(v2/*: any*/), (v2/*: any*/),
(v7/*: any*/), (v4/*: any*/),
{ {
"kind": "InlineFragment", "kind": "InlineFragment",
"selections": [ "selections": [
(v3/*: any*/), (v3/*: any*/),
(v4/*: any*/), (v5/*: any*/),
{ {
"alias": null, "alias": null,
"args": null, "args": null,
@@ -184,12 +191,12 @@ return {
"name": "identity", "name": "identity",
"plural": false, "plural": false,
"selections": [ "selections": [
(v5/*: any*/), (v6/*: any*/),
(v7/*: any*/) (v4/*: any*/)
], ],
"storageKey": null "storageKey": null
}, },
(v6/*: any*/), (v7/*: any*/),
{ {
"alias": null, "alias": null,
"args": null, "args": null,
@@ -239,7 +246,7 @@ return {
"storageKey": "permission(action:\"iam:membership-profile:update\")" "storageKey": "permission(action:\"iam:membership-profile:update\")"
} }
], ],
"type": "MembershipProfile", "type": "Profile",
"abstractKey": null "abstractKey": null
} }
], ],
@@ -248,16 +255,16 @@ return {
] ]
}, },
"params": { "params": {
"cacheID": "f754630a84c19798f2b0611dba4c6603", "cacheID": "e148eb605cc90b57c6c7772b9045217d",
"id": null, "id": null,
"metadata": {}, "metadata": {},
"name": "PersonPageQuery", "name": "PersonPageQuery",
"operationKind": "query", "operationKind": "query",
"text": "query PersonPageQuery(\n $personId: ID!\n) {\n person: node(id: $personId) {\n __typename\n ... on MembershipProfile {\n fullName\n membershipId\n identity {\n email\n id\n }\n canDelete: permission(action: \"iam:membership-profile:delete\")\n ...PersonFormFragment\n }\n id\n }\n}\n\nfragment PersonFormFragment on MembershipProfile {\n id\n fullName\n kind\n position\n additionalEmailAddresses\n contractStartDate\n contractEndDate\n canUpdate: permission(action: \"iam:membership-profile:update\")\n}\n" "text": "query PersonPageQuery(\n $personId: ID!\n) {\n person: node(id: $personId) {\n __typename\n ... on Profile {\n fullName\n membership {\n id\n }\n identity {\n email\n id\n }\n canDelete: permission(action: \"iam:membership-profile:delete\")\n ...PersonFormFragment\n }\n id\n }\n}\n\nfragment PersonFormFragment on Profile {\n id\n fullName\n kind\n position\n additionalEmailAddresses\n contractStartDate\n contractEndDate\n canUpdate: permission(action: \"iam:membership-profile:update\")\n}\n"
} }
}; };
})(); })();
(node as any).hash = "d701ae3a51eb1fed62aec260f42b3c41"; (node as any).hash = "24863216f5484c1fae7ff6ad002a7f8c";
export default node; export default node;

20
apps/console/src/__generated__/iam/SCIMEventListPaginationQuery.graphql.ts generated
View File

@@ -1,5 +1,5 @@
/** /**
* @generated SignedSource<<b32ec8d0912fecc61b56c7b4473e8938>> * @generated SignedSource<<22d63f81020d1e99f7cdb84fc23913a4>>
* @lightSyntaxTransform * @lightSyntaxTransform
* @nogrep * @nogrep
*/ */
@@ -224,16 +224,7 @@ return {
{ {
"alias": null, "alias": null,
"args": null, "args": null,
"concreteType": "Membership", "concreteType": "Profile",
"kind": "LinkedField",
"name": "membership",
"plural": false,
"selections": [
(v8/*: any*/),
{
"alias": null,
"args": null,
"concreteType": "MembershipProfile",
"kind": "LinkedField", "kind": "LinkedField",
"name": "profile", "name": "profile",
"plural": false, "plural": false,
@@ -248,9 +239,6 @@ return {
(v8/*: any*/) (v8/*: any*/)
], ],
"storageKey": null "storageKey": null
}
],
"storageKey": null
}, },
(v7/*: any*/) (v7/*: any*/)
], ],
@@ -327,12 +315,12 @@ return {
] ]
}, },
"params": { "params": {
"cacheID": "eea534b94a74bce26338555fbb71364e", "cacheID": "58b36de1b4c1f54de6433a95b297b570",
"id": null, "id": null,
"metadata": {}, "metadata": {},
"name": "SCIMEventListPaginationQuery", "name": "SCIMEventListPaginationQuery",
"operationKind": "query", "operationKind": "query",
"text": "query SCIMEventListPaginationQuery(\n $after: CursorKey = null\n $before: CursorKey = null\n $first: Int = 20\n $last: Int = null\n $id: ID!\n) {\n node(id: $id) {\n __typename\n ...SCIMEventListFragment_pbnwq\n id\n }\n}\n\nfragment SCIMEventListFragment_pbnwq on SCIMConfiguration {\n events(first: $first, after: $after, last: $last, before: $before) {\n edges {\n node {\n id\n ...SCIMEventListItemFragment\n __typename\n }\n cursor\n }\n pageInfo {\n endCursor\n hasNextPage\n hasPreviousPage\n startCursor\n }\n }\n id\n}\n\nfragment SCIMEventListItemFragment on SCIMEvent {\n id\n method\n path\n statusCode\n errorMessage\n ipAddress\n createdAt\n membership {\n id\n profile {\n fullName\n id\n }\n }\n}\n" "text": "query SCIMEventListPaginationQuery(\n $after: CursorKey = null\n $before: CursorKey = null\n $first: Int = 20\n $last: Int = null\n $id: ID!\n) {\n node(id: $id) {\n __typename\n ...SCIMEventListFragment_pbnwq\n id\n }\n}\n\nfragment SCIMEventListFragment_pbnwq on SCIMConfiguration {\n events(first: $first, after: $after, last: $last, before: $before) {\n edges {\n node {\n id\n ...SCIMEventListItemFragment\n __typename\n }\n cursor\n }\n pageInfo {\n endCursor\n hasNextPage\n hasPreviousPage\n startCursor\n }\n }\n id\n}\n\nfragment SCIMEventListItemFragment on SCIMEvent {\n method\n path\n statusCode\n errorMessage\n ipAddress\n createdAt\n profile {\n fullName\n id\n }\n}\n"
} }
}; };
})(); })();

20
apps/console/src/__generated__/iam/SCIMSettingsPageQuery.graphql.ts generated
View File

@@ -1,5 +1,5 @@
/** /**
* @generated SignedSource<<e59dc83c1f91e928764947766661f044>> * @generated SignedSource<<339e086642b09eb0bacbc51601014fe7>>
* @lightSyntaxTransform * @lightSyntaxTransform
* @nogrep * @nogrep
*/ */
@@ -277,16 +277,7 @@ return {
{ {
"alias": null, "alias": null,
"args": null, "args": null,
"concreteType": "Membership", "concreteType": "Profile",
"kind": "LinkedField",
"name": "membership",
"plural": false,
"selections": [
(v3/*: any*/),
{
"alias": null,
"args": null,
"concreteType": "MembershipProfile",
"kind": "LinkedField", "kind": "LinkedField",
"name": "profile", "name": "profile",
"plural": false, "plural": false,
@@ -301,9 +292,6 @@ return {
(v3/*: any*/) (v3/*: any*/)
], ],
"storageKey": null "storageKey": null
}
],
"storageKey": null
}, },
(v2/*: any*/) (v2/*: any*/)
], ],
@@ -416,12 +404,12 @@ return {
] ]
}, },
"params": { "params": {
"cacheID": "1074234a9a3734270b5da7420dea2ec6", "cacheID": "3d49152bd3fd384a0b1de3d012268ebe",
"id": null, "id": null,
"metadata": {}, "metadata": {},
"name": "SCIMSettingsPageQuery", "name": "SCIMSettingsPageQuery",
"operationKind": "query", "operationKind": "query",
"text": "query SCIMSettingsPageQuery(\n $organizationId: ID!\n) {\n organization: node(id: $organizationId) {\n __typename\n ... on Organization {\n id\n scimConfiguration {\n id\n bridge {\n id\n }\n ...SCIMEventListFragment\n }\n ...SCIMConfigurationFragment\n ...ConnectorListFragment\n }\n id\n }\n}\n\nfragment ConnectorListFragment on Organization {\n scimConfiguration {\n ...GoogleWorkspaceConnectorFragment\n id\n }\n}\n\nfragment GoogleWorkspaceConnectorFragment on SCIMConfiguration {\n id\n bridge {\n id\n excludedUserNames\n connector {\n id\n createdAt\n }\n }\n}\n\nfragment SCIMConfigurationFragment on Organization {\n canCreateSCIMConfiguration: permission(action: \"iam:scim-configuration:create\")\n canDeleteSCIMConfiguration: permission(action: \"iam:scim-configuration:delete\")\n scimConfiguration {\n id\n endpointUrl\n bridge {\n id\n }\n }\n}\n\nfragment SCIMEventListFragment on SCIMConfiguration {\n events(first: 20) {\n edges {\n node {\n id\n ...SCIMEventListItemFragment\n __typename\n }\n cursor\n }\n pageInfo {\n endCursor\n hasNextPage\n hasPreviousPage\n startCursor\n }\n }\n id\n}\n\nfragment SCIMEventListItemFragment on SCIMEvent {\n id\n method\n path\n statusCode\n errorMessage\n ipAddress\n createdAt\n membership {\n id\n profile {\n fullName\n id\n }\n }\n}\n" "text": "query SCIMSettingsPageQuery(\n $organizationId: ID!\n) {\n organization: node(id: $organizationId) {\n __typename\n ... on Organization {\n id\n scimConfiguration {\n id\n bridge {\n id\n }\n ...SCIMEventListFragment\n }\n ...SCIMConfigurationFragment\n ...ConnectorListFragment\n }\n id\n }\n}\n\nfragment ConnectorListFragment on Organization {\n scimConfiguration {\n ...GoogleWorkspaceConnectorFragment\n id\n }\n}\n\nfragment GoogleWorkspaceConnectorFragment on SCIMConfiguration {\n id\n bridge {\n id\n excludedUserNames\n connector {\n id\n createdAt\n }\n }\n}\n\nfragment SCIMConfigurationFragment on Organization {\n canCreateSCIMConfiguration: permission(action: \"iam:scim-configuration:create\")\n canDeleteSCIMConfiguration: permission(action: \"iam:scim-configuration:delete\")\n scimConfiguration {\n id\n endpointUrl\n bridge {\n id\n }\n }\n}\n\nfragment SCIMEventListFragment on SCIMConfiguration {\n events(first: 20) {\n edges {\n node {\n id\n ...SCIMEventListItemFragment\n __typename\n }\n cursor\n }\n pageInfo {\n endCursor\n hasNextPage\n hasPreviousPage\n startCursor\n }\n }\n id\n}\n\nfragment SCIMEventListItemFragment on SCIMEvent {\n method\n path\n statusCode\n errorMessage\n ipAddress\n createdAt\n profile {\n fullName\n id\n }\n}\n"
} }
}; };
})(); })();

40
apps/console/src/__generated__/iam/ViewerMembershipLayoutQuery.graphql.ts generated
View File

@@ -1,5 +1,5 @@
/** /**
* @generated SignedSource<<f3fe7986abd30c9414ea3361c3b1162d>> * @generated SignedSource<<bb127fea9cdcaddd0cf0a0a3db90ff14>>
* @lightSyntaxTransform * @lightSyntaxTransform
* @nogrep * @nogrep
*/ */
@@ -18,12 +18,12 @@ export type ViewerMembershipLayoutQuery$variables = {
export type ViewerMembershipLayoutQuery$data = { export type ViewerMembershipLayoutQuery$data = {
readonly organization: { readonly organization: {
readonly __typename: "Organization"; readonly __typename: "Organization";
readonly viewerMembership: { readonly viewer: {
readonly profile: {
readonly fullName: string; readonly fullName: string;
}; readonly membership: {
readonly role: MembershipRole; readonly role: MembershipRole;
}; };
};
readonly " $fragmentSpreads": FragmentRefs<"MembershipsDropdown_organizationFragment" | "SidebarFragment" | "ViewerMembershipDropdownFragment">; readonly " $fragmentSpreads": FragmentRefs<"MembershipsDropdown_organizationFragment" | "SidebarFragment" | "ViewerMembershipDropdownFragment">;
} | { } | {
// This will never be '%other', but we need some // This will never be '%other', but we need some
@@ -72,14 +72,14 @@ v4 = {
"alias": null, "alias": null,
"args": null, "args": null,
"kind": "ScalarField", "kind": "ScalarField",
"name": "role", "name": "fullName",
"storageKey": null "storageKey": null
}, },
v5 = { v5 = {
"alias": null, "alias": null,
"args": null, "args": null,
"kind": "ScalarField", "kind": "ScalarField",
"name": "fullName", "name": "role",
"storageKey": null "storageKey": null
}, },
v6 = { v6 = {
@@ -154,9 +154,9 @@ return {
"field": { "field": {
"alias": null, "alias": null,
"args": null, "args": null,
"concreteType": "Membership", "concreteType": "Profile",
"kind": "LinkedField", "kind": "LinkedField",
"name": "viewerMembership", "name": "viewer",
"plural": false, "plural": false,
"selections": [ "selections": [
(v4/*: any*/), (v4/*: any*/),
@@ -165,9 +165,9 @@ return {
"field": { "field": {
"alias": null, "alias": null,
"args": null, "args": null,
"concreteType": "MembershipProfile", "concreteType": "Membership",
"kind": "LinkedField", "kind": "LinkedField",
"name": "profile", "name": "membership",
"plural": false, "plural": false,
"selections": [ "selections": [
(v5/*: any*/) (v5/*: any*/)
@@ -266,11 +266,12 @@ return {
{ {
"alias": null, "alias": null,
"args": null, "args": null,
"concreteType": "Membership", "concreteType": "Profile",
"kind": "LinkedField", "kind": "LinkedField",
"name": "viewerMembership", "name": "viewer",
"plural": false, "plural": false,
"selections": [ "selections": [
(v4/*: any*/),
{ {
"alias": null, "alias": null,
"args": null, "args": null,
@@ -297,21 +298,20 @@ return {
], ],
"storageKey": null "storageKey": null
}, },
(v8/*: any*/),
{ {
"alias": null, "alias": null,
"args": null, "args": null,
"concreteType": "MembershipProfile", "concreteType": "Membership",
"kind": "LinkedField", "kind": "LinkedField",
"name": "profile", "name": "membership",
"plural": false, "plural": false,
"selections": [ "selections": [
(v5/*: any*/), (v5/*: any*/),
(v8/*: any*/) (v8/*: any*/)
], ],
"storageKey": null "storageKey": null
}, }
(v8/*: any*/),
(v4/*: any*/)
], ],
"storageKey": null "storageKey": null
}, },
@@ -618,16 +618,16 @@ return {
] ]
}, },
"params": { "params": {
"cacheID": "a553750ba3bad35fb5b3ed7c1bebcbb4", "cacheID": "63f113e3848e77978d2caee55ca07ed4",
"id": null, "id": null,
"metadata": {}, "metadata": {},
"name": "ViewerMembershipLayoutQuery", "name": "ViewerMembershipLayoutQuery",
"operationKind": "query", "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 viewerMembership {\n role\n profile {\n fullName\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 viewerMembership {\n identity {\n email\n canListAPIKeys: permission(action: \"iam:personal-api-key:list\")\n id\n }\n profile {\n fullName\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 ...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"
} }
}; };
})(); })();
(node as any).hash = "298aba62d7920932f86433919c623d4c"; (node as any).hash = "1ca4734452833d75388f7409315cf715";
export default node; export default node;

90
pkg/coredata/membership.go
View File

@@ -39,7 +39,6 @@ type (
State MembershipState `db:"state"` State MembershipState `db:"state"`
FullName string `db:"full_name"` FullName string `db:"full_name"`
EmailAddress mail.Addr `db:"email_address"` EmailAddress mail.Addr `db:"email_address"`
OrganizationName string `db:"organization_name"`
CreatedAt time.Time `db:"created_at"` CreatedAt time.Time `db:"created_at"`
UpdatedAt time.Time `db:"updated_at"` UpdatedAt time.Time `db:"updated_at"`
} }
@@ -49,8 +48,6 @@ type (
func (m Membership) CursorKey(orderBy MembershipOrderField) page.CursorKey { func (m Membership) CursorKey(orderBy MembershipOrderField) page.CursorKey {
switch orderBy { switch orderBy {
case MembershipOrderFieldOrganizationName:
return page.NewCursorKey(m.ID, m.OrganizationName)
case MembershipOrderFieldFullName: case MembershipOrderFieldFullName:
return page.NewCursorKey(m.ID, m.FullName) return page.NewCursorKey(m.ID, m.FullName)
case MembershipOrderFieldEmailAddress: case MembershipOrderFieldEmailAddress:
@@ -426,93 +423,6 @@ WHERE
return nil return nil
} }
func (m *Memberships) LoadByIdentityID(
ctx context.Context,
conn pg.Conn,
scope Scoper,
identityID gid.GID,
cursor *page.Cursor[MembershipOrderField],
) error {
query := `
WITH mbr AS (
SELECT
id,
identity_id,
organization_id,
role,
source,
state,
created_at,
updated_at
FROM
iam_memberships
WHERE
identity_id = @identity_id
AND state = 'ACTIVE'
AND %s
),
r AS (
SELECT
mbr.id,
mbr.identity_id,
mbr.organization_id,
mbr.role,
mbr.source,
mbr.state,
COALESCE(mp.full_name, i.full_name, '') as full_name,
i.email_address,
o.name as organization_name,
mbr.created_at,
mbr.updated_at
FROM
mbr
JOIN
identities i ON mbr.identity_id = i.id
JOIN
organizations o ON mbr.organization_id = o.id
LEFT JOIN
iam_membership_profiles mp ON mp.membership_id = mbr.id
)
SELECT
id,
identity_id,
organization_id,
role,
source,
state,
full_name,
email_address,
organization_name,
created_at,
updated_at
FROM
r
WHERE
%s
`
query = fmt.Sprintf(query, scope.SQLFragment(), cursor.SQLFragment())
args := pgx.StrictNamedArgs{
"identity_id": identityID,
}
maps.Copy(args, scope.SQLArguments())
maps.Copy(args, cursor.SQLArguments())
rows, err := conn.Query(ctx, query, args)
if err != nil {
return fmt.Errorf("cannot query memberships: %w", err)
}
memberships, err := pgx.CollectRows(rows, pgx.RowToAddrOfStructByName[Membership])
if err != nil {
return fmt.Errorf("cannot collect memberships: %w", err)
}
*m = memberships
return nil
}
func (m *Memberships) LoadByOrganizationID( func (m *Memberships) LoadByOrganizationID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Conn,

76
pkg/coredata/membership_profile.go
View File

@@ -40,6 +40,7 @@ type (
Position *string `db:"position"` Position *string `db:"position"`
ContractStartDate *time.Time `db:"contract_start_date"` ContractStartDate *time.Time `db:"contract_start_date"`
ContractEndDate *time.Time `db:"contract_end_date"` ContractEndDate *time.Time `db:"contract_end_date"`
OrganizationName string `db:"organization_name"`
CreatedAt time.Time `db:"created_at"` CreatedAt time.Time `db:"created_at"`
UpdatedAt time.Time `db:"updated_at"` UpdatedAt time.Time `db:"updated_at"`
} }
@@ -55,6 +56,8 @@ func (p MembershipProfile) CursorKey(orderBy MembershipProfileOrderField) page.C
return page.NewCursorKey(p.ID, p.FullName) return page.NewCursorKey(p.ID, p.FullName)
case MembershipProfileOrderFieldKind: case MembershipProfileOrderFieldKind:
return page.NewCursorKey(p.ID, p.Kind) return page.NewCursorKey(p.ID, p.Kind)
case MembershipProfileOrderFieldOrganizationName:
return page.NewCursorKey(p.ID, p.OrganizationName)
} }
panic(fmt.Sprintf("unsupported order by: %s", orderBy)) panic(fmt.Sprintf("unsupported order by: %s", orderBy))
@@ -307,6 +310,75 @@ INNER JOIN identities i ON i.id = p.identity_id
return nil return nil
} }
func (p *MembershipProfiles) LoadByIdentityID(
ctx context.Context,
conn pg.Conn,
scope Scoper,
identityID gid.GID,
cursor *page.Cursor[MembershipProfileOrderField],
filter *MembershipProfileFilter,
) error {
q := `
WITH profiles AS (
SELECT
id,
identity_id,
organization_id,
full_name,
kind,
additional_email_addresses,
position,
contract_start_date,
contract_end_date,
created_at,
updated_at
FROM
iam_membership_profiles
WHERE
%s
AND identity_id = @identity_id
AND %s
AND %s
)
SELECT
p.id,
p.identity_id,
p.organization_id,
i.email_address,
p.full_name,
p.kind,
p.additional_email_addresses,
p.position,
p.contract_start_date,
p.contract_end_date,
o.name AS organization_name,
p.created_at,
p.updated_at
FROM profiles p
INNER JOIN identities i ON i.id = p.identity_id
INNER JOIN organizations o ON o.id = p.organization_id
`
q = fmt.Sprintf(q, scope.SQLFragment(), filter.SQLFragment(), cursor.SQLFragment())
args := pgx.NamedArgs{"identity_id": identityID}
maps.Copy(args, scope.SQLArguments())
rows, err := conn.Query(ctx, q, args)
if err != nil {
return fmt.Errorf("cannot query profiles: %w", err)
}
profiles, err := pgx.CollectRows(rows, pgx.RowToAddrOfStructByName[MembershipProfile])
if err != nil {
return fmt.Errorf("cannot collect profiles: %w", err)
}
*p = profiles
return nil
}
func (p *MembershipProfiles) LoadByDocumentID( func (p *MembershipProfiles) LoadByDocumentID(
ctx context.Context, ctx context.Context,
conn pg.Conn, conn pg.Conn,
@@ -320,7 +392,6 @@ WITH profiles AS (
mp.id, mp.id,
mp.identity_id, mp.identity_id,
mp.organization_id, mp.organization_id,
mp.membership_id,
mp.full_name, mp.full_name,
mp.kind, mp.kind,
mp.additional_email_addresses, mp.additional_email_addresses,
@@ -344,7 +415,6 @@ SELECT
p.id, p.id,
p.identity_id, p.identity_id,
p.organization_id, p.organization_id,
p.membership_id,
i.email_address, i.email_address,
p.full_name, p.full_name,
p.kind, p.kind,
@@ -423,7 +493,6 @@ WITH profiles AS (
mp.id, mp.id,
mp.identity_id, mp.identity_id,
mp.organization_id, mp.organization_id,
mp.membership_id,
mp.full_name, mp.full_name,
mp.kind, mp.kind,
mp.additional_email_addresses, mp.additional_email_addresses,
@@ -447,7 +516,6 @@ SELECT
p.id, p.id,
p.identity_id, p.identity_id,
p.organization_id, p.organization_id,
p.membership_id,
i.email_address, i.email_address,
p.full_name, p.full_name,
p.kind, p.kind,

1
pkg/coredata/membership_profile_order_field.go
View File

@@ -22,6 +22,7 @@ const (
MembershipProfileOrderFieldCreatedAt MembershipProfileOrderField = "CREATED_AT" MembershipProfileOrderFieldCreatedAt MembershipProfileOrderField = "CREATED_AT"
MembershipProfileOrderFieldFullName MembershipProfileOrderField = "FULL_NAME" MembershipProfileOrderFieldFullName MembershipProfileOrderField = "FULL_NAME"
MembershipProfileOrderFieldKind MembershipProfileOrderField = "KIND" MembershipProfileOrderFieldKind MembershipProfileOrderField = "KIND"
MembershipProfileOrderFieldOrganizationName MembershipProfileOrderField = "ORGANIZATION_NAME"
) )
func (p MembershipProfileOrderField) Column() string { func (p MembershipProfileOrderField) Column() string {

31
pkg/coredata/migrations/20260212T163603Z.sql Normal file
View File

@@ -0,0 +1,31 @@
ALTER TABLE
iam_memberships
ADD
COLUMN profile_id REFERENCES iam_membership_profiles(id);
UPDATE
iam_memberships m
SET
profile_id = p.id
FROM
iam_membership_profiles p
WHERE
p.membership_id = m.id;
DROP INDEX authz_memberships_user_id_organization_id_key;
DROP INDEX idx_iam_memberships_identity_tenant_org;
CREATE UNIQUE INDEX idx_iam_memberships_profile_id_idx ON iam_memberships(profile_id);
ALTER TABLE
iam_memberships
ALTER COLUMN
profile_id
SET
NOT NULL,
DROP COLUMN organization_id,
DROP COLUMN identity_id;
ALTER TABLE
iam_membership_profiles DROP COLUMN membership_id;

26
pkg/iam/account_service.go
View File

@@ -384,32 +384,6 @@ func (s *AccountService) CountPendingInvitations(
return count, nil return count, nil
} }
func (s *AccountService) ListMemberships(
ctx context.Context,
identityID gid.GID,
cursor *page.Cursor[coredata.MembershipOrderField],
) (*page.Page[*coredata.Membership, coredata.MembershipOrderField], error) {
var memberships coredata.Memberships
err := s.pg.WithConn(
ctx,
func(conn pg.Conn) error {
err := memberships.LoadByIdentityID(ctx, conn, coredata.NewNoScope(), identityID, cursor)
if err != nil {
return fmt.Errorf("cannot load memberships: %w", err)
}
return nil
},
)
if err != nil {
return nil, err
}
return page.NewPage(memberships, cursor), nil
}
func (s *AccountService) CountMemberships( func (s *AccountService) CountMemberships(
ctx context.Context, ctx context.Context,
identityID gid.GID, identityID gid.GID,

29
pkg/iam/organization_service.go
View File

@@ -944,35 +944,6 @@ func (s *OrganizationService) DeleteOrganization(ctx context.Context, organizati
) )
} }
func (s *OrganizationService) ListMembers(
ctx context.Context,
organizationID gid.GID,
cursor *page.Cursor[coredata.MembershipOrderField],
) (*page.Page[*coredata.Membership, coredata.MembershipOrderField], error) {
var (
scope = coredata.NewScopeFromObjectID(organizationID)
memberships = coredata.Memberships{}
)
err := s.pg.WithConn(
ctx,
func(conn pg.Conn) error {
err := memberships.LoadByOrganizationID(ctx, conn, scope, organizationID, cursor, coredata.NewMembershipFilter())
if err != nil {
return fmt.Errorf("cannot load memberships: %w", err)
}
return nil
},
)
if err != nil {
return nil, err
}
return page.NewPage(memberships, cursor), nil
}
func (s *OrganizationService) UpdateProfile(ctx context.Context, req *UpdateProfileRequest) (*coredata.MembershipProfile, error) { func (s *OrganizationService) UpdateProfile(ctx context.Context, req *UpdateProfileRequest) (*coredata.MembershipProfile, error) {
if err := req.Validate(); err != nil { if err := req.Validate(); err != nil {
return nil, fmt.Errorf("invalid request: %w", err) return nil, fmt.Errorf("invalid request: %w", err)

114
pkg/server/api/connect/v1/schema.graphql
View File

@@ -138,13 +138,13 @@ type Identity implements Node {
createdAt: Datetime! createdAt: Datetime!
updatedAt: Datetime! updatedAt: Datetime!
memberships( profiles(
first: Int first: Int
after: CursorKey after: CursorKey
last: Int last: Int
before: CursorKey before: CursorKey
orderBy: MembershipOrder orderBy: ProfileOrder
): MembershipConnection @goField(forceResolver: true) ): ProfileConnection @goField(forceResolver: true)
pendingInvitations( pendingInvitations(
first: Int first: Int
@@ -178,7 +178,7 @@ type Identity implements Node {
@session(required: PRESENT) @session(required: PRESENT)
} }
type MembershipProfile implements Node { type Profile implements Node {
id: ID! id: ID!
fullName: String! fullName: String!
additionalEmailAddresses: [EmailAddr!]! additionalEmailAddresses: [EmailAddr!]!
@@ -191,9 +191,7 @@ type MembershipProfile implements Node {
identity: Identity @goField(forceResolver: true) identity: Identity @goField(forceResolver: true)
organization: Organization @goField(forceResolver: true) organization: Organization @goField(forceResolver: true)
membership: Membership @goField(forceResolver: true)
# FIXME: remove when memberships are under profile
membershipId: ID!
permission(action: String!): Boolean! permission(action: String!): Boolean!
@goField(forceResolver: true) @goField(forceResolver: true)
@@ -212,13 +210,13 @@ type Organization implements Node {
createdAt: Datetime! createdAt: Datetime!
updatedAt: Datetime! updatedAt: Datetime!
members( profiles(
first: Int first: Int
after: CursorKey after: CursorKey
last: Int last: Int
before: CursorKey before: CursorKey
orderBy: MembershipOrder orderBy: ProfileOrder
): MembershipConnection @goField(forceResolver: true) ): ProfileConnection @goField(forceResolver: true)
invitations( invitations(
first: Int first: Int
@@ -238,7 +236,7 @@ type Organization implements Node {
scimConfiguration: SCIMConfiguration @goField(forceResolver: true) scimConfiguration: SCIMConfiguration @goField(forceResolver: true)
viewerMembership: Membership @goField(forceResolver: true) viewer: Profile @goField(forceResolver: true)
permission(action: String!): Boolean! permission(action: String!): Boolean!
@goField(forceResolver: true) @goField(forceResolver: true)
@@ -285,9 +283,6 @@ enum MembershipState
type Membership implements Node { type Membership implements Node {
id: ID! id: ID!
createdAt: Datetime! createdAt: Datetime!
identity: Identity @goField(forceResolver: true)
profile: MembershipProfile @goField(forceResolver: true)
organization: Organization @goField(forceResolver: true)
role: MembershipRole! role: MembershipRole!
source: MembershipSource! source: MembershipSource!
state: MembershipState! state: MembershipState!
@@ -445,7 +440,7 @@ type SCIMEvent implements Node {
requestBody: String requestBody: String
responseBody: String responseBody: String
errorMessage: String errorMessage: String
membership: Membership @goField(forceResolver: true) profile: Profile @goField(forceResolver: true)
ipAddress: String! ipAddress: String!
createdAt: Datetime! createdAt: Datetime!
@@ -483,50 +478,6 @@ enum ReauthenticationReason {
POLICY_REQUIREMENT POLICY_REQUIREMENT
} }
enum MembershipOrderField
@goModel(model: "go.probo.inc/probo/pkg/coredata.MembershipOrderField") {
FULL_NAME
@goEnum(
value: "go.probo.inc/probo/pkg/coredata.MembershipOrderFieldFullName"
)
ORGANIZATION_NAME
@goEnum(
value: "go.probo.inc/probo/pkg/coredata.MembershipOrderFieldOrganizationName"
)
EMAIL_ADDRESS
@goEnum(
value: "go.probo.inc/probo/pkg/coredata.MembershipOrderFieldEmailAddress"
)
ROLE
@goEnum(value: "go.probo.inc/probo/pkg/coredata.MembershipOrderFieldRole")
CREATED_AT
@goEnum(
value: "go.probo.inc/probo/pkg/coredata.MembershipOrderFieldCreatedAt"
)
}
input MembershipOrder
@goModel(
model: "go.probo.inc/probo/pkg/server/api/connect/v1/types.MembershipOrderBy"
) {
direction: OrderDirection!
field: MembershipOrderField!
}
type MembershipConnection
@goModel(
model: "go.probo.inc/probo/pkg/server/api/connect/v1/types.MembershipConnection"
) {
edges: [MembershipEdge!]!
pageInfo: PageInfo!
totalCount: Int @goField(forceResolver: true)
}
type MembershipEdge {
node: Membership!
cursor: CursorKey!
}
enum InvitationOrderField enum InvitationOrderField
@goModel(model: "go.probo.inc/probo/pkg/coredata.InvitationOrderField") { @goModel(model: "go.probo.inc/probo/pkg/coredata.InvitationOrderField") {
FULL_NAME FULL_NAME
@@ -573,6 +524,45 @@ type InvitationEdge {
cursor: CursorKey! cursor: CursorKey!
} }
enum ProfileOrderField
@goModel(model: "go.probo.inc/probo/pkg/coredata.MembershipProfileOrderField") {
FULL_NAME
@goEnum(
value: "go.probo.inc/probo/pkg/coredata.MembershipProfileOrderFieldFullName"
)
CREATED_AT
@goEnum(
value: "go.probo.inc/probo/pkg/coredata.MembershipProfileOrderFieldCreatedAt"
)
KIND @goEnum(value: "go.probo.inc/probo/pkg/coredata.MembershipProfileOrderFieldKind")
ORGANIZATION_NAME
@goEnum(
value: "go.probo.inc/probo/pkg/coredata.MembershipProfileOrderFieldOrganizationName"
)
}
input ProfileOrder
@goModel(
model: "go.probo.inc/probo/pkg/server/api/connect/v1/types.ProfileOrderBy"
) {
direction: OrderDirection!
field: ProfileOrderField!
}
type ProfileConnection
@goModel(
model: "go.probo.inc/probo/pkg/server/api/connect/v1/types.ProfileConnection"
) {
totalCount: Int @goField(forceResolver: true)
edges: [ProfileEdge!]!
pageInfo: PageInfo!
}
type ProfileEdge {
cursor: CursorKey!
node: Profile!
}
type SessionConnection type SessionConnection
@goModel( @goModel(
model: "go.probo.inc/probo/pkg/server/api/connect/v1/types.SessionConnection" model: "go.probo.inc/probo/pkg/server/api/connect/v1/types.SessionConnection"
@@ -885,7 +875,7 @@ type RevokePersonalAPIKeyPayload {
type CreateOrganizationPayload { type CreateOrganizationPayload {
organization: Organization organization: Organization
membershipEdge: MembershipEdge! membership: Membership!
} }
type UpdateOrganizationPayload { type UpdateOrganizationPayload {
@@ -905,7 +895,7 @@ type InviteMemberPayload {
} }
type UpdateProfilePayload { type UpdateProfilePayload {
profile: MembershipProfile! profile: Profile!
} }
type UpdateMembershipPayload { type UpdateMembershipPayload {
@@ -917,7 +907,7 @@ type RemoveMemberPayload {
} }
type AcceptInvitationPayload { type AcceptInvitationPayload {
membershipEdge: MembershipEdge! membership: Membership!
invitation: Invitation! invitation: Invitation!
} }

3473
pkg/server/api/connect/v1/schema/schema.go
View File

File diff suppressed because it is too large Load Diff

47
pkg/server/api/connect/v1/types/membership.go
View File

@@ -16,59 +16,12 @@ package types
import ( import (
"go.probo.inc/probo/pkg/coredata" "go.probo.inc/probo/pkg/coredata"
"go.probo.inc/probo/pkg/gid"
"go.probo.inc/probo/pkg/page"
) )
type (
MembershipOrderBy OrderBy[coredata.MembershipOrderField]
MembershipConnection struct {
TotalCount int
Edges []*MembershipEdge
PageInfo PageInfo
Resolver any
ParentID gid.GID
}
)
func NewMembershipConnection(
p *page.Page[*coredata.Membership, coredata.MembershipOrderField],
resolver any,
parentID gid.GID,
) *MembershipConnection {
edges := make([]*MembershipEdge, len(p.Data))
for i, membership := range p.Data {
edges[i] = NewMembershipEdge(membership, p.Cursor.OrderBy.Field)
}
return &MembershipConnection{
Edges: edges,
PageInfo: *NewPageInfo(p),
Resolver: resolver,
ParentID: parentID,
}
}
func NewMembershipEdge(membership *coredata.Membership, orderField coredata.MembershipOrderField) *MembershipEdge {
return &MembershipEdge{
Node: NewMembership(membership),
Cursor: membership.CursorKey(orderField),
}
}
func NewMembership(membership *coredata.Membership) *Membership { func NewMembership(membership *coredata.Membership) *Membership {
return &Membership{ return &Membership{
ID: membership.ID, ID: membership.ID,
CreatedAt: membership.CreatedAt, CreatedAt: membership.CreatedAt,
Identity: &Identity{
ID: membership.IdentityID,
},
Organization: &Organization{
ID: membership.OrganizationID,
},
Role: membership.Role, Role: membership.Role,
Source: membership.Source, Source: membership.Source,
State: membership.State, State: membership.State,

52
pkg/server/api/connect/v1/types/identity_profile.go → pkg/server/api/connect/v1/types/profile.go
View File

@@ -14,10 +14,56 @@
package types package types
import "go.probo.inc/probo/pkg/coredata" import (
"go.probo.inc/probo/pkg/coredata"
"go.probo.inc/probo/pkg/gid"
"go.probo.inc/probo/pkg/page"
)
func NewMembershipProfile(profile *coredata.MembershipProfile) *MembershipProfile { type (
return &MembershipProfile{ ProfileOrderBy OrderBy[coredata.MembershipProfileOrderField]
ProfileConnection struct {
TotalCount int
Edges []*ProfileEdge
PageInfo PageInfo
Resolver any
ParentID gid.GID
}
)
func NewProfileConnection(
p *page.Page[*coredata.MembershipProfile, coredata.MembershipProfileOrderField],
resolver any,
parentID gid.GID,
) *ProfileConnection {
edges := make([]*ProfileEdge, len(p.Data))
for i, profile := range p.Data {
edges[i] = NewProfileEdge(profile, p.Cursor.OrderBy.Field)
}
return &ProfileConnection{
Edges: edges,
PageInfo: *NewPageInfo(p),
Resolver: resolver,
ParentID: parentID,
}
}
func NewProfileEdge(
profile *coredata.MembershipProfile,
orderField coredata.MembershipProfileOrderField,
) *ProfileEdge {
return &ProfileEdge{
Node: NewProfile(profile),
Cursor: profile.CursorKey(orderField),
}
}
func NewProfile(profile *coredata.MembershipProfile) *Profile {
return &Profile{
ID: profile.ID, ID: profile.ID,
FullName: profile.FullName, FullName: profile.FullName,
AdditionalEmailAddresses: profile.AdditionalEmailAddresses, AdditionalEmailAddresses: profile.AdditionalEmailAddresses,

11
pkg/server/api/connect/v1/types/scim_event.go
View File

@@ -72,11 +72,12 @@ func NewSCIMEvent(scimEvent *coredata.SCIMEvent) *SCIMEvent {
CreatedAt: scimEvent.CreatedAt, CreatedAt: scimEvent.CreatedAt,
} }
if scimEvent.MembershipID != nil { // FIXME: profile
event.Membership = &Membership{ // if scimEvent.MembershipID != nil {
ID: *scimEvent.MembershipID, // event.Membership = &Membership{
} // ID: *scimEvent.MembershipID,
} // }
// }
return event return event
} }

65
pkg/server/api/connect/v1/types/types.go
View File

@@ -30,7 +30,7 @@ type AcceptInvitationInput struct {
} }
type AcceptInvitationPayload struct { type AcceptInvitationPayload struct {
MembershipEdge *MembershipEdge `json:"membershipEdge"` Membership *Membership `json:"membership"`
Invitation *Invitation `json:"invitation"` Invitation *Invitation `json:"invitation"`
} }
@@ -80,7 +80,7 @@ type CreateOrganizationInput struct {
type CreateOrganizationPayload struct { type CreateOrganizationPayload struct {
Organization *Organization `json:"organization,omitempty"` Organization *Organization `json:"organization,omitempty"`
MembershipEdge *MembershipEdge `json:"membershipEdge"` Membership *Membership `json:"membership"`
} }
type CreatePersonalAPIKeyInput struct { type CreatePersonalAPIKeyInput struct {
@@ -176,7 +176,7 @@ type Identity struct {
EmailVerified bool `json:"emailVerified"` EmailVerified bool `json:"emailVerified"`
CreatedAt time.Time `json:"createdAt"` CreatedAt time.Time `json:"createdAt"`
UpdatedAt time.Time `json:"updatedAt"` UpdatedAt time.Time `json:"updatedAt"`
Memberships *MembershipConnection `json:"memberships,omitempty"` Profiles *ProfileConnection `json:"profiles,omitempty"`
PendingInvitations *InvitationConnection `json:"pendingInvitations,omitempty"` PendingInvitations *InvitationConnection `json:"pendingInvitations,omitempty"`
Sessions *SessionConnection `json:"sessions,omitempty"` Sessions *SessionConnection `json:"sessions,omitempty"`
PersonalAPIKeys *PersonalAPIKeyConnection `json:"personalAPIKeys,omitempty"` PersonalAPIKeys *PersonalAPIKeyConnection `json:"personalAPIKeys,omitempty"`
@@ -222,9 +222,6 @@ type InviteMemberPayload struct {
type Membership struct { type Membership struct {
ID gid.GID `json:"id"` ID gid.GID `json:"id"`
CreatedAt time.Time `json:"createdAt"` CreatedAt time.Time `json:"createdAt"`
Identity *Identity `json:"identity,omitempty"`
Profile *MembershipProfile `json:"profile,omitempty"`
Organization *Organization `json:"organization,omitempty"`
Role coredata.MembershipRole `json:"role"` Role coredata.MembershipRole `json:"role"`
Source coredata.MembershipSource `json:"source"` Source coredata.MembershipSource `json:"source"`
State coredata.MembershipState `json:"state"` State coredata.MembershipState `json:"state"`
@@ -235,30 +232,6 @@ type Membership struct {
func (Membership) IsNode() {} func (Membership) IsNode() {}
func (this Membership) GetID() gid.GID { return this.ID } func (this Membership) GetID() gid.GID { return this.ID }
type MembershipEdge struct {
Node *Membership `json:"node"`
Cursor page.CursorKey `json:"cursor"`
}
type MembershipProfile struct {
ID gid.GID `json:"id"`
FullName string `json:"fullName"`
AdditionalEmailAddresses []mail.Addr `json:"additionalEmailAddresses"`
Kind coredata.MembershipProfileKind `json:"kind"`
Position *string `json:"position,omitempty"`
ContractStartDate *time.Time `json:"contractStartDate,omitempty"`
ContractEndDate *time.Time `json:"contractEndDate,omitempty"`
CreatedAt time.Time `json:"createdAt"`
UpdatedAt time.Time `json:"updatedAt"`
Identity *Identity `json:"identity,omitempty"`
Organization *Organization `json:"organization,omitempty"`
MembershipID gid.GID `json:"membershipId"`
Permission bool `json:"permission"`
}
func (MembershipProfile) IsNode() {}
func (this MembershipProfile) GetID() gid.GID { return this.ID }
type Mutation struct { type Mutation struct {
} }
@@ -273,11 +246,11 @@ type Organization struct {
HeadquarterAddress *string `json:"headquarterAddress,omitempty"` HeadquarterAddress *string `json:"headquarterAddress,omitempty"`
CreatedAt time.Time `json:"createdAt"` CreatedAt time.Time `json:"createdAt"`
UpdatedAt time.Time `json:"updatedAt"` UpdatedAt time.Time `json:"updatedAt"`
Members *MembershipConnection `json:"members,omitempty"` Profiles *ProfileConnection `json:"profiles,omitempty"`
Invitations *InvitationConnection `json:"invitations,omitempty"` Invitations *InvitationConnection `json:"invitations,omitempty"`
SamlConfigurations *SAMLConfigurationConnection `json:"samlConfigurations,omitempty"` SamlConfigurations *SAMLConfigurationConnection `json:"samlConfigurations,omitempty"`
ScimConfiguration *SCIMConfiguration `json:"scimConfiguration,omitempty"` ScimConfiguration *SCIMConfiguration `json:"scimConfiguration,omitempty"`
ViewerMembership *Membership `json:"viewerMembership,omitempty"` Viewer *Profile `json:"viewer,omitempty"`
Permission bool `json:"permission"` Permission bool `json:"permission"`
} }
@@ -322,6 +295,30 @@ type PersonalAPIKeyEdge struct {
Cursor page.CursorKey `json:"cursor"` Cursor page.CursorKey `json:"cursor"`
} }
type Profile struct {
ID gid.GID `json:"id"`
FullName string `json:"fullName"`
AdditionalEmailAddresses []mail.Addr `json:"additionalEmailAddresses"`
Kind coredata.MembershipProfileKind `json:"kind"`
Position *string `json:"position,omitempty"`
ContractStartDate *time.Time `json:"contractStartDate,omitempty"`
ContractEndDate *time.Time `json:"contractEndDate,omitempty"`
CreatedAt time.Time `json:"createdAt"`
UpdatedAt time.Time `json:"updatedAt"`
Identity *Identity `json:"identity,omitempty"`
Organization *Organization `json:"organization,omitempty"`
Membership *Membership `json:"membership,omitempty"`
Permission bool `json:"permission"`
}
func (Profile) IsNode() {}
func (this Profile) GetID() gid.GID { return this.ID }
type ProfileEdge struct {
Cursor page.CursorKey `json:"cursor"`
Node *Profile `json:"node"`
}
type Query struct { type Query struct {
} }
@@ -455,7 +452,7 @@ type SCIMEvent struct {
RequestBody *string `json:"requestBody,omitempty"` RequestBody *string `json:"requestBody,omitempty"`
ResponseBody *string `json:"responseBody,omitempty"` ResponseBody *string `json:"responseBody,omitempty"`
ErrorMessage *string `json:"errorMessage,omitempty"` ErrorMessage *string `json:"errorMessage,omitempty"`
Membership *Membership `json:"membership,omitempty"` Profile *Profile `json:"profile,omitempty"`
IPAddress string `json:"ipAddress"` IPAddress string `json:"ipAddress"`
CreatedAt time.Time `json:"createdAt"` CreatedAt time.Time `json:"createdAt"`
Permission bool `json:"permission"` Permission bool `json:"permission"`
@@ -564,7 +561,7 @@ type UpdateProfileInput struct {
} }
type UpdateProfilePayload struct { type UpdateProfilePayload struct {
Profile *MembershipProfile `json:"profile"` Profile *Profile `json:"profile"`
} }
type UpdateSAMLConfigurationInput struct { type UpdateSAMLConfigurationInput struct {

284
pkg/server/api/connect/v1/v1_resolver.go
View File

@@ -23,6 +23,7 @@ import (
"go.probo.inc/probo/pkg/server/api/authz" "go.probo.inc/probo/pkg/server/api/authz"
"go.probo.inc/probo/pkg/server/api/connect/v1/schema" "go.probo.inc/probo/pkg/server/api/connect/v1/schema"
"go.probo.inc/probo/pkg/server/api/connect/v1/types" "go.probo.inc/probo/pkg/server/api/connect/v1/types"
types1 "go.probo.inc/probo/pkg/server/api/console/v1/types"
"go.probo.inc/probo/pkg/server/gqlutils" "go.probo.inc/probo/pkg/server/gqlutils"
"go.probo.inc/probo/pkg/server/gqlutils/types/cursor" "go.probo.inc/probo/pkg/server/gqlutils/types/cursor"
) )
@@ -32,39 +33,9 @@ func (r *connectorResolver) Permission(ctx context.Context, obj *types.Connector
return r.Resolver.Permission(ctx, obj, action) return r.Resolver.Permission(ctx, obj, action)
} }
// Memberships is the resolver for the memberships field. // Profiles is the resolver for the profiles field.
func (r *identityResolver) Memberships(ctx context.Context, obj *types.Identity, first *int, after *page.CursorKey, last *int, before *page.CursorKey, orderBy *types.MembershipOrderBy) (*types.MembershipConnection, error) { func (r *identityResolver) Profiles(ctx context.Context, obj *types.Identity, first *int, after *page.CursorKey, last *int, before *page.CursorKey, orderBy *types1.ProfileOrderBy) (*types1.ProfileConnection, error) {
if err := r.authorize(ctx, obj.ID, iam.ActionMembershipList); err != nil { panic(fmt.Errorf("not implemented: Profiles - profiles"))
return nil, err
}
if gqlutils.OnlyTotalCountSelected(ctx) {
return &types.MembershipConnection{
Resolver: r,
ParentID: obj.ID,
}, nil
}
pageOrderBy := page.OrderBy[coredata.MembershipOrderField]{
Field: coredata.MembershipOrderFieldCreatedAt,
Direction: page.OrderDirectionDesc,
}
if orderBy != nil {
pageOrderBy = page.OrderBy[coredata.MembershipOrderField]{
Field: orderBy.Field,
Direction: orderBy.Direction,
}
}
cursor := cursor.NewCursor(first, after, last, before, pageOrderBy)
page, err := r.iam.AccountService.ListMemberships(ctx, obj.ID, cursor)
if err != nil {
r.logger.ErrorCtx(ctx, "cannot list memberships", log.Error(err))
return nil, gqlutils.Internal(ctx)
}
return types.NewMembershipConnection(page, r, obj.ID), nil
} }
// PendingInvitations is the resolver for the pendingInvitations field. // PendingInvitations is the resolver for the pendingInvitations field.
@@ -267,73 +238,6 @@ func (r *invitationConnectionResolver) TotalCount(ctx context.Context, obj *type
return nil, gqlutils.Internal(ctx) return nil, gqlutils.Internal(ctx)
} }
// Identity is the resolver for the identity field.
func (r *membershipResolver) Identity(ctx context.Context, obj *types.Membership) (*types.Identity, error) {
if err := r.authorize(
ctx,
obj.Identity.ID,
iam.ActionIdentityGet,
authz.WithAttr("organization_id", obj.Organization.ID.String()),
); err != nil {
return nil, err
}
if gqlutils.OnlyIDSelected(ctx) {
return &types.Identity{
ID: obj.Identity.ID,
}, nil
}
identity, err := r.iam.AccountService.GetIdentityForMembership(ctx, obj.ID)
if err != nil {
r.logger.ErrorCtx(ctx, "cannot get identity for membership", log.Error(err))
return nil, gqlutils.Internal(ctx)
}
return types.NewIdentity(identity), nil
}
// Profile is the resolver for the profile field.
func (r *membershipResolver) Profile(ctx context.Context, obj *types.Membership) (*types.MembershipProfile, error) {
if err := r.authorize(ctx, obj.ID, iam.ActionMembershipProfileGet, authz.WithSkipAssumptionCheck()); err != nil {
return nil, err
}
profile, err := r.iam.AccountService.GetProfileForMembership(ctx, obj.ID)
if err != nil {
var errProfileNotFound *iam.ErrProfileNotFound
if errors.As(err, &errProfileNotFound) {
return nil, gqlutils.NotFound(ctx, err)
}
r.logger.ErrorCtx(ctx, "cannot get profile for membership", log.Error(err))
return nil, gqlutils.Internal(ctx)
}
return types.NewMembershipProfile(profile), nil
}
// Organization is the resolver for the organization field.
func (r *membershipResolver) Organization(ctx context.Context, obj *types.Membership) (*types.Organization, error) {
if err := r.authorize(ctx, obj.Organization.ID, iam.ActionOrganizationGet, authz.WithSkipAssumptionCheck()); err != nil {
return nil, err
}
if gqlutils.OnlyIDSelected(ctx) {
return &types.Organization{
ID: obj.Organization.ID,
}, nil
}
organization, err := r.iam.OrganizationService.GetOrganizationForMembership(ctx, obj.ID)
if err != nil {
r.logger.ErrorCtx(ctx, "cannot get organization for membership", log.Error(err))
return nil, gqlutils.Internal(ctx)
}
return types.NewOrganization(organization), nil
}
// LastSession is the resolver for the lastSession field. // LastSession is the resolver for the lastSession field.
func (r *membershipResolver) LastSession(ctx context.Context, obj *types.Membership) (*types.Session, error) { func (r *membershipResolver) LastSession(ctx context.Context, obj *types.Membership) (*types.Session, error) {
if err := r.authorize(ctx, obj.ID, iam.ActionMembershipGet, authz.WithSkipAssumptionCheck()); err != nil { if err := r.authorize(ctx, obj.ID, iam.ActionMembershipGet, authz.WithSkipAssumptionCheck()); err != nil {
@@ -364,87 +268,6 @@ func (r *membershipResolver) Permission(ctx context.Context, obj *types.Membersh
return r.Resolver.Permission(ctx, obj, action) return r.Resolver.Permission(ctx, obj, action)
} }
// TotalCount is the resolver for the totalCount field.
func (r *membershipConnectionResolver) TotalCount(ctx context.Context, obj *types.MembershipConnection) (*int, error) {
if err := r.authorize(ctx, obj.ParentID, iam.ActionMembershipList); err != nil {
return nil, err
}
switch obj.Resolver.(type) {
case *identityResolver:
count, err := r.iam.AccountService.CountMemberships(ctx, obj.ParentID)
if err != nil {
r.logger.ErrorCtx(ctx, "cannot count memberships", log.Error(err))
return nil, gqlutils.Internal(ctx)
}
return &count, nil
case *organizationResolver:
count, err := r.iam.OrganizationService.CountMemberships(ctx, obj.ParentID)
if err != nil {
r.logger.ErrorCtx(ctx, "cannot count memberships", 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)
}
// Identity is the resolver for the identity field.
func (r *membershipProfileResolver) Identity(ctx context.Context, obj *types.MembershipProfile) (*types.Identity, error) {
if err := r.authorize(
ctx,
obj.Identity.ID,
iam.ActionIdentityGet,
authz.WithAttr("organization_id", obj.Organization.ID.String()),
); err != nil {
return nil, err
}
if gqlutils.OnlyIDSelected(ctx) {
return &types.Identity{
ID: obj.Identity.ID,
}, nil
}
identity, err := r.iam.AccountService.GetIdentity(ctx, obj.Identity.ID)
if err != nil {
r.logger.ErrorCtx(ctx, "cannot get identity for membership", log.Error(err))
return nil, gqlutils.Internal(ctx)
}
return types.NewIdentity(identity), nil
}
// Organization is the resolver for the organization field.
func (r *membershipProfileResolver) Organization(ctx context.Context, obj *types.MembershipProfile) (*types.Organization, error) {
if err := r.authorize(ctx, obj.Organization.ID, iam.ActionOrganizationGet, authz.WithSkipAssumptionCheck()); err != nil {
return nil, err
}
if gqlutils.OnlyIDSelected(ctx) {
return &types.Organization{
ID: obj.Organization.ID,
}, nil
}
organization, err := r.iam.OrganizationService.GetOrganizationForMembership(ctx, obj.ID)
if err != nil {
r.logger.ErrorCtx(ctx, "cannot get organization for membership", log.Error(err))
return nil, gqlutils.Internal(ctx)
}
return types.NewOrganization(organization), nil
}
// Permission is the resolver for the permission field.
func (r *membershipProfileResolver) Permission(ctx context.Context, obj *types.MembershipProfile, action string) (bool, error) {
return r.Resolver.Permission(ctx, obj, action)
}
// SignIn is the resolver for the signIn field. // SignIn is the resolver for the signIn field.
func (r *mutationResolver) SignIn(ctx context.Context, input types.SignInInput) (*types.SignInPayload, error) { func (r *mutationResolver) SignIn(ctx context.Context, input types.SignInInput) (*types.SignInPayload, error) {
identity, err := r.iam.AuthService.CheckCredentials(ctx, input.Email, input.Password) identity, err := r.iam.AuthService.CheckCredentials(ctx, input.Email, input.Password)
@@ -939,7 +762,7 @@ func (r *mutationResolver) CreateOrganization(ctx context.Context, input types.C
return &types.CreateOrganizationPayload{ return &types.CreateOrganizationPayload{
Organization: types.NewOrganization(organization), Organization: types.NewOrganization(organization),
MembershipEdge: types.NewMembershipEdge(membership, coredata.MembershipOrderFieldCreatedAt), Membership: types.NewMembership(membership),
}, nil }, nil
} }
@@ -1105,7 +928,7 @@ func (r *mutationResolver) UpdateProfile(ctx context.Context, input types.Update
} }
return &types.UpdateProfilePayload{ return &types.UpdateProfilePayload{
Profile: types.NewMembershipProfile(profile), Profile: types.NewProfile(profile),
}, nil }, nil
} }
@@ -1173,7 +996,7 @@ func (r *mutationResolver) AcceptInvitation(ctx context.Context, input types.Acc
} }
return &types.AcceptInvitationPayload{ return &types.AcceptInvitationPayload{
MembershipEdge: types.NewMembershipEdge(membership, coredata.MembershipOrderFieldCreatedAt), Membership: types.NewMembership(membership),
Invitation: types.NewInvitation(invitation), Invitation: types.NewInvitation(invitation),
}, nil }, nil
} }
@@ -1387,37 +1210,9 @@ func (r *organizationResolver) HorizontalLogoURL(ctx context.Context, obj *types
return presignedURL, nil return presignedURL, nil
} }
// Members is the resolver for the members field. // Profiles is the resolver for the profiles field.
func (r *organizationResolver) Members(ctx context.Context, obj *types.Organization, first *int, after *page.CursorKey, last *int, before *page.CursorKey, orderBy *types.MembershipOrderBy) (*types.MembershipConnection, error) { func (r *organizationResolver) Profiles(ctx context.Context, obj *types.Organization, first *int, after *page.CursorKey, last *int, before *page.CursorKey, orderBy *types1.ProfileOrderBy) (*types1.ProfileConnection, error) {
if err := r.authorize(ctx, obj.ID, iam.ActionMembershipList); err != nil { panic(fmt.Errorf("not implemented: Profiles - profiles"))
return nil, err
}
if gqlutils.OnlyTotalCountSelected(ctx) {
return &types.MembershipConnection{
Resolver: r,
ParentID: obj.ID,
}, nil
}
pageOrderBy := page.OrderBy[coredata.MembershipOrderField]{
Field: coredata.MembershipOrderFieldCreatedAt,
Direction: page.OrderDirectionDesc,
}
if orderBy != nil {
pageOrderBy.Field = coredata.MembershipOrderField(orderBy.Field)
pageOrderBy.Direction = page.OrderDirection(orderBy.Direction)
}
cursor := cursor.NewCursor(first, after, last, before, pageOrderBy)
page, err := r.iam.OrganizationService.ListMembers(ctx, obj.ID, cursor)
if err != nil {
r.logger.ErrorCtx(ctx, "cannot list memberships", log.Error(err))
return nil, gqlutils.Internal(ctx)
}
return types.NewMembershipConnection(page, r, obj.ID), nil
} }
// Invitations is the resolver for the invitations field. // Invitations is the resolver for the invitations field.
@@ -1575,6 +1370,41 @@ func (r *personalAPIKeyConnectionResolver) TotalCount(ctx context.Context, obj *
return nil, gqlutils.Internal(ctx) return nil, gqlutils.Internal(ctx)
} }
// Identity is the resolver for the identity field.
func (r *profileResolver) Identity(ctx context.Context, obj *types.Profile) (*types.Identity, error) {
panic(fmt.Errorf("not implemented: Identity - identity"))
}
// Organization is the resolver for the organization field.
func (r *profileResolver) Organization(ctx context.Context, obj *types.Profile) (*types.Organization, error) {
panic(fmt.Errorf("not implemented: Organization - organization"))
}
// Membership is the resolver for the membership field.
func (r *profileResolver) Membership(ctx context.Context, obj *types.Profile) (*types.Membership, error) {
panic(fmt.Errorf("not implemented: Membership - membership"))
}
// Permission is the resolver for the permission field.
func (r *profileResolver) Permission(ctx context.Context, obj *types.Profile, action string) (bool, error) {
panic(fmt.Errorf("not implemented: Permission - permission"))
}
// TotalCount is the resolver for the totalCount field.
func (r *profileConnectionResolver) TotalCount(ctx context.Context, obj *types1.ProfileConnection) (int, error) {
panic(fmt.Errorf("not implemented: TotalCount - totalCount"))
}
// Edges is the resolver for the edges field.
func (r *profileConnectionResolver) Edges(ctx context.Context, obj *types1.ProfileConnection) ([]*types.ProfileEdge, error) {
panic(fmt.Errorf("not implemented: Edges - edges"))
}
// PageInfo is the resolver for the pageInfo field.
func (r *profileConnectionResolver) PageInfo(ctx context.Context, obj *types1.ProfileConnection) (*types.PageInfo, error) {
panic(fmt.Errorf("not implemented: PageInfo - pageInfo"))
}
// Node is the resolver for the node field. // Node is the resolver for the node field.
func (r *queryResolver) Node(ctx context.Context, id gid.GID) (types.Node, error) { func (r *queryResolver) Node(ctx context.Context, id gid.GID) (types.Node, error) {
var ( var (
@@ -1620,7 +1450,7 @@ func (r *queryResolver) Node(ctx context.Context, id gid.GID) (types.Node, error
return nil, err return nil, err
} }
return types.NewMembershipProfile(profile), nil return types.NewProfile(profile), nil
} }
case coredata.MembershipEntityType: case coredata.MembershipEntityType:
action = iam.ActionMembershipGet action = iam.ActionMembershipGet
@@ -2042,16 +1872,6 @@ func (r *Resolver) InvitationConnection() schema.InvitationConnectionResolver {
// Membership returns schema.MembershipResolver implementation. // Membership returns schema.MembershipResolver implementation.
func (r *Resolver) Membership() schema.MembershipResolver { return &membershipResolver{r} } func (r *Resolver) Membership() schema.MembershipResolver { return &membershipResolver{r} }
// MembershipConnection returns schema.MembershipConnectionResolver implementation.
func (r *Resolver) MembershipConnection() schema.MembershipConnectionResolver {
return &membershipConnectionResolver{r}
}
// MembershipProfile returns schema.MembershipProfileResolver implementation.
func (r *Resolver) MembershipProfile() schema.MembershipProfileResolver {
return &membershipProfileResolver{r}
}
// Mutation returns schema.MutationResolver implementation. // Mutation returns schema.MutationResolver implementation.
func (r *Resolver) Mutation() schema.MutationResolver { return &mutationResolver{r} } func (r *Resolver) Mutation() schema.MutationResolver { return &mutationResolver{r} }
@@ -2066,6 +1886,14 @@ func (r *Resolver) PersonalAPIKeyConnection() schema.PersonalAPIKeyConnectionRes
return &personalAPIKeyConnectionResolver{r} return &personalAPIKeyConnectionResolver{r}
} }
// Profile returns schema.ProfileResolver implementation.
func (r *Resolver) Profile() schema.ProfileResolver { return &profileResolver{r} }
// ProfileConnection returns schema.ProfileConnectionResolver implementation.
func (r *Resolver) ProfileConnection() schema.ProfileConnectionResolver {
return &profileConnectionResolver{r}
}
// Query returns schema.QueryResolver implementation. // Query returns schema.QueryResolver implementation.
func (r *Resolver) Query() schema.QueryResolver { return &queryResolver{r} } func (r *Resolver) Query() schema.QueryResolver { return &queryResolver{r} }
@@ -2108,12 +1936,12 @@ type identityResolver struct{ *Resolver }
type invitationResolver struct{ *Resolver } type invitationResolver struct{ *Resolver }
type invitationConnectionResolver struct{ *Resolver } type invitationConnectionResolver struct{ *Resolver }
type membershipResolver struct{ *Resolver } type membershipResolver struct{ *Resolver }
type membershipConnectionResolver struct{ *Resolver }
type membershipProfileResolver struct{ *Resolver }
type mutationResolver struct{ *Resolver } type mutationResolver struct{ *Resolver }
type organizationResolver struct{ *Resolver } type organizationResolver struct{ *Resolver }
type personalAPIKeyResolver struct{ *Resolver } type personalAPIKeyResolver struct{ *Resolver }
type personalAPIKeyConnectionResolver struct{ *Resolver } type personalAPIKeyConnectionResolver struct{ *Resolver }
type profileResolver struct{ *Resolver }
type profileConnectionResolver struct{ *Resolver }
type queryResolver struct{ *Resolver } type queryResolver struct{ *Resolver }
type sAMLConfigurationResolver struct{ *Resolver } type sAMLConfigurationResolver struct{ *Resolver }
type sAMLConfigurationConnectionResolver struct{ *Resolver } type sAMLConfigurationConnectionResolver struct{ *Resolver }