feat: update EAU query (#3)

Co-authored-by: ppaul <pritam.paul@yahooinc.com>

Author: pritamstyz4ever

index.js

@@ -28,15 +28,22 @@ class GithubScmGraphQL {
 
         const { data } = await this.sdGql.query({
             query: queries.GetEnterpriseUserAccount,
-            variables: { slug, query: login },
+            variables: { login },
             token
         });
 
-        if (data && data.enterprise) {
-            const { members } = data.enterprise;
+        if (data && data.user && data.user.enterprises) {
+            const { totalCount, nodes, pageInfo } = data.user.enterprises;
+
+            if (nodes && totalCount > 0 && pageInfo.hasNextPage === false) {
+                const enterprise = nodes.find(node => node.slug === slug);
 
-            if (members && members.totalCount === 1) {
-                return members.nodes[0];
+                if (enterprise) {
+                    return {
+                        login,
+                        type: 'EnterpriseUserAccount'
+                    };
+                }
             }
         }
 

queries.js

@@ -3,30 +3,28 @@
 const gql = require('graphql-tag');
 
 module.exports.GetEnterpriseUserAccount = gql`
-    query GetEnterpriseUserAccount($slug: String!, $query: String!) {
-        enterprise(slug: $slug) {
+    query GetEnterpriseUserAccount($login: String!) {
+        user(login: $login) {
             name
             id
-            members(query: $query, first: 1, role: MEMBER) {
+            login
+            enterprises(first: 100) {
                 totalCount
+                pageInfo {
+                    endCursor
+                    hasNextPage
+                }
                 nodes {
-                    type: __typename
-                    ... on EnterpriseUserAccount {
-                        id
-                        name
-                        login
-                    }
-                    ... on User {
-                        id
-                        name
-                        login
-                    }
+                    id
+                    name
+                    slug
                 }
             }
         }
     }
 `;
 
+// needs `admin:enterprise` scope for EAU fragment
 module.exports.ListEnterpriseMembers = gql`
     query ListEnterpriseMembers($slug: String!, $cursor: String) {
         enterprise(slug: $slug) {

test/index.test.js

@@ -60,44 +60,93 @@ describe('GithubGraphQL', () => {
     it('should get enterprise user account', async () => {
         const slug = 'slug';
         const login = 'ai_humanoid';
-        const data = {
-            enterprise: {
-                members: {
-                    totalCount: 1,
-                    nodes: [mockUser1]
+        const response = {
+            data: {
+                user: {
+                    name: 'AI Humanoid',
+                    id: 'U_abcdef',
+                    login: 'ai_humanoid',
+                    enterprises: {
+                        totalCount: 1,
+                        pageInfo: {
+                            hasNextPage: false,
+                            cursor: 'abcdefg'
+                        },
+                        nodes: [
+                            {
+                                id: 'EUA_abcdef',
+                                name: 'AI Humanoid',
+                                slug: 'slug'
+                            }
+                        ]
+                    }
                 }
             }
         };
 
-        githubGql.sdGql.query.resolves({ data });
+        githubGql.sdGql.query.resolves(response);
 
         const result = await githubGql.getEnterpriseUserAccount({
             slug,
             login,
             token
         });
 
-        assert.deepEqual(result, data.enterprise.members.nodes[0]);
+        assert.deepEqual(result, {
+            login,
+            type: 'EnterpriseUserAccount'
+        });
         assert.calledWith(githubGql.sdGql.query, {
             query: queries.GetEnterpriseUserAccount,
-            variables: { slug, query: login },
+            variables: { login },
             token
         });
     });
 
-    it('should return null if no enterprise user account', async () => {
+    it('should return null if no user is not part of enterprise', async () => {
         const slug = 'slug';
         const login = 'ai_humanoid';
-        const data = {
-            enterprise: {
-                members: {
-                    totalCount: 0
+        const response = {
+            data: {
+                user: {
+                    name: 'AI Humanoid',
+                    id: 'U_abcdef',
+                    login: 'ai_humanoid',
+                    enterprises: null
                 }
+            },
+            errors: {
+                type: 'FORBIDDEN',
+                path: ['user', 'enterprises']
             }
         };
 
-        githubGql.sdGql.query.resolves({ data });
+        githubGql.sdGql.query.resolves(response);
+
+        const result = await githubGql.getEnterpriseUserAccount({
+            slug,
+            login,
+            token
+        });
+
+        assert.equal(result, null);
+        assert.calledWith(githubGql.sdGql.query, {
+            query: queries.GetEnterpriseUserAccount,
+            variables: { login },
+            token
+        });
+    });
+
+    it('should return null if no user does not exists', async () => {
+        const slug = 'slug';
+        const login = 'ai_humanoid';
+        const response = {
+            data: {
+                user: null
+            }
+        };
 
+        githubGql.sdGql.query.resolves(response);
         const result = await githubGql.getEnterpriseUserAccount({
             slug,
             login,
@@ -107,7 +156,7 @@ describe('GithubGraphQL', () => {
         assert.equal(result, null);
         assert.calledWith(githubGql.sdGql.query, {
             query: queries.GetEnterpriseUserAccount,
-            variables: { slug, query: login },
+            variables: { login },
             token
         });
     });