fix: set env var for base domain for synthetic service account email and remove nested transaction

Author: hamir-suspect

guard/helm/templates/user-api-dpl.yaml

@@ -117,6 +117,11 @@ spec:
                 secretKeyRef:
                   name: {{ .Values.global.rabbitmq.secretName }}
                   key: amqp-url
+            - name: BASE_DOMAIN
+              valueFrom:
+                configMapKeyRef:
+                  name: {{ .Values.global.domain.configMapName }}
+                  key: BASE_DOMAIN
             - name: LOG_LEVEL
               value: {{ .Values.userApi.logging.level | quote }}
 {{- if .Values.global.statsd.enabled }}

guard/lib/guard/grpc_servers/service_account_server.ex

@@ -242,8 +242,8 @@ defmodule Guard.GrpcServers.ServiceAccountServer do
       description: service_account.description || "",
       org_id: service_account.org_id,
       creator_id: service_account.creator_id || "",
-      created_at: grpc_timestamp(service_account.created_at),
-      updated_at: grpc_timestamp(service_account.updated_at),
+      created_at: grpc_timestamp(service_account.user.created_at),
+      updated_at: grpc_timestamp(service_account.user.updated_at),
       deactivated: service_account.deactivated || false
     )
   end

guard/lib/guard/service_account/actions.ex

@@ -122,10 +122,9 @@ defmodule Guard.ServiceAccount.Actions do
   # Private helper functions
 
   defp _create(params) do
-    # Use nested transactions because FrontRepo and Repo are different databases
     FrontRepo.transaction(fn ->
       with {:ok, result} <- ServiceAccount.create(params),
-           {:ok, _rbac_user} <- create_rbac_user_in_transaction(result.service_account) do
+           {:ok, _rbac_user} <- create_rbac_user(result.service_account) do
         # Return the service account data and API token
         {result.service_account, result.api_token}
       else
@@ -135,7 +134,7 @@ defmodule Guard.ServiceAccount.Actions do
     end)
   end
 
-  defp create_rbac_user_in_transaction(service_account) do
+  defp create_rbac_user(service_account) do
     # RBAC operations use Guard.Repo (different database from FrontRepo)
     case Guard.Store.RbacUser.create(
            service_account.id,

guard/lib/guard/store/service_account.ex

@@ -95,17 +95,15 @@ defmodule Guard.Store.ServiceAccount do
           {:ok, %{service_account: map(), api_token: String.t()}}
           | {:error, term()}
   def create(params) do
-    FrontRepo.transaction(fn ->
-      with {:ok, {plain_token, hashed_token}} <- generate_api_token(),
-           {:ok, user} <- create_user_record(params, hashed_token),
-           {:ok, service_account} <- create_service_account_record(user.id, params),
-           service_account_data <- format_service_account_response(service_account, user) do
-        %{service_account: service_account_data, api_token: plain_token}
-      else
-        {:error, reason} ->
-          FrontRepo.rollback(reason)
-      end
-    end)
+    with {:ok, {plain_token, hashed_token}} <- generate_api_token(),
+         {:ok, user} <- create_user_record(params, hashed_token),
+         {:ok, service_account} <- create_service_account_record(user.id, params),
+         service_account_data <- format_service_account_response(service_account, user) do
+      {:ok, %{service_account: service_account_data, api_token: plain_token}}
+    else
+      {:error, reason} ->
+        {:error, reason}
+    end
   end
 
   @doc """

guard/test/guard/store/service_account_test.exs

@@ -65,7 +65,7 @@ defmodule Guard.Store.ServiceAccountTest do
       {:ok, %{service_account: sa2}} = ServiceAccountFactory.insert(org_id: org_id, name: "SA2")
 
       # Create service account in different org
-      {:ok, %{service_account: sa3}} = ServiceAccountFactory.insert(name: "SA3")
+      {:ok, %{service_account: _sa3}} = ServiceAccountFactory.insert(name: "SA3")
 
       {:ok, result} = ServiceAccount.find_by_org(org_id, 10, nil)
 
@@ -111,7 +111,7 @@ defmodule Guard.Store.ServiceAccountTest do
       org_id = Ecto.UUID.generate()
       {:ok, %{service_account: sa1}} = ServiceAccountFactory.insert(org_id: org_id, name: "SA1")
 
-      {:ok, %{service_account: sa2, user: user2}} =
+      {:ok, %{service_account: _sa2, user: user2}} =
         ServiceAccountFactory.insert(org_id: org_id, name: "SA2")
 
       # Deactivate second service account