update: atualiza dependências

- corrige uso das bibliotecas `supabase`
- corretamente baixa apenas as deps usadas

config/config.exs

@@ -6,12 +6,6 @@ config :pescarte, PescarteWeb,
   notice_title_max_length: 110,
   notice_desc_max_length: 145
 
-config :supabase_gotrue,
-  endpoint: PescarteWeb.Endpoint,
-  signed_in_path: "/app/pesquisa/perfil",
-  not_authenticated_path: "/acessar",
-  authentication_client: Pescarte.Supabase.Auth
-
 config :tesla, adapter: {Tesla.Adapter.Finch, name: PescarteHTTPClient}
 
 config :flop, repo: Pescarte.Database.Repo.Replica

config/runtime.exs

@@ -6,10 +6,9 @@ config :pescarte, :pesquisa_ingestion, sheet_url: System.get_env("SHEET_URL")
 
 config :resend, Resend.Client, api_key: System.get_env("RESEND_KEY")
 
-config :supabase_potion,
-  manage_clients: true,
-  supabase_base_url: System.get_env("SUPABASE_URL"),
-  supabase_api_key: System.get_env("SUPABASE_KEY")
+config :pescarte, Pescarte.Supabase,
+  base_url: System.get_env("SUPABASE_URL"),
+  api_key: System.get_env("SUPABASE_KEY")
 
 if System.get_env("PHX_SERVER") do
   config :pescarte, PescarteWeb.Endpoint, server: true

lib/pescarte.ex

@@ -5,6 +5,11 @@ defmodule Pescarte do
     @environment
   end
 
+  @spec get_supabase_client :: {:ok, Supabase.Client.t()} | {:error, term}
+  def get_supabase_client do
+    Pescarte.Supabase.get_client()
+  end
+
   def get_static_file_path(folder, file) do
     :pescarte
     |> :code.priv_dir()

lib/pescarte/identidades/register_usuario.ex

@@ -2,14 +2,15 @@ defmodule Pescarte.Identidades.RegisterUsuario do
   alias Pescarte.Database.Repo
   alias Pescarte.Identidades.Adapters.UsuarioAdapter
   alias Pescarte.Identidades.Models.Usuario
-  alias Pescarte.Supabase.Auth
+  alias Supabase.GoTrue
 
   def run(attrs, tipo) when tipo in ~w(pesquisador admin)a do
     Repo.transaction(fn ->
       attrs = Map.put(attrs, :papel, tipo)
       {:ok, internal} = do_create_usuario(attrs)
       {:ok, external} = UsuarioAdapter.to_external(internal)
-      {:ok, _} = Auth.Admin.create_user(external)
+      {:ok, client} = Pescarte.get_supabase_client()
+      {:ok, _} = GoTrue.Admin.create_user(client, external)
       internal
     end)
   end
@@ -18,7 +19,8 @@ defmodule Pescarte.Identidades.RegisterUsuario do
     Repo.transaction(fn ->
       {:ok, internal} = do_create_usuario(attrs)
       {:ok, external} = UsuarioAdapter.to_external(internal)
-      {:ok, _} = Auth.Admin.create_user(external)
+      {:ok, client} = Pescarte.get_supabase_client()
+      {:ok, _} = GoTrue.Admin.create_user(client, external)
       internal
     end)
   end

lib/pescarte/modulo_pesquisa/register_pesquisador.ex

@@ -5,15 +5,17 @@ defmodule Pescarte.ModuloPesquisa.RegisterPesquisador do
   alias Pescarte.Identidades.Adapters.UsuarioAdapter
   alias Pescarte.Identidades.Models.Usuario
   alias Pescarte.ModuloPesquisa.Models.Pesquisador
