-
-
- Done
-
-
- Cancel
-
+{{! Show results if model has an ID, which is only generated after save }}
+{{#if @model.id}}
+
+ {{#if @model.privateKey}}
+
- {{#if this.invalidFormAlert}}
+ {{/if}}
+
+ {{#each this.returnedFields as |field|}}
+ {{#let (find-by "name" field @model.allFields) as |attr|}}
+ {{#if attr.options.detailLinkTo}}
+
+ {{get @model attr.name}}
+
+ {{else if attr.options.masked}}
+
+
+ {{else}}
+
+ {{#if @model.privateKey}}
+ internal
+ {{/if}}
+
+
+ {{or @model.privateKeyType "internal"}}
+
+
+
+{{else}}
+
-
\ No newline at end of file
+
+
+
+
+ Done
+
+
+ Cancel
+
+
+ {{#if this.invalidFormAlert}}
+
+ {{/if}}
+
+
+{{/if}}
\ No newline at end of file
diff --git a/ui/lib/pki/addon/components/pki-generate-root.js b/ui/lib/pki/addon/components/pki-generate-root.ts
similarity index 55%
rename from ui/lib/pki/addon/components/pki-generate-root.js
rename to ui/lib/pki/addon/components/pki-generate-root.ts
index 8f6743144..93f12728b 100644
--- a/ui/lib/pki/addon/components/pki-generate-root.js
+++ b/ui/lib/pki/addon/components/pki-generate-root.ts
@@ -4,34 +4,53 @@
*/
import { action } from '@ember/object';
+import RouterService from '@ember/routing/router-service';
import { service } from '@ember/service';
import { waitFor } from '@ember/test-waiters';
import Component from '@glimmer/component';
import { tracked } from '@glimmer/tracking';
import { task } from 'ember-concurrency';
+import PkiActionModel from 'vault/models/pki/action';
+import PkiUrlsModel from 'vault/models/pki/urls';
+import FlashMessageService from 'vault/services/flash-messages';
import errorMessage from 'vault/utils/error-message';
+interface AdapterOptions {
+ actionType: string;
+ useIssuer: boolean | undefined;
+}
+interface Args {
+ model: PkiActionModel;
+ urls: PkiUrlsModel;
+ onCancel: CallableFunction;
+ onComplete: CallableFunction;
+ onSave?: CallableFunction;
+ adapterOptions: AdapterOptions;
+}
+
/**
* @module PkiGenerateRoot
* PkiGenerateRoot shows only the fields valid for the generate root endpoint.
- * This form handles the model save and rollback actions, and will call the passed
- * onSave and onCancel args for transition (passed from parent).
- * NOTE: this component is not TS because decorator-added parameters (eg validator and
- * formFields) aren't recognized on the model.
+ * This component renders the form, handles the model save and rollback actions,
+ * and shows the resulting data on success. onCancel is required for the cancel
+ * transition, and if onSave is provided it will call that after save for any
+ * side effects in the parent.
*
* @example
* ```js
- *
+ *
* ```
*
* @param {Object} model - pki/action model.
* @callback onCancel - Callback triggered when cancel button is clicked, after model is unloaded
+ * @callback onSave - Optional - Callback triggered after model is saved, as a side effect. Results are shown on the same component
+ * @callback onComplete - Callback triggered when "Done" button clicked, on results view
* @param {Object} adapterOptions - object passed as adapterOptions on the model.save method
*/
-export default class PkiGenerateRootComponent extends Component {
- @service flashMessages;
- @service router;
- @tracked showGroup = null;
+export default class PkiGenerateRootComponent extends Component
{
+ @service declare readonly flashMessages: FlashMessageService;
+ @service declare readonly router: RouterService;
+
@tracked modelValidations = null;
@tracked errorBanner = '';
@tracked invalidFormAlert = '';
@@ -49,6 +68,19 @@ export default class PkiGenerateRootComponent extends Component {
];
}
+ get returnedFields() {
+ return [
+ 'certificate',
+ 'expiration',
+ 'issuerId',
+ 'issuerName',
+ 'issuingCa',
+ 'keyId',
+ 'keyName',
+ 'serialNumber',
+ ];
+ }
+
@action cancel() {
// Generate root form will always have a new model
this.args.model.unloadRecord();
@@ -68,19 +100,17 @@ export default class PkiGenerateRootComponent extends Component {
@task
@waitFor
- *save(event) {
+ *save(event: Event) {
event.preventDefault();
const continueSave = this.checkFormValidity();
if (!continueSave) return;
try {
yield this.setUrls();
- const result = yield this.args.model.save({ adapterOptions: this.args.adapterOptions });
+ yield this.args.model.save({ adapterOptions: this.args.adapterOptions });
this.flashMessages.success('Successfully generated root.');
- this.router.transitionTo(
- 'vault.cluster.secrets.backend.pki.issuers.issuer.details',
- result.backend,
- result.issuerId
- );
+ if (this.args.onSave) {
+ this.args.onSave();
+ }
} catch (e) {
this.errorBanner = errorMessage(e);
this.invalidFormAlert = 'There was a problem generating the root.';
diff --git a/ui/lib/pki/addon/components/pki-import-pem-bundle.hbs b/ui/lib/pki/addon/components/pki-import-pem-bundle.hbs
index 0fc6a7caa..0b799d97b 100644
--- a/ui/lib/pki/addon/components/pki-import-pem-bundle.hbs
+++ b/ui/lib/pki/addon/components/pki-import-pem-bundle.hbs
@@ -1,36 +1,87 @@
-
-
\ No newline at end of file
+
+ {{#each-in this.importedResponse as |issuer key|}}
+
+
+
+ {{#if issuer}}
+
+ {{issuer}}
+
+ {{else}}
+ None
+ {{/if}}
+
+
+ {{#if key}}
+
+ {{key}}
+
+ {{else}}
+ None
+ {{/if}}
+
+
+
+ {{/each-in}}
+
+
+{{else}}
+
+{{/if}}
\ No newline at end of file
diff --git a/ui/lib/pki/addon/components/pki-import-pem-bundle.ts b/ui/lib/pki/addon/components/pki-import-pem-bundle.ts
index b68e8cb68..3549ce314 100644
--- a/ui/lib/pki/addon/components/pki-import-pem-bundle.ts
+++ b/ui/lib/pki/addon/components/pki-import-pem-bundle.ts
@@ -33,8 +33,9 @@ interface AdapterOptions {
useIssuer: boolean | undefined;
}
interface Args {
- onSave: CallableFunction;
+ onSave?: CallableFunction;
onCancel: CallableFunction;
+ onComplete: CallableFunction;
model: PkiActionModel;
adapterOptions: AdapterOptions;
}
@@ -44,14 +45,28 @@ export default class PkiImportPemBundle extends Component
{
@tracked errorBanner = '';
+ get importedResponse() {
+ // mapping only exists after success
+ // TODO VAULT-14791: handle issuer already exists, but key doesn't -- empty object returned here
+ return this.args.model.mapping;
+ }
+
@task
@waitFor
*submitForm(event: Event) {
event.preventDefault();
+ this.errorBanner = '';
+ if (!this.args.model.pemBundle) {
+ this.errorBanner = 'please upload your PEM bundle';
+ return;
+ }
try {
yield this.args.model.save({ adapterOptions: this.args.adapterOptions });
this.flashMessages.success('Successfully imported data.');
- this.args.onSave();
+ // This component shows the results, but call `onSave` for any side effects on parent
+ if (this.args.onSave) {
+ this.args.onSave();
+ }
} catch (error) {
this.errorBanner = errorMessage(error);
}
diff --git a/ui/lib/pki/addon/templates/configuration/create.hbs b/ui/lib/pki/addon/templates/configuration/create.hbs
index 06fe28945..2c180aa03 100644
--- a/ui/lib/pki/addon/templates/configuration/create.hbs
+++ b/ui/lib/pki/addon/templates/configuration/create.hbs
@@ -1,15 +1,5 @@
-
-
-
-
-
- Configure PKI
-
-
-
-
-
-
-
-
-
- Generate intermediate CSR
-
-
-
-
-
-
-
-
-
- Generate root
-
-
-
-
-
-
-
-
-
- Import a CA
-
-
-
-;