From d51e25888d098151791ff808c9ac44b0c28c5571 Mon Sep 17 00:00:00 2001
From: Kevin Ansfield <kevin@lookingsideways.co.uk>
Date: Sat, 22 Jan 2022 00:30:56 +0000
Subject: [PATCH] Resolved ember-simple-auth deprecations

no issue

- many "The automatic session initialization is deprecated" were shown in test output due to an old method of initializing the session service
- switched to explicit session setup in the application route's `beforeModel` hook
- https://github.com/simplabs/ember-simple-auth/issues/2314
---
 ghost/admin/app/initializers/ember-simple-auth.js | 2 --
 ghost/admin/app/routes/application.js             | 3 ++-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/ghost/admin/app/initializers/ember-simple-auth.js b/ghost/admin/app/initializers/ember-simple-auth.js
index 42f0f08688..be5c8b35d9 100644
--- a/ghost/admin/app/initializers/ember-simple-auth.js
+++ b/ghost/admin/app/initializers/ember-simple-auth.js
@@ -2,7 +2,6 @@ import Configuration from 'ember-simple-auth/configuration';
 import ENV from '../config/environment';
 import ghostPaths from '../utils/ghost-paths';
 import setupSession from 'ember-simple-auth/initializers/setup-session';
-import setupSessionRestoration from 'ember-simple-auth/initializers/setup-session-restoration';
 
 export default {
     name: 'ember-simple-auth',
@@ -12,6 +11,5 @@ export default {
         Configuration.load(config);
 
         setupSession(registry);
-        setupSessionRestoration(registry);
     }
 };
diff --git a/ghost/admin/app/routes/application.js b/ghost/admin/app/routes/application.js
index 09273bb283..0bb0822c34 100644
--- a/ghost/admin/app/routes/application.js
+++ b/ghost/admin/app/routes/application.js
@@ -52,7 +52,8 @@ export default Route.extend(ShortcutsRoute, {
         this.ui.initBodyDragHandlers();
     },
 
-    beforeModel() {
+    async beforeModel() {
+        await this.session.setup();
         return this.prepareApp();
     },