From ffecd5e9817b93f266f3256bda0daa93aca3ba90 Mon Sep 17 00:00:00 2001
From: Tessa Thornton <tessathornton@gmail.com>
Date: Fri, 23 Aug 2019 15:00:36 -0400
Subject: [PATCH] change routing for auth and auth/callback (#2493)

---
 config/webpackDevServer.config.ts    |  2 +-
 src/core/server/app/router/client.ts | 16 ++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/config/webpackDevServer.config.ts b/config/webpackDevServer.config.ts
index 784be01b2..764853486 100644
--- a/config/webpackDevServer.config.ts
+++ b/config/webpackDevServer.config.ts
@@ -71,7 +71,7 @@ export default function({
         { from: /^\/account/, to: "/account.html" },
         { from: /^\/admin/, to: "/admin.html" },
         { from: /^\/embed\/stream/, to: "/stream.html" },
-        { from: /^\/embed\/auth/, to: "/auth.html" },
+        { from: /^\/embed\/auth$/, to: "/auth.html" },
         { from: /^\/embed\/auth\/callback/, to: "/auth-callback.html" },
         { from: /^\/install/, to: "/install.html" },
       ],
diff --git a/src/core/server/app/router/client.ts b/src/core/server/app/router/client.ts
index e29651b4a..1671acf9c 100644
--- a/src/core/server/app/router/client.ts
+++ b/src/core/server/app/router/client.ts
@@ -121,14 +121,6 @@ export function mountClientRoutes(
       entrypoint: entrypoints.get("stream"),
     })
   );
-  router.use(
-    "/embed/auth",
-    createClientTargetRouter({
-      staticURI,
-      cacheDuration: false,
-      entrypoint: entrypoints.get("auth"),
-    })
-  );
   router.use(
     "/embed/auth/callback",
     createClientTargetRouter({
@@ -137,6 +129,14 @@ export function mountClientRoutes(
       entrypoint: entrypoints.get("authCallback"),
     })
   );
+  router.use(
+    "/embed/auth",
+    createClientTargetRouter({
+      staticURI,
+      cacheDuration: false,
+      entrypoint: entrypoints.get("auth"),
+    })
+  );
 
   // Add the standalone targets.
   router.use(