scottk/vault
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/vault.git synced 2025-11-01 02:57:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into ui/VAULT-20170/prep-ember-data-upgrade-ids

Browse Source
This commit is contained in:
Angel Garbarino
2024-01-08 13:36:26 -08:00
committed by GitHub
parent da0b12dcb5 9088f2b1b7
commit 7dcb157acc
7 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ui/app/models/control-group.js
View File

@@ -10,8 +10,8 @@ import lazyCapabilities, { apiPath } from 'vault/macros/lazy-capabilities';
export default Model.extend({ export default Model.extend({
approved: attr('boolean'), approved: attr('boolean'),
requestPath: attr('string'), requestPath: attr('string'),
requestEntity: belongsTo('identity/entity', { async: false }), requestEntity: belongsTo('identity/entity', { async: false, inverse: null }),
authorizations: hasMany('identity/entity', { async: false }), authorizations: hasMany('identity/entity', { async: false, inverse: null }),
authorizePath: lazyCapabilities(apiPath`sys/control-group/authorize`), authorizePath: lazyCapabilities(apiPath`sys/control-group/authorize`),
canAuthorize: alias('authorizePath.canUpdate'), canAuthorize: alias('authorizePath.canUpdate'),

2
ui/app/models/identity/entity-alias.js
View File

@@ -14,7 +14,7 @@ export default IdentityModel.extend({
formFields: computed(function () { formFields: computed(function () {
return ['name', 'mountAccessor']; return ['name', 'mountAccessor'];
}), }),
entity: belongsTo('identity/entity', { readOnly: true, async: false }), entity: belongsTo('identity/entity', { readOnly: true, async: false, inverse: 'aliases' }),
name: attr('string'), name: attr('string'),
canonicalId: attr('string'), canonicalId: attr('string'),

2
ui/app/models/identity/entity.js
View File

@@ -34,7 +34,7 @@ export default IdentityModel.extend({
lastUpdateTime: attr('string', { lastUpdateTime: attr('string', {
readOnly: true, readOnly: true,
}), }),
aliases: hasMany('identity/entity-alias', { async: false, readOnly: true }), aliases: hasMany('identity/entity-alias', { async: false, readOnly: true, inverse: 'entity' }),
groupIds: attr({ groupIds: attr({
readOnly: true, readOnly: true,
}), }),

2
ui/app/models/identity/group.js
View File

@@ -77,7 +77,7 @@ export default IdentityModel.extend({
), ),
policyPath: lazyCapabilities(apiPath`sys/policies`), policyPath: lazyCapabilities(apiPath`sys/policies`),
canCreatePolicies: alias('policyPath.canCreate'), canCreatePolicies: alias('policyPath.canCreate'),
alias: belongsTo('identity/group-alias', { async: false, readOnly: true }), alias: belongsTo('identity/group-alias', { async: false, readOnly: true, inverse: 'group' }),
updatePath: identityCapabilities(), updatePath: identityCapabilities(),
canDelete: alias('updatePath.canDelete'), canDelete: alias('updatePath.canDelete'),
canEdit: alias('updatePath.canUpdate'), canEdit: alias('updatePath.canUpdate'),

2
ui/app/models/kmip/ca.js
View File

@@ -6,7 +6,7 @@
import Model, { belongsTo, attr } from '@ember-data/model'; import Model, { belongsTo, attr } from '@ember-data/model';
export default Model.extend({ export default Model.extend({
config: belongsTo('kmip/config', { async: false }), config: belongsTo('kmip/config', { async: false, inverse: 'ca' }),
caPem: attr('string', { caPem: attr('string', {
label: 'CA PEM', label: 'CA PEM',
}), }),

2
ui/app/models/kmip/config.js
View File

@@ -10,7 +10,7 @@ import fieldToAttrs from 'vault/utils/field-to-attrs';
export default Model.extend({ export default Model.extend({
useOpenAPI: true, useOpenAPI: true,
ca: belongsTo('kmip/ca', { async: false }), ca: belongsTo('kmip/ca', { async: false, inverse: 'config' }),
getHelpUrl(path) { getHelpUrl(path) {
return `/v1/${path}/config?help=1`; return `/v1/${path}/config?help=1`;
}, },

6
ui/app/models/mfa-login-enforcement.js
View File

@@ -37,12 +37,12 @@ const validations = {
export default class MfaLoginEnforcementModel extends Model { export default class MfaLoginEnforcementModel extends Model {
@service store; @service store;
@attr('string') name; @attr('string') name;
@hasMany('mfa-method') mfa_methods; @hasMany('mfa-method', { async: true, inverse: null }) mfa_methods;
@attr('string') namespace_id; @attr('string') namespace_id;
@attr('array', { defaultValue: () => [] }) auth_method_accessors; // ["auth_approle_17a552c6"] @attr('array', { defaultValue: () => [] }) auth_method_accessors; // ["auth_approle_17a552c6"]
@attr('array', { defaultValue: () => [] }) auth_method_types; // ["userpass"] @attr('array', { defaultValue: () => [] }) auth_method_types; // ["userpass"]
@hasMany('identity/entity') identity_entities; @hasMany('identity/entity', { async: true, inverse: null }) identity_entities;
@hasMany('identity/group') identity_groups; @hasMany('identity/group', { async: true, inverse: null }) identity_groups;
get targets() { get targets() {
return ArrayProxy.extend(PromiseProxyMixin).create({ return ArrayProxy.extend(PromiseProxyMixin).create({