toil(front): Remove all references to deprecated user_api_endpoint (#312)

## 📝 Description

The issue was discovered while working on
renderedtext/project-tasks#2405

Largely a revert of this PR
renderedtext/alles#1713

## ✅ Checklist
- [x] I have tested this change
- [ ] This change requires documentation update

Author: VeljkoMaksimovic

front/config/dev.exs

@@ -66,7 +66,6 @@ config :front,
   self_hosted_agents_grpc_endpoint: "127.0.0.1:50052",
   superjerry_grpc_endpoint: "127.0.0.1:50051",
   task_grpc_endpoint: "127.0.0.1:50052",
-  user_grpc_endpoint: "127.0.0.1:50052",
   velocity_grpc_endpoint: "127.0.0.1:50052",
   workflow_api_grpc_endpoint: "127.0.0.1:50052",
   jwt_grpc_endpoint: "127.0.0.1:50052"

front/config/runtime.exs

@@ -111,7 +111,6 @@ if config_env() == :prod do
     self_hosted_agents_grpc_endpoint: System.fetch_env!("INTERNAL_API_URL_SELFHOSTEDHUB"),
     superjerry_grpc_endpoint: System.fetch_env!("INTERNAL_API_URL_SUPERJERRY"),
     task_grpc_endpoint: System.fetch_env!("INTERNAL_API_URL_TASK"),
-    user_grpc_endpoint: System.fetch_env!("INTERNAL_API_URL_USER"),
     velocity_grpc_endpoint: System.fetch_env!("INTERNAL_API_URL_VELOCITY"),
     workflow_api_grpc_endpoint: System.fetch_env!("INTERNAL_API_URL_PLUMBER"),
     jwt_grpc_endpoint: System.fetch_env!("INTERNAL_API_URL_SECRETHUB")

front/config/test.exs

@@ -47,7 +47,6 @@ config :front,
   superjerry_grpc_endpoint: "127.0.0.1:50051",
   task_grpc_endpoint: "127.0.0.1:50052",
   usage_grpc_endpoint: "127.0.0.1:50052",
-  user_grpc_endpoint: "127.0.0.1:50052",
   velocity_grpc_endpoint: "127.0.0.1:50052",
   workflow_api_grpc_endpoint: "127.0.0.1:50052",
   jwt_grpc_endpoint: "127.0.0.1:50052"

front/lib/front/activity_monitor/repo.ex

@@ -36,9 +36,7 @@ defmodule Front.ActivityMonitor.Repo do
          ppl_ids <- Enum.map(active_pipelines, fn %{ppl_id: id} -> id end),
          debugged_ppl_ids <- Enum.map(debug_sessions, fn debug -> debug.debugged_job.ppl_id end),
          fetch_users <-
-           Async.run(fn ->
-             list_authors_of(active_pipelines, debug_sessions, tracing_headers, org_id)
-           end),
+           Async.run(fn -> list_authors_of(active_pipelines, debug_sessions, tracing_headers) end),
          fetch_jobs <- Async.run(fn -> list_active_jobs(tracing_headers, org_id, ppl_ids) end),
          fetch_debugged_ppls <-
            Async.run(fn -> describe_many_ppls(debugged_ppl_ids, tracing_headers) end),
@@ -251,7 +249,7 @@ defmodule Front.ActivityMonitor.Repo do
 
   # List Users
 
-  def list_authors_of(active_pipelines, debug_sessions, tracing_headers, organization_id \\ nil) do
+  def list_authors_of(active_pipelines, debug_sessions, tracing_headers) do
     active_pipelines
     |> Enum.reduce([], fn ppl, acc ->
       if ppl.promoter_id != "" do
@@ -262,14 +260,14 @@ defmodule Front.ActivityMonitor.Repo do
     end)
     |> Enum.concat(Enum.map(debug_sessions, fn debug -> debug.debug_user_id end))
     |> Enum.uniq()
-    |> get_users(tracing_headers, organization_id)
+    |> get_users(tracing_headers)
     |> ok_err_tuple()
   end
 
-  defp get_users(list, tracing_headers, organization_id) when is_list(list) and length(list) > 0,
-    do: User.find_many(list, tracing_headers, organization_id)
+  defp get_users(list, tracing_headers) when is_list(list) and length(list) > 0,
+    do: User.find_many(list, tracing_headers)
 
-  defp get_users(_, _, _), do: []
+  defp get_users(_, _), do: []
 
   defp ok_err_tuple(nil), do: {:error, nil}
   defp ok_err_tuple(list), do: {:ok, list}

front/lib/front/models/user.ex

@@ -56,19 +56,18 @@ defmodule Front.Models.User do
       metadata = Keyword.get(opts, :metadata, nil)
       fields = Keyword.get(opts, :fields, @fields)
       use_cache = Keyword.get(opts, :use_cache, true)
-      organization_id = Keyword.get(opts, :organization_id, "")
 
-      find_(id, metadata, fields, use_cache, organization_id: organization_id)
+      find_(id, metadata, fields, use_cache)
     end)
   end
 
