Merge branch 'main' into update/elixir-deps

Author: zoedsoupe

lib/supabase.ex

@@ -165,4 +165,9 @@ defmodule Supabase do
   defmacro __using__(which) when is_atom(which) do
     apply(__MODULE__, which, [])
   end
+
+  @doc "Returns the configured JSON encoding library for Supabase libraries."
+  def json_library do
+    Application.get_env(:supabase, :json_library, Jason)
+  end
 end

lib/supabase/fetcher.ex

@@ -137,6 +137,8 @@ defmodule Supabase.Fetcher do
   alias Supabase.Fetcher.Response
   alias Supabase.Fetcher.ResponseAdapter
 
+  require Logger
+
   @behaviour Supabase.Fetcher.Behaviour
 
   @typedoc "Generic typespec to define possible response values, adapt to each client"
@@ -267,7 +269,14 @@ defmodule Supabase.Fetcher do
   defp handle_response({:error, %Error{} = err}, %Request{} = builder) do
     metadata = Error.make_default_http_metadata(builder)
     metadata = Map.merge(metadata, err.metadata)
-    {:error, %{err | metadata: metadata}}
+
+    {:error,
+     %{err | metadata: metadata}
+     |> tap(
+       &Logger.error("""
+       [#{__MODULE__}]: Error response while processing request. #{inspect(&1)}
+       """)
+     )}
   end
 
   defp handle_response({:error, err}, %Request{} = builder) do
@@ -278,6 +287,11 @@ defmodule Supabase.Fetcher do
        code: :unexpected,
        service: builder.service,
        metadata: Map.put(metadata, :raw_error, err)
+     )
+     |> tap(
+       &Logger.debug("""
+       [#{__MODULE__}]: Unexpected error while processing request. #{inspect(&1)}
+       """)
      )}
   end
 
@@ -292,6 +306,11 @@ defmodule Supabase.Fetcher do
        message: message,
        service: builder.service,
        metadata: %{stacktrace: stacktrace, exception: exception}
+     )
+     |> tap(
+       &Logger.error("""
+       [#{__MODULE__}]: Exception raised while processing request. #{inspect(&1)}
+       """)
      )}
   end
 

lib/supabase/fetcher/body_decoder.ex

@@ -35,6 +35,6 @@ defmodule Supabase.Fetcher.JSONDecoder do
   @impl true
   def decode(%Response{body: body}, opts \\ []) do
     keys = Keyword.get(opts, :keys, :strings)
-    Jason.decode(body, keys: keys)
+    Supabase.json_library().decode(body, keys: keys)
   end
 end

lib/supabase/fetcher/request.ex

@@ -196,14 +196,15 @@ defmodule Supabase.Fetcher.Request do
 
   @doc """
   Defines the request body to be sent, it can be a map, that will be encoded
-  with `Jason.encode_to_iodata!/1`, any `iodata` or a stream body in the pattern of `{:stream, Enumerable.t}`, although you will problably prefer to use the `upload/2`
+  with `encode_to_iodata!/1`, any `iodata` or a stream body in the pattern of `{:stream, Enumerable.t}`, although you will problably prefer to use the `upload/2`
   function of this module to hadle body stream since it will handle file management, content headers and so on.
   """
   @impl true
   def with_body(builder, body \\ nil)
 
   def with_body(%__MODULE__{} = builder, %{} = body) do
-    %{builder | body: Jason.encode_to_iodata!(body)}
+    json_library = Supabase.json_library()
+    %{builder | body: json_library.encode_to_iodata!(body)}
   end
 
   def with_body(%__MODULE__{} = builder, body) do

lib/supabase/fetcher/request/behaviour.ex

@@ -14,7 +14,7 @@ defmodule Supabase.Fetcher.Request.Behaviour do
   @callback with_http_client(Request.t(), adapter :: module) :: Request.t()
   @callback with_query(Request.t(), query :: Enumerable.t()) :: Request.t()
   @callback with_body(Request.t(), body) :: Request.t()
-            when body: Jason.Encoder.t() | {:stream, Enumerable.t()} | nil
+            when body: term | {:stream, Enumerable.t()} | nil
   @callback with_headers(Request.t(), headers) :: Request.t()
             when headers: Supabase.Fetcher.headers()
   @callback with_body_decoder(Request.t(), decoder, decoder_opts) :: Request.t()

mix.exs

