feat: add branchingEnabled to API key endpoint (chrome-extension)

backend/api/src/main/kotlin/io/tolgee/api/v2/controllers/ApiKeyController.kt

@@ -6,6 +6,7 @@ import io.swagger.v3.oas.annotations.media.Content
 import io.swagger.v3.oas.annotations.media.Schema
 import io.swagger.v3.oas.annotations.responses.ApiResponse
 import io.swagger.v3.oas.annotations.tags.Tag
+import io.tolgee.constants.Feature
 import io.tolgee.constants.Message
 import io.tolgee.dtos.cacheable.isAdmin
 import io.tolgee.dtos.request.apiKey.CreateApiKeyDto
@@ -31,6 +32,7 @@ import io.tolgee.security.authentication.AuthTokenType
 import io.tolgee.security.authentication.AuthenticationFacade
 import io.tolgee.security.authentication.RequiresSuperAuthentication
 import io.tolgee.security.authorization.RequiresProjectPermissions
+import io.tolgee.service.project.ProjectFeatureGuard
 import io.tolgee.service.project.ProjectService
 import io.tolgee.service.security.ApiKeyService
 import io.tolgee.service.security.PermissionService
@@ -67,6 +69,7 @@ class ApiKeyController(
   private val pagedResourcesAssembler: PagedResourcesAssembler<ApiKey>,
   private val permissionService: PermissionService,
   private val simpleProjectModelAssembler: SimpleProjectModelAssembler,
+  private val projectFeatureGuard: ProjectFeatureGuard,
 ) {
   @PostMapping(path = ["/api-keys"])
   @Operation(summary = "Create API key", description = "Creates new API key with provided scopes")
@@ -133,6 +136,7 @@ class ApiKeyController(
     return ApiKeyWithLanguagesModel(
       apiKeyModelAssembler.toModel(apiKey),
       permittedLanguageIds = translateLanguageIds,
+      branchingEnabled = projectFeatureGuard.isFeatureEnabled(Feature.BRANCHING, apiKey.project),
     )
   }
 

backend/api/src/main/kotlin/io/tolgee/hateoas/apiKey/ApiKeyWithLanguagesModel.kt

@@ -14,5 +14,9 @@ open class ApiKeyWithLanguagesModel(
     deprecated = true,
   )
   val permittedLanguageIds: Set<Long>?,
+  @Schema(
+    description = "Whether branching is enabled and active on this project.",
+  )
+  val branchingEnabled: Boolean = false,
 ) : RepresentationModel<ApiKeyWithLanguagesModel>(),
   IApiKeyModel by apiKeyModel

backend/data/src/main/kotlin/io/tolgee/constants/Message.kt

@@ -324,7 +324,7 @@ enum class Message {
   BRANCH_MERGE_REVISION_NOT_VALID,
   BRANCH_MERGE_CONFLICTS_NOT_RESOLVED,
   BRANCH_MERGE_ALREADY_MERGED,
-  BRANCHING_NOT_ENABLED_FOR_PROJECT,
+  FEATURE_NOT_ENABLED_FOR_PROJECT,
   EXPORT_KEY_PLURAL_SUFFIX_COLLISION,
   TRANSLATION_EXCEEDS_CHAR_LIMIT,
   ;

backend/data/src/main/kotlin/io/tolgee/service/project/ProjectFeatureGuard.kt

@@ -3,7 +3,7 @@ package io.tolgee.service.project
 import io.tolgee.component.enabledFeaturesProvider.EnabledFeaturesProvider
 import io.tolgee.constants.Feature
 import io.tolgee.constants.Message
-import io.tolgee.dtos.request.validators.exceptions.ValidationException
+import io.tolgee.exceptions.BadRequestException
 import io.tolgee.model.Project
 import io.tolgee.security.ProjectHolder
 import org.springframework.stereotype.Service
@@ -25,7 +25,7 @@ class ProjectFeatureGuard(
     val project = projectHolder.projectEntity
     enabledFeaturesProvider.checkFeatureEnabled(project.organizationOwner.id, feature)
     if (!ProjectFeatureRegistry.isEnabledOnProject(feature, project)) {
-      throw ValidationException(Message.BRANCHING_NOT_ENABLED_FOR_PROJECT)
+      throw BadRequestException(Message.FEATURE_NOT_ENABLED_FOR_PROJECT, listOf(feature.name))
     }
   }
 
@@ -35,7 +35,7 @@ class ProjectFeatureGuard(
   ) {
     enabledFeaturesProvider.checkFeatureEnabled(project.organizationOwner.id, feature)
     if (!ProjectFeatureRegistry.isEnabledOnProject(feature, project)) {
-      throw ValidationException(Message.BRANCHING_NOT_ENABLED_FOR_PROJECT)
+      throw BadRequestException(Message.FEATURE_NOT_ENABLED_FOR_PROJECT, listOf(feature.name))
     }
   }
 

webapp/src/service/apiSchema.generated.ts

@@ -1358,6 +1358,8 @@ export interface components {
       viewLanguageIds?: number[];
     };
     ApiKeyWithLanguagesModel: {
+      /** @description Whether branching is enabled and active on this project. */
+      branchingEnabled: boolean;
       description: string;
       /** Format: int64 */
       expiresAt?: number;
@@ -2942,7 +2944,7 @@ export interface components {
         | "branch_merge_revision_not_valid"
         | "branch_merge_conflicts_not_resolved"
         | "branch_merge_already_merged"
-        | "branching_not_enabled_for_project"
+        | "feature_not_enabled_for_project"
         | "export_key_plural_suffix_collision"
         | "translation_exceeds_char_limit";
       params?: unknown[];
@@ -6378,7 +6380,7 @@ export interface components {
         | "branch_merge_revision_not_valid"
         | "branch_merge_conflicts_not_resolved"
         | "branch_merge_already_merged"
-        | "branching_not_enabled_for_project"
+        | "feature_not_enabled_for_project"
         | "export_key_plural_suffix_collision"
         | "translation_exceeds_char_limit";
       params?: unknown[];

webapp/src/translationTools/useErrorTranslation.ts

@@ -213,6 +213,10 @@ export function useErrorTranslation() {
         return t('operation_not_permitted_in_read_only_mode');
       case 'cannot_delete_branch_with_children':
         return t('cannot_delete_branch_with_children');
+      case 'feature_not_enabled_for_project':
+        return t('feature_not_enabled_for_project', {
+          feature: params?.[0] || '',
+        });
       case 'export_key_plural_suffix_collision':
         return t('export_key_plural_suffix_collision', {
           pluralKey: params?.[0] || '',