add more testcases and respect base for html files

owncloud · Feb 3, 2022 · e158945 · e158945
1 parent aaaa4a9
commit e158945
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 13 deletions.
diff --git a/packages/web-runtime/src/router/index.js b/packages/web-runtime/src/router/index.js
@@ -110,13 +110,16 @@ export const router = patchRouter(
 export const buildUrl = (pathname) => {
   const baseUrl = new URL(window.location.href.split('#')[0])
   if (baseUrl.pathname.endsWith('/index.html')) {
-    baseUrl.pathname = baseUrl.pathname.substr(0, baseUrl.pathname.length - 11)
+    baseUrl.pathname = baseUrl.pathname.split('/').slice(0, -1).filter(Boolean).join('/')
   }
 
   if (/\.(html?)$/i.test(pathname)) {
-    baseUrl.pathname = base
-      ? pathname
-      : [...baseUrl.pathname.split('/'), ...pathname.split('/')].filter(Boolean).join('/')
+    baseUrl.pathname = [
+      ...(base ? new URL(base.href) : baseUrl).pathname.split('/'),
+      ...pathname.split('/')
+    ]
+      .filter(Boolean)
+      .join('/')
   } else {
     baseUrl[base ? 'pathname' : 'hash'] = router.resolve(pathname).href
   }

diff --git a/packages/web-runtime/tests/unit/router/index.spec.ts b/packages/web-runtime/tests/unit/router/index.spec.ts
@@ -1,14 +1,18 @@
 describe('buildUrl', () => {
   it.each`
-    location                                                                  | base      | path            | expected
-    ${'https://localhost:8080/index.php/apps/web/index.html#/files/list/all'} | ${''}     | ${'/login'}     | ${'https://localhost:8080/index.php/apps/web#/login'}
-    ${'https://localhost:8080/index.php/apps/web/index.html#/files/list/all'} | ${''}     | ${'/login/foo'} | ${'https://localhost:8080/index.php/apps/web#/login/foo'}
-    ${'https://localhost:8080/index.php/apps/web/#/login'}                    | ${''}     | ${'/bar.html'}  | ${'https://localhost:8080/index.php/apps/web/bar.html'}
-    ${'https://localhost:9200/#/files/list/all'}                              | ${''}     | ${'/login/foo'} | ${'https://localhost:9200/#/login/foo'}
-    ${'https://localhost:9200/#/files/list/all'}                              | ${''}     | ${'/bar.html'}  | ${'https://localhost:9200/bar.html'}
-    ${'https://localhost:9200/files/list/all'}                                | ${'/'}    | ${'/login/foo'} | ${'https://localhost:9200/login/foo'}
-    ${'https://localhost:9200/files/list/all'}                                | ${'/foo'} | ${'/bar.html'}  | ${'https://localhost:9200/bar.html'}
-    ${'https://localhost:9200/files/list/all'}                                | ${'/foo'} | ${'/bar.htm'}   | ${'https://localhost:9200/bar.htm'}
+    location                                                                          | base                         | path            | expected
+    ${'https://localhost:8080/index.php/apps/web/index.html#/files/list/all'}         | ${''}                        | ${'/login'}     | ${'https://localhost:8080/index.php/apps/web#/login'}
+    ${'https://localhost:8080/index.php/apps/web/index.html#/files/list/all'}         | ${''}                        | ${'/login/foo'} | ${'https://localhost:8080/index.php/apps/web#/login/foo'}
+    ${'https://localhost:8080/////index.php/apps/web/////index.html#/files/list/all'} | ${''}                        | ${'/login/foo'} | ${'https://localhost:8080/index.php/apps/web#/login/foo'}
+    ${'https://localhost:8080/index.php/apps/web/#/login'}                            | ${''}                        | ${'/bar.html'}  | ${'https://localhost:8080/index.php/apps/web/bar.html'}
+    ${'https://localhost:8080/index.php/apps/web/#/login'}                            | ${'/index.php/apps/web/foo'} | ${'/bar'}       | ${'https://localhost:8080/index.php/apps/web/foo/bar'}
+    ${'https://localhost:8080/index.php/apps/web/#/login'}                            | ${'/index.php/apps/web/foo'} | ${'/bar.html'}  | ${'https://localhost:8080/index.php/apps/web/foo/bar.html'}
+    ${'https://localhost:9200/#/files/list/all'}                                      | ${''}                        | ${'/login/foo'} | ${'https://localhost:9200/#/login/foo'}
+    ${'https://localhost:9200/#/files/list/all'}                                      | ${''}                        | ${'/bar.html'}  | ${'https://localhost:9200/bar.html'}
+    ${'https://localhost:9200/files/list/all'}                                        | ${'/'}                       | ${'/login/foo'} | ${'https://localhost:9200/login/foo'}
+    ${'https://localhost:9200/files/list/all'}                                        | ${'/foo'}                    | ${'/login/foo'} | ${'https://localhost:9200/foo/login/foo'}
+    ${'https://localhost:9200/files/list/all'}                                        | ${'/'}                       | ${'/bar.html'}  | ${'https://localhost:9200/bar.html'}
+    ${'https://localhost:9200/files/list/all'}                                        | ${'/foo'}                    | ${'/bar.html'}  | ${'https://localhost:9200/foo/bar.html'}
   `('$path -> $expected', async ({ location, base, path, expected }) => {
     delete window.location
     window.location = new URL(location) as any