Update to Elixir 1.18

.github/workflows/ci.yml

@@ -16,8 +16,8 @@ jobs:
       - uses: actions/checkout@v3
       - uses: erlef/setup-beam@v1
         with:
-          otp-version: 26.0
-          elixir-version: 1.16
+          otp-version: 27.0
+          elixir-version: 1.18
       - run: mix deps.get
       - run: mix compile --warnings-as-errors
       - run: mix credo --strict --ignore design.tagtodo
@@ -27,8 +27,8 @@ jobs:
     strategy:
       matrix:
         version:
-          - otp: 26.0
-            elixir: 1.16
+          - otp: 27.0
+            elixir: 1.18
             os: ubuntu-latest
           - otp: 22.0
             elixir: 1.13

.github/workflows/publish.yml

@@ -19,7 +19,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: erlef/setup-beam@v1
         with:
-          otp-version: 26.0
-          elixir-version: 1.16
+          otp-version: 27.0
+          elixir-version: 1.18
       - run: mix deps.get
       - run: mix hex.publish --yes

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## v0.2.11 (TBA)
+
+* Default to using `JSON` instead of `Jason` for JSON parsing on Elixir 1.18
+
 ## v0.2.10 (2024-04-11)
 
 Requires Elixir 1.13+

lib/assent/config.ex

@@ -32,17 +32,20 @@ defmodule Assent.Config do
 
   defdelegate merge(config_a, config_b), to: Keyword
 
+  @default_json_library (Code.ensure_loaded?(JSON) && JSON) || Jason
+
   @doc """
   Fetches the JSON library in config.
 
   If not found in provided config, this will attempt to load the JSON library
-  from global application environment for `:assent`. Defaults to `Jason`.
+  from global application environment for `:assent`. Defaults to
+  `#{@default_json_library}`.
   """
   @spec json_library(t()) :: module()
   def json_library(config) do
     case get(config, :json_library, nil) do
       nil ->
-        Application.get_env(:assent, :json_library, Jason)
+        Application.get_env(:assent, :json_library, @default_json_library)
 
       json_library ->
         json_library

lib/assent/jwt_adapter/assent_jwt.ex

@@ -42,11 +42,17 @@ defmodule Assent.JWTAdapter.AssentJWT do
 
   defp encode_json_base64(map, opts) do
     with {:ok, json_library} <- Config.fetch(opts, :json_library),
-         {:ok, json} <- json_library.encode(map) do
+         {:ok, json} <- json_encode(json_library, map) do
       {:ok, Base.url_encode64(json, padding: false)}
     end
   end
 
+  defp json_encode(json_library, map) do
+    {:ok, json_library.encode!(map)}
+  rescue
+    error -> {:error, error}
+  end
+
   defp encode_claims(claims, opts) do
     case encode_json_base64(claims, opts) do
       {:ok, encoded_claims} ->

mix.exs

@@ -36,13 +36,12 @@ defmodule Assent.MixProject do
     [
       # JWT libraries
       {:jose, "~> 1.8", optional: true},
-      # HTTP clients (Jason is required for Req)
+      # HTTP clients
       {:certifi, ">= 0.0.0", optional: true},
       {:ssl_verify_fun, ">= 0.0.0", optional: true},
       {:finch, "~> 0.15", optional: true},
       {:mint, "~> 1.0", optional: true},
       {:req, "~> 0.4", optional: true},
-      {:jason, "~> 1.0", optional: true},
       # Docs and tests
       {:ex_doc, ">= 0.0.0", only: :dev, runtime: false},
       {:credo, "~> 1.1", only: [:dev, :test]},

test/assent/config_test.exs

@@ -1,4 +1,4 @@
 defmodule Assent.ConfigTest do
-  use ExUnit.Case
+  use Assent.TestCase
   doctest Assent.Config
 end

test/assent/http_adapter/finch_test.exs

@@ -1,5 +1,5 @@
 defmodule Assent.HTTPAdapter.FinchTest do
-  use ExUnit.Case
+  use Assent.TestCase
   doctest Assent.HTTPAdapter.Finch
 
   alias Assent.HTTPAdapter.Finch, as: FinchAdapter
@@ -54,7 +54,7 @@ defmodule Assent.HTTPAdapter.FinchTest do
       assert capture_log(fn ->
                assert {:error, %Error{reason: :disconnected}} =
                         FinchAdapter.request(:get, bad_host_url, nil, [], supervisor: supervisor)
-             end) =~ "{bad_cert,hostname_check_failed}"
+             end) =~ "hostname_check_failed"
     end
 
     test "handles SSL with bad certificate and no verification" do