-  def find(id, metadata \\ nil, fields \\ @fields, use_cache \\ true, opts \\ []) do
+  def find(id, metadata \\ nil, fields \\ @fields, use_cache \\ true) do
     Watchman.benchmark("fetch_user.duration", fn ->
-      find_(id, metadata, fields, use_cache, opts)
+      find_(id, metadata, fields, use_cache)
     end)
   end
 
-  defp find_(id, metadata, fields, true, opts) do
+  defp find_(id, metadata, fields, true) do
     cache_keys = Enum.map(fields, fn f -> cache_key(id, f) end)
 
     case Front.Cache.get_all(cache_keys) do
@@ -78,15 +77,15 @@ defmodule Front.Models.User do
         struct!(__MODULE__, user)
 
       {:not_cached, _} ->
-        find(id, metadata, fields, false, opts)
+        find(id, metadata, fields, false)
     end
   end
 
-  defp find_(id, metadata, _fields, false, opts) do
+  defp find_(id, metadata, _fields, false) do
     alias InternalApi.User.UserService.Stub
     req = InternalApi.User.DescribeRequest.new(user_id: id)
 
-    {:ok, channel} = build_user_channel(opts)
+    {:ok, channel} = channel()
 
     case Stub.describe(channel, req, metadata: metadata, timeout: 30_000) do
       {:ok, res} ->
@@ -104,19 +103,16 @@ defmodule Front.Models.User do
     end
   end
 
-  def find_user_with_providers(user_id, organization_id \\ nil) do
+  def find_user_with_providers(user_id) do
     alias Front.Async
 
     fetch_user = Async.run(fn -> find(user_id) end)
 
-    fetch_github_provider =
-      Async.run(fn -> refresh_repository_provider(user_id, "github", organization_id) end)
+    fetch_github_provider = Async.run(fn -> refresh_repository_provider(user_id, "github") end)
 
-    fetch_bb_provider =
-      Async.run(fn -> refresh_repository_provider(user_id, "bitbucket", organization_id) end)
+    fetch_bb_provider = Async.run(fn -> refresh_repository_provider(user_id, "bitbucket") end)
 
-    fetch_gitlab_provider =
-      Async.run(fn -> refresh_repository_provider(user_id, "gitlab", organization_id) end)
+    fetch_gitlab_provider = Async.run(fn -> refresh_repository_provider(user_id, "gitlab") end)
 
     {:ok, user} = Async.await(fetch_user)
     {:ok, github_provider} = Async.await(fetch_github_provider)
@@ -139,7 +135,7 @@ defmodule Front.Models.User do
         integration_type: IntegrationType.value(project.integration_type)
       )
 
-    {:ok, channel} = build_user_channel(organization_id: project.organization_id)
+    {:ok, channel} = channel()
 
     case Stub.get_repository_token(channel, req, timeout: 30_000) do
       {:ok, res} ->
@@ -167,7 +163,7 @@ defmodule Front.Models.User do
           kind: kind
         )
 
-      {:ok, channel} = build_user_channel(organization_id: organization_id)
+      {:ok, channel} = channel()
 
       {:ok, _} =
         InternalApi.User.UserService.Stub.create_favorite(channel, favorite,
@@ -193,7 +189,7 @@ defmodule Front.Models.User do
           kind: kind
         )
 
-      {:ok, channel} = build_user_channel(organization_id: organization_id)
+      {:ok, channel} = channel()
 
       {:ok, _} =
         InternalApi.User.UserService.Stub.delete_favorite(channel, favorite,
@@ -211,7 +207,7 @@ defmodule Front.Models.User do
           organization_id: organization_id
         )
 
