fix: set correct subject type for rbac user

Author: hamir-suspect

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.user.created_at),
-      updated_at: grpc_timestamp(service_account.user.updated_at),
+      created_at: grpc_timestamp(service_account.created_at),
+      updated_at: grpc_timestamp(service_account.updated_at),
       deactivated: service_account.deactivated || false
     )
   end

guard/lib/guard/service_account/actions.ex

@@ -139,7 +139,8 @@ defmodule Guard.ServiceAccount.Actions do
     case Guard.Store.RbacUser.create(
            service_account.id,
            service_account.email,
-           service_account.name
+           service_account.name,
+           "service_account"
          ) do
       :ok ->
         case Guard.Store.RbacUser.fetch(service_account.id) do

guard/lib/guard/store/rbac_user.ex

@@ -59,9 +59,9 @@ defmodule Guard.Store.RbacUser do
     {page, users}
   end
 
-  @spec create(Ecto.UUID.t(), String.t(), String.t()) :: :ok | :error
-  def create(user_id, email, name) do
-    subject_changeset = Subject.changeset(%Subject{}, %{id: user_id, name: name, type: "user"})
+  @spec create(Ecto.UUID.t(), String.t(), String.t(), "user" | "service_account") :: :ok | :error
+  def create(user_id, email, name, type \\ "user") do
+    subject_changeset = Subject.changeset(%Subject{}, %{id: user_id, name: name, type: type})
     user_changeset = RbacUser.changeset(%RbacUser{}, %{id: user_id, email: email})
 
     Multi.new()

guard/lib/guard/store/service_account.ex

@@ -215,13 +215,14 @@ defmodule Guard.Store.ServiceAccount do
       where: u.creation_source == :service_account,
       select: %{
         id: sa.id,
-        user_id: u.id,
         name: u.name,
         description: sa.description,
         org_id: u.org_id,
         creator_id: sa.creator_id,
         deactivated: u.deactivated,
-        email: u.email
+        email: u.email,
+        created_at: u.created_at,
+        updated_at: u.updated_at
       }
     )
   end
@@ -254,8 +255,6 @@ defmodule Guard.Store.ServiceAccount do
       authentication_token: hashed_token
     }
 
-    require Logger
-    Logger.info("User params: #{inspect(user_params)}")
     changeset = User.changeset(%User{}, user_params)
 
     case FrontRepo.insert(changeset) do