Skip to content

Commit 0832071

Browse files
victorolinascvictorolinasc
committed
Fix benchmarks proper usage and credo
1 parent cdd978a commit 0832071

File tree

5 files changed

+45
-47
lines changed

5 files changed

+45
-47
lines changed

‎benchmarks/hs_benchmark.exs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
defmodule HS256Auth do
2-
use Joken.Config, default_key: :hs256
2+
use Joken.Config, default_signer: :hs256
33
end
44

55
defmodule HS384Auth do
6-
use Joken.Config, default_key: :hs384
6+
use Joken.Config, default_signer: :hs384
77
end
88

99
defmodule HS512Auth do
10-
use Joken.Config, default_key: :hs512
10+
use Joken.Config, default_signer: :hs512
1111
end
1212

1313
defmodule HS256AuthVerify do
14-
use Joken.Config, default_key: :hs256
14+
use Joken.Config, default_signer: :hs256
1515

1616
def token_config do
1717
%{}
@@ -23,7 +23,7 @@ defmodule HS256AuthVerify do
2323
end
2424

2525
defmodule HS384AuthVerify do
26-
use Joken.Config, default_key: :hs384
26+
use Joken.Config, default_signer: :hs384
2727

2828
def token_config do
2929
%{}
@@ -35,7 +35,7 @@ defmodule HS384AuthVerify do
3535
end
3636

3737
defmodule HS512AuthVerify do
38-
use Joken.Config, default_key: :hs512
38+
use Joken.Config, default_signer: :hs512
3939

4040
def token_config do
4141
%{}

‎benchmarks/jose_hs_benchmark.exs‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,34 +10,34 @@ Benchee.run(%{
1010
"JOSE HS256" => fn ->
1111
# Same as default claims for Joken
1212
jwt = %{
13-
"exp" => Joken.CurrentTime.current_time() + 2 * 60 * 60,
13+
"exp" => Joken.CurrentTime.OS.current_time() + 2 * 60 * 60,
1414
"iss" => "Joken",
15-
"nbf" => Joken.CurrentTime.current_time(),
16-
"iat" => Joken.CurrentTime.current_time()
15+
"nbf" => Joken.CurrentTime.OS.current_time(),
16+
"iat" => Joken.CurrentTime.OS.current_time()
1717
}
1818

1919
JOSE.JWT.sign(jwk_hs256, jws_hs256, jwt) |> JOSE.JWS.compact()
2020
end,
2121
"JOSE HS384" => fn ->
2222
# Same as default claims for Joken
2323
jwt = %{
24-
"exp" => Joken.CurrentTime.current_time() + 2 * 60 * 60,
24+
"exp" => Joken.CurrentTime.OS.current_time() + 2 * 60 * 60,
2525
"iss" => "Joken",
26-
"nbf" => Joken.CurrentTime.current_time(),
27-
"iat" => Joken.CurrentTime.current_time()
26+
"nbf" => Joken.CurrentTime.OS.current_time(),
27+
"iat" => Joken.CurrentTime.OS.current_time()
2828
}
2929

3030
JOSE.JWT.sign(jwk_hs384, jws_hs384, jwt) |> JOSE.JWS.compact()
3131
end,
3232
"JOSE HS512" => fn ->
3333
# Same as default claims for Joken
3434
jwt = %{
35-
"exp" => Joken.CurrentTime.current_time() + 2 * 60 * 60,
35+
"exp" => Joken.CurrentTime.OS.current_time() + 2 * 60 * 60,
3636
"iss" => "Joken",
37-
"nbf" => Joken.CurrentTime.current_time(),
38-
"iat" => Joken.CurrentTime.current_time()
37+
"nbf" => Joken.CurrentTime.OS.current_time(),
38+
"iat" => Joken.CurrentTime.OS.current_time()
3939
}
4040

4141
JOSE.JWT.sign(jwk_hs512, jws_hs512, jwt) |> JOSE.JWS.compact()
4242
end
43-
})
43+
})

‎benchmarks/pem_rs_benchmark.exs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
defmodule RS256Auth do
2-
use Joken.Config, default_key: :pem_rs256
2+
use Joken.Config, default_signer: :pem_rs256
33
end
44

55
defmodule RS384Auth do
6-
use Joken.Config, default_key: :pem_rs384
6+
use Joken.Config, default_signer: :pem_rs384
77
end
88

