fix(authentication-oauth): OAuth redirect lost sometimes due to sessi…

…on store race (feathersjs#2514)
mterrel · Dec 23, 2021 · 11d9491 · 11d9491
1 parent 325e633
commit 11d9491
Showing 1 changed file with 13 additions and 1 deletion.
diff --git a/packages/authentication-oauth/src/express.ts b/packages/authentication-oauth/src/express.ts
@@ -57,7 +57,19 @@ export default (options: OauthSetupSettings) => {
       req.session.redirect = redirect as string;
       req.session.query = query;
 
-      res.redirect(`${path}/connect/${name}?${qs.stringify(query as any)}`);
+      const sendRedirect = () => res.redirect(`${path}/connect/${name}?${qs.stringify(query as any)}`);
+
+      if (typeof req.session.save === 'function') {
+        req.session.save((err: any) => {
+          if (err) {
+            res.status(500).send(`Error storing session: ${err}`);
+          } else {
+            sendRedirect();
+          }
+        });
+      } else {
+        sendRedirect();
+      }
     });
 
     authApp.get('/:name/callback', (req: any, res: any) => {