Merge pull request #557 from VATSIM-UK/api-key-url

Andy Ford · web-flow · commit f03067dcc066 · 2024-04-30T21:33:30.000+01:00
fix: change user create api key path
diff --git a/src/utils/api/ApiKeyRedirectUrlBuilder.cpp b/src/utils/api/ApiKeyRedirectUrlBuilder.cpp
@@ -31,7 +31,7 @@ namespace UKControllerPluginUtils::Api {
     auto ApiKeyRedirectUrlBuilder::BuildUrl(const std::string& host, int port) const -> std::string
     {
         const auto redirectUrl = "http://" + host + ":" + std::to_string(port);
-        return impl->settings.Url() + "/admin/user-create-api-key/?redirect=" +
+        return impl->settings.Url() + "/user-create-api-key/?redirect=" +
                curl_easy_escape(impl->curlHandle, redirectUrl.c_str(), redirectUrl.size());
     }
 } // namespace UKControllerPluginUtils::Api
diff --git a/test/utils/api/ApiKeyRedirectUrlBuilderTest.cpp b/test/utils/api/ApiKeyRedirectUrlBuilderTest.cpp
@@ -18,7 +18,7 @@ namespace UKControllerPluginUtilsTest::Api {
     TEST_F(ApiKeyRedirectUrlBuilderTest, ItReturnsUrl)
     {
         EXPECT_EQ(
-            "https://vatsim.uk/admin/user-create-api-key/?redirect=http%3A%2F%2Flocalhost%3A62134",
+            "https://vatsim.uk/user-create-api-key/?redirect=http%3A%2F%2Flocalhost%3A62134",
             builder.BuildUrl("localhost", 62134));
     }
 } // namespace UKControllerPluginUtilsTest::Api

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ namespace UKControllerPluginUtils::Api {`
`31`	`31`	`auto ApiKeyRedirectUrlBuilder::BuildUrl(const std::string& host, int port) const -> std::string`
`32`	`32`	`{`
`33`	`33`	`const auto redirectUrl = "http://" + host + ":" + std::to_string(port);`
`34`		`- return impl->settings.Url() + "/admin/user-create-api-key/?redirect=" +`
	`34`	`+ return impl->settings.Url() + "/user-create-api-key/?redirect=" +`
`35`	`35`	`curl_easy_escape(impl->curlHandle, redirectUrl.c_str(), redirectUrl.size());`
`36`	`36`	`}`
`37`	`37`	`} // namespace UKControllerPluginUtils::Api`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ namespace UKControllerPluginUtilsTest::Api {`
`18`	`18`	`TEST_F(ApiKeyRedirectUrlBuilderTest, ItReturnsUrl)`
`19`	`19`	`{`
`20`	`20`	`EXPECT_EQ(`
`21`		`- "https://vatsim.uk/admin/user-create-api-key/?redirect=http%3A%2F%2Flocalhost%3A62134",`
	`21`	`+ "https://vatsim.uk/user-create-api-key/?redirect=http%3A%2F%2Flocalhost%3A62134",`
`22`	`22`	`builder.BuildUrl("localhost", 62134));`
`23`	`23`	`}`
`24`	`24`	`} // namespace UKControllerPluginUtilsTest::Api`