added connect-ensure-login for OAuth authorize dialog

app/services/oauth2.js

@@ -15,6 +15,8 @@ const striptags = require('striptags');
 
 const oauth2orize = require('oauth2orize');
 const passport = require('passport');
+const ensureLoggedIn = require('connect-ensure-login');
+
 const generatePassword = require('password-generator');
 
 const { SiteService/*, SiteError*/ } = require('../../lib/site-lib');
@@ -60,20 +62,16 @@ class OAuth2Service extends SiteService {
   }
 
   attachRoutes (app) {
-    const { session: sessionService } = this.dtp.services;
-
-    const requireLogin = sessionService.authCheckMiddleware({ requireLogin: true });
-
     app.get(
       '/oauth2/authorize',
-      requireLogin,
+      ensureLoggedIn('/welcome/login'),
       this.server.authorize(this.processAuthorize.bind(this)),
       this.renderAuthorizeDialog.bind(this),
     );
 
     app.post(
       '/oauth2/authorize/decision',
-      requireLogin,
+      ensureLoggedIn('/welcome/login'),
       this.server.decision(),
     );
 

package.json

@@ -21,6 +21,7 @@
     "chart.js": "^3.7.1",
     "chartjs-adapter-moment": "^1.0.0",
     "compression": "^1.7.4",
+    "connect-ensure-login": "^0.1.1",
     "connect-redis": "^6.1.1",
     "cookie-parser": "^1.4.6",
     "cron": "^1.8.2",

yarn.lock

@@ -2557,6 +2557,11 @@ configstore@^5.0.1:
     write-file-atomic "^3.0.0"
     xdg-basedir "^4.0.0"
 
+connect-ensure-login@^0.1.1:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/connect-ensure-login/-/connect-ensure-login-0.1.1.tgz#174dcc51243b9eac23f8d98215aeb6694e2e8a12"
+  integrity sha512-u0LGY/YXgkqdD4uVz8Gkri0adby5SBPYIFQvIa4FjBIaZUN0yuZPVHsjAA2bUiprGyjh8NlqxPUcIzzfTiXhQQ==
+
 connect-history-api-fallback@^1:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz#8b32089359308d111115d81cad3fceab888f97bc"