upd backend for my access update signed jwt data

bcgov · May 12, 2023 · 0343014 · 0343014
1 parent 8d463de
commit 0343014
Show file tree

Hide file tree

Showing 7 changed files with 106 additions and 25 deletions.
diff --git a/src/authz/graphql-whitelist/httplocalhost4180devportalaccess-0c2f56.gql b/src/authz/graphql-whitelist/httplocalhost4180devportalaccess-0c2f56.gql
@@ -0,0 +1,43 @@
+
+  query GetMyServiceAccesses {
+    myServiceAccesses(where: { productEnvironment_is_null: false }) {
+      id
+      name
+      active
+      credentialReference
+      application {
+        name
+      }
+      productEnvironment {
+        id
+        name
+        flow
+        product {
+          id
+          name
+        }
+        credentialIssuer {
+          clientAuthenticator
+        }
+      }
+    }
+    myAccessRequests(
+      where: { productEnvironment_is_null: false, serviceAccess_is_null: true }
+    ) {
+      id
+      application {
+        name
+      }
+      productEnvironment {
+        id
+        name
+        product {
+          id
+          name
+        }
+      }
+      isComplete
+      isApproved
+      isIssued
+    }
+  }
diff --git a/src/nextapp/components/access-list/access-list-row.tsx b/src/nextapp/components/access-list/access-list-row.tsx
@@ -46,7 +46,9 @@ const AccessListRow: React.FC<AccessListRowProps> = ({
     },
     [onRevoke]
   );
