feat(api): use api prefix for all routes

VATSIM-UK · Jul 11, 2022 · e9f7338 · e9f7338
2 parents 03ecda9 + 3bd4156
commit e9f7338
Show file tree

Hide file tree

Showing 10 changed files with 58 additions and 56 deletions.
diff --git a/src/utils/api/ApiRequestBuilder.cpp b/src/utils/api/ApiRequestBuilder.cpp
@@ -438,7 +438,7 @@ namespace UKControllerPlugin::Api {
 
     auto ApiRequestBuilder::BuildUrl(const std::string uri) const -> std::string
     {
-        return this->settings.Url() + uri;
+        return this->settings.Url() + "/api" + uri;
     }
 
     auto ApiRequestBuilder::GetApiDomain() const -> const std::string&

diff --git a/src/utils/api/ApiUrlBuilder.cpp b/src/utils/api/ApiUrlBuilder.cpp
@@ -11,7 +11,7 @@ namespace UKControllerPluginUtils::Api {
 
     auto ApiUrlBuilder::BuildUrl(const ApiRequestData& requestData) const -> const std::string
     {
-        return String::rtrim(settings.Url(), URL_PATH_SEPARATOR) + URL_PATH_SEPARATOR +
+        return String::rtrim(settings.Url(), URL_PATH_SEPARATOR) + URL_PATH_SEPARATOR + "api" + URL_PATH_SEPARATOR +
                String::trim(requestData.Uri(), URL_PATH_SEPARATOR);
     }
 } // namespace UKControllerPluginUtils::Api
diff --git a/test/testingutils/helper/ApiRequestHelperFunctions.cpp b/test/testingutils/helper/ApiRequestHelperFunctions.cpp
@@ -14,7 +14,7 @@ std::shared_ptr<ApiSettings> settings;
 */
 CurlRequest GetApiCurlRequest(std::string route, std::string method, nlohmann::json body)
 {
-    CurlRequest request(mockApiUrl + route, method);
+    CurlRequest request(mockApiUrl + "/api" + route, method);
     request.SetBody(body.dump());
     request.AddHeader("Authorization", "Bearer " + mockApiKey);
     request.AddHeader("Accept", "application/json");
@@ -27,7 +27,7 @@ CurlRequest GetApiCurlRequest(std::string route, std::string method, nlohmann::j
 */
 CurlRequest GetApiCurlRequest(std::string route, std::string method)
 {
-    CurlRequest request(mockApiUrl + route, method);
+    CurlRequest request(mockApiUrl + "/api" + route, method);
     request.AddHeader("Authorization", "Bearer " + mockApiKey);
     request.AddHeader("Accept", "application/json");
     request.AddHeader("Content-Type", "application/json");

diff --git a/test/utils/api/ApiBootstrapTest.cpp b/test/utils/api/ApiBootstrapTest.cpp
@@ -41,7 +41,7 @@ namespace UKControllerPluginUtilsTest::Api {
         auto legacyInterface = BootstrapLegacy(*factory, curl);
         EXPECT_NE(nullptr, legacyInterface);
 
-        CurlRequest expectedRequest("https://ukcp.vatsim.uk/authorise", CurlRequest::METHOD_GET);
+        CurlRequest expectedRequest("https://ukcp.vatsim.uk/api/authorise", CurlRequest::METHOD_GET);
         expectedRequest.AddHeader("Authorization", "Bearer ");
         expectedRequest.AddHeader("Accept", "application/json");
         expectedRequest.AddHeader("Content-Type", "application/json");

diff --git a/test/utils/api/ApiCurlRequestFactoryTest.cpp b/test/utils/api/ApiCurlRequestFactoryTest.cpp
@@ -31,7 +31,7 @@ namespace UKControllerPluginUtilsTest::Api {
         auto request =
             requestFactory.BuildCurlRequest(ApiRequestData("test", UKControllerPluginUtils::Http::HttpMethod::Get()));
 
-        CurlRequest expectedRequest("https://ukcp.vatsim.uk/test", CurlRequest::METHOD_GET);
+        CurlRequest expectedRequest("https://ukcp.vatsim.uk/api/test", CurlRequest::METHOD_GET);
         expectedRequest.AddHeader("Authorization", "Bearer key");
         expectedRequest.AddHeader("Accept", "application/json");
         expectedRequest.AddHeader("Content-Type", "application/json");

diff --git a/test/utils/api/ApiFactoryTest.cpp b/test/utils/api/ApiFactoryTest.cpp
@@ -57,7 +57,7 @@ namespace UKControllerPluginUtilsTest::Api {
     {
         auto& builder = factory.LegacyRequestBuilder();
 
-        CurlRequest expectedRequest("https://ukcp.vatsim.uk/authorise", CurlRequest::METHOD_GET);
+        CurlRequest expectedRequest("https://ukcp.vatsim.uk/api/authorise", CurlRequest::METHOD_GET);
         expectedRequest.AddHeader("Authorization", "Bearer key");
         expectedRequest.AddHeader("Accept", "application/json");
         expectedRequest.AddHeader("Content-Type", "application/json");

diff --git a/test/utils/api/ApiHelperTest.cpp b/test/utils/api/ApiHelperTest.cpp
@@ -423,7 +423,7 @@ namespace UKControllerPluginUtilsTest::Api {
         params.requestedLevel = 10000;
 
         CurlRequest expectedRequest(GetApiGetUriCurlRequest(
-            "http://ukcp.test.com/srd/route/search?origin=EGLL&destination=EGGD&requestedLevel=10000",
+            "http://ukcp.test.com/api/srd/route/search?origin=EGLL&destination=EGGD&requestedLevel=10000",
             CurlRequest::METHOD_GET));
 
         EXPECT_CALL(this->mockCurlApi, MakeCurlRequest(expectedRequest)).Times(1).WillOnce(Return(response));
@@ -438,7 +438,7 @@ namespace UKControllerPluginUtilsTest::Api {
         CurlResponse response(responseData.dump(), false, 200);
 
         CurlRequest expectedRequest(
-            GetApiGetUriCurlRequest("http://ukcp.test.com/hold/assigned", CurlRequest::METHOD_GET));
+            GetApiGetUriCurlRequest("http://ukcp.test.com/api/hold/assigned", CurlRequest::METHOD_GET));
 
         EXPECT_CALL(this->mockCurlApi, MakeCurlRequest(expectedRequest)).Times(1).WillOnce(Return(response));
 
@@ -523,7 +523,7 @@ namespace UKControllerPluginUtilsTest::Api {
         CurlResponse response(responseData.dump(), false, 200);
 
         CurlRequest expectedRequest(
-            GetApiGetUriCurlRequest("http://ukcp.test.com/stand/assignment", CurlRequest::METHOD_GET));
+            GetApiGetUriCurlRequest("http://ukcp.test.com/api/stand/assignment", CurlRequest::METHOD_GET));
 
         EXPECT_CALL(this->mockCurlApi, MakeCurlRequest(expectedRequest)).Times(1).WillOnce(Return(response));
 
@@ -632,7 +632,7 @@ namespace UKControllerPluginUtilsTest::Api {
         CurlResponse response(responseData.dump(), false, 200);
 
         CurlRequest expectedRequest(
-            GetApiGetUriCurlRequest("http://ukcp.test.com/version/latest?channel=beta", CurlRequest::METHOD_GET));
+            GetApiGetUriCurlRequest("http://ukcp.test.com/api/version/latest?channel=beta", CurlRequest::METHOD_GET));
 
         EXPECT_CALL(this->mockCurlApi, MakeCurlRequest(expectedRequest)).Times(1).WillOnce(Return(response));