feat: user management public api (wip)

Author: n1ru4l

integration-tests/testkit/flow.ts

@@ -205,16 +205,18 @@ export function getOrganizationMembers(selector: OrganizationSelectorInput, auth
       query getOrganizationMembers($selector: OrganizationSelectorInput!) {
         organization(reference: { bySelector: $selector }) {
           members {
-            nodes {
-              id
-              user {
-                id
-                email
-              }
-              role {
+            edges {
+              node {
                 id
-                name
-                permissions
+                user {
+                  id
+                  email
+                }
+                role {
+                  id
+                  name
+                  permissions
+                }
               }
             }
           }

integration-tests/testkit/seed.ts

@@ -202,7 +202,7 @@ export function initSeed() {
                 ownerToken,
               ).then(r => r.expectNoGraphQLErrors());
 
-              const members = membersResult.organization?.members?.nodes;
+              const members = membersResult.organization?.members?.edges?.map(edge => edge.node);
 
               if (!members) {
                 throw new Error(`Could not get members for org ${organization.slug}`);

packages/services/api/src/modules/organization/module.graphql.ts

@@ -274,6 +274,11 @@ export default gql`
     organization: Organization!
   }
 
+  input MemberReferenceInput @oneOf {
+    byId: ID
+    byEmail: String
+  }
+
   type Organization {
     """
     Unique UUID of the organization
@@ -287,7 +292,11 @@ export default gql`
     name: String! @deprecated(reason: "Use the 'slug' field instead.")
     owner: Member!
     me: Member!
-    members: MemberConnection
+    member(reference: MemberReferenceInput!): Member
+    members(
+      first: Int! @tag(name: "public")
+      after: String @tag(name: "public")
+    ): MemberConnection! @tag(name: "public")
     invitations: OrganizationInvitationConnection
     getStarted: OrganizationGetStarted!
     memberRoles: [MemberRole!]
@@ -585,8 +594,13 @@ export default gql`
   }
 
   type MemberConnection {
-    nodes: [Member!]!
-    total: Int!
+    edges: [MemberEdge!]! @tag(name: "public")
+    pageInfo: PageInfo! @tag(name: "public")
+  }
+
+  type MemberEdge {
+    cursor: String! @tag(name: "public")
+    node: Member! @tag(name: "public")
   }
 
   input AppDeploymentResourceAssignmentInput {

packages/services/api/src/modules/organization/resolvers/MemberConnection.ts

@@ -6,4 +6,10 @@ const connection = createConnection<ResolversTypes['Member']>();
 export const MemberConnection: MemberConnectionResolvers = {
   nodes: connection.nodes,
   total: connection.total,
+  edges: async (_parent, _arg, _ctx) => {
+    /* MemberConnection.edges resolver is required because MemberConnection.edges exists but MemberConnectionMapper.edges does not */
+  },
+  pageInfo: async (_parent, _arg, _ctx) => {
+    /* MemberConnection.pageInfo resolver is required because MemberConnection.pageInfo exists but MemberConnectionMapper.pageInfo does not */
+  },
 };

packages/services/api/src/modules/shared/providers/storage.ts

@@ -169,7 +169,6 @@ export interface Storage {
     },
   ): Promise<void>;
 
-  getOrganizationMembers(_: OrganizationSelector): Promise<readonly Member[] | never>;
   countOrganizationMembers(_: OrganizationSelector): Promise<number>;
 
   getOrganizationInvitations(_: OrganizationSelector): Promise<readonly OrganizationInvitation[]>;

packages/services/storage/src/index.ts

@@ -878,49 +878,6 @@ export async function createStorage(
 
       return total;
     },
-    getOrganizationMembers: batch(async selectors => {
-      const organizations = selectors.map(s => s.organizationId);
-      const allMembers = await pool.query<
-        users &
-          Pick<organization_member, 'scopes' | 'organization_id' | 'connected_to_zendesk'> & {
-            is_owner: boolean;
-          } & MemberRoleColumns & {
-            provider: string | null;
-          }
-      >(
-        sql`/* getOrganizationMembers */
-        SELECT
-          ${userFields(sql`"u".`, sql`"stu".`)},
-          omr.scopes as scopes,
-          om.organization_id,
-          om.connected_to_zendesk,
-          CASE WHEN o.user_id = om.user_id THEN true ELSE false END AS is_owner,
-          omr.id as role_id,
-          omr.name as role_name,
-          omr.locked as role_locked,
-          omr.scopes as role_scopes,
-          omr.description as role_description
-        FROM organization_member as om
-        LEFT JOIN organizations as o ON (o.id = om.organization_id)
-        LEFT JOIN users as u ON (u.id = om.user_id)
-        LEFT JOIN organization_member_roles as omr ON (omr.organization_id = o.id AND omr.id = om.role_id)
-        LEFT JOIN supertokens_thirdparty_users as stu ON (stu.user_id = u.supertoken_user_id)
-        WHERE om.organization_id = ANY(${sql.array(
-          organizations,
-          'uuid',
-        )}) ORDER BY u.created_at DESC`,
-      );
-
-      return organizations.map(organization => {
-        const members = allMembers.rows.filter(row => row.organization_id === organization);
-
-        if (members) {
-          return Promise.resolve(members.map(transformMember));
-        }
-
-        return Promise.reject(new Error(`Members not found (organization=${organization})`));
-      });
-    }),
     getOrganizationMember: batch(async selectors => {
       const membersResult = await pool.query<
         users &

packages/web/app/src/components/organization/members/list.tsx

@@ -61,9 +61,10 @@ const OrganizationMemberRow_DeleteMember = graphql(`
       organization {
         id
         members {
-          total
-          nodes {
-            ...OrganizationMemberRow_MemberFragment
+          edges {
+            node {
+              ...OrganizationMemberRow_MemberFragment
+            }
           }
         }
       }
@@ -286,18 +287,19 @@ const OrganizationMembers_OrganizationFragment = graphql(`
       id
     }
     members {
-      nodes {
-        id
-        user {
-          displayName
-        }
-        role {
+      edges {
+        node {
           id
-          name
+          user {
+            displayName
+          }
+          role {
+            id
+            name
+          }
+          ...OrganizationMemberRow_MemberFragment
         }
-        ...OrganizationMemberRow_MemberFragment
       }
-      total
     }
     viewerCanManageInvitations
     ...MemberInvitationForm_OrganizationFragment
@@ -310,7 +312,7 @@ export function OrganizationMembers(props: {
   refetchMembers(): void;
 }) {
   const organization = useFragment(OrganizationMembers_OrganizationFragment, props.organization);
-  const members = organization.members?.nodes;
+  const members = organization.members?.edges?.map(edge => edge.node);
   const [orderDirection, setOrderDirection] = useState<'asc' | 'desc' | null>(null);
   const [sortByKey, setSortByKey] = useState<'name' | 'role'>('name');
 

packages/web/app/src/components/v2/modals/transfer-organization-ownership.tsx

@@ -33,18 +33,19 @@ const TransferOrganizationOwnership_Members = graphql(`
       id
       slug
       members {
-        nodes {
-          id
-          isOwner
-          ...MemberFields
-          user {
+        edges {
+          node {
             id
-            fullName
-            displayName
-            email
+            isOwner
+            ...MemberFields
+            user {
+              id
+              fullName
+              displayName
+              email
+            }
           }
         }
-        total
       }
     }
   }
@@ -159,9 +160,9 @@ export const TransferOrganizationOwnershipModal = ({
     [setSelected, setFieldValue],
   );
 
-  const members = (query.data?.organization?.members?.nodes ?? []).filter(
-    member => !member.isOwner,
-  );
+  const members = (query.data?.organization?.members?.edges ?? [])
+    .map(edge => edge.node)
+    .filter(member => !member.isOwner);
 
   const filteredMembers = (
     searchPhrase === ''