upd activity details

Author: ikethecoder

src/services/keystone/access-request.ts

@@ -9,29 +9,6 @@ import {
 const assert = require('assert').strict;
 const logger = Logger('keystone.access-req');
 
-/*
-acceptLegal
-: 
-false
-additionalDetails
-: 
-""
-applicationId
-: 
-"2"
-controls
-: 
-"{\"clientGenCertificate\":false,\"jwksUrl\":\"\",\"clientCertificate\":\"\"}"
-name
-: 
-"Sample API FOR Cope, Aidan CITZ:EX"
-productEnvironmentId
-: 
-"12"
-requestor
-: 
-"12"*/
-
 export async function addAccessRequest(
   context: any,
   data: any
@@ -98,6 +75,30 @@ export async function collectCredentials(context: any, id: string): Promise<Acce
   return result.data.updateAccessRequest;
 }
 
+export async function getAccessRequest(context: any, id: string): Promise<AccessRequest> {
+  const query = gql`
+    query GetAccessRequestById($id: ID!) {
+      AccessRequest(where: { id: $id }) {
+        id
+        name
+        isApproved
+        isIssued
+        isComplete
+        serviceAccess {
+          id
+        }
+      }
+    }
+  `;
+
+  const result = await context.executeGraphQL({
+    query,
+    variables: { id },
+  });
+  logger.debug('Query [getAccessRequest] result %j', result);
+  return result.data.AccessRequest;
+}
+
 export async function getAccessRequestsByNamespace(
   context: any,
   ns: string

src/services/keystone/activity.ts

@@ -133,7 +133,7 @@ export async function recordActivity(
     ? productNamespace
     : context.authedItem.namespace;
   const name = `${action} ${type}[${refId}]`;
-  logger.debug('[recordActivity] userid=%s name=%s', userId, name);
+  logger.debug('[recordActivity] ns=%s userid=%s name=%s', namespace, userId, name);
 
   const variables: { [key: string]: any } = {
     name,

src/services/workflow/types.ts

@@ -20,7 +20,7 @@ export interface NewCredential {
   apiKey?: string;
   clientPublicKey?: string;
   clientPrivateKey?: string;
-  subjectDn?: string; // Subject DN for the client certificate
+  subjectDn?: string; // Subject DN for the client certificate,
 }
 
 export interface CredentialReference {

src/test/integrated/keystonejs/accessRequest.ts

@@ -31,10 +31,12 @@ export FEEDER_URL=http://localhost:6767
 
 import InitKeystone from './init';
 import { o } from '../util';
-import { addAccessRequest, collectCredentials, getOpenAccessRequestsByConsumer } from '../../../services/keystone/access-request';
+import { addAccessRequest, collectCredentials, getAccessRequest, getOpenAccessRequestsByConsumer } from '../../../services/keystone/access-request';
 import { add } from 'lodash';
 import { AccessRequestCreateInput } from 'apis/shared/types/query.types';
 import { createApplication } from '../../../services/keystone/application';
+import { deleteServiceAccess } from '../../../services/keystone';
+import { revokeAllConsumerAccess } from '../../../services/workflow';
 
 (async () => {
   const keystone = await InitKeystone();
@@ -47,6 +49,7 @@ import { createApplication } from '../../../services/keystone/application';
   const identity = {
     id: null,
     username: 'sample_username',
+    name: "SampleF UserL",
     namespace: ns,
     roles: JSON.stringify(['api-owner']),
     scopes: [],
@@ -62,9 +65,10 @@ import { createApplication } from '../../../services/keystone/application';
 
   const accessRequestData = {
     acceptLegal: false,
-    additionalDetails: '',
+    additionalDetails: 'here is some additional details',
     //applicationId: '5', // App2
-    controls: '{"clientGenCertificate":false,"jwksUrl":"","clientCertificate":""}',
+    //controls: '{"clientGenCertificate":false,"jwksUrl":"","clientCertificate":""}',
+    controls: JSON.stringify({ "jwksUrl":"",subjectDn: "CN=my-site"}),
     name: 'Sample API FOR Cope, Aidan CITZ:EX',
     productEnvironmentId: '13',
     requestor: userId,
@@ -81,8 +85,40 @@ import { createApplication } from '../../../services/keystone/application';
   o(result);
 
   const creds = await collectCredentials(ctx, result.id);
-  o(creds);
+  o(JSON.parse(creds.credential));
 
+//   query
+// : 
+// "\n  mutation SaveConsumerLabels($consumerId: ID!, $labels: [JSON]) {\n    saveConsumerLabels(consumerId: $consumerId, labels: $labels)\n  }\n"
+// variables
+// : 
+// {consumerId: "27",…}
+// consumerId
+// : 
+// "27"
+// labels
+// : 
+// [{labelGroup: "Priority", values: ["Mister"]}, {labelGroup: "", values: []}]
+
+
+  const request = await getAccessRequest(ctx, result.id);
+  o(request);
+
+  const revoke = await revokeAllConsumerAccess(ctx, ns, request.serviceAccess.id);
+  o(revoke);
+  
+  // const revoke = await deleteServiceAccess(ctx, request.serviceAccess.id);
+  // o(revoke);
+  
+// flow: client-credentials
+// clientId: 50C1D755-945C1E80ABB
+// clientSecret: null
+// issuer: null
+// tokenEndpoint: >-
+//   https://sdx-authz-apps-gov-bc-ca-lab.apps.gov.bc.ca/auth/realms/sdx/protocol/openid-connect/token
+// clientPublicKey: null
+// clientPrivateKey: null
+
   // const serviceAccess = await getOpenAccessRequestsByConsumer(
   //   ctx,
   //   ns,