-  const controls = data?.controls ? JSON.parse(data.controls) : {};
+  const controls = data?.credentialReference
+    ? JSON.parse(data.credentialReference)
+    : {};
 
   return (
     <Tr>
@@ -67,7 +69,7 @@ const AccessListRow: React.FC<AccessListRowProps> = ({
         </Tag>
       </Td>
       <Td>{data.application?.name}</Td>
-      <Td color="bc-blue">{data.productEnvironment.clientId}</Td>
+      <Td color="bc-blue">{data.name}</Td>
       <Td isNumeric data-testid={`access-generate-credentials-${index}`}>
         {(has(data, 'isApproved') ||
           has(data, 'isIssued') ||
@@ -80,8 +82,18 @@ const AccessListRow: React.FC<AccessListRowProps> = ({
           isOpen={isOpen}
           onClose={onClose}
         />
-        <JwksDialog id={data.id} isOpen={jwksDialog.isOpen} onClose={jwksDialog.onClose}/>
-        <PublicKeyDialog id={data.id} isOpen={publicKeyDialog.isOpen} onClose={publicKeyDialog.onClose}/>
+        <JwksDialog
+          id={data.id}
+          jwksUrl={controls.jwksUrl}
+          isOpen={jwksDialog.isOpen}
+          onClose={jwksDialog.onClose}
+        />
+        <PublicKeyDialog
+          id={data.id}
+          clientCertificate={controls.clientCertificate}
+          isOpen={publicKeyDialog.isOpen}
+          onClose={publicKeyDialog.onClose}
+        />
         <Menu placement="bottom-end">
           <MenuButton
             as={IconButton}
@@ -95,30 +107,36 @@ const AccessListRow: React.FC<AccessListRowProps> = ({
               'kong-api-key-only',
               'kong-api-key-acl',
               'client-credentials',
-            ].includes(data.productEnvironment.flow) && (
+            ].includes(data.productEnvironment.flow) ||
+              (data.productEnvironment?.credentialIssuer
+                ?.clientAuthenticator === 'client-secret' && (
                 <MenuItem
                   data-testid="regenerate-credentials-btn"
                   onClick={onOpen}
                 >
                   Regenerate Credentials
                 </MenuItem>
+              ))}
+            {data.productEnvironment?.credentialIssuer?.clientAuthenticator ===
+              'client-jwt-jwks-url' &&
+              controls.jwksUrl && (
+                <MenuItem
+                  data-testid="update-jwksurl-btn"
+                  onClick={jwksDialog.onOpen}
+                >
+                  Update JWKS URL
+                </MenuItem>
+              )}
+            {data.productEnvironment?.credentialIssuer?.clientAuthenticator ===
+              'client-jwt-jwks-url' &&
+              controls.clientCertificate && (
+                <MenuItem
+                  data-testid="update-pubkey-btn"
+                  onClick={publicKeyDialog.onOpen}
+                >
+                  Update Public Key
+                </MenuItem>
               )}
-            {data.productEnvironment?.flow === 'client-jwt-jwks-url' && controls.jwksUrl && (
-              <MenuItem
-                data-testid="regenerate-credentials-btn"
-                onClick={jwksDialog.onOpen}
-              >
-                Update JWKS URL
-              </MenuItem>
-            )}
-            {data.productEnvironment?.flow === 'client-jwt-jwks-url' && controls.publicKey && (
-              <MenuItem
-                data-testid="regenerate-credentials-btn"
-                onClick={publicKeyDialog.onOpen}
-              >
-                Update Public Key
-              </MenuItem>
-            )}
             <MenuItem
               color="bc-error"
               onClick={handleRevoke(data.id, has(data, 'isIssued'))}

diff --git a/src/nextapp/components/access-request-form/jwks-dialog.tsx b/src/nextapp/components/access-request-form/jwks-dialog.tsx
@@ -19,11 +19,17 @@ import CopyButton from '../copy-button/copy-button.tsx';
 
 interface JwksDialogProps {
   id: string;
+  jwksUrl: string;
   isOpen: boolean;
   onClose: () => void;
 }
 
-const JwksDialog: React.FC<JwksDialogProps> = ({ id, isOpen, onClose }) => {
+const JwksDialog: React.FC<JwksDialogProps> = ({
+  id,
+  jwksUrl,
+  isOpen,
+  onClose,
+}) => {
   return (
     <>
       <Modal
@@ -51,7 +57,7 @@ const JwksDialog: React.FC<JwksDialogProps> = ({ id, isOpen, onClose }) => {
                   name="jwksUrl"
                   variant="bc-input"
                   type="url"
-                  value="https://example.com/.well-known/jwks.json"
+                  value={jwksUrl}
                 />
               </FormControl>
               <FormControl mb={4}>
@@ -104,7 +110,9 @@ const JwksDialog: React.FC<JwksDialogProps> = ({ id, isOpen, onClose }) => {
           </ModalBody>
           <ModalFooter>
             <ButtonGroup>
-              <Button variant="secondary" onClick={onClose}>Cancel</Button>
+              <Button variant="secondary" onClick={onClose}>
+                Cancel
+              </Button>
               <Button onClick={onClose} data-testid="jwks-update-button">
                 Update
               </Button>

diff --git a/src/nextapp/components/access-request-form/public-key-dialog.tsx b/src/nextapp/components/access-request-form/public-key-dialog.tsx
@@ -20,12 +20,14 @@ import CopyButton from '../copy-button/copy-button';
 
 interface PublicKeyDialogProps {
   id: string;
+  clientCertificate: string;
   isOpen: boolean;
   onClose: () => void;
 }
 
 const PublicKeyDialog: React.FC<PublicKeyDialogProps> = ({
   id,
+  clientCertificate,
   isOpen,
   onClose,
 }) => {
@@ -55,6 +57,7 @@ const PublicKeyDialog: React.FC<PublicKeyDialogProps> = ({
                     height="64px"
                     name="publicKey"
                     variant="bc-input"
+                    value={clientCertificate}
                   />
                   <CopyButton value="alskdfjalsjfalskdfjlsdkj" />
                 </Flex>

diff --git a/src/nextapp/pages/devportal/access/index.tsx b/src/nextapp/pages/devportal/access/index.tsx
@@ -88,6 +88,7 @@ const query = gql`
       id
       name
       active
+      credentialReference
       application {
         name
       }
@@ -99,6 +100,9 @@ const query = gql`
           id
           name
         }
+        credentialIssuer {
+          clientAuthenticator
+        }
       }
     }
     myAccessRequests(

diff --git a/src/services/workflow/generate-credential.ts b/src/services/workflow/generate-credential.ts
@@ -144,9 +144,11 @@ export const generateCredential = async (
       consumer.id
     );
 
-    const credentialReference = {
+    const credentialReference: CredentialReference = {
       id: newClient.client.id,
       clientId: newClient.client.clientId,
+      clientCertificate: controls.clientCertificate,
+      jwksUrl: controls.jwksUrl,
     };
     // Create a ServiceAccess record
     const consumerType = 'client';

diff --git a/src/services/workflow/types.ts b/src/services/workflow/types.ts
@@ -23,8 +23,11 @@ export interface NewCredential {
 }
 
 export interface CredentialReference {
+  id?: string;
   keyAuthPK?: string;
   clientId?: string;
+  clientCertificate?: string;
+  jwksUrl?: string;
 }
 
 // Subject Identity when a Product is requested using the Authentication Code Flow