Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: typo in error message for expired token #1298

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/realtime_web/channels/auth/channels_authorization.ex
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ defmodule RealtimeWeb.ChannelsAuthorization do

{:error, [message: validation_timer, claim: "exp", claim_val: claim_val]}
when is_integer(validation_timer) ->
msg = "Token as expired #{validation_timer - claim_val} seconds ago"
msg = "Token has expired #{validation_timer - claim_val} seconds ago"
{:error, :expired_token, msg}

{:error, reason} ->
Expand Down
12 changes: 6 additions & 6 deletions test/integration/rt_channel_test.exs
Original file line number Diff line number Diff line change
Expand Up @@ -540,7 +540,7 @@ defmodule Realtime.Integration.RtChannelTest do
test "invalid JWT with expired token" do
assert capture_log(fn ->
get_connection("authenticated", %{:exp => System.system_time(:second) - 1000})
end) =~ "InvalidJWTToken: Token as expired 1000 seconds ago"
end) =~ "InvalidJWTToken: Token has expired 1000 seconds ago"
end

test "token required the role key" do
Expand Down Expand Up @@ -720,13 +720,13 @@ defmodule Realtime.Integration.RtChannelTest do
event: "system",
payload: %{
"extension" => "system",
"message" => "Token as expired 1000 seconds ago",
"message" => "Token has expired 1000 seconds ago",
"status" => "error"
}
}
end)

assert log =~ "ChannelShutdown: Token as expired 1000 seconds ago"
assert log =~ "ChannelShutdown: Token has expired 1000 seconds ago"
end

test "ChannelShutdown include sub if available in jwt claims",
Expand Down Expand Up @@ -820,7 +820,7 @@ defmodule Realtime.Integration.RtChannelTest do

assert_receive %Message{event: "phx_close"}

assert msg =~ "Token as expired"
assert msg =~ "Token has expired"
end

test "token expires in between joins", %{topic: topic} do
Expand All @@ -845,7 +845,7 @@ defmodule Realtime.Integration.RtChannelTest do
event: "phx_reply",
payload: %{
"status" => "error",
"response" => %{"reason" => "Token as expired 0 seconds ago"}
"response" => %{"reason" => "Token has expired 0 seconds ago"}
},
topic: ^realtime_topic
},
Expand Down Expand Up @@ -1311,7 +1311,7 @@ defmodule Realtime.Integration.RtChannelTest do
get_connection("authenticated", %{:exp => System.system_time(:second) - 1000})
end)

assert log =~ "InvalidJWTToken: Token as expired 1000 seconds ago"
assert log =~ "InvalidJWTToken: Token has expired 1000 seconds ago"
end
end

Expand Down
8 changes: 4 additions & 4 deletions test/realtime_web/channels/realtime_channel_test.exs
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ defmodule RealtimeWeb.RealtimeChannelTest do
test "expired token returns a error" do
with_mock ChannelsAuthorization, [],
authorize_conn: fn _, _, _ ->
{:error, :expired_token, "InvalidJWTToken: Token as expired 1000 seconds ago"}
{:error, :expired_token, "InvalidJWTToken: Token has expired 1000 seconds ago"}
end do
sub = random_string()
conn_opts = conn_opts(@tenant_external_id, %{sub: sub})
Expand All @@ -150,15 +150,15 @@ defmodule RealtimeWeb.RealtimeChannelTest do
Process.sleep(300)
end)

assert log =~ "InvalidJWTToken: Token as expired 1000 seconds ago"
assert log =~ "InvalidJWTToken: Token has expired 1000 seconds ago"
assert log =~ "sub=#{sub}"
end
end

test "expired token returns a error with sub in metadata if available" do
with_mock ChannelsAuthorization, [],
authorize_conn: fn _, _, _ ->
{:error, :expired_token, "InvalidJWTToken: Token as expired 1000 seconds ago"}
{:error, :expired_token, "InvalidJWTToken: Token has expired 1000 seconds ago"}
end do
log =
capture_log(fn ->
Expand All @@ -168,7 +168,7 @@ defmodule RealtimeWeb.RealtimeChannelTest do
Process.sleep(300)
end)

assert log =~ "InvalidJWTToken: Token as expired 1000 seconds ago"
assert log =~ "InvalidJWTToken: Token has expired 1000 seconds ago"
end
end
end
Expand Down