Merge pull request #454 from AndyTWF/452-nattrak-endpoint

AndyTWF · web-flow · commit b6cc84dbb118 · 2022-04-17T10:49:41.000+01:00
fix(oceanic): Use new Nattrak API endpoint
diff --git a/src/plugin/oceanic/OceanicEventHandler.h b/src/plugin/oceanic/OceanicEventHandler.h
@@ -76,7 +76,7 @@ namespace UKControllerPlugin::Oceanic {
         Dialog::DialogManager& dialogManager;
 
         // The URL to find nattrak
-        const std::string nattrakUrl = "https://nattrak.vatsim.net/pluginapi.php";
+        const std::string nattrakUrl = "https://nattrak.vatsim.net/api/plugins";
 
         // Returned if clearance doesnt exist
         const Clearance invalidClearance = Clearance("NOTAVALIDCLEARANCESORRY");
diff --git a/test/plugin/oceanic/OceanicEventHandlerTest.cpp b/test/plugin/oceanic/OceanicEventHandlerTest.cpp
@@ -35,7 +35,7 @@ namespace UKControllerPluginTest {
 
             void SimulateNattrakCall(bool curlError, uint64_t statusCode, std::string body)
             {
-                CurlRequest expectedRequest("https://nattrak.vatsim.net/pluginapi.php", CurlRequest::METHOD_GET);
+                CurlRequest expectedRequest("https://nattrak.vatsim.net/api/plugins", CurlRequest::METHOD_GET);
                 EXPECT_CALL(mockCurl, MakeCurlRequest(expectedRequest))
                     .Times(1)
                     .WillOnce(Return(CurlResponse(body, curlError, statusCode)));

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ namespace UKControllerPluginTest {`
`35`	`35`
`36`	`36`	`void SimulateNattrakCall(bool curlError, uint64_t statusCode, std::string body)`
`37`	`37`	`{`
`38`		`- CurlRequest expectedRequest("https://nattrak.vatsim.net/pluginapi.php", CurlRequest::METHOD_GET);`
	`38`	`+ CurlRequest expectedRequest("https://nattrak.vatsim.net/api/plugins", CurlRequest::METHOD_GET);`
`39`	`39`	`EXPECT_CALL(mockCurl, MakeCurlRequest(expectedRequest))`
`40`	`40`	`.Times(1)`
`41`	`41`	`.WillOnce(Return(CurlResponse(body, curlError, statusCode)));`