From 904a630d43195b3044c71b4399a52cf60b86ccf7 Mon Sep 17 00:00:00 2001 From: Charles Fries Date: Mon, 30 Dec 2024 15:35:18 -0800 Subject: [PATCH] Update `ember-simple-auth` to v7 in test app --- package-lock.json | 36 +++++----- package.json | 2 +- tests/dummy/app/services/session.ts | 3 + tests/dummy/app/session-stores/application.ts | 3 + .../authenticators/base.d.ts | 9 --- types/ember-simple-auth/services/session.d.ts | 68 ------------------- .../session-stores/local-storage.d.ts | 11 --- 7 files changed, 27 insertions(+), 105 deletions(-) create mode 100644 tests/dummy/app/services/session.ts create mode 100644 tests/dummy/app/session-stores/application.ts delete mode 100644 types/ember-simple-auth/authenticators/base.d.ts delete mode 100644 types/ember-simple-auth/services/session.d.ts delete mode 100644 types/ember-simple-auth/session-stores/local-storage.d.ts diff --git a/package-lock.json b/package-lock.json index 3e6b5701..3a9d5c32 100644 --- a/package-lock.json +++ b/package-lock.json @@ -68,7 +68,7 @@ "ember-page-title": "^8.0.0", "ember-qunit": "^8.0.1", "ember-resolver": "^11.0.1", - "ember-simple-auth": "^6.0.0", + "ember-simple-auth": "^7.1.0", "ember-sinon-qunit": "^7.4.0", "ember-source": "~5.4.0", "ember-source-channel-url": "^3.0.0", @@ -22244,15 +22244,18 @@ } }, "node_modules/ember-cookies": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/ember-cookies/-/ember-cookies-1.1.2.tgz", - "integrity": "sha512-6GaN0eEDZT9SEUSZBxWzZMlvxjcGKXFTJNjv30LVXTTOxozE5IBmIxiDAEq0udi0UpWUGHLYQBgnANn4jdll7w==", + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/ember-cookies/-/ember-cookies-1.3.0.tgz", + "integrity": "sha512-nhVDm9lql4EVLpbjxyosyEITFvuNAmHr7cod8K2FmIyw2KcAFWSS0v88quIWc+GvcawBTz3KSMRXOJq/0InVpg==", "dev": true, "dependencies": { "@embroider/addon-shim": "^1.7.1" }, "engines": { "node": ">= 16.*" + }, + "peerDependencies": { + "ember-source": ">=4.0" } }, "node_modules/ember-data": { @@ -25517,20 +25520,21 @@ } }, "node_modules/ember-simple-auth": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/ember-simple-auth/-/ember-simple-auth-6.0.0.tgz", - "integrity": "sha512-9SzSFApxZ74CD4UxIeTV+poIPeXcRLXWM60cMvC1SwTYjoc/p9DeQF0pVm6m1XV6uA3kPUzEsEn4/GeHc2YX1w==", + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/ember-simple-auth/-/ember-simple-auth-7.1.0.tgz", + "integrity": "sha512-hFcje2qSda3Axs5jxsSgaXqoxuwzyspMrganAKm35/rcnExvBD4vXbm/at7W5XvFbSF5UYoEpRUN2VvLpf3EUw==", "dev": true, "dependencies": { "@ember/test-waiters": "^3", "@embroider/addon-shim": "^1.0.0", "@embroider/macros": "^1.0.0", "ember-cli-is-package-missing": "^1.0.0", - "ember-cookies": "^1.0.0", + "ember-cookies": "^1.3.0", "silent-error": "^1.0.0" }, "peerDependencies": { - "@ember/test-helpers": ">= 3 || > 2.7" + "@ember/test-helpers": ">= 3 || > 2.7", + "ember-source": ">=4.0" }, "peerDependenciesMeta": { "@ember/test-helpers": { @@ -71652,9 +71656,9 @@ } }, "ember-cookies": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/ember-cookies/-/ember-cookies-1.1.2.tgz", - "integrity": "sha512-6GaN0eEDZT9SEUSZBxWzZMlvxjcGKXFTJNjv30LVXTTOxozE5IBmIxiDAEq0udi0UpWUGHLYQBgnANn4jdll7w==", + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/ember-cookies/-/ember-cookies-1.3.0.tgz", + "integrity": "sha512-nhVDm9lql4EVLpbjxyosyEITFvuNAmHr7cod8K2FmIyw2KcAFWSS0v88quIWc+GvcawBTz3KSMRXOJq/0InVpg==", "dev": true, "requires": { "@embroider/addon-shim": "^1.7.1" @@ -74378,16 +74382,16 @@ } }, "ember-simple-auth": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/ember-simple-auth/-/ember-simple-auth-6.0.0.tgz", - "integrity": "sha512-9SzSFApxZ74CD4UxIeTV+poIPeXcRLXWM60cMvC1SwTYjoc/p9DeQF0pVm6m1XV6uA3kPUzEsEn4/GeHc2YX1w==", + "version": "7.1.0", + "resolved": "https://registry.npmjs.org/ember-simple-auth/-/ember-simple-auth-7.1.0.tgz", + "integrity": "sha512-hFcje2qSda3Axs5jxsSgaXqoxuwzyspMrganAKm35/rcnExvBD4vXbm/at7W5XvFbSF5UYoEpRUN2VvLpf3EUw==", "dev": true, "requires": { "@ember/test-waiters": "^3", "@embroider/addon-shim": "^1.0.0", "@embroider/macros": "^1.0.0", "ember-cli-is-package-missing": "^1.0.0", - "ember-cookies": "^1.0.0", + "ember-cookies": "^1.3.0", "silent-error": "^1.0.0" } }, diff --git a/package.json b/package.json index 8fa6a252..3051b2d6 100644 --- a/package.json +++ b/package.json @@ -93,7 +93,7 @@ "ember-page-title": "^8.0.0", "ember-qunit": "^8.0.1", "ember-resolver": "^11.0.1", - "ember-simple-auth": "^6.0.0", + "ember-simple-auth": "^7.1.0", "ember-sinon-qunit": "^7.4.0", "ember-source": "~5.4.0", "ember-source-channel-url": "^3.0.0", diff --git a/tests/dummy/app/services/session.ts b/tests/dummy/app/services/session.ts new file mode 100644 index 00000000..290b4e8d --- /dev/null +++ b/tests/dummy/app/services/session.ts @@ -0,0 +1,3 @@ +import Session from 'ember-simple-auth/services/session'; + +export default class MySession extends Session {} diff --git a/tests/dummy/app/session-stores/application.ts b/tests/dummy/app/session-stores/application.ts new file mode 100644 index 00000000..8702c599 --- /dev/null +++ b/tests/dummy/app/session-stores/application.ts @@ -0,0 +1,3 @@ +import AdaptiveSessionStore from 'ember-simple-auth/session-stores/adaptive'; + +export default class ApplicationSessionStore extends AdaptiveSessionStore {} diff --git a/types/ember-simple-auth/authenticators/base.d.ts b/types/ember-simple-auth/authenticators/base.d.ts deleted file mode 100644 index ff2337dc..00000000 --- a/types/ember-simple-auth/authenticators/base.d.ts +++ /dev/null @@ -1,9 +0,0 @@ -declare module 'ember-simple-auth/authenticators/base' { - export default class BaseAuthenticator { - authenticate(args: unknown): Promise; - - invalidate(data: Record, args: unknown[]): Promise; - - restore(data: Record): Promise; - } -} diff --git a/types/ember-simple-auth/services/session.d.ts b/types/ember-simple-auth/services/session.d.ts deleted file mode 100644 index 8795ef7a..00000000 --- a/types/ember-simple-auth/services/session.d.ts +++ /dev/null @@ -1,68 +0,0 @@ -/* - eslint - @typescript-eslint/no-explicit-any: off, - @typescript-eslint/explicit-module-boundary-types: off -*/ - -import Service from '@ember/service'; -import Evented from '@ember/object/evented'; - -import type firebase from 'firebase/compat/app'; - -interface Data { - authenticated: { - user: firebase.User; - }; -} - -declare module 'ember-simple-auth/services/session' { - export default class SessionService extends Service.extend(Evented) { - /** - * Triggered whenever the session is successfully authenticated. This happens - * when the session gets authenticated via - * {{#crossLink "SessionService/authenticate:method"}}{{/crossLink}} but also - * when the session is authenticated in another tab or window of the same - * application and the session state gets synchronized across tabs or windows - * via the store (see - * {{#crossLink "BaseStore/sessionDataUpdated:event"}}{{/crossLink}}). - * When using the {{#crossLink "ApplicationRouteMixin"}}{{/crossLink}} this - * event will automatically get handled (see - * {{#crossLink "ApplicationRouteMixin/sessionAuthenticated:method"}}{{/crossLink}}). - * @event authenticationSucceeded - * @public - */ - - /** - * Triggered whenever the session is successfully invalidated. This happens - * when the session gets invalidated via - * {{#crossLink "SessionService/invalidate:method"}}{{/crossLink}} but also - * when the session is invalidated in another tab or window of the same - * application and the session state gets synchronized across tabs or windows - * via the store (see - * {{#crossLink "BaseStore/sessionDataUpdated:event"}}{{/crossLink}}). - * When using the {{#crossLink "ApplicationRouteMixin"}}{{/crossLink}} this - * event will automatically get handled (see - * {{#crossLink "ApplicationRouteMixin/sessionInvalidated:method"}}{{/crossLink}}). - * @event invalidationSucceeded - * @public - */ - - isAuthenticated: boolean; - - data: Data | null; - - store: any; - - attemptedTransition: any; - - session: any; - - authenticate(...args: any[]): Promise; - - invalidate(...args: any): Promise; - - authorize(...args: any[]): Promise; - - setup(): Promise; - } -} diff --git a/types/ember-simple-auth/session-stores/local-storage.d.ts b/types/ember-simple-auth/session-stores/local-storage.d.ts deleted file mode 100644 index dcda187c..00000000 --- a/types/ember-simple-auth/session-stores/local-storage.d.ts +++ /dev/null @@ -1,11 +0,0 @@ -declare module 'ember-simple-auth/session-stores/local-storage' { - export default class LocalStorageStore { - key: string; - - clear(): Promise; - - persist(data: Record): Promise; - - restore(): Promise; - } -}