-  alias Pescarte.Supabase.Auth
+
+  alias Supabase.GoTrue
 
   def run(attrs) do
     Repo.transaction(fn ->
       with {:ok, pesquisador} <- do_create_pesquisador(attrs),
            external = UsuarioAdapter.to_external(pesquisador.usuario),
-           {:ok, external} <- Auth.Admin.create_user(external),
+           {:ok, client} <- Pescarte.get_supabase_client(),
+           {:ok, external} <- GoTrue.Admin.create_user(client, external),
            opts = [type: :signup, redirect_to: ~p"/confirmar"],
-           :ok <- Auth.resend(external.email, opts),
+           :ok <- GoTrue.resend(client, external.email, opts),
            {:ok, _} <- Usuario.link_to_external(pesquisador.usuario, external.id) do
         pesquisador
       else

lib/pescarte/scripts/pesquisa_ingestion.ex

@@ -5,8 +5,6 @@ defmodule Pescarte.Scripts.PesquisaIngestion do
   alias Ecto.Multi, as: TRX
   alias Pescarte.Database.Repo
 
-  alias Pescarte.Supabase.Auth
-
   alias Pescarte.Identidades.Models.Contato
   alias Pescarte.Identidades.RegisterUsuario
 
@@ -197,7 +195,10 @@ defmodule Pescarte.Scripts.PesquisaIngestion do
           |> Map.put("phone_confirm", true)
           |> Map.put("role", "pesquisador")
           |> Map.put("app_metadata", app_metadata)
-          |> then(&Auth.Admin.create_user/1)
+          |> then(fn attrs ->
+            {:ok, client} = Pescarte.get_supabase_client()
+            Supabase.GoTrue.Admin.create_user(client, attrs)
+          end)
         end)
         |> TRX.run(key, fn _repo, state ->
           contato = state[contato_key]

lib/pescarte/supabase.ex

@@ -1,25 +1,3 @@
 defmodule Pescarte.Supabase do
-  defmodule Auth do
-    use Supabase.GoTrue, client: Pescarte.Supabase.Auth
-  end
-
-  defmodule Storage do
-    use Supabase.Storage, client: Pescarte.Supabase.Auth
-  end
-
-  def start_link(_opts) do
-    children = [__MODULE__.Auth]
-    opts = [strategy: :one_for_one, name: __MODULE__]
-    Supervisor.start_link(children, opts)
-  end
-
-  def child_spec(opts) do
-    %{
-      id: __MODULE__,
-      start: {__MODULE__, :start_link, [opts]},
-      type: :worker,
-      restart: :permanent,
-      shutdown: 500
-    }
-  end
+  use Supabase.Client, otp_app: :pescarte
 end

lib/pescarte_web/controllers/login_controller.ex

@@ -4,8 +4,8 @@ defmodule PescarteWeb.LoginController do
   import Phoenix.LiveView.Controller, only: [live_render: 3]
 
   alias Pescarte.Identidades.Models.Usuario
+  alias PescarteWeb.Auth
   alias PescarteWeb.LoginLive
-  alias Supabase.GoTrue
 
   require Logger
 
@@ -23,7 +23,7 @@ defmodule PescarteWeb.LoginController do
     with {:ok, user} <- Usuario.fetch_by(cpf: cpf),
          email = user.contato.email_principal,
          params = %{email: email, password: password},
-         %Plug.Conn{} = conn <- GoTrue.Plug.log_in_with_password(conn, params) do
+         %Plug.Conn{} = conn <- Auth.log_in_with_password(conn, params) do
       conn
     else
       err ->
@@ -41,7 +41,7 @@ defmodule PescarteWeb.LoginController do
   def delete(conn, _params) do
     conn
     |> put_flash(:info, "Desconectado com sucesso")
-    |> GoTrue.Plug.log_out_user(:local)
+    |> Auth.log_out_user(:local)
   end
 
   defp to_live_view_session(conn) do

lib/pescarte_web/controllers/token_controller.ex

@@ -3,7 +3,7 @@ defmodule PescarteWeb.TokenController do
 
   import Phoenix.LiveView.Controller, only: [live_render: 2]
 
-  alias Pescarte.Supabase.Auth
+  alias PescarteWeb.Auth
   alias PescarteWeb.LoginLive
   alias Supabase.GoTrue
 
@@ -13,10 +13,12 @@ defmodule PescarteWeb.TokenController do
   @cannot_reset_err "Você não possui permissão para acessar essa página"
 
   def confirm(conn, %{"token_hash" => token, "type" => "signup"}) do
-    with {:ok, session} <- Auth.verify_otp(%{token_hash: token, type: :signup}),
-         {:ok, _} <- Auth.get_user(session) do
+    with {:ok, client} <- Pescarte.get_supabase_client(),
+         params = %{token_hash: token, type: :signup},
+         {:ok, session} <- GoTrue.verify_otp(client, params),
+         {:ok, _} <- GoTrue.get_user(client, session) do
       conn
-      |> GoTrue.Plug.put_token_in_session(session.access_token)
+      |> Auth.put_token_in_session(session.access_token)
       |> redirect(to: ~p"/app/pesquisa/perfil?type=recovery")
     else
       {:error, %{"error_code" => "otp_expired"}} ->
@@ -41,10 +43,12 @@ defmodule PescarteWeb.TokenController do
   end
 
   def confirm(conn, %{"token_hash" => token, "type" => "recovery"}) do
-    with {:ok, session} <- Auth.verify_otp(%{token_hash: token, type: :recovery}),
-         {:ok, _} <- Auth.get_user(session) do
+    with {:ok, client} <- Pescarte.get_supabase_client(),
+         params = %{token_hash: token, type: :recovery},
+         {:ok, session} <- GoTrue.verify_otp(client, params),
+         {:ok, _} <- GoTrue.get_user(client, session) do
       conn
-      |> GoTrue.Plug.put_token_in_session(session.access_token)
+      |> Auth.put_token_in_session(session.access_token)
       |> redirect(to: ~p"/app/pesquisa/perfil?type=recovery")
     else
       {:error, %{"error_code" => "otp_expired"}} ->

lib/pescarte_web/gettext.ex

@@ -1,3 +1,3 @@
 defmodule PescarteWeb.Gettext do
-  use Gettext, otp_app: :pescarte
+  use Gettext.Backend, otp_app: :pescarte
 end

lib/pescarte_web/graphql/context.ex

@@ -4,6 +4,7 @@ defmodule PescarteWeb.GraphQL.Context do
   import Plug.Conn
 
   alias Pescarte.Identidades.Models.Usuario
+  alias Supabase.GoTrue
 
   def init(opts), do: opts
 
@@ -25,9 +26,10 @@ defmodule PescarteWeb.GraphQL.Context do
     if Pescarte.env() == :test do
       Usuario.fetch_by(id: token)
     else
-      session = %Supabase.GoTrue.Session{access_token: token}
+      session = %GoTrue.Session{access_token: token}
 
-      with {:ok, user} <- Pescarte.Supabase.Auth.get_user(session) do
+      with {:ok, client} <- Pescarte.get_supabase_client(),
+           {:ok, user} <- GoTrue.get_user(client, session) do
         Usuario.fetch_by(external_customer_id: user.id)
       end
     end

lib/pescarte_web/graphql/resolver/login.ex

@@ -1,7 +1,7 @@
 defmodule PescarteWeb.GraphQL.Resolver.Login do
   alias Pescarte.Identidades.Models.Usuario
 
-  alias Pescarte.Supabase.Auth
+  alias PescarteWeb.Auth
 
   def resolve(%{input: %{cpf: cpf, senha: password}}, _resolution) do
     if Pescarte.env() == :test do
@@ -12,7 +12,7 @@ defmodule PescarteWeb.GraphQL.Resolver.Login do
       with {:ok, user} <- Usuario.fetch_by(cpf: cpf),
            email = user.contato.email_principal,
            params = %{email: email, password: password},
-           {:ok, session} <- Auth.sign_in_with_password(params) do
+           {:ok, session} <- Auth.log_in_with_password(params) do
         {:ok, %{usuario: user, token: session.access_token}}
       end
     end

lib/pescarte_web/live/login_live.ex

@@ -1,7 +1,7 @@
 defmodule PescarteWeb.LoginLive do
   use PescarteWeb, :live_view
 
-  alias Pescarte.Supabase
+  alias Supabase.GoTrue
 
   @impl true
   def mount(_params, _session, socket) do
@@ -87,7 +87,8 @@ defmodule PescarteWeb.LoginLive do
 
   @impl true
   def handle_event("trigger_reset_pass", %{"key" => "Enter", "value" => email}, socket) do
-    :ok = Supabase.Auth.reset_password_for_email(email, redirect_to: ~p"/confirmar")
+    {:ok, client} = Pescarte.get_supabase_client()
+    :ok = GoTrue.reset_password_for_email(client, email, redirect_to: ~p"/confirmar")
 
     {:noreply,
      socket
@@ -96,7 +97,8 @@ defmodule PescarteWeb.LoginLive do
   end
 
   def handle_event("trigger_reset_pass", %{"reset_pass" => %{"email" => email}}, socket) do
-    :ok = Supabase.Auth.reset_password_for_email(email, redirect_to: ~p"/confirmar")
+    {:ok, client} = Pescarte.get_supabase_client()
+    :ok = GoTrue.reset_password_for_email(client, email, redirect_to: ~p"/confirmar")
 
     {:noreply,
      socket

lib/pescarte_web/live/pesquisa/pesquisador_live/show.ex

@@ -6,7 +6,7 @@ defmodule PescarteWeb.Pesquisa.PesquisadorLive.Show do
   alias Pescarte.Identidades.Models.Usuario
   alias Pescarte.ModuloPesquisa.GetPesquisador
   alias Pescarte.ModuloPesquisa.Models.Pesquisador
-  alias Pescarte.Supabase
+  alias Supabase.GoTrue
 
   @impl true
   def mount(%{"id" => id}, _session, socket) do
@@ -73,15 +73,16 @@ defmodule PescarteWeb.Pesquisa.PesquisadorLive.Show do
   def handle_event("trigger_reset_pass", %{"reset_pass" => params}, socket) do
     # TODO criar função para verificar se a senha atual é correta
 
-    case recover_pass_changeset(params) do
-      {:ok, attrs} ->
-        case Supabase.Auth.update_user(socket, %{password: attrs.password}) do
-          {:ok, socket} -> {:noreply, redirect(socket, to: ~p"/app/pesquisa/perfil")}
-          {:error, error} -> {:noreply, assign_error(socket, error)}
-        end
-
-      {:error, _} ->
-        {:noreply, put_flash(socket, :error, "Os campos foram preenchidos incorretamente")}
+    with {:ok, attrs} <- recover_pass_changeset(params),
+         {:ok, client} <- Pescarte.get_supabase_client(),
+         {:ok, socket} <- GoTrue.update_user(client, socket, %{password: attrs.password}) do
+      {:noreply, redirect(socket, to: ~p"/app/pesquisa/perfil")}
+    else
+      {:error, err} ->
+        {:noreply,
+         socket
+         |> assign_error(err)
+         |> put_flash(:error, "Os campos foram preenchidos incorretamente")}
     end
   end
 

lib/pescarte_web/router.ex

@@ -1,8 +1,9 @@
 defmodule PescarteWeb.Router do
   use PescarteWeb, :router
 
-  import Supabase.GoTrue.Plug
-  alias Supabase.GoTrue
+  import PescarteWeb.Auth
+
+  alias PescarteWeb.Auth
 
   pipeline :browser do
     plug :accepts, ["html"]
@@ -91,7 +92,7 @@ defmodule PescarteWeb.Router do
       on_mount: [
         PescarteWeb.NavbarLive,
         {PescarteWeb.SessionContext, :mount_session_from_conn},
-        {GoTrue.LiveView, :ensure_authenticated},
+        {Auth, :ensure_authenticated},
         {PescarteWeb.Flash, :flash}
       ] do
       live "/perfil", PesquisadorLive.Show, :show

lib/pescarte_web/session_context.ex

@@ -3,11 +3,11 @@ defmodule PescarteWeb.SessionContext do
   import Phoenix.LiveView, only: [redirect: 2, put_flash: 3]
 
   alias Pescarte.Identidades.Models.Usuario
-  alias Supabase.GoTrue
+  alias PescarteWeb.Auth
 
   def on_mount(:mount_session_from_conn, _params, session, socket) do
     session
-    |> GoTrue.LiveView.mount_current_user(socket)
+    |> Auth.mount_current_user(socket)
     |> mount_current_usuario()
   end