From 77e8f1166015b7d22a27e814b41b8562cf85d62e Mon Sep 17 00:00:00 2001 From: Randall Morey Date: Thu, 19 Nov 2020 14:42:23 -0500 Subject: [PATCH 1/2] =?UTF-8?q?refactor:=20=F0=9F=92=A1=20port=20error/mes?= =?UTF-8?q?sage=20component=20to=20core=20addon?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/addon/components/error/message/index.hbs | 0 .../core/addon/components/error/message/index.js | 0 addons/core/app/components/error/message.js | 1 + addons/core/package.json | 1 + .../tests/dummy/app/templates/application.hbs | 2 +- addons/core/tests/dummy/config/ember-intl.js | 4 ++-- .../integration/components/error/message-test.js | 0 yarn.lock | 15 +++++++++++---- 8 files changed, 16 insertions(+), 7 deletions(-) rename ui/admin/app/components/error/message.hbs => addons/core/addon/components/error/message/index.hbs (100%) rename ui/admin/app/components/error/message.js => addons/core/addon/components/error/message/index.js (100%) create mode 100644 addons/core/app/components/error/message.js rename {ui/admin => addons/core}/tests/integration/components/error/message-test.js (100%) diff --git a/ui/admin/app/components/error/message.hbs b/addons/core/addon/components/error/message/index.hbs similarity index 100% rename from ui/admin/app/components/error/message.hbs rename to addons/core/addon/components/error/message/index.hbs diff --git a/ui/admin/app/components/error/message.js b/addons/core/addon/components/error/message/index.js similarity index 100% rename from ui/admin/app/components/error/message.js rename to addons/core/addon/components/error/message/index.js diff --git a/addons/core/app/components/error/message.js b/addons/core/app/components/error/message.js new file mode 100644 index 000000000..055e64811 --- /dev/null +++ b/addons/core/app/components/error/message.js @@ -0,0 +1 @@ +export { default } from 'core/components/error/message'; \ No newline at end of file diff --git a/addons/core/package.json b/addons/core/package.json index f6961fa16..b6cc606c0 100644 --- a/addons/core/package.json +++ b/addons/core/package.json @@ -44,6 +44,7 @@ "ember-disable-prototype-extensions": "^1.1.3", "ember-export-application-global": "^2.0.1", "ember-get-config": "^0.3.0", + "ember-inline-svg": "^1.0.0", "ember-intl": "^5.5.0", "ember-load-initializers": "^2.1.1", "ember-maybe-import-regenerator": "^0.1.6", diff --git a/addons/core/tests/dummy/app/templates/application.hbs b/addons/core/tests/dummy/app/templates/application.hbs index 5230580f8..9c8163e59 100644 --- a/addons/core/tests/dummy/app/templates/application.hbs +++ b/addons/core/tests/dummy/app/templates/application.hbs @@ -1,3 +1,3 @@

Welcome to Ember

