Move grantValidatorLicense to HttpSvOperatorHandler

Signed-off-by: Divam <dfordivam@gmail.com>

Author: dfordivam

apps/app/src/main/scala/org/lfdecentralizedtrust/splice/console/SvAppReference.scala

@@ -363,7 +363,7 @@ class SvAppBackendReference(
   def grantValidatorLicense(partyId: PartyId): Unit =
     consoleEnvironment.run {
       httpCommand(
-        HttpSvAdminAppClient.GrantValidatorLicense(partyId)
+        HttpSvOperatorAppClient.GrantValidatorLicense(partyId)
       )
     }
 

apps/sv/src/main/openapi/sv-internal.yaml

@@ -75,7 +75,7 @@ paths:
   /v0/admin/validator/licenses/grant:
     post:
       tags: [sv]
-      x-jvm-package: sv_admin
+      x-jvm-package: sv_operator
       operationId: "grantValidatorLicense"
       requestBody:
         required: true

apps/sv/src/main/scala/org/lfdecentralizedtrust/splice/sv/admin/api/client/commands/HttpSvAdminAppClient.scala

@@ -8,7 +8,6 @@ import org.apache.pekko.stream.Materializer
 import cats.data.EitherT
 import org.lfdecentralizedtrust.splice.admin.api.client.commands.{HttpClientBuilder, HttpCommand}
 import org.lfdecentralizedtrust.splice.http.HttpClient
-import org.lfdecentralizedtrust.splice.http.v0.definitions
 import org.lfdecentralizedtrust.splice.http.v0.definitions.TriggerDomainMigrationDumpRequest
 import org.lfdecentralizedtrust.splice.http.v0.sv_admin.TriggerDomainMigrationDumpResponse
 import org.lfdecentralizedtrust.splice.http.v0.sv_admin as http
@@ -40,25 +39,6 @@ object HttpSvAdminAppClient {
       )
   }
 