99
defmodule RS512Auth do
10-
use Joken.Config, default_key: :pem_rs512
10+
use Joken.Config, default_signer: :pem_rs512
1111
end
1212

1313
defmodule RS256AuthVerify do
14-
use Joken.Config, default_key: :rs256
14+
use Joken.Config, default_signer: :rs256
1515

1616
def token_config do
1717
%{}
@@ -23,7 +23,7 @@ defmodule RS256AuthVerify do
2323
end
2424

2525
defmodule RS384AuthVerify do
26-
use Joken.Config, default_key: :rs384
26+
use Joken.Config, default_signer: :rs384
2727

2828
def token_config do
2929
%{}
@@ -35,7 +35,7 @@ defmodule RS384AuthVerify do
3535
end
3636

3737
defmodule RS512AuthVerify do
38-
use Joken.Config, default_key: :rs512
38+
use Joken.Config, default_signer: :rs512
3939

4040
def token_config do
4141
%{}

‎benchmarks/rs_benchmark.exs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
defmodule RS256Auth do
2-
use Joken.Config, default_key: :rs256
2+
use Joken.Config, default_signer: :rs256
33
end
44

55
defmodule RS384Auth do
6-
use Joken.Config, default_key: :rs384
6+
use Joken.Config, default_signer: :rs384
77
end
88

99
defmodule RS512Auth do
10-
use Joken.Config, default_key: :rs512
10+
use Joken.Config, default_signer: :rs512
1111
end
1212

1313
defmodule RS256AuthVerify do
14-
use Joken.Config, default_key: :rs256
14+
use Joken.Config, default_signer: :rs256
1515

1616
def token_config do
1717
%{}
@@ -23,7 +23,7 @@ defmodule RS256AuthVerify do
2323
end
2424

2525
defmodule RS384AuthVerify do
26-
use Joken.Config, default_key: :rs384
26+
use Joken.Config, default_signer: :rs384
2727

2828
def token_config do
2929
%{}
@@ -35,7 +35,7 @@ defmodule RS384AuthVerify do
3535
end
3636

3737
defmodule RS512AuthVerify do
38-
use Joken.Config, default_key: :rs512
38+
use Joken.Config, default_signer: :rs512
3939

4040
def token_config do
4141
%{}

‎lib/joken/config.ex‎

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -266,31 +266,29 @@ defmodule Joken.Config do
266266
end
267267

268268
defp generate_config(skip, default_exp, default_iss, default_aud, generate_jti) do
269-
gen_exp_func = fn -> current_time() + default_exp end
270-
271269
Enum.reduce(@default_generated_claims, %{}, fn claim, acc ->
272-
if claim in skip do
273-
acc
274-
else
275-
case claim do
276-
:exp ->
277-
add_claim(acc, "exp", gen_exp_func, &(&1 > current_time()))
270+
cond do
271+
claim in skip ->
272+
acc
278273

279-
:iat ->
280-
add_claim(acc, "iat", fn -> current_time() end)
274+
# credo:disable-for-lines:14 Credo.Check.Refactor.Nesting
275+
claim == :exp ->
276+
add_claim(acc, "exp", fn -> current_time() + default_exp end, &(&1 > current_time()))
281277

282-
:nbf ->
283-
add_claim(acc, "nbf", fn -> current_time() end, &(current_time() >= &1))
278+
claim == :iat ->
279+
add_claim(acc, "iat", fn -> current_time() end)
284280

285-
:iss ->
286-
add_claim(acc, "iss", fn -> default_iss end, &(&1 == default_iss))
281+
claim == :nbf ->
282+
add_claim(acc, "nbf", fn -> current_time() end, &(current_time() >= &1))
287283

288-
:aud ->
289-
add_claim(acc, "aud", fn -> default_aud end, &(&1 == default_aud))
284+
claim == :iss ->
285+
add_claim(acc, "iss", fn -> default_iss end, &(&1 == default_iss))
290286

291-
:jti ->
292-
add_claim(acc, "jti", generate_jti)
293-
end
287+
claim == :aud ->
288+
add_claim(acc, "aud", fn -> default_aud end, &(&1 == default_aud))
289+
290+
claim == :jti ->
291+
add_claim(acc, "jti", generate_jti)
294292
end
295293
end)
296294
end

0 commit comments

Comments
 (0)