diff --git a/addons/api/addon/generated/models/account.js b/addons/api/addon/generated/models/account.js index 2c34bd65f..f2dd7dcfb 100644 --- a/addons/api/addon/generated/models/account.js +++ b/addons/api/addon/generated/models/account.js @@ -13,11 +13,13 @@ export default class GeneratedAccountModel extends BaseModel { // =attributes @attr('string', { + readOnly: true, description: 'The type of the resource, to help differentiate schemas', }) type; @attr('string', { + readOnly: true, description: 'The owning auth method ID.', }) auth_method_id; diff --git a/addons/api/tests/unit/serializers/account-test.js b/addons/api/tests/unit/serializers/account-test.js index d630df393..1f00a9a74 100644 --- a/addons/api/tests/unit/serializers/account-test.js +++ b/addons/api/tests/unit/serializers/account-test.js @@ -32,9 +32,7 @@ module('Unit | Serializer | account', function (hooks) { const snapshot = record._createSnapshot(); const serializedRecord = serializer.serialize(snapshot); assert.deepEqual(serializedRecord, { - type: TYPE_AUTH_METHOD_OIDC, name: 'Name', - auth_method_id: '1', description: 'Description', version: 1, attributes: { @@ -70,9 +68,7 @@ module('Unit | Serializer | account', function (hooks) { const serializedRecord = serializer.serialize(snapshot); assert.notOk(serializedRecord.attributes); assert.deepEqual(serializedRecord, { - type: TYPE_AUTH_METHOD_OIDC, name: 'Name', - auth_method_id: '1', description: 'Description', version: 1, }); @@ -93,9 +89,7 @@ module('Unit | Serializer | account', function (hooks) { const snapshot = record._createSnapshot(); const serializedRecord = serializer.serialize(snapshot); assert.deepEqual(serializedRecord, { - type: TYPE_AUTH_METHOD_PASSWORD, name: 'Name', - auth_method_id: '1', description: 'Description', attributes: { login_name: 'Login Name', @@ -122,9 +116,7 @@ module('Unit | Serializer | account', function (hooks) { }; const serializedRecord = serializer.serialize(snapshot); assert.deepEqual(serializedRecord, { - type: TYPE_AUTH_METHOD_PASSWORD, name: 'Name', - auth_method_id: '1', description: 'Description', attributes: { login_name: 'Login Name', @@ -207,9 +199,7 @@ module('Unit | Serializer | account', function (hooks) { const snapshot = record._createSnapshot(); const serializedRecord = serializer.serialize(snapshot); assert.deepEqual(serializedRecord, { - type: TYPE_AUTH_METHOD_LDAP, name: 'Name', - auth_method_id: '1', description: 'Description', version: 1, attributes: { @@ -244,9 +234,8 @@ module('Unit | Serializer | account', function (hooks) { const snapshot = record._createSnapshot(); const serializedRecord = serializer.serialize(snapshot); assert.deepEqual(serializedRecord, { - type: TYPE_AUTH_METHOD_LDAP, name: 'Name', - auth_method_id: '1', + description: 'Description', version: 1, }); diff --git a/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/accounts/index.hbs b/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/accounts/index.hbs index c749f2ea8..735d4cdad 100644 --- a/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/accounts/index.hbs +++ b/ui/admin/app/templates/scopes/scope/auth-methods/auth-method/accounts/index.hbs @@ -46,10 +46,10 @@ @route='scopes.scope.auth-methods.auth-method.accounts.account' @model={{B.data.id}} > - {{B.data.accountName}} + {{B.data.displayName}} {{else}} - {{B.data.accountName}} + {{B.data.displayName}} {{/if}}

{{B.data.description}}