Skip to content

Commit 5b9e5cd

Browse files
committed
fix: signed_in_path edge case
1 parent fbdeab3 commit 5b9e5cd

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

lib/algora_web/controllers/installation_callback_controller.ex

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ defmodule AlgoraWeb.InstallationCallbackController do
22
use AlgoraWeb, :controller
33

44
alias Algora.Accounts
5+
alias Algora.Accounts.User
56
alias Algora.Github
67
alias Algora.Organizations
78
alias Algora.Workspace
@@ -77,5 +78,5 @@ defmodule AlgoraWeb.InstallationCallbackController do
7778
end
7879
end
7980

80-
defp redirect_url(conn), do: ~p"/org/#{conn.assigns.current_user.last_context}/settings"
81+
defp redirect_url(conn), do: ~p"/org/#{User.last_context(conn.assigns.current_user)}/settings"
8182
end

lib/algora_web/controllers/user_auth.ex

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ defmodule AlgoraWeb.UserAuth do
194194
end
195195

196196
def signed_in_path(conn) do
197-
signed_in_path_from_context(get_session(conn, :last_context, User.default_context()))
197+
signed_in_path_from_context(get_session(conn, :last_context) || User.default_context())
198198
end
199199

200200
defp login_code_ttl, do: 3600

0 commit comments

Comments
 (0)