Fix #579: empty string at end of Sitelet endpoint

dotnet-websharper · Jul 25, 2016 · d315b29 · d315b29
1 parent c89173b
commit d315b29
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/src/sitelets/WebSharper.Sitelets/Router.fs b/src/sitelets/WebSharper.Sitelets/Router.fs
@@ -62,7 +62,6 @@ module RouterUtil =
         if uri.IsAbsoluteUri
         then uri.AbsolutePath
         else Uri.UnescapeDataString(uri.OriginalString) |> joinWithSlash "/"
-        |> trimFinalSlash
 
 type Router<'Action when 'Action : equality> =
     {
@@ -78,7 +77,7 @@ type Router<'Action when 'Action : equality> =
         | _ -> this.DynamicLink(action)
 
     member this.Route(req: Http.Request) =
-        match this.StaticRoutes.TryGetValue(path req.Uri) with
+        match this.StaticRoutes.TryGetValue(path req.Uri |> trimFinalSlash) with
         | true, r -> Some r
         | _ -> this.DynamicRoute(req)
 
@@ -201,7 +200,7 @@ module Router =
         let prefix = joinWithSlash "/" prefix
         let shift (loc: Location) =
             if loc.IsAbsoluteUri then loc else
-                makeUri (joinWithSlash prefix (path loc))
+                makeUri (joinWithSlash prefix (path loc |> trimFinalSlash))
         {
             StaticRoutes =
                 let d = Dictionary()