https://serval-api.org/ - add the slash

sillsdev · Oct 25, 2023 · a75975c · a75975c
1 parent 2b66ece
commit a75975c
Show file tree

Hide file tree

Showing 8 changed files with 229 additions and 179 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -9,7 +9,7 @@ services:
     environment:
       - ASPNETCORE_ENVIRONMENT=Staging
       - Auth__Domain=sil-appbuilder.auth0.com
-      - Auth__Audience=https://serval-api.org
+      - Auth__Audience=https://serval-api.org/
       - ASPNETCORE_Kestrel__Endpoints__Http__Url=http://*:80
       - ASPNETCORE_Kestrel__Endpoints__Http2__Url=http://*:81
       - ASPNETCORE_Kestrel__Endpoints__Http2__Protocols=Http2

diff --git a/samples/ServalApp/serval_auth_module.py b/samples/ServalApp/serval_auth_module.py
@@ -32,7 +32,7 @@ def update_token(self):
         data = {
             "client_id": f"{self.__client_id}",
             "client_secret": f"{self.__client_secret}",
-            "audience": "https://serval-api.org",
+            "audience": "https://serval-api.org/",
             "grant_type": "client_credentials",
         }
 

diff --git a/scripts/load_testing.py b/scripts/load_testing.py
diff --git a/src/Serval.ApiServer/appsettings.json b/src/Serval.ApiServer/appsettings.json
@@ -2,7 +2,7 @@
   "AllowedHosts": "*",
   "Auth": {
     "Domain": "sil-appbuilder.auth0.com",
-    "Audience": "https://serval-api.org"
+    "Audience": "https://serval-api.org/"
   },
   "DataFile": {
     "FilesDirectory": "/var/lib/serval/files"

diff --git a/src/Serval.ApiServer/wwwroot/js/auth0.js b/src/Serval.ApiServer/wwwroot/js/auth0.js
@@ -3,7 +3,7 @@ var f = window.fetch;
 window.fetch = function (url, opts) {
     if (opts && opts.body && typeof opts.body === 'string' && opts.body.indexOf('client_credentials') !== -1) {
         // We know the audience - just add it.
-        opts.body += '&audience=https://serval-api.org';
+        opts.body += '&audience=https://serval-api.org/';
     }
     return f(url, opts);
 };
diff --git a/tests/Serval.E2ETests/MissingServicesTests.cs b/tests/Serval.E2ETests/MissingServicesTests.cs
@@ -9,7 +9,7 @@ public class MissingServicesTests
         [SetUp]
         public void Setup()
         {
-            _helperClient = new ServalClientHelper("https://machine.sil.org", ignoreSSLErrors: true);
+            _helperClient = new ServalClientHelper("https://serval-api.org/", ignoreSSLErrors: true);
         }
 
         [Test]

diff --git a/tests/Serval.E2ETests/ServalApiSlowTests.cs b/tests/Serval.E2ETests/ServalApiSlowTests.cs
@@ -10,7 +10,7 @@ public class ServalApiSlowTests
     [SetUp]
     public void SetUp()
     {
-        _helperClient = new ServalClientHelper("https://machine.sil.org", ignoreSSLErrors: true);
+        _helperClient = new ServalClientHelper("https://serval-api.org/", ignoreSSLErrors: true);
     }
 
     [Test]

diff --git a/tests/Serval.E2ETests/ServalApiTests.cs b/tests/Serval.E2ETests/ServalApiTests.cs
@@ -9,7 +9,7 @@ public class ServalApiTests
     [SetUp]
     public void SetUp()
     {
-        _helperClient = new ServalClientHelper("https://serval-api.org", ignoreSSLErrors: true);
+        _helperClient = new ServalClientHelper("https://serval-api.org/", ignoreSSLErrors: true);
     }
 
     [Test]
-Original file line number
+Diff line change
@@ Expand Up / @@ -9,7 +9,7 @@ public class MissingServicesTests @@
             [SetUp]
             public void Setup()
             {
-                _helperClient = new ServalClientHelper("https://machine.sil.org", ignoreSSLErrors: true);
+                _helperClient = new ServalClientHelper("https://serval-api.org/", ignoreSSLErrors: true);
             }
             [Test]
@@ Expand Down @@