Update ember-simple-auth to v7 (#2255)

BobrImperator · web-flow · commit b67c06ce36c4 · 2025-01-03T13:04:40.000-05:00
* feat(deps): bump ember-simple-auth to v7

* refactor: import 'our' session service instead of the generic'
diff --git a/app/components/forgot-password.ts b/app/components/forgot-password.ts
@@ -5,9 +5,9 @@ import Component from '@glimmer/component';
 import { tracked } from '@glimmer/tracking';
 
 import type CognitoService from 'ember-cognito/services/cognito';
-import type Session from 'ember-simple-auth/services/session';
 
 import 'swach/components/loading-button';
+import type Session from 'swach/services/session';
 
 export default class ForgotPasswordComponent extends Component {
   @service declare cognito: CognitoService;
diff --git a/app/components/login.ts b/app/components/login.ts
@@ -5,9 +5,9 @@ import Component from '@glimmer/component';
 import { tracked } from '@glimmer/tracking';
 
 import { storageFor } from 'ember-local-storage';
-import type Session from 'ember-simple-auth/services/session';
 
 import config from 'swach/config/environment';
+import type Session from 'swach/services/session';
 import type { SettingsStorage } from 'swach/storages/settings';
 
 export default class LoginComponent extends Component {
diff --git a/app/controllers/application.ts b/app/controllers/application.ts
@@ -7,14 +7,14 @@ import { tracked } from '@glimmer/tracking';
 import type FlashMessageService from 'ember-cli-flash/services/flash-messages';
 import { storageFor } from 'ember-local-storage';
 import type { Store } from 'ember-orbit';
-import type Session from 'ember-simple-auth/services/session';
 
 import type { RecordSchema } from '@orbit/records';
 import type { IpcRenderer } from 'electron';
 
 import type ColorModel from 'swach/data-models/color';
 import type ColorUtils from 'swach/services/color-utils';
 import type DataService from 'swach/services/data';
+import type Session from 'swach/services/session';
 import type UndoManager from 'swach/services/undo-manager';
 import type { SettingsStorage, themes } from 'swach/storages/settings';
 
diff --git a/app/controllers/settings.ts b/app/controllers/settings.ts
@@ -2,9 +2,8 @@ import Controller, { inject as controller } from '@ember/controller';
 import { action } from '@ember/object';
 import { service } from '@ember/service';
 
-import type Session from 'ember-simple-auth/services/session';
-
 import type ApplicationController from 'swach/controllers/application';
+import type Session from 'swach/services/session';
 
 export default class SettingsController extends Controller {
   @controller application!: ApplicationController;
diff --git a/app/controllers/settings/cloud/profile.ts b/app/controllers/settings/cloud/profile.ts
@@ -3,7 +3,7 @@ import { action } from '@ember/object';
 import { service } from '@ember/service';
 import { tracked } from '@glimmer/tracking';
 
-import type Session from 'ember-simple-auth/services/session';
+import type Session from 'swach/services/session';
 
 export default class SettingsAccountController extends Controller {
   @service declare session: Session;
diff --git a/app/routes/-private/application.ts b/app/routes/-private/application.ts
@@ -2,9 +2,8 @@ import Route from '@ember/routing/route';
 import type Router from '@ember/routing/router-service';
 import { service } from '@ember/service';
 
-import type Session from 'ember-simple-auth/services/session';
-
 import type DataService from 'swach/services/data';
+import type Session from 'swach/services/session';
 
 export default class ApplicationRoute extends Route {
   @service declare data: DataService;
diff --git a/app/routes/colors.ts b/app/routes/colors.ts
@@ -4,9 +4,9 @@ import { service } from '@ember/service';
 
 import { storageFor } from 'ember-local-storage';
 import type { Store } from 'ember-orbit';
-import type Session from 'ember-simple-auth/services/session';
 
 import type PaletteModel from 'swach/data-models/palette';
+import type Session from 'swach/services/session';
 import type { SettingsStorage } from 'swach/storages/settings';
 import viewTransitions from 'swach/utils/view-transitions';
 
diff --git a/app/routes/contrast.ts b/app/routes/contrast.ts
@@ -3,8 +3,8 @@ import Route from '@ember/routing/route';
 import { service } from '@ember/service';
 
 import { storageFor } from 'ember-local-storage';
-import type Session from 'ember-simple-auth/services/session';
 
+import type Session from 'swach/services/session';
 import type { SettingsStorage } from 'swach/storages/settings';
 import viewTransitions from 'swach/utils/view-transitions';
 
diff --git a/app/routes/kuler.ts b/app/routes/kuler.ts
@@ -4,9 +4,9 @@ import { service } from '@ember/service';
 
 import { storageFor } from 'ember-local-storage';
 import type { Store } from 'ember-orbit';
-import type Session from 'ember-simple-auth/services/session';
 
 import type ColorModel from 'swach/data-models/color';
+import type Session from 'swach/services/session';
 import type { SettingsStorage } from 'swach/storages/settings';
 import viewTransitions from 'swach/utils/view-transitions';
 
diff --git a/app/routes/palettes.ts b/app/routes/palettes.ts
@@ -4,8 +4,8 @@ import { service } from '@ember/service';
 
 import { storageFor } from 'ember-local-storage';
 import type { LiveQuery, Store } from 'ember-orbit';
-import type Session from 'ember-simple-auth/services/session';
 
+import type Session from 'swach/services/session';
 import type { SettingsStorage } from 'swach/storages/settings';
 import viewTransitions from 'swach/utils/view-transitions';
 
diff --git a/app/routes/settings/cloud/index.ts b/app/routes/settings/cloud/index.ts
@@ -4,8 +4,8 @@ import type Router from '@ember/routing/router-service';
 import { service } from '@ember/service';
 
 import type CognitoService from 'ember-cognito/services/cognito';
-import type Session from 'ember-simple-auth/services/session';
 
+import type Session from 'swach/services/session';
 import viewTransitions from 'swach/utils/view-transitions';
 
 export default class SettingsAccountRoute extends Route {
diff --git a/app/routes/settings/cloud/profile.ts b/app/routes/settings/cloud/profile.ts
@@ -2,8 +2,8 @@ import Route from '@ember/routing/route';
 import { service } from '@ember/service';
 
 import type CognitoService from 'ember-cognito/services/cognito';
-import type Session from 'ember-simple-auth/services/session';
 
+import type Session from 'swach/services/session';
 import viewTransitions from 'swach/utils/view-transitions';
 
 export default class SettingsAccountRoute extends Route {
diff --git a/app/routes/settings/data.ts b/app/routes/settings/data.ts
@@ -3,8 +3,8 @@ import Route from '@ember/routing/route';
 import { service } from '@ember/service';
 
 import { storageFor } from 'ember-local-storage';
-import type Session from 'ember-simple-auth/services/session';
 
+import type Session from 'swach/services/session';
 import type { SettingsStorage } from 'swach/storages/settings';
 import viewTransitions from 'swach/utils/view-transitions';
 
diff --git a/app/routes/settings/index.ts b/app/routes/settings/index.ts
@@ -3,8 +3,8 @@ import Route from '@ember/routing/route';
 import { service } from '@ember/service';
 
 import { storageFor } from 'ember-local-storage';
-import type Session from 'ember-simple-auth/services/session';
 
+import type Session from 'swach/services/session';
 import type { SettingsStorage } from 'swach/storages/settings';
 import viewTransitions from 'swach/utils/view-transitions';
 
diff --git a/app/services/data.ts b/app/services/data.ts
@@ -2,14 +2,14 @@ import Service, { inject as service } from '@ember/service';
 import { tracked } from '@glimmer/tracking';
 
 import type { Store } from 'ember-orbit';
-import type Session from 'ember-simple-auth/services/session';
 
 import type { Coordinator } from '@orbit/coordinator';
 import type IndexedDBSource from '@orbit/indexeddb';
 import type JSONAPISource from '@orbit/jsonapi';
 import type { InitializedRecord, RecordIdentity } from '@orbit/records';
 
 import type Palette from 'swach/data-models/palette';
+import type Session from 'swach/services/session';
 
 export default class DataService extends Service {
   @service dataCoordinator!: Coordinator;
diff --git a/app/services/session.js b/app/services/session.js
diff --git a/app/services/session.ts b/app/services/session.ts
@@ -0,0 +1,27 @@
+import { inject as service } from '@ember/service';
+
+import BaseSessionService from 'ember-simple-auth/services/session';
+
+import DataService from './data';
+
+interface Data {
+  authenticated: {
+    id: string;
+  };
+}
+
+export default class SessionService extends BaseSessionService<Data> {
+  @service('data') declare swachData: DataService;
+
+  async handleAuthentication(routeAfterAuthentication: string) {
+    super.handleAuthentication(routeAfterAuthentication);
+
+    this.swachData.synchronize();
+  }
+
+  async handleInvalidation(routeAfterInvalidation: string) {
+    super.handleInvalidation(routeAfterInvalidation);
+
+    this.swachData.reset();
+  }
+}
diff --git a/app/session-stores/application.ts b/app/session-stores/application.ts
@@ -0,0 +1,3 @@
+import Adaptive from 'ember-simple-auth/session-stores/adaptive';
+
+export default Adaptive;
diff --git a/ember-cli-build.js b/ember-cli-build.js
@@ -13,9 +13,6 @@ module.exports = function (defaults) {
     'ember-cli-babel': {
       enableTypeScriptTransform: true,
     },
-    'ember-simple-auth': {
-      useSessionSetupMethod: true,
-    },
     postcssOptions: {
       compile: {
         extension: 'scss',
diff --git a/package.json b/package.json
@@ -114,7 +114,7 @@
     "ember-resolver": "^11.0.1",
     "ember-set-body-class": "^1.0.2",
     "ember-set-helper": "^3.0.1",
-    "ember-simple-auth": "^6.1.0",
+    "ember-simple-auth": "^7.1.0",
     "ember-sinon-qunit": "^7.5.0",
     "ember-source": "^5.12.0",
     "ember-svg-jar": "^2.6.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/types/ember-simple-auth/services/session.d.ts b/types/ember-simple-auth/services/session.d.ts