-{{outlet}} \ No newline at end of file +{{t "errors.401.title"}} diff --git a/addons/core/tests/dummy/config/ember-intl.js b/addons/core/tests/dummy/config/ember-intl.js index 2cb1c38c1..a5a3a93d5 100644 --- a/addons/core/tests/dummy/config/ember-intl.js +++ b/addons/core/tests/dummy/config/ember-intl.js @@ -25,7 +25,7 @@ module.exports = function (/* environment */) { * @type {String} * @default "'translations'" */ - inputPath: "translations", + inputPath: "../../translations", /** * Prevents the translations from being bundled with the application code. @@ -47,7 +47,7 @@ module.exports = function (/* environment */) { * @type {Boolean} * @default "false" */ - wrapTranslationsWithNamespace: false, + wrapTranslationsWithNamespace: true, /** * Cause a build error if ICU argument mismatches are detected between translations diff --git a/ui/admin/tests/integration/components/error/message-test.js b/addons/core/tests/integration/components/error/message-test.js similarity index 100% rename from ui/admin/tests/integration/components/error/message-test.js rename to addons/core/tests/integration/components/error/message-test.js diff --git a/yarn.lock b/yarn.lock index da2d17406..f16a1bd39 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7489,10 +7489,10 @@ debug@3.1.0, debug@~3.1.0: dependencies: ms "2.0.0" -debug@4, debug@^4.0.0, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.2.0: - version "4.2.0" - resolved "https://registry.yarnpkg.com/debug/-/debug-4.2.0.tgz#7f150f93920e94c58f5574c2fd01a3110effe7f1" - integrity sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg== +debug@4: + version "4.3.1" + resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.1.tgz#f0d229c505e0c6d8c49ac553d1b13dc183f6b2ee" + integrity sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ== dependencies: ms "2.1.2" @@ -7503,6 +7503,13 @@ debug@^3.0.0, debug@^3.0.1, debug@^3.1.0, debug@^3.1.1, debug@^3.2.6: dependencies: ms "^2.1.1" +debug@^4.0.0, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.2.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/debug/-/debug-4.2.0.tgz#7f150f93920e94c58f5574c2fd01a3110effe7f1" + integrity sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg== + dependencies: + ms "2.1.2" + debug@~4.1.0: version "4.1.1" resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791" From 4b0b4bdbcd8fb9d5b637f6b1649625e72ae56725 Mon Sep 17 00:00:00 2001 From: Randall Morey Date: Thu, 19 Nov 2020 15:31:19 -0500 Subject: [PATCH 2/2] =?UTF-8?q?refactor:=20=F0=9F=92=A1=20port=20app-level?= =?UTF-8?q?=20auth=20concerns=20into=20core=20addon?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../app => addons/core/addon}/authenticators/password.js | 3 +++ .../core/addon}/session-stores/application.js | 0 addons/core/app/authenticators/password.js | 1 + addons/core/app/session-stores/application.js | 1 + addons/core/package.json | 8 ++++++++ addons/core/tests/dummy/config/environment.js | 9 +++++++++ .../core}/tests/unit/authenticators/password-test.js | 0 yarn.lock | 2 +- 8 files changed, 23 insertions(+), 1 deletion(-) rename {ui/admin/app => addons/core/addon}/authenticators/password.js (97%) rename {ui/admin/app => addons/core/addon}/session-stores/application.js (100%) create mode 100644 addons/core/app/authenticators/password.js create mode 100644 addons/core/app/session-stores/application.js rename {ui/admin => addons/core}/tests/unit/authenticators/password-test.js (100%) diff --git a/ui/admin/app/authenticators/password.js b/addons/core/addon/authenticators/password.js similarity index 97% rename from ui/admin/app/authenticators/password.js rename to addons/core/addon/authenticators/password.js index f9d97033e..c76874ce9 100644 --- a/ui/admin/app/authenticators/password.js +++ b/addons/core/addon/authenticators/password.js @@ -85,6 +85,9 @@ export default class PasswordAuthenticator extends BasePasswordAuthenticator { * Assigns a token string all future requests via the `Authorization` header * on the application adapter prototype. Only application and adapters that * extend the application adapter receive this header (which is most). + * + * TODO: if cookies were requested, this step should be skipped. + * * @param {string} token */ addTokenToAuthorization(token) { diff --git a/ui/admin/app/session-stores/application.js b/addons/core/addon/session-stores/application.js similarity index 100% rename from ui/admin/app/session-stores/application.js rename to addons/core/addon/session-stores/application.js diff --git a/addons/core/app/authenticators/password.js b/addons/core/app/authenticators/password.js new file mode 100644 index 000000000..67f90f433 --- /dev/null +++ b/addons/core/app/authenticators/password.js @@ -0,0 +1 @@ +export { default } from 'core/authenticators/password'; diff --git a/addons/core/app/session-stores/application.js b/addons/core/app/session-stores/application.js new file mode 100644 index 000000000..1b75c3e51 --- /dev/null +++ b/addons/core/app/session-stores/application.js @@ -0,0 +1 @@ +export { default } from 'core/session-stores/application'; diff --git a/addons/core/package.json b/addons/core/package.json index b6cc606c0..9dbf4a011 100644 --- a/addons/core/package.json +++ b/addons/core/package.json @@ -32,6 +32,8 @@ "@ember/optional-features": "^1.3.0", "@glimmer/component": "^1.0.1", "@glimmer/tracking": "^1.0.0", + "api": "*", + "auth": "*", "babel-eslint": "^10.1.0", "broccoli-asset-rev": "^3.0.0", "doctoc": "^1.4.0", @@ -39,10 +41,14 @@ "ember-cli": "~3.20.2", "ember-cli-dependency-checker": "^3.2.0", "ember-cli-inject-live-reload": "^2.0.2", + "ember-cli-mirage": "^1.1.8", "ember-cli-sri": "^2.1.1", "ember-cli-uglify": "^3.0.0", + "ember-data": "^3.22.1", + "ember-data-model-fragments": "5.0.0-beta.0", "ember-disable-prototype-extensions": "^1.1.3", "ember-export-application-global": "^2.0.1", + "ember-fetch": "^8.0.2", "ember-get-config": "^0.3.0", "ember-inline-svg": "^1.0.0", "ember-intl": "^5.5.0", @@ -50,6 +56,7 @@ "ember-maybe-import-regenerator": "^0.1.6", "ember-qunit": "^4.6.0", "ember-resolver": "^8.0.0", + "ember-simple-auth": "^3.0.1", "ember-source": "~3.20.2", "ember-source-channel-url": "^2.0.1", "ember-template-lint": "^2.9.1", @@ -57,6 +64,7 @@ "eslint": "^7.5.0", "eslint-plugin-ember": "^8.9.1", "eslint-plugin-node": "^11.1.0", + "faker": "^5.1.0", "loader.js": "^4.7.0", "npm-run-all": "^4.1.5", "prettier": "^2.1.2", diff --git a/addons/core/tests/dummy/config/environment.js b/addons/core/tests/dummy/config/environment.js index 529a24c47..84720c90a 100644 --- a/addons/core/tests/dummy/config/environment.js +++ b/addons/core/tests/dummy/config/environment.js @@ -30,6 +30,15 @@ module.exports = function (environment) { topics: { account: '/accounts', } + }, + + api: { + host: '', + namespace: 'v1', + }, + + 'ember-cli-mirage': { + directory: '../api/mirage' } }; diff --git a/ui/admin/tests/unit/authenticators/password-test.js b/addons/core/tests/unit/authenticators/password-test.js similarity index 100% rename from ui/admin/tests/unit/authenticators/password-test.js rename to addons/core/tests/unit/authenticators/password-test.js diff --git a/yarn.lock b/yarn.lock index f16a1bd39..bc34354c4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8766,7 +8766,7 @@ ember-data-model-fragments@5.0.0-beta.0: git-repo-info "^2.0.0" npm-git-info "^1.0.3" -ember-data@^3.16.0: +ember-data@^3.16.0, ember-data@^3.22.1: version "3.22.1" resolved "https://registry.yarnpkg.com/ember-data/-/ember-data-3.22.1.tgz#5b075fc8a2c3f18dac2305037d34b88666631b1a" integrity sha512-5QXJkkwSXKgdVa9qg6lYrTdG7+5PvtfwLwj0weCOFixXLxZWyhXzPcnDyn4lNDCyMZbsy/10VNH5miPkRBf8lQ==