-      {:ok, channel} = build_user_channel(organization_id: organization_id)
+      {:ok, channel} = channel()
 
       {:ok, response} =
         InternalApi.User.UserService.Stub.list_favorites(channel, request,
@@ -223,14 +219,14 @@ defmodule Front.Models.User do
     end)
   end
 
-  def find_many(ids, tracing_headers \\ nil, organization_id \\ nil) do
+  def find_many(ids, tracing_headers \\ nil) do
     Watchman.benchmark("fetch_many_users.duration", fn ->
       request = InternalApi.User.DescribeManyRequest.new(user_ids: ids)
 
       Logger.debug("Sending request to User API")
       Logger.debug(inspect(request))
 
-      {:ok, channel} = build_user_channel(organization_id: organization_id)
+      {:ok, channel} = channel()
 
       {:ok, response} =
         InternalApi.User.UserService.Stub.describe_many(channel, request,
@@ -249,7 +245,7 @@ defmodule Front.Models.User do
     end)
   end
 
-  def update(user, fields, metadata \\ nil, organization_id \\ nil) do
+  def update(user, fields, metadata \\ nil) do
     alias Front.Form.RequiredParams, as: RP
     alias Google.Rpc.Status
     alias InternalApi.User.UpdateRequest, as: UpdateRequest
@@ -270,7 +266,7 @@ defmodule Front.Models.User do
                    name: fields[:name]
                  )
              ),
-           {:ok, channel} <- build_user_channel(organization_id: organization_id),
+           {:ok, channel} <- channel(),
            {:ok, res = %UpdateResponse{status: %Status{code: 0}}} <-
              InternalApi.User.UserService.Stub.update(channel, req,
                metadata: metadata,
@@ -292,11 +288,11 @@ defmodule Front.Models.User do
     end)
   end
 
