try a different way of the reverse proxy

6 years ago · 91e1db06f2
parent 4baff16d07
commit 91e1db06f2
3 changed files with 48 additions and 87 deletions
--- a/src/Ombi/.vscode/launch.json
+++ b/src/Ombi/.vscode/launch.json
@ -2,40 +2,26 @@
    "version": "0.2.0",
    "configurations": [
      {
-            "name": ".NET Core Launch",
-            "type": "coreclr",
+        "name": "ng serve",
+        "type": "chrome",
        "request": "launch",
-            "preLaunchTask": "build",
-            "program": "${workspaceRoot}/bin/Debug/netcoreapp2.0/Ombi.dll",
-            "args": [],
-            "cwd": "${workspaceRoot}",
-            "stopAtEntry": false,
-            "launchBrowser": {
-                "enabled": true,
-                "args": "${auto-detect-url}",
-                "windows": {
-                    "command": "cmd.exe",
-                    "args": "/C start ${auto-detect-url}"
-                },
-                "osx": {
-                    "command": "open"
-                },
-                "linux": {
-                    "command": "xdg-open"
-                }
-            },
-            "env": {
-                "ASPNETCORE_ENVIRONMENT": "Development"
-            },
-            "sourceFileMap": {
-                "/Views": "${workspaceRoot}/Views"
-            }
+        "preLaunchTask": "npm: start",
+        "url": "http://localhost:3578/",
+        "webRoot": "${workspaceFolder}"
      },
      {
-            "name": ".NET Core Attach",
-            "type": "coreclr",
-            "request": "attach",
-            "processId": "${command:pickProcess}"
+        "name": "ng test",
+        "type": "chrome",
+        "request": "launch",
+        "url": "http://localhost:9876/debug.html",
+        "webRoot": "${workspaceFolder}",
+        "sourceMaps": true,
+        "sourceMapPathOverrides": {
+          "/./*": "${webRoot}/*",
+          "/src/*": "${webRoot}/*",
+          "/*": "*",
+          "/./~/*": "${webRoot}/node_modules/*"
        }
+      },
    ]
  }
--- a/src/Ombi/ClientApp/src/app/app.module.ts
+++ b/src/Ombi/ClientApp/src/app/app.module.ts
@ -79,8 +79,9 @@ const routes: Routes = [
 ];

 // AoT requires an exported function for factories
-export function HttpLoaderFactory(http: HttpClient) {
-    const base = getBaseLocation();
+export function HttpLoaderFactory(http: HttpClient, platformLocation: PlatformLocation) {
+    // const base = getBaseLocation();
+    const base = platformLocation.getBaseHrefFromDOM();
    const version = Math.floor(Math.random() * 999999999);
    if (base.length > 1) {
        return new TranslateHttpLoader(http, `${base}/translations/`, `.json?v=${version}`);
@ -175,10 +176,11 @@ export function JwtTokenGetter() {
        SearchService,
        SearchV2Service,
        MessageService,
-        {
-            provide: APP_BASE_HREF,
-            useFactory: getBaseLocation
-        }
+        { provide: APP_BASE_HREF, useValue: window['_app_base'] || '/' }
+        // {
+        //     provide: APP_BASE_HREF,
+        //     useFactory: getBaseLocation
+        // }
       ],
    bootstrap: [AppComponent],
 })
--- a/src/Ombi/ClientApp/src/index.html
+++ b/src/Ombi/ClientApp/src/index.html
@ -2,53 +2,26 @@
 <html lang="en">

 <head>
-
-  <!-- <script>
-
-    const existingBaseUrl = window.localStorage.getItem("baseUrl");
-    if (existingBaseUrl && existingBaseUrl.length === 0) {
-      document.write('<base href="/' + existingBaseUrl + '" />');
-      if (existingBaseUrl.length === 0) {
-        document.write("<link rel=\"stylesheet\" href='/loading.css' />")
-      } else {
-        document.write("<link rel=\"stylesheet\" href='" + existingBaseUrl + "/loading.css' />")
+  <script>
+    // manually sets the <base> tag's href attribute so the app can be located in places other than root
+    debugger;
+    var split = location.pathname.split('/');
+    var base = "";
+    for (var i = 0; i < split.length - 1; i++) {
+        base += split[i];
+        if(base.length > 1) {
+          break;
        }
-    } else {
-      // Work out the base URL
-      // Need to find the baseUrl.txt file
-      let url = window.location.href;
-      let hasFile = false;
-
-      var xmlhttp = new XMLHttpRequest();
-
-      xmlhttp.open("GET", url + "api/v1/Settings/baseurl", false);
-      xmlhttp.send();
-      while (xmlhttp.status === 404) {
-        // try again
-        url = url.slice(0, url.lastIndexOf("/"));
-        tryGetBaseUrl(xmlhttp, url);
+        if (i < split.length - 2) {
+            base += "/";
        }
-      const data = JSON.parse(xmlhttp.responseText);
-      hasFile = true;
-      document.write('<base href="/' + data + '" />');
-        document.write("<link rel=\"stylesheet\" href='" + data + "/loading.css' />")
-      window.localStorage.setItem("baseUrl", data);
-
-      function tryGetBaseUrl(xmlhttp, url) {
-        if (endsWith(url, "/")) {
-          xmlhttp.open("GET", url + "api/v1/Settings/baseurl", false);
-        } else {
-          xmlhttp.open("GET", url + "/api/v1/Settings/baseurl", false);
-        }
-
-        xmlhttp.send();
-      }
-
-      function endsWith(str, suffix) {
-        return str.indexOf(suffix, str.length - suffix.length) !== -1;
    }
+    if(base === "") {
+      base = "./";
    }
-  </script> -->
+    window['_app_base'] = base;
+    document.write("<base href='" + base + "' />");
+</script>
  <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
  <link href="https://fonts.googleapis.com/css?family=Roboto:300,400,500" rel="stylesheet">
  <meta charset="utf-8" />