Skip to content
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/algora_web/controllers/user_auth.ex
Original file line number Diff line number Diff line change
Expand Up @@ -229,7 +229,7 @@ defmodule AlgoraWeb.UserAuth do

defp maybe_store_return_to(conn), do: conn

def signed_in_path_from_context("personal"), do: ~p"/home"
def signed_in_path_from_context("personal"), do: ~p"/"

def signed_in_path_from_context("preview/" <> ctx) do
case String.split(ctx, "/") do
Expand Down
10 changes: 10 additions & 0 deletions lib/algora_web/controllers/user_controller.ex
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,14 @@ defmodule AlgoraWeb.UserController do
raise AlgoraWeb.NotFoundError
end
end

def profile(conn, _params) do
case conn.assigns[:current_user] do
nil ->
redirect(conn, to: "/auth/login")

user ->
redirect(conn, to: "/#{user.handle}/profile")
end
end
end
10 changes: 10 additions & 0 deletions lib/algora_web/router.ex
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,11 @@ defmodule AlgoraWeb.Router do
plug CORSPlug, headers: ["Content-Type"]
end

# Route redirects for common paths that don't exist at top level
redirect("/home", "/", :temporary)
redirect("/dashboard", "/", :temporary)
redirect("/settings", "/user/settings", :temporary)

scope "/" do
forward "/asset", AlgoraWeb.Plugs.RewriteAssetsPlug, upstream: :assets_url
forward "/storage", AlgoraWeb.Plugs.RewriteStoragePlug, upstream: :storage_url
Expand All @@ -56,6 +61,7 @@ defmodule AlgoraWeb.Router do
get "/auth/logout", OAuthCallbackController, :sign_out
get "/tip", TipController, :create
get "/preview", OrgPreviewCallbackController, :new
get "/profile", UserController, :profile

scope "/callbacks" do
get "/stripe/refresh", StripeCallbackController, :refresh
Expand Down Expand Up @@ -223,5 +229,9 @@ defmodule AlgoraWeb.Router do
scope "/:handle" do
get "/", UserController, :index
end

scope "/users" do
get "/:handle", UserController, :index
end
end
end