Merge pull request #18 from Azure-Samples/derisen

fix redirect route handler invalid route path issue

demo/App/routes/router.js

@@ -45,10 +45,10 @@ module.exports = (authProvider) => {
         mainController.getTenantPage
     ); // get token for this route to call web API
 
-    // unauthorized
+    // error
     router.get('/error', (req, res) => res.redirect('/401.html'));
 
-    // error
+    // unauthorized
     router.get('/unauthorized', (req, res) => res.redirect('/500.html'));
 
     // 404

dist/UrlUtils.d.ts

@@ -7,4 +7,10 @@ export declare class UrlUtils {
      * @returns {string}
      */
     static ensureAbsoluteUrl: (req: Request, url: string) => string;
+    /**
+     * Gets the path segment from a given URL
+     * @param {string} url: a given URL
+     * @returns {string}
+     */
+    static getPathFromUrl: (url: string) => string;
 }

src/AuthProvider.ts

@@ -116,7 +116,7 @@ export class AuthProvider {
         const appRouter = express.Router();
 
         // handle redirect
-        appRouter.get(this.appSettings.authRoutes.redirect, this.handleRedirect());
+        appRouter.get(UrlUtils.getPathFromUrl(this.appSettings.authRoutes.redirect), this.handleRedirect());
 
         if (this.appSettings.authRoutes.frontChannelLogout) {
             /**

src/UrlUtils.ts

@@ -25,4 +25,14 @@ export class UrlUtils {
             return url;
         }
     };
+
+    /**
+     * Gets the path segment from a given URL
+     * @param {string} url: a given URL
+     * @returns {string}
+     */
+    static getPathFromUrl = (url: string): string => {
+        const urlComponents: IUri = new UrlString(url).getUrlComponents();
+        return `/${urlComponents.PathSegments.join("/")}`;
+    };
 }