-  case class GrantValidatorLicense(partyId: PartyId)
-      extends BaseCommand[http.GrantValidatorLicenseResponse, Unit] {
-
-    override def submitRequest(
-        client: Client,
-        headers: List[HttpHeader],
-    ): EitherT[Future, Either[Throwable, HttpResponse], http.GrantValidatorLicenseResponse] =
-      client.grantValidatorLicense(
-        body = definitions.GrantValidatorLicenseRequest(partyId.toProtoPrimitive),
-        headers = headers,
-      )
-
-    override def handleOk()(implicit
-        decoder: TemplateJsonDecoder
-    ) = { case http.GrantValidatorLicenseResponse.OK =>
-      Right(())
-    }
-  }
-
   case class PauseDecentralizedSynchronizer()
       extends BaseCommand[http.PauseDecentralizedSynchronizerResponse, Unit] {
 

apps/sv/src/main/scala/org/lfdecentralizedtrust/splice/sv/admin/api/client/commands/HttpSvOperatorAppClient.scala

@@ -24,6 +24,7 @@ import org.lfdecentralizedtrust.splice.http.v0.{definitions, sv_operator as http
 import org.lfdecentralizedtrust.splice.util.{Codec, Contract, TemplateJsonDecoder}
 import org.lfdecentralizedtrust.splice.sv.util.ValidatorOnboarding
 import com.digitalasset.canton.admin.api.client.data.NodeStatus
+import com.digitalasset.canton.topology.PartyId
 import com.digitalasset.canton.daml.lf.value.json.ApiCodecCompressed
 import com.digitalasset.canton.logging.ErrorLoggingContext
 import com.digitalasset.canton.tracing.TraceContext
@@ -99,6 +100,25 @@ object HttpSvOperatorAppClient {
     }
   }
 
+  case class GrantValidatorLicense(partyId: PartyId)
+      extends BaseCommand[http.GrantValidatorLicenseResponse, Unit] {
+
+    override def submitRequest(
+        client: Client,
+        headers: List[HttpHeader],
+    ): EitherT[Future, Either[Throwable, HttpResponse], http.GrantValidatorLicenseResponse] =
+      client.grantValidatorLicense(
+        body = definitions.GrantValidatorLicenseRequest(partyId.toProtoPrimitive),
+        headers = headers,
+      )
+
+    override def handleOk()(implicit
+        decoder: TemplateJsonDecoder
+    ) = { case http.GrantValidatorLicenseResponse.OK =>
+      Right(())
+    }
+  }
+
   case object ListAmuletPriceVotes
       extends BaseCommand[http.ListAmuletPriceVotesResponse, Seq[
         Contract[AmuletPriceVote.ContractId, AmuletPriceVote]

apps/sv/src/main/scala/org/lfdecentralizedtrust/splice/sv/admin/http/HttpSvAdminHandler.scala

@@ -51,42 +51,6 @@ class HttpSvAdminHandler(
   protected val workflowId: String = this.getClass.getSimpleName
   private val dsoStore = dsoStoreWithIngestion.store
 
-  override def grantValidatorLicense(
-      respond: r0.GrantValidatorLicenseResponse.type
-  )(
-      body: definitions.GrantValidatorLicenseRequest
-  )(tuser: AdminUserRequest): Future[r0.GrantValidatorLicenseResponse] = {
-    implicit val AdminUserRequest(traceContext) = tuser
-    withSpan(s"$workflowId.grantValidatorLicense") { implicit traceContext => _ =>
-      Codec.decode(Codec.Party)(body.partyId) match {
-        case Left(error) =>
-          Future.failed(
-            HttpErrorHandler.badRequest(s"Invalid party ID '${body.partyId}': $error")
-          )
-        case Right(validatorParty) =>
-          for {
-            dsoRules <- dsoStore.getDsoRules()
-            svParty = dsoStore.key.svParty
-            dsoParty = dsoStore.key.dsoParty
-            cmd = dsoRules.exercise(
-              _.exerciseDsoRules_GrantValidatorLicense(
-                svParty.toProtoPrimitive,
-                validatorParty.toProtoPrimitive,
-              )
-            )
-            _ <- dsoStoreWithIngestion
-              .connection(SpliceLedgerConnectionPriority.Low)
-              .submit(Seq(svParty), Seq(dsoParty), cmd)
-              .withSynchronizerId(dsoRules.domain)
-              .noDedup
-              .yieldUnit()
-          } yield {
-            r0.GrantValidatorLicenseResponseOK
-          }
-      }
-    }
-  }
-
   override def pauseDecentralizedSynchronizer(
       respond: r0.PauseDecentralizedSynchronizerResponse.type
   )()(

apps/sv/src/main/scala/org/lfdecentralizedtrust/splice/sv/admin/http/HttpSvOperatorHandler.scala

@@ -169,6 +169,42 @@ class HttpSvOperatorHandler(
       .map(r0.ListValidatorLicensesResponse.OK)
   }
 
+  override def grantValidatorLicense(
+      respond: r0.GrantValidatorLicenseResponse.type
+  )(
+      body: definitions.GrantValidatorLicenseRequest
+  )(extracted: ActAsKnownUserRequest): Future[r0.GrantValidatorLicenseResponse] = {
+    implicit val ActAsKnownUserRequest(traceContext) = extracted
+    withSpan(s"$workflowId.grantValidatorLicense") { implicit traceContext => _ =>
+      Codec.decode(Codec.Party)(body.partyId) match {
+        case Left(error) =>
+          Future.failed(
+            HttpErrorHandler.badRequest(s"Invalid party ID '${body.partyId}': $error")
+          )
+        case Right(validatorParty) =>
+          for {
+            dsoRules <- dsoStore.getDsoRules()
+            svParty = dsoStore.key.svParty
+            dsoParty = dsoStore.key.dsoParty
+            cmd = dsoRules.exercise(
+              _.exerciseDsoRules_GrantValidatorLicense(
+                svParty.toProtoPrimitive,
+                validatorParty.toProtoPrimitive,
+              )
+            )
+            _ <- dsoStoreWithIngestion
+              .connection(AppStoreWithIngestion.SpliceLedgerConnectionPriority.Low)
+              .submit(Seq(svParty), Seq(dsoParty), cmd)
+              .withSynchronizerId(dsoRules.domain)
+              .noDedup
+              .yieldUnit()
+          } yield {
+            r0.GrantValidatorLicenseResponseOK
+          }
+      }
+    }
+  }
+
   def listOngoingValidatorOnboardings(
       respond: r0.ListOngoingValidatorOnboardingsResponse.type
   )()(