wip

Author: Yashin Santos

apps/rest_api/lib/controllers/admin/user.ex

@@ -27,11 +27,12 @@ defmodule RestAPI.Controller.Admin.User do
     end
   end
 
-  def show(conn, %{"username" => _username} = params) do
+  def show(conn, %{"id" => username} = params) do
     params
-    |> ResourceManager.create_identity()
+    |> Map.put(:username, username)
+    |> ResourceManager.get_identity()
     |> case do
-      {:ok, identity} when is_struct(identity) ->
+      {:ok, identity} when is_map(identity) ->
         conn
         |> put_status(:created)
         |> put_view(User)

apps/rest_api/lib/views/admin/user.ex

@@ -16,10 +16,12 @@ defmodule RestAPI.Views.Admin.User do
 
   def render("show.json", %{response: response}) do
     %{
+      id: response.id,
       username: response.username,
       status: response.status,
       is_admin: response.is_admin,
-      blocked_until: response.blocked_until
+      inserted_at: response.inserted_at,
+      updated_at: response.updated_at
     }
   end
 end

apps/rest_api/test/controllers/admin/user_test.exs

@@ -5,6 +5,7 @@ defmodule RestAPI.Controllers.Admin.User do
   alias RestAPI.Ports.{AuthenticatorMock, AuthorizerMock, ResourceManagerMock}
 
   @create_endpoint "/admin/v1/users"
+  @show_endpoint "/admin/v1/users/"
 
   describe "POST #{@create_endpoint}" do
     setup do
@@ -163,29 +164,21 @@ defmodule RestAPI.Controllers.Admin.User do
     end
   end
 
-  describe "GET #{@create_endpoint}" do
+  describe "GET #{@show_endpoint}" do
     setup do
       access_token = "my-access-token"
       claims = default_claims()
 
-      {:ok, access_token: access_token, claims: claims}
+      {:ok, access_token: access_token, claims: claims, user: insert!(:user)}
     end
 
-    test "should render user identity response", %{
+    test "should render user identity", %{
       conn: conn,
       access_token: access_token,
-      claims: claims
+      claims: claims,
+      user: user
     } do
-      password = "MyP@ssword1234"
-
-      params = %{
-        "username" => "Shurato",
-        "password" => password,
-        "scopes" => [
-          "6a3a3771-9f56-4254-9497-927e441dacfc",
-          "8a235ba0-a827-4593-92c9-6248bef4fa06"
-        ]
-      }
+      username = user.username
 
       expect(AuthenticatorMock, :validate_access_token, fn token ->
         assert access_token == token
@@ -197,41 +190,33 @@ defmodule RestAPI.Controllers.Admin.User do
         {:ok, success_session(claims)}
       end)
 
-      expect(ResourceManagerMock, :password_allowed?, fn _input ->
-        true
-      end)
-
-      expect(AuthenticatorMock, :generate_hash, fn password_to_hash, :argon2 ->
-        assert password == password_to_hash
-        "password_hashed"
-      end)
+      expect(AuthorizerMock, :authorize_admin, fn %Plug.Conn{} -> :ok end)
 
-      expect(ResourceManagerMock, :create_identity, fn input ->
+      expect(ResourceManagerMock, :get_identity, fn input ->
         assert is_map(input)
 
         {:ok,
          %{
-           id: Ecto.UUID.generate(),
+           id: user.id,
            inserted_at: NaiveDateTime.utc_now(),
-           is_admin: false,
-           status: "active",
+           is_admin: user.is_admin,
+           status: user.status,
            updated_at: NaiveDateTime.utc_now(),
-           username: "Shurato"
+           username: username
          }}
       end)
 
-      expect(AuthorizerMock, :authorize_admin, fn %Plug.Conn{} -> :ok end)
-
       assert %{
                "id" => _id,
                "inserted_at" => _inserted_at,
+               "updated_at" => _updated_at,
                "is_admin" => false,
                "status" => "active",
-               "username" => "Shurato"
+               "username" => ^username
              } =
                conn
                |> put_req_header("authorization", "Bearer #{access_token}")
-               |> post(@create_endpoint, params)
+               |> get(@show_endpoint <> "username")
                |> json_response(201)
     end
   end

apps/rest_api/test/support/conn_case.ex

@@ -24,6 +24,7 @@ defmodule RestAPI.ConnCase do
       import Phoenix.ConnTest
       import RestAPI.ConnCase
       import Mox
+      import ResourceManager.Factory
 
       alias RestAPI.Router.Helpers, as: Routes