add access request retrieval

Author: ikethecoder

src/batch/data-rules.js

@@ -1,3 +1,5 @@
+const AccessRequest = require("../lists/AccessRequest");
+
 const metadata = {
   Organization: {
     query: 'allOrganizations',

src/services/keystone/access-request.ts

@@ -4,6 +4,7 @@ import {
   AccessRequest,
   AccessRequestCreateInput,
   AccessRequestUpdateInput,
+  AccessRequestWhereInput,
 } from './types';
 
 const assert = require('assert').strict;
@@ -126,12 +127,15 @@ export async function getAccessRequest(context: any, id: string): Promise<Access
 
 export async function getAccessRequestsByNamespace(
   context: any,
-  ns: string
+  nsList: string[]
 ): Promise<AccessRequest[]> {
   const query = gql`
-    query GetNamespaceAccessRequests($ns: String!) {
+    query GetNamespaceAccessRequests($nsList: [String]!) {
       allAccessRequests(
-        where: { productEnvironment: { product: { namespace: $ns } } }
+        where: { OR: [
+          { productEnvironment: { product: { namespace_in: $nsList } } },
+          { application: { namespace_in: $nsList } }
+        ] }
       ) {
         id
         name
@@ -145,6 +149,7 @@ export async function getAccessRequestsByNamespace(
         application {
           name
           appId
+          namespace
         }
         requestor {
           username
@@ -154,21 +159,24 @@ export async function getAccessRequestsByNamespace(
           appId
           flow
           product {
+            namespace
+            openapiSpecs
             name
           }
         }
         serviceAccess {
           id
           consumer {
             username
+            tags
           }
         }
         createdAt
       }
     }
   `;
 
-  const result = await context.executeGraphQL({ query, variables: { ns } });
+  const result = await context.executeGraphQL({ query, variables: { nsList } });
   logger.debug('Query [getAccessRequestsByNamespace] result %j', result);
   return result.data.allAccessRequests;
 }

src/services/report/data/consumer-requests.ts

@@ -29,7 +29,7 @@ export async function getConsumerRequests(
 ): Promise<ReportOfConsumerRequest[]> {
   const dataPromises = namespaces.map(
     async (ns): Promise<ReportOfConsumerRequest[]> => {
-      const requests = await getAccessRequestsByNamespace(ksCtx, ns.name);
+      const requests = await getAccessRequestsByNamespace(ksCtx, [ ns.name ]);
 
       // services
       let data: ReportOfConsumerRequest[] = [];

src/test/integrated/keystonejs/accessRequest.ts

@@ -36,6 +36,7 @@ import {
   addAccessRequest,
   collectCredentials,
   getAccessRequest,
+  getAccessRequestsByNamespace,
 } from '../../../services/keystone/access-request';
 import { createApplication } from '../../../services/keystone/application';
 import {
@@ -66,54 +67,66 @@ import {
     authentication: { item: identity },
   });
 
-  // o(await getOrganizations(ctx));
-  const app = await createApplication(ctx, {
-    name: 'App ' + new Date().toISOString(),
-    description: 'App Desc',
-    ownerId: userId,
-  });
-
-  const controls = {
-    clientName: app.name,
-    subjectDn: 'CN=my-site',
-    //defaultClientScopes: [],
-    optionalClientScopes: ['user/Test1'],
-  };
-
-  const accessRequestData = {
-    acceptLegal: false,
-    additionalDetails: 'here is some additional details',
-    controls: JSON.stringify(controls),
-    name: 'Sample API FOR Cope, Aidan CITZ:EX',
-    productEnvironmentId: '13',
-    requestor: userId,
-  } as any;
-
-  accessRequestData.applicationId = app.id;
-
-  const result = await addAccessRequest(ctx, accessRequestData);
-  o(result);
-
-  const creds = await collectCredentials(ctx, result.id);
-  const credDetails = JSON.parse(creds.credential);
-  o(credDetails);
-
-  const request = await getAccessRequest(ctx, result.id);
-  o(request);
-
-  const labels = [
-    { labelGroup: 'sdx-member', values: ['/MIN/CITZ'] },
-    { labelGroup: 'sdx-res-locator', values: ['/LAB/MIN/CITZ/MYSVC-API'] },
-    { labelGroup: "application", values: [app.name] }
-  ];
-
-  await saveConsumerLabels(ctx, ns, request.serviceAccess.consumer.id, labels);
-
-  // const revoke = await revokeAllConsumerAccess(ctx, ns, request.serviceAccess.id);
-  // o(revoke);
-
-  // const revoke = await deleteServiceAccess(ctx, request.serviceAccess.id);
-  // o(revoke);
+  if (false) {
+    // o(await getOrganizations(ctx));
+    const app = await createApplication(ctx, {
+      name: 'App ' + new Date().toISOString(),
+      description: 'App Desc',
+      ownerId: userId,
+    });
+
+    const controls = {
+      clientName: app.name,
+      subjectDn: 'CN=my-site',
+      //defaultClientScopes: [],
+      optionalClientScopes: ['user/Test1'],
+    };
+
+    const accessRequestData = {
+      acceptLegal: false,
+      additionalDetails: 'here is some additional details',
+      controls: JSON.stringify(controls),
+      name: 'Sample API FOR Cope, Aidan CITZ:EX',
+      productEnvironmentId: '13',
+      requestor: userId,
+    } as any;
+
+    accessRequestData.applicationId = app.id;
+
+    const result = await addAccessRequest(ctx, accessRequestData);
+    o(result);
+
+    const creds = await collectCredentials(ctx, result.id);
+    const credDetails = JSON.parse(creds.credential);
+    o(credDetails);
+
+    const request = await getAccessRequest(ctx, result.id);
+    o(request);
+
+    const labels = [
+      { labelGroup: 'sdx-member', values: ['/MIN/CITZ'] },
+      { labelGroup: 'sdx-res-locator', values: ['/LAB/MIN/CITZ/MYSVC-API'] },
+      { labelGroup: 'application', values: [app.name] },
+    ];
+
+    await saveConsumerLabels(
+      ctx,
+      ns,
+      request.serviceAccess.consumer.id,
+      labels
+    );
+
+    // const revoke = await revokeAllConsumerAccess(ctx, ns, request.serviceAccess.id);
+    // o(revoke);
+
+    // const revoke = await deleteServiceAccess(ctx, request.serviceAccess.id);
+    // o(revoke);
+  }
+
+  if (true) {
+    const result = await getAccessRequestsByNamespace(ctx, [ns]);
+    o(result);
+  }
 
   // const serviceAccess = await getOpenAccessRequestsByConsumer(
   //   ctx,