From dc68dfad85ee9bdc4ac18a93b43d52b385b53397 Mon Sep 17 00:00:00 2001 From: Susmitha Girumala Date: Tue, 15 Sep 2020 11:00:00 -0400 Subject: [PATCH 1/7] test: Add missing account serializer test Delete account password attribute in mirage to mimic API exactly --- addons/api/tests/unit/models/account-test.js | 11 ------ .../tests/unit/serializers/account-test.js | 38 +++++++++++++++++++ ui/core/mirage/serializers/account.js | 1 + 3 files changed, 39 insertions(+), 11 deletions(-) create mode 100644 addons/api/tests/unit/serializers/account-test.js diff --git a/addons/api/tests/unit/models/account-test.js b/addons/api/tests/unit/models/account-test.js index 4237ae6b6..dcd3fe8bb 100644 --- a/addons/api/tests/unit/models/account-test.js +++ b/addons/api/tests/unit/models/account-test.js @@ -4,21 +4,10 @@ import { setupTest } from 'ember-qunit'; module('Unit | Model | account', function(hooks) { setupTest(hooks); - // Replace this with your real tests. test('it exists', function(assert) { let store = this.owner.lookup('service:store'); let model = store.createRecord('account', {}); assert.ok(model); }); - test('it contains attributes', function(assert) { - let store = this.owner.lookup('service:store'); - let model = store.createRecord('account', { - type: 'password', - attributes: { - login_name: 'loginname' - } - }); - assert.equal(model.attributes.login_name, 'loginname'); - }); }); diff --git a/addons/api/tests/unit/serializers/account-test.js b/addons/api/tests/unit/serializers/account-test.js new file mode 100644 index 000000000..9ab5b521c --- /dev/null +++ b/addons/api/tests/unit/serializers/account-test.js @@ -0,0 +1,38 @@ +import { module, test } from 'qunit'; +import { setupTest } from 'ember-qunit'; + +module('Unit | Serializer | account', function(hooks) { + setupTest(hooks); + + test('it serializes account', function (assert) { + assert.expect(1); + const store = this.owner.lookup('service:store'); + const serializer = store.serializerFor('account'); + const record = store.createRecord('account', { + type: 'password', + name: 'Name', + description: 'Description', + attributes: { + login_name: 'Login Name', + password: 'Password', + }, + auth_method_id: '1', + version: 1 + }); + const snapshot = record._createSnapshot(); + snapshot.adapterOptions = {}; + const serializedRecord = serializer.serialize(snapshot); + assert.deepEqual(serializedRecord, { + type: 'password', + name: 'Name', + description: 'Description', + attributes: { + login_name: 'Login Name', + password: 'Password', + }, + auth_method_id: '1', + version: 1 + }); + }); + +}); diff --git a/ui/core/mirage/serializers/account.js b/ui/core/mirage/serializers/account.js index 7c6186756..85d38851b 100644 --- a/ui/core/mirage/serializers/account.js +++ b/ui/core/mirage/serializers/account.js @@ -6,6 +6,7 @@ export default ApplicationSerializer.extend({ _hashForModel(model) { const json = ApplicationSerializer.prototype._hashForModel.apply(this, arguments); json.auth_method_id = model.authMethodId; + delete json.attributes?.password; return json; } }); From 5643db1eabe61a5738c25c35db156bd0af59fcc2 Mon Sep 17 00:00:00 2001 From: Susmitha Girumala Date: Tue, 15 Sep 2020 12:25:13 -0400 Subject: [PATCH 2/7] fix: Mirage set-password should use attributes for update --- ui/core/mirage/config.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ui/core/mirage/config.js b/ui/core/mirage/config.js index 62cb242b7..f3a7cda5f 100644 --- a/ui/core/mirage/config.js +++ b/ui/core/mirage/config.js @@ -63,11 +63,12 @@ export default function() { const method = idMethod.split(':')[1]; const account = accounts.find(id); const updatedAttrs = { - version: attrs.version + version: attrs.version, + attributes: {} }; // Set new password if (method === 'set-password') { - updatedAttrs.password = accounts.attributes.password; + updatedAttrs.attributes.password = attrs.password; } return account.update(updatedAttrs); }); From cd6d18d16483b1d5508ccc7f40d54ea36d0ef138 Mon Sep 17 00:00:00 2001 From: Randall Morey Date: Tue, 15 Sep 2020 16:36:40 -0400 Subject: [PATCH 3/7] =?UTF-8?q?chore:=20=F0=9F=A4=96=20add=20target=20defa?= =?UTF-8?q?ult=5Fport=20field=20to=20API=20and=20UI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../models/fragment-target-attributes.js | 10 +++++++ addons/api/addon/models/target.js | 8 +++++- .../app/models/fragment-target-attributes.js | 1 + .../api/tests/unit/serializers/target-test.js | 5 +++- ui/core/app/components/form/target/index.hbs | 27 +++++++++++++++---- ui/core/mirage/factories/target.js | 14 ++++++++++ ui/core/translations/en-us.yaml | 1 + 7 files changed, 59 insertions(+), 7 deletions(-) create mode 100644 addons/api/addon/models/fragment-target-attributes.js create mode 100644 addons/api/app/models/fragment-target-attributes.js diff --git a/addons/api/addon/models/fragment-target-attributes.js b/addons/api/addon/models/fragment-target-attributes.js new file mode 100644 index 000000000..1ab994d9d --- /dev/null +++ b/addons/api/addon/models/fragment-target-attributes.js @@ -0,0 +1,10 @@ +import Fragment from 'ember-data-model-fragments/fragment'; +import { attr } from '@ember-data/model'; + +export default class FragmentTargetAttributesModel extends Fragment { + + @attr('number', { + description: 'The default port a target should use if present.' + }) default_port; + +} diff --git a/addons/api/addon/models/target.js b/addons/api/addon/models/target.js index 03a3ad5d7..57b87ff29 100644 --- a/addons/api/addon/models/target.js +++ b/addons/api/addon/models/target.js @@ -1,11 +1,17 @@ import GeneratedTargetModel from '../generated/models/target'; -import { fragmentArray } from 'ember-data-model-fragments/attributes'; +import { fragment, fragmentArray } from 'ember-data-model-fragments/attributes'; import { computed } from '@ember/object'; export default class TargetModel extends GeneratedTargetModel { // =attributes + /** + * Attributes of this resource, if any, represented as a JSON fragment. + * @type {FragmentTargetAttributesModel} + */ + @fragment('fragment-target-attributes', { defaultValue: {} }) attributes; + /** * @type {[FragmentHostSetModel]} */ diff --git a/addons/api/app/models/fragment-target-attributes.js b/addons/api/app/models/fragment-target-attributes.js new file mode 100644 index 000000000..41eb7d88f --- /dev/null +++ b/addons/api/app/models/fragment-target-attributes.js @@ -0,0 +1 @@ +export { default } from 'api/models/fragment-target-attributes'; diff --git a/addons/api/tests/unit/serializers/target-test.js b/addons/api/tests/unit/serializers/target-test.js index 94cab05e5..e129331eb 100644 --- a/addons/api/tests/unit/serializers/target-test.js +++ b/addons/api/tests/unit/serializers/target-test.js @@ -30,7 +30,10 @@ module('Unit | Serializer | target', function(hooks) { description: 'Description', version: 1, type: 'tcp', - scope_id: 'org_1' + scope_id: 'org_1', + attributes: { + default_port: null + } }); }); diff --git a/ui/core/app/components/form/target/index.hbs b/ui/core/app/components/form/target/index.hbs index a6e5a204e..5a977d2e4 100644 --- a/ui/core/app/components/form/target/index.hbs +++ b/ui/core/app/components/form/target/index.hbs @@ -14,11 +14,10 @@ {{#if @model.errors.name}} @@ -31,12 +30,10 @@ {{#if @model.errors.description}} @@ -47,6 +44,26 @@ {{/if}} + {{!-- TODO this is a type-specific field --}} + + {{!-- TODO need to figure out how to reference `attributes.errors` here --}} + {{#if @model.errors.default_port}} + + {{#each @model.errors.default_port as |error|}} + {{error.message}} + {{/each}} + + {{/if}} + + Math.random() < chance; const hostSetChance = 0.3; export default factory.extend({ + /** + * Generates attributes fields by type. + */ + afterCreate(target) { + if (target.type === 'tcp') { + target.update({ + attributes: { + default_port: random.number() + } + }); + } + }, + /** * Randomly selects existing host sets to assign to target. */ diff --git a/ui/core/translations/en-us.yaml b/ui/core/translations/en-us.yaml index 394f1e6ec..142c3577f 100644 --- a/ui/core/translations/en-us.yaml +++ b/ui/core/translations/en-us.yaml @@ -140,6 +140,7 @@ form: address: Address protocol: Protocol actions: Actions + default_port: Default Port errors: titles: unauthenticated-error: You are not signed in From d9353bdc3b3164961702f8646da6a40ef47a6793 Mon Sep 17 00:00:00 2001 From: Susmitha Girumala Date: Tue, 15 Sep 2020 16:51:07 -0400 Subject: [PATCH 4/7] fix: Remove password attribute from account model --- addons/api/addon/models/account.js | 25 +++++++ .../models/fragment-account-attributes.js | 3 - addons/api/addon/serializers/account.js | 39 +++++++++++ addons/api/app/serializers/account.js | 1 + .../tests/unit/serializers/account-test.js | 67 +++++++++++++++++-- 5 files changed, 126 insertions(+), 9 deletions(-) create mode 100644 addons/api/addon/serializers/account.js create mode 100644 addons/api/app/serializers/account.js diff --git a/addons/api/addon/models/account.js b/addons/api/addon/models/account.js index 76321d86d..4c16a34a4 100644 --- a/addons/api/addon/models/account.js +++ b/addons/api/addon/models/account.js @@ -9,4 +9,29 @@ export default class AccountModel extends GeneratedAccountModel { */ @fragment('fragment-account-attributes', { defaultValue: {} }) attributes; + // =methods + + /** + * Save account password via the `set-password` method. + * See serializer and adapter for more information. + * @param {string} password + * @param {object} options + * @param {object} options.adapterOptions + * @return {Promise} + */ + savePassword(password, options={ adapterOptions: {} }) { + const defaultAdapterOptions = { + method: 'set-password', + serializeWithNewPassword: true, + password + }; + return this.save({ + ...options, + adapterOptions: { + ...defaultAdapterOptions, + ...options.adapterOptions + } + }); + } + } diff --git a/addons/api/addon/models/fragment-account-attributes.js b/addons/api/addon/models/fragment-account-attributes.js index ee2281f18..76ee82487 100644 --- a/addons/api/addon/models/fragment-account-attributes.js +++ b/addons/api/addon/models/fragment-account-attributes.js @@ -7,7 +7,4 @@ export default class FragmentAccountAttributesModel extends Fragment { description: 'The account login name' }) login_name; - @attr('string', { - description: 'The account password' - }) password; } diff --git a/addons/api/addon/serializers/account.js b/addons/api/addon/serializers/account.js new file mode 100644 index 000000000..acad9cb7e --- /dev/null +++ b/addons/api/addon/serializers/account.js @@ -0,0 +1,39 @@ +import ApplicationSerializer from './application'; +import { get } from '@ember/object'; + +export default class AccountSerializer extends ApplicationSerializer { + + // =methods + + /** + * If `adapterOptions.serializeWithNewPassword` is true, the serialization should + * include **password** and the version. + * If `adapterOptions.password` is set, the serialization should + * include **password** in it's `attributes`. + * @override + * @param {Snapshot} snapshot + * @return {object} + */ + serialize(snapshot) { + const password = get(snapshot, 'adapterOptions.password'); + const serializeWithNewPassword = get(snapshot, 'adapterOptions.serializeWithNewPassword'); + let serialized = super.serialize(...arguments); + if (password) serialized.attributes.password = password; + if (serializeWithNewPassword) serialized = this.serializeWithNewPassword(snapshot, password) + return serialized; + } + + /** + * Returns a payload containing only new password. + * @param {Snapshot} snapshot + * @param {string} password + * @return {object} + */ + serializeWithNewPassword(snapshot, password) { + return { + version: snapshot.attr('version'), + password, + }; + } + +} diff --git a/addons/api/app/serializers/account.js b/addons/api/app/serializers/account.js new file mode 100644 index 000000000..af9b2cc1c --- /dev/null +++ b/addons/api/app/serializers/account.js @@ -0,0 +1 @@ +export { default } from 'api/serializers/account'; diff --git a/addons/api/tests/unit/serializers/account-test.js b/addons/api/tests/unit/serializers/account-test.js index 9ab5b521c..7a523d9dd 100644 --- a/addons/api/tests/unit/serializers/account-test.js +++ b/addons/api/tests/unit/serializers/account-test.js @@ -4,19 +4,18 @@ import { setupTest } from 'ember-qunit'; module('Unit | Serializer | account', function(hooks) { setupTest(hooks); - test('it serializes account', function (assert) { + test('it serializes normally', function (assert) { assert.expect(1); const store = this.owner.lookup('service:store'); const serializer = store.serializerFor('account'); const record = store.createRecord('account', { type: 'password', name: 'Name', + auth_method_id: '1', description: 'Description', attributes: { login_name: 'Login Name', - password: 'Password', }, - auth_method_id: '1', version: 1 }); const snapshot = record._createSnapshot(); @@ -25,14 +24,70 @@ module('Unit | Serializer | account', function(hooks) { assert.deepEqual(serializedRecord, { type: 'password', name: 'Name', + auth_method_id: '1', description: 'Description', attributes: { - login_name: 'Login Name', - password: 'Password', + login_name: 'Login Name' }, - auth_method_id: '1', version: 1 }); }); + test('it serializes password attribute when `adapterOptions.password` is true', function (assert) { + assert.expect(1); + const store = this.owner.lookup('service:store'); + const serializer = store.serializerFor('account'); + const record = store.createRecord('account', { + type: 'password', + name: 'Name', + auth_method_id: '1', + description: 'Description', + attributes: { + login_name: 'Login Name', + }, + version: 1 + }); + const snapshot = record._createSnapshot(); + snapshot.adapterOptions = { + password: 'Password' + }; + const serializedRecord = serializer.serialize(snapshot); + assert.deepEqual(serializedRecord, { + type: 'password', + name: 'Name', + auth_method_id: '1', + description: 'Description', + attributes: { + login_name: 'Login Name', + password: 'Password' + }, + version: 1 + }); + }); + + test('it serializes only password when `adapterOptions.serializeWithNewPassword` is true', function (assert) { + assert.expect(1); + const store = this.owner.lookup('service:store'); + const serializer = store.serializerFor('account'); + const record = store.createRecord('account', { + type: 'password', + name: 'Name', + description: 'Description', + attributes: { + login_name: 'Login Name' + }, + auth_method_id: '1', + version: 1 + }); + const snapshot = record._createSnapshot(); + snapshot.adapterOptions = { + serializeWithNewPassword: true, + password: 'Password' + }; + const serializedRecord = serializer.serialize(snapshot); + assert.deepEqual(serializedRecord, { + password: 'Password', + version: 1 + }); + }); }); From b6c91ede402e93baf09cdebd1130746cc6085c7a Mon Sep 17 00:00:00 2001 From: Susmitha Girumala Date: Tue, 15 Sep 2020 17:02:36 -0400 Subject: [PATCH 5/7] test: Remove inverse relation in auth-method --- ui/core/mirage/config.js | 2 +- ui/core/mirage/models/auth-method.js | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/ui/core/mirage/config.js b/ui/core/mirage/config.js index f3a7cda5f..7f2ea5ba0 100644 --- a/ui/core/mirage/config.js +++ b/ui/core/mirage/config.js @@ -64,7 +64,7 @@ export default function() { const account = accounts.find(id); const updatedAttrs = { version: attrs.version, - attributes: {} + attributes: account.attributes }; // Set new password if (method === 'set-password') { diff --git a/ui/core/mirage/models/auth-method.js b/ui/core/mirage/models/auth-method.js index 878b8bd8a..3aebcb472 100644 --- a/ui/core/mirage/models/auth-method.js +++ b/ui/core/mirage/models/auth-method.js @@ -2,7 +2,6 @@ import { Model, belongsTo, hasMany} from 'ember-cli-mirage'; export default Model.extend({ - scope: belongsTo(), - accounts: hasMany('account') + scope: belongsTo() }); From 6549e094c1703210507e6cea19dbcbb76e1a1bc4 Mon Sep 17 00:00:00 2001 From: Susmitha Girumala Date: Tue, 15 Sep 2020 17:06:33 -0400 Subject: [PATCH 6/7] fix: Remove unused 'hasMany' import in auth-method mirage --- ui/core/mirage/models/auth-method.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/core/mirage/models/auth-method.js b/ui/core/mirage/models/auth-method.js index 3aebcb472..08b1f5ad3 100644 --- a/ui/core/mirage/models/auth-method.js +++ b/ui/core/mirage/models/auth-method.js @@ -1,4 +1,4 @@ -import { Model, belongsTo, hasMany} from 'ember-cli-mirage'; +import { Model, belongsTo } from 'ember-cli-mirage'; export default Model.extend({ From 72e5ad601c114d34497e7df862a1fb648ef4b0e8 Mon Sep 17 00:00:00 2001 From: Susmitha Girumala Date: Tue, 15 Sep 2020 18:11:23 -0400 Subject: [PATCH 7/7] refactor: Remove serializeWithNewPassword adapteroptions --- addons/api/addon/models/account.js | 3 +-- addons/api/addon/serializers/account.js | 16 ++++++++-------- .../api/tests/unit/serializers/account-test.js | 8 ++++++-- 3 files changed, 15 insertions(+), 12 deletions(-) diff --git a/addons/api/addon/models/account.js b/addons/api/addon/models/account.js index 4c16a34a4..4c52347f5 100644 --- a/addons/api/addon/models/account.js +++ b/addons/api/addon/models/account.js @@ -19,10 +19,9 @@ export default class AccountModel extends GeneratedAccountModel { * @param {object} options.adapterOptions * @return {Promise} */ - savePassword(password, options={ adapterOptions: {} }) { + setPassword(password, options={ adapterOptions: {} }) { const defaultAdapterOptions = { method: 'set-password', - serializeWithNewPassword: true, password }; return this.save({ diff --git a/addons/api/addon/serializers/account.js b/addons/api/addon/serializers/account.js index acad9cb7e..c014c2361 100644 --- a/addons/api/addon/serializers/account.js +++ b/addons/api/addon/serializers/account.js @@ -1,13 +1,12 @@ import ApplicationSerializer from './application'; -import { get } from '@ember/object'; export default class AccountSerializer extends ApplicationSerializer { // =methods /** - * If `adapterOptions.serializeWithNewPassword` is true, the serialization should - * include **password** and the version. + * If `adapterOptions.method` is `set-password`, the serialization should + * include only **password** and the version. * If `adapterOptions.password` is set, the serialization should * include **password** in it's `attributes`. * @override @@ -15,11 +14,12 @@ export default class AccountSerializer extends ApplicationSerializer { * @return {object} */ serialize(snapshot) { - const password = get(snapshot, 'adapterOptions.password'); - const serializeWithNewPassword = get(snapshot, 'adapterOptions.serializeWithNewPassword'); + const password = snapshot?.adapterOptions?.password; let serialized = super.serialize(...arguments); - if (password) serialized.attributes.password = password; - if (serializeWithNewPassword) serialized = this.serializeWithNewPassword(snapshot, password) + if (password && snapshot?.record?.isNew) serialized.attributes.password = password; + if (snapshot?.adapterOptions?.method === 'set-password') { + serialized = this.serializeForSetPassword(snapshot, password); + } return serialized; } @@ -29,7 +29,7 @@ export default class AccountSerializer extends ApplicationSerializer { * @param {string} password * @return {object} */ - serializeWithNewPassword(snapshot, password) { + serializeForSetPassword(snapshot, password) { return { version: snapshot.attr('version'), password, diff --git a/addons/api/tests/unit/serializers/account-test.js b/addons/api/tests/unit/serializers/account-test.js index 7a523d9dd..85f9b655f 100644 --- a/addons/api/tests/unit/serializers/account-test.js +++ b/addons/api/tests/unit/serializers/account-test.js @@ -65,7 +65,11 @@ module('Unit | Serializer | account', function(hooks) { }); }); - test('it serializes only password when `adapterOptions.serializeWithNewPassword` is true', function (assert) { + test('it does not serialize password for non-new records', function (assert) { + assert.expect(0); + }); + + test('it serializes only password when `adapterOptions.method` is set to `set-password`', function (assert) { assert.expect(1); const store = this.owner.lookup('service:store'); const serializer = store.serializerFor('account'); @@ -81,7 +85,7 @@ module('Unit | Serializer | account', function(hooks) { }); const snapshot = record._createSnapshot(); snapshot.adapterOptions = { - serializeWithNewPassword: true, + method: 'set-password', password: 'Password' }; const serializedRecord = serializer.serialize(snapshot);