Skip to content

Prevention of double slashes when building API URLs #32

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pasotee merged 1 commit into from
Jul 16, 2025
Merged

Prevention of double slashes when building API URLs #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Source/TolgeeEditor/Private/STolgeeTranslationTab.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ namespace
void STolgeeTranslationTab::Construct(const FArguments& InArgs)
{
const UTolgeeEditorSettings* Settings = GetDefault<UTolgeeEditorSettings>();
const FString LoginUrl = FString::Printf(TEXT("%s/login"), *Settings->ApiUrl);
const FString LoginUrl = FString::Printf(TEXT("%s/login"), *Settings->GetBaseUrl());

DrawHandle = UDebugDrawService::Register(TEXT("Game"), FDebugDrawDelegate::CreateSP(this, &STolgeeTranslationTab::DebugDrawCallback));

Expand Down Expand Up @@ -149,7 +149,7 @@ void STolgeeTranslationTab::ShowWidgetFor(const FString& TolgeeKeyId)

const UTolgeeEditorSettings* Settings = GetDefault<UTolgeeEditorSettings>();

const FString NewUrl = FString::Printf(TEXT("%s/projects/%s/translations/single?key=%s"), *Settings->ApiUrl, *ProjectId, *TolgeeKeyId);
const FString NewUrl = FString::Printf(TEXT("%s/projects/%s/translations/single?key=%s"), *Settings->GetBaseUrl(), *ProjectId, *TolgeeKeyId);
const FString CurrentUrl = Browser->GetUrl();

if (NewUrl != CurrentUrl && Browser->IsLoaded())
Expand All @@ -167,7 +167,7 @@ FString STolgeeTranslationTab::FindProjectIdFor(const FString& TolgeeKeyId) cons
TMap<FString, FHttpRequestPtr> PendingRequests;
for (const FString& ProjectId : Settings->ProjectIds)
{
const FString RequestUrl = FString::Printf(TEXT("%s/v2/projects/%s/translations?filterKeyName=%s"), *Settings->ApiUrl, *ProjectId, *TolgeeKeyId);
const FString RequestUrl = FString::Printf(TEXT("%s/v2/projects/%s/translations?filterKeyName=%s"), *Settings->GetBaseUrl(), *ProjectId, *TolgeeKeyId);

FHttpRequestRef HttpRequest = FHttpModule::Get().CreateRequest();
HttpRequest->SetVerb("GET");
Expand Down
2 changes: 1 addition & 1 deletion Source/TolgeeEditor/Private/TolgeeEditor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ void FTolgeeEditorModule::ExtendToolbar(FToolBarBuilder& Builder)
[]()
{
const UTolgeeEditorSettings* Settings = GetDefault<UTolgeeEditorSettings>();
FPlatformProcess::LaunchURL(*Settings->ApiUrl, nullptr, nullptr);
FPlatformProcess::LaunchURL(*Settings->GetBaseUrl(), nullptr, nullptr);
}
))
);
Expand Down
4 changes: 2 additions & 2 deletions Source/TolgeeEditor/Private/TolgeeEditorIntegrationSubsystem.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ void UTolgeeEditorIntegrationSubsystem::FetchAllProjects()

for (const FString& ProjectId : Settings->ProjectIds)
{
const FString RequestUrl = FString::Printf(TEXT("%s/v2/projects/%s/export?format=PO"), *Settings->ApiUrl, *ProjectId);
const FString RequestUrl = FString::Printf(TEXT("%s/v2/projects/%s/export?format=PO"), *Settings->GetBaseUrl(), *ProjectId);
UE_LOG(LogTolgee, Display, TEXT("Fetching localization data for project %s from Tolgee dashboard: %s"), *ProjectId, *RequestUrl);
FetchFromDashboard(ProjectId, RequestUrl);
}
Expand Down Expand Up @@ -183,7 +183,7 @@ void UTolgeeEditorIntegrationSubsystem::FetchIfProjectsWereUpdated()

for (const FString& ProjectId : Settings->ProjectIds)
{
const FString RequestUrl = FString::Printf(TEXT("%s/v2/projects/%s/stats"), *Settings->ApiUrl, *ProjectId);
const FString RequestUrl = FString::Printf(TEXT("%s/v2/projects/%s/stats"), *Settings->GetBaseUrl(), *ProjectId);

FHttpRequestRef HttpRequest = FHttpModule::Get().CreateRequest();
HttpRequest->SetVerb("GET");
Expand Down
5 changes: 5 additions & 0 deletions Source/TolgeeEditor/Private/TolgeeEditorSettings.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@

#include "TolgeeEditorSettings.h"

FString UTolgeeEditorSettings::GetBaseUrl() const
{
return ApiUrl.EndsWith(TEXT("/")) ? ApiUrl.LeftChop(1) : ApiUrl;
}

FName UTolgeeEditorSettings::GetCategoryName() const
{
return TEXT("Plugins");
Expand Down
7 changes: 7 additions & 0 deletions Source/TolgeeEditor/Public/TolgeeEditorSettings.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,13 @@ class TOLGEEEDITOR_API UTolgeeEditorSettings : public UDeveloperSettings
UPROPERTY(Config, EditAnywhere, Category = "Tolgee|Provider")
TMap<FGuid, FTolgeePerTargetSettings> PerTargetSettings;

/**
* Returns the ApiUrl without a trailing slash.
* Use this when building API requests to avoid getting double slashes.
*/
FString GetBaseUrl() const;

private:
// ~ Begin UDeveloperSettings Interface
virtual FName GetCategoryName() const override;
// ~ End UDeveloperSettings Interface
Expand Down
4 changes: 2 additions & 2 deletions Source/TolgeeProvider/Private/TolgeeProviderLocalizationServiceOperations.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ bool FTolgeeProviderUploadFileWorker::Execute(FTolgeeProviderLocalizationService

const UTolgeeEditorSettings* ProviderSettings = GetDefault<UTolgeeEditorSettings>();
const FTolgeePerTargetSettings* ProjectSettings = ProviderSettings->PerTargetSettings.Find(TargetGuid);
const FString Url = FString::Printf(TEXT("%s/v2/projects/%s/single-step-import"), *ProviderSettings->ApiUrl, *ProjectSettings->ProjectId);
const FString Url = FString::Printf(TEXT("%s/v2/projects/%s/single-step-import"), *ProviderSettings->GetBaseUrl(), *ProjectSettings->ProjectId);

FHttpRequestRef HttpRequest = FHttpModule::Get().CreateRequest();
HttpRequest->SetURL(Url);
Expand Down Expand Up @@ -132,7 +132,7 @@ bool FTolgeeProviderDownloadFileWorker::Execute(FTolgeeProviderLocalizationServi
const UTolgeeEditorSettings* ProviderSettings = GetDefault<UTolgeeEditorSettings>();
const FTolgeePerTargetSettings* ProjectSettings = ProviderSettings->PerTargetSettings.Find(TargetGuid);

const FString Url = FString::Printf(TEXT("%s/v2/projects/%s/export"), *ProviderSettings->ApiUrl, *ProjectSettings->ProjectId);
const FString Url = FString::Printf(TEXT("%s/v2/projects/%s/export"), *ProviderSettings->GetBaseUrl(), *ProjectSettings->ProjectId);

FHttpRequestRef HttpRequest = FHttpModule::Get().CreateRequest();
HttpRequest->SetURL(Url);
Expand Down
Loading