@@ -33,8 +33,8 @@ defmodule Supabase.MixProject do
     [
       {:mime, "~> 2.0"},
       {:finch, "~> 0.18"},
-      {:jason, "~> 1.4"},
       {:ecto, "~> 3.10"},
+      {:jason, "~> 1.4", optional: true},
       {:mox, "~> 1.2", only: :test},
       {:ex_doc, ">= 0.0.0", only: [:dev, :test], runtime: false},
       {:credo, "~> 1.7", only: [:dev, :test], runtime: false},

supabase/config.toml

@@ -50,7 +50,7 @@ enabled = true
 sql_paths = ['./seed.sql']
 
 [realtime]
-enabled = false
+enabled = true
 # Bind realtime via either IPv4 or IPv6. (default: IPv4)
 # ip_version = "IPv6"
 # The maximum length in bytes of HTTP request headers. (default: 4096)
@@ -68,7 +68,7 @@ openai_api_key = "env(OPENAI_API_KEY)"
 # Email testing server. Emails sent with the local dev setup are not actually sent - rather, they
 # are monitored, and you can view the emails that would have been sent from the web interface.
 [inbucket]
-enabled = false
+enabled = true
 # Port to use for the email testing server web interface.
 port = 54324
 # Uncomment to expose additional ports for testing user applications that send emails.
@@ -126,9 +126,9 @@ enable_signup = true
 # addresses. If disabled, only the new email is required to confirm.
 double_confirm_changes = false
 # If enabled, users need to confirm their email address before signing in.
-enable_confirmations = false
+enable_confirmations = true
 # If enabled, users will need to reauthenticate or have logged in recently to change their password.
-secure_password_change = false
+secure_password_change = true
 # Controls the minimum amount of time that must pass before sending another signup confirmation or password reset email.
 max_frequency = "1s"
 # Number of characters used in the email OTP.
@@ -146,10 +146,21 @@ otp_expiry = 3600
 # admin_email = "[email protected]"
 # sender_name = "Admin"
 
-# Uncomment to customize email template
-# [auth.email.template.invite]
-# subject = "You have been invited"
-# content_path = "./supabase/templates/invite.html"
+[auth.email.template.invite]
+subject = "You have been invited"
+content_path = "./supabase/templates/invite_user.html"
+
+[auth.email.template.recovery]
+subject = "Password recovery"
+content_path = "./supabase/templates/reset_password.html"
+
+[auth.email.template.confirmation]
+subject = "Signup confirmation"
+content_path = "./supabase/templates/confirm_signup.html"
+
+[auth.email.template.magicLink]
+subject = "Your magic Link"
+content_path = "./supabase/templates/magic_link_otp.html"
 
 [auth.sms]
 # Allow/disallow new user signups via SMS to your project.
@@ -217,10 +228,10 @@ client_id = "client-id-123"
 secret = "secret-123456"
 
 [auth.external.apple]
-enabled = false
-client_id = ""
+enabled = true
+client_id = "client-123"
 # DO NOT commit your OAuth provider secret to git. Use environment variable substitution instead:
-secret = "env(SUPABASE_AUTH_EXTERNAL_APPLE_SECRET)"
+secret = "secret-123"
 # Overrides the default auth redirectUrl.
 redirect_uri = ""
 # Overrides the default auth provider URL. Used to support self-hosted gitlab, single-tenant Azure,

supabase/templates/confirm_signup.html

@@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+  <meta charset="UTF-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <title>Password Recovery</title>
+</head>
+
+<body>
+  <main>
+    <div class="email-content">
+      <h2>Hello!</h2>
+      <p>Check the link below:</p>
+      <a href="{{ .SiteURL }}?token_hash={{ .TokenHash }}&type=signup">
+        {{ .SiteURL }}?token_hash={{ .TokenHash }}&type=signup
+      </a>
+    </div>
+  </main>
+</body>
+
+</html>

supabase/templates/invite_user.html

@@ -0,0 +1,20 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+  <meta charset="UTF-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <title>Invitation</title>
+</head>
+
+<body>
+  <main>
+    <div>
+      <h2>Hello!</h2>
+      <p>Check the link below</p>
+      <a href="{{ .ConfirmationURL }}">{{ .ConfirmationURL }}</a>
+    </div>
+  </main>
+</body>
+
+</html>

supabase/templates/magic_link_otp.html

@@ -0,0 +1,23 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+  <meta charset="UTF-8">
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+  <title>Magic Link</title>
+</head>
+
+<body>
+  <main>
+    <div class="email-content">
+      <h2>Hello!</h2>
+      <p>Check the link below</p>
+      <a href="{{ .SiteURL }}?token_hash={{ .TokenHash }}&type=magiclink">
+        {{ .SiteURL }}?token_hash={{ .TokenHash }}&type=magiclink
+      </a>
+      <p>Or use the following token code {{ .Token }}</p>
+    </div>
+  </main>
+</body>
+
+</html>