diff --git a/app/abilities/base.ts b/app/abilities/base.ts index e0fa4bb..6ec9a27 100644 --- a/app/abilities/base.ts +++ b/app/abilities/base.ts @@ -6,7 +6,7 @@ import { Ability } from 'ember-can'; import type CurrentUserService from 'ember-boilerplate/services/current-user'; -export default abstract class BaseAbility extends Ability { +export default abstract class BaseAbility extends Ability { @service declare currentUser: CurrentUserService; @computed('currentUser.user') diff --git a/app/app.ts b/app/app.ts index 1a03bff..ded2204 100644 --- a/app/app.ts +++ b/app/app.ts @@ -1,12 +1,9 @@ import { setBuildURLConfig } from '@ember-data/request-utils'; import Application from '@ember/application'; -// @ts-expect-error -import initializer from 'ember-simple-auth/initializers/ember-simple-auth'; -// @ts-expect-error -import initializerJwt from '@triptyk/ember-simple-auth-token/initializers/simple-auth-token'; import config from 'ember-boilerplate/config/environment'; import Resolver from 'ember-resolver'; +import loadInitializers from 'ember-load-initializers'; export default class App extends Application { modulePrefix = config.modulePrefix; @@ -14,15 +11,10 @@ export default class App extends Application { Resolver = Resolver; } -// ember-load-initializers not working anymore, registering manually -function loadInitializers() { - App.instanceInitializer(initializer); - App.instanceInitializer(initializerJwt); -} - setBuildURLConfig({ host: config.host, namespace: config.namespace, }); -loadInitializers(); +loadInitializers(App, config.modulePrefix); + diff --git a/app/components/forms/forgot-password.gts b/app/components/forms/forgot-password.gts index 3b66657..713f1ca 100644 --- a/app/components/forms/forgot-password.gts +++ b/app/components/forms/forgot-password.gts @@ -1,6 +1,4 @@ import { LinkTo } from '@ember/routing'; - -import InputsValidationComponent from 'ember-boilerplate/components/inputs/input-validation'; import t from 'ember-intl/helpers/t'; import TpkForm from '@triptyk/ember-input-validation/components/tpk-form'; @@ -28,9 +26,9 @@ const FormsForgotPassword: TOC =