Skip to content

Commit c20d2fe

Browse files
hc-github-team-secure-vault-corehc-github-team-secure-vault-core
committed
Merge remote-tracking branch 'remotes/from/ce/main'
2 parents 809516b + 52ad6dd commit c20d2fe

33 files changed

Lines changed: 571 additions & 124 deletions

File tree

‎changelog/_16976.txt‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:bug
2+
oauth-resource-server (enterprise): OAuth Resource Server authorization now treats an empty `authorization_details` array like an absent claim when authorization details are optional. Previously, tokens containing an empty array were rejected with `RAR_NO_MATCH` instead of continuing through normal identity and policy authorization.
3+
```

‎ui/app/components/auth-config-form/options.hbs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@
1111
{{#each @form.tuneFields as |field|}}
1212
<FormField data-test-field @attr={{field}} @model={{@form}} />
1313
{{#if (and (eq field.name "config.listing_visibility") this.directLoginLink)}}
14-
<div class="has-top-margin-negative-s has-bottom-margin-l is-flex-center">
14+
<Hds::Layout::Flex @align="center" @gap="8" class="has-top-margin-negative-s has-bottom-margin-l">
1515
<Hds::Text::Body @tag="p" @color="faint">UI login link:</Hds::Text::Body>
1616
<Hds::Copy::Snippet @textToCopy={{this.directLoginLink}} />
17-
</div>
17+
</Hds::Layout::Flex>
1818
{{/if}}
1919
{{/each}}
2020

‎ui/app/components/console/log-command.hbs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
SPDX-License-Identifier: BUSL-1.1
44
}}
55

6-
<div class="is-flex-center">
6+
<Hds::Layout::Flex @align="center" @gap="8">
77
<Icon @name="chevron-right" />
88
<pre class="console-ui-command">{{@content}}</pre>
9-
</div>
9+
</Hds::Layout::Flex>

‎ui/app/components/dashboard/widgets/replication.hbs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
SPDX-License-Identifier: BUSL-1.1
44
}}
55
<div data-test-card="replication" ...attributes>
6-
<div class="is-flex-between">
6+
<Hds::Layout::Flex @justify="space-between" @align="center">
77
<Hds::Text::Display @size="300" data-test-text-display="Cluster replication">Cluster replication</Hds::Text::Display>
88

99
{{#if (or @replication.dr.clusterId @replication.performance.clusterId)}}
@@ -23,7 +23,7 @@
2323
data-test-link-to="Enable replication"
2424
/>
2525
{{/if}}
26-
</div>
26+
</Hds::Layout::Flex>
2727

2828
<div class="has-top-margin-s">
2929
<Hds::Text::Body @tag="p" @size="100" @color="faint">

‎ui/app/components/get-credentials-card.hbs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55

66
<Hds::Card::Container @level="mid" @hasBorder={{true}} class="has-padding-l" ...attributes>
77
<form {{on "submit" this.transitionToCredential}}>
8-
<div class="is-flex-between is-fullwidth">
8+
<Hds::Layout::Flex @justify="space-between" class="is-fullwidth">
99
<h3 class="title is-5">{{@title}}</h3>
10-
</div>
10+
</Hds::Layout::Flex>
1111
<p class="has-top-margin-s has-bottom-margin-xs has-text-weight-semibold">{{@searchLabel}}</p>
1212
<SearchSelect
1313
@id="search-input-role"

‎ui/app/components/mfa/method-list-item.hbs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
>
1111
<div class="level is-mobile">
1212
<div class="level-left">
13-
<div class="is-flex-row">
13+
<Hds::Layout::Flex @direction="row" @align="center" @gap="16" as |LF|>
1414
<Hds::Icon @size="24" @name={{@model.icon}} class="has-text-grey" data-test-mfa-method-list-icon={{@model.type}} />
15-
<div>
15+
<LF.Item @grow={{true}} @shrink={{true}}>
1616
<span class="has-text-weight-semibold has-text-black">
1717
{{@model.displayName}}
1818
</span>
@@ -25,8 +25,8 @@
2525
</code>
2626
</div>
2727
{{/if}}
28-
</div>
29-
</div>
28+
</LF.Item>
29+
</Hds::Layout::Flex>
3030
</div>
3131
<div class="level-right is-flex is-paddingless is-marginless">
3232
<div class="level-item">

‎ui/app/components/okta-number-challenge.hbs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@
1919
{{@correctAnswer}}
2020
</h1>
2121
{{else}}
22-
<div class="has-top-margin-l has-bottom-margin-m is-flex-row">
22+
<Hds::Layout::Flex @direction="row" @align="center" @gap="8" class="has-top-margin-l has-bottom-margin-m">
2323
<Hds::Icon @name="loading" @isInline={{true}} />
24-
<p class="has-left-margin-xs" data-test-loading>Please wait...</p>
25-
</div>
24+
<p data-test-loading>Please wait...</p>
25+
</Hds::Layout::Flex>
2626
{{/if}}
2727
</div>
2828
<Hds::Button

‎ui/app/utils/constants/capabilities.ts‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,10 +83,16 @@ export const PATH_MAP = {
8383
pkiTidyStatus: apiPath`${'backend'}/tidy/status`,
8484
pkiExternalConfigAcmeAccount: apiPath`${'backend'}/config/acme-account`,
8585
pkiExternalConfigDns: apiPath`${'backend'}/config/dns`,
86+
pkiExternalLookupCert: apiPath`${'backend'}/lookup/cert/*`, // Use glob since serial numbers are generated
87+
pkiExternalLookupOrder: apiPath`${'backend'}/lookup/order/*`, // Use glob since order IDs are generated
8688
pkiExternalLookupOrders: apiPath`${'backend'}/lookup/orders`,
8789
pkiExternalLookupOrdersRecent: apiPath`${'backend'}/lookup/orders/recent`,
88-
pkiExternalRole: apiPath`${'backend'}/role`,
90+
pkiExternalRoleList: apiPath`${'backend'}/role`,
91+
pkiExternalRole: apiPath`${'backend'}/role/${'roleName'}`,
8992
pkiExternalRoleActiveOrders: apiPath`${'backend'}/role/${'roleName'}/active-orders`,
93+
pkiExternalRoleOrderStatus: apiPath`${'backend'}/role/${'roleName'}/order/+/status`, // Use wildcard since order IDs are generated
94+
pkiExternalRoleOrderFetchCert: apiPath`${'backend'}/role/${'roleName'}/order/+/fetch-cert`, // Use wildcard since order IDs are generated
95+
pkiExternalRoleCachedCert: apiPath`${'backend'}/role/${'roleName'}/cached`,
9096
policy: apiPath`sys/policies/${'policyType'}/${'id'}`,
9197
policies: apiPath`sys/policies`,
9298
sshCredentials: apiPath`${'backend'}/creds/${'id'}`,

‎ui/lib/core/addon/components/form/v2/apply.hbs‎

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -49,28 +49,26 @@
4949
@hasCopyButton={{true}}
5050
data-test-field="terraform"
5151
/>
52-
<div class="is-flex-end has-top-margin-l has-bottom-margin-s">
53-
<div>
54-
<DownloadButton
55-
@color="secondary"
56-
@filename="vault-resources"
57-
@data={{this.tfSnippet}}
58-
@extension="tf"
59-
@stringify={{true}}
60-
@text="Export as tf file"
61-
/>
62-
</div>
63-
</div>
52+
<Hds::Layout::Flex @justify="end" class="has-top-margin-l has-bottom-margin-s">
53+
<DownloadButton
54+
@color="secondary"
55+
@filename="vault-resources"
56+
@data={{this.tfSnippet}}
57+
@extension="tf"
58+
@stringify={{true}}
59+
@text="Export as tf file"
60+
/>
61+
</Hds::Layout::Flex>
6462
{{/if}}
6563
</Hds::Card::Container>
6664
{{/unless}}
6765

68-
<div class="is-flex-center is-flex-between">
66+
<Hds::Layout::Flex @justify="space-between" @align="center">
6967
<Hds::Button @text="Back" @color="tertiary" @icon="chevron-left" {{on "click" @onBack}} />
7068
<div>
7169
<Hds::Button @text="Done & exit" @color="secondary" {{on "click" @onDone}} />
7270
{{#if (eq this.creationMethodChoice this.methods.UI)}}
7371
<Hds::Button @text="Apply changes" @color="primary" {{on "click" @onApply}} />
7472
{{/if}}
7573
</div>
76-
</div>
74+
</Hds::Layout::Flex>

‎ui/lib/core/addon/utils/all-engines-metadata.ts‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -259,9 +259,7 @@ export const ALL_ENGINES: EngineDisplayData[] = [
259259
{
260260
pluginCategory: 'generic',
261261
displayName: 'Public PKI',
262-
isConfigurable: true,
263262
engineRoute: 'pki.external.overview',
264-
configRoute: 'pki.external.configuration',
265263
glyph: 'certificate',
266264
mountCategory: ['secret'],
267265
requiresEnterprise: true,

0 commit comments

Comments
 (0)