Merge branch 'dev'

bcgov · Aug 25, 2021 · feb77c4 · feb77c4
2 parents 4a93073 + ed2338d
commit feb77c4
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 0 deletions.
diff --git a/src/nextapp/components/view-secret/view-secret.tsx b/src/nextapp/components/view-secret/view-secret.tsx
@@ -39,6 +39,7 @@ const ViewSecret: React.FC<ViewSecretProps> = ({ credentials }) => {
           { name: 'clientSecret', label: 'Client Secret' },
           { name: 'clientPrivateKey', label: 'Signing Private Key' },
           { name: 'clientPublicKey', label: 'Signing Public Certificate' },
+          { name: 'issuer', label: 'Issuer' },
           { name: 'tokenEndpoint', label: 'Token Endpoint' },
         ]
           .filter(

diff --git a/src/services/workflow/generate-credential.ts b/src/services/workflow/generate-credential.ts
@@ -179,6 +179,7 @@ export const generateCredential = async (
       clientSecret: controls.clientGenCertificate
         ? null
         : newClient.client.clientSecret,
+      issuer: controls.jwksUrl ? newClient.openid.issuer : null,
       tokenEndpoint: newClient.openid.token_endpoint,
       clientPublicKey: clientSigning.publicKey,
       clientPrivateKey: clientSigning.privateKey,

diff --git a/src/services/workflow/types.ts b/src/services/workflow/types.ts
@@ -6,6 +6,7 @@ export interface NewCredential {
   flow: string;
   clientId?: string;
   clientSecret?: string;
+  issuer?: string;
   tokenEndpoint?: string;
   apiKey?: string;
   clientPublicKey?: string;