-  def regenerate_token(user_id, metadata \\ nil, organization_id \\ nil) do
+  def regenerate_token(user_id, metadata \\ nil) do
     Watchman.benchmark("regenerate_token.duration", fn ->
       req = InternalApi.User.RegenerateTokenRequest.new(user_id: user_id)
 
-      {:ok, channel} = build_user_channel(organization_id: organization_id)
+      {:ok, channel} = channel()
 
       {:ok, res} =
         InternalApi.User.UserService.Stub.regenerate_token(channel, req,
@@ -318,7 +314,8 @@ defmodule Front.Models.User do
 
       req = InternalApi.User.CheckGithubTokenRequest.new(user_id: user_id)
 
-      {:ok, channel} = GRPC.Stub.connect(Application.fetch_env!(:front, :user_grpc_endpoint))
+      {:ok, channel} =
+        GRPC.Stub.connect(Application.fetch_env!(:front, :guard_user_grpc_endpoint))
 
       case Stub.check_github_token(channel, req, metadata: metadata, timeout: 30_000) do
         {:ok, res} ->
@@ -330,7 +327,7 @@ defmodule Front.Models.User do
     end)
   end
 
-  defp refresh_repository_provider(user_id, provider, organization_id) do
+  defp refresh_repository_provider(user_id, provider) do
     Watchman.benchmark("refresh_repository_provider.duration", fn ->
       alias InternalApi.User.UserService.Stub
 
@@ -346,7 +343,7 @@ defmodule Front.Models.User do
           type: type
         )
 
-      {:ok, channel} = build_user_channel(organization_id: organization_id)
+      {:ok, channel} = channel()
 
       case Stub.refresh_repository_provider(channel, req, timeout: 30_000) do
         {:ok, res} ->
@@ -473,18 +470,5 @@ defmodule Front.Models.User do
     end
   end
 
-  def build_user_channel(opts \\ []) do
-    organization_id = Keyword.get(opts, :organization_id, "") || ""
-
-    cond do
-      organization_id == "" ->
-        GRPC.Stub.connect(Application.fetch_env!(:front, :user_grpc_endpoint))
-
-      FeatureProvider.feature_enabled?(:use_new_user_api, param: organization_id) ->
-        GRPC.Stub.connect(Application.fetch_env!(:front, :guard_user_grpc_endpoint))
-
-      true ->
-        GRPC.Stub.connect(Application.fetch_env!(:front, :user_grpc_endpoint))
-    end
-  end
+  def channel, do: GRPC.Stub.connect(Application.fetch_env!(:front, :guard_user_grpc_endpoint))
 end

front/lib/front_web/controllers/account_controller.ex

@@ -33,14 +33,12 @@ defmodule FrontWeb.AccountController do
   def update(conn, params) do
     Watchman.benchmark("account.update.duration", fn ->
       user_id = conn.assigns.user_id
-      organization_id = conn.assigns.organization_id
 
-      fetch_user =
-        Async.run(fn -> Models.User.find_user_with_providers(user_id, organization_id) end)
+      fetch_user = Async.run(fn -> Models.User.find_user_with_providers(user_id) end)
 
       {:ok, user} = Async.await(fetch_user)
 
-      case Models.User.update(user, %{name: params["name"]}, nil, organization_id) do
+      case Models.User.update(user, %{name: params["name"]}) do
         {:ok, _updated_user} ->
           conn
           |> put_flash(:notice, "Changes saved.")
@@ -63,9 +61,8 @@ defmodule FrontWeb.AccountController do
   def reset_token(conn, _params) do
     Watchman.benchmark("account.regenerate_token.duration", fn ->
       user_id = conn.assigns.user_id
-      org_id = conn.assigns.organization_id
 
-      case Models.User.regenerate_token(user_id, nil, org_id) do
+      case Models.User.regenerate_token(user_id) do
         {:ok, new_token} ->
           conn
           |> put_flash(:notice, "Token reset.")
@@ -142,8 +139,7 @@ defmodule FrontWeb.AccountController do
   defp render_show(conn, user_id, errors \\ nil)
 
   defp render_show(conn, user_id, errors) when is_binary(user_id) do
-    org_id = conn.assigns.organization_id
-    fetch_user = Async.run(fn -> Models.User.find_user_with_providers(user_id, org_id) end)
+    fetch_user = Async.run(fn -> Models.User.find_user_with_providers(user_id) end)
     {:ok, user} = Async.await(fetch_user)
 
     render_show(conn, user, errors)

front/lib/front_web/controllers/people_controller.ex

@@ -700,11 +700,10 @@ defmodule FrontWeb.PeopleController do
 
   def update(conn, params = %{"user_id" => user_id}) do
     Watchman.benchmark("people.update", fn ->
-      org_id = conn.assigns.organization_id
-      fetch_user = Async.run(fn -> Models.User.find_user_with_providers(user_id, org_id) end)
+      fetch_user = Async.run(fn -> Models.User.find_user_with_providers(user_id) end)
       {:ok, user} = Async.await(fetch_user)
 
-      case Models.User.update(user, %{name: params["name"]}, nil, org_id) do
+      case Models.User.update(user, %{name: params["name"]}) do
         {:ok, _updated_user} ->
           conn
           |> put_flash(:notice, "Changes saved.")
@@ -747,9 +746,7 @@ defmodule FrontWeb.PeopleController do
       |> Audit.add(resource_id: user_id)
       |> Audit.log()
 
-      org_id = conn.assigns.organization_id
-
-      case Models.User.regenerate_token(user_id, nil, org_id) do
+      case Models.User.regenerate_token(user_id) do
         {:ok, new_token} ->
           conn
           |> put_flash(:notice, "Token reset.")
@@ -924,8 +921,7 @@ defmodule FrontWeb.PeopleController do
   defp render_show(conn, user_id, errors \\ nil)
 
   defp render_show(conn, user_id, errors) when is_binary(user_id) do
-    org_id = conn.assigns.organization_id
-    fetch_user = Async.run(fn -> Models.User.find_user_with_providers(user_id, org_id) end)
+    fetch_user = Async.run(fn -> Models.User.find_user_with_providers(user_id) end)
     {:ok, user} = Async.await(fetch_user)
 
     render_show(conn, user, errors)

front/lib/job_page/api/user.ex

@@ -5,7 +5,7 @@ defmodule JobPage.Api.User do
     Watchman.benchmark("fetch_user.duration", fn ->
       req = InternalApi.User.DescribeRequest.new(user_id: id)
 
-      {:ok, channel} = GRPC.Stub.connect(GrpcConfig.endpoint(:user_grpc_endpoint))
+      {:ok, channel} = GRPC.Stub.connect(GrpcConfig.endpoint(:guard_user_grpc_endpoint))
       {:ok, res} = InternalApi.User.UserService.Stub.describe(channel, req, timeout: 30_000)
 
       if res.status.code == 0 do