test/assent/http_adapter/httpc_test.exs

@@ -1,5 +1,5 @@
 defmodule Assent.HTTPAdapter.HttpcTest do
-  use ExUnit.Case
+  use Assent.TestCase
   doctest Assent.HTTPAdapter.Httpc
 
   alias Assent.HTTPAdapter.{Httpc, HTTPResponse}

test/assent/http_adapter/mint_test.exs

@@ -1,5 +1,5 @@
 defmodule Assent.HTTPAdapter.MintTest do
-  use ExUnit.Case
+  use Assent.TestCase
   doctest Assent.HTTPAdapter.Mint
 
   alias ExUnit.CaptureIO

test/assent/http_adapter/req_test.exs

@@ -1,16 +1,25 @@
 defmodule Assent.HTTPAdapter.ReqTest do
-  use ExUnit.Case
+  use Assent.TestCase
   doctest Assent.HTTPAdapter.Req
 
-  alias Mint.TransportError
+  alias Req.TransportError
   alias Assent.HTTPAdapter.{HTTPResponse, Req}
 
+  # Test retries quickly
+  @req_opts [retry_delay: 0]
+
   describe "request/4" do
     test "handles SSL" do
       TestServer.start(scheme: :https)
       TestServer.add("/", via: :get)
 
-      req_opts = [connect_options: [transport_opts: [cacerts: TestServer.x509_suite().cacerts]]]
+      req_opts =
+        Keyword.put(
+          @req_opts,
+          :connect_options,
+          transport_opts: [cacerts: TestServer.x509_suite().cacerts],
+          protocols: [:http2]
+        )
 
       assert {:ok, %HTTPResponse{status: 200, body: "HTTP/2"}} =
                Req.request(:get, TestServer.url(), nil, [], req_opts)
@@ -20,7 +29,13 @@ defmodule Assent.HTTPAdapter.ReqTest do
       TestServer.start(scheme: :https)
 
       bad_host_url = TestServer.url(host: "bad-host.localhost")
-      req_opts = [connect_options: [transport_opts: [cacerts: TestServer.x509_suite().cacerts]]]
+
+      req_opts =
+        Keyword.put(
+          @req_opts,
+          :connect_options,
+          transport_opts: [cacerts: TestServer.x509_suite().cacerts]
+        )
 
       assert {:error, %TransportError{reason: {:tls_alert, {:handshake_failure, _error}}}} =
                Req.request(:get, bad_host_url, nil, [], req_opts)
@@ -32,11 +47,12 @@ defmodule Assent.HTTPAdapter.ReqTest do
 
       bad_host_url = TestServer.url(host: "bad-host.localhost")
 
-      req_opts = [
-        connect_options: [
+      req_opts =
+        Keyword.put(
+          @req_opts,
+          :connect_options,
           transport_opts: [cacerts: TestServer.x509_suite().cacerts, verify: :verify_none]
-        ]
-      ]
+        )
 
       assert {:ok, %HTTPResponse{status: 200}} =
                Req.request(:get, bad_host_url, nil, [], req_opts)
@@ -62,7 +78,7 @@ defmodule Assent.HTTPAdapter.ReqTest do
       )
 
       assert {:ok, %HTTPResponse{status: 200}} =
-               Req.request(:get, TestServer.url("/get?a=1"), nil, [])
+               Req.request(:get, TestServer.url("/get?a=1"), nil, [], @req_opts)
     end
 
     test "handles POST" do
@@ -84,9 +100,15 @@ defmodule Assent.HTTPAdapter.ReqTest do
       )
 
       assert {:ok, %HTTPResponse{status: 200}} =
-               Req.request(:post, TestServer.url("/post"), "a=1&b=2", [
-                 {"content-type", "application/x-www-form-urlencoded"}
-               ])
+               Req.request(
+                 :post,
+                 TestServer.url("/post"),
+                 "a=1&b=2",
+                 [
+                   {"content-type", "application/x-www-form-urlencoded"}
+                 ],
+                 @req_opts
+               )
     end
   end
 end