feat: redirect user to original URL on signing in (#25)

Author: zcesur

lib/algora/integrations/github/github.ex

@@ -29,11 +29,6 @@ defmodule Algora.Github do
   end
 
   def authorize_url(data \\ nil) do
-    # TODO: find out a way to set return_to w/o github complaining about redirect_uri mismatch
-
-    # redirect_query = if return_to, do: URI.encode_query(return_to: return_to)
-    # redirect_uri = "#{AlgoraWeb.Endpoint.url()}/callbacks/github/oauth?#{redirect_query}"
-
     redirect_uri = "#{AlgoraWeb.Endpoint.url()}/callbacks/github/oauth"
 
     query =

lib/algora_web/controllers/oauth_callback_controller.ex

@@ -14,16 +14,15 @@ defmodule AlgoraWeb.OAuthCallbackController do
     end
   end
 
-  def new(conn, %{"provider" => "github", "code" => code, "state" => state} = params) do
-    with {:ok, _data} <- Github.verify_oauth_state(state),
+  def new(conn, %{"provider" => "github", "code" => code, "state" => state}) do
+    with {:ok, data} <- Github.verify_oauth_state(state),
          {:ok, info} <- Github.OAuth.exchange_access_token(code: code, state: state),
          %{info: info, primary_email: primary, emails: emails, token: token} = info,
          {:ok, user} <- Accounts.register_github_user(primary, info, emails, token) do
       conn =
-        if params["return_to"] do
-          put_session(conn, :user_return_to, params["return_to"])
-        else
-          conn
+        case data[:return_to] do
+          nil -> conn
+          return_to -> put_session(conn, :user_return_to, return_to)
         end
 
       conn

lib/algora_web/controllers/user_auth.ex

@@ -63,7 +63,13 @@ defmodule AlgoraWeb.UserAuth do
   end
 
   defp redirect_require_login(socket) do
-    LiveView.redirect(socket, to: ~p"/auth/login")
+    redirect_url =
+      case socket.private.connect_info.request_path do
+        nil -> ~p"/auth/login"
+        request_path -> ~p"/auth/login?#{%{return_to: request_path}}"
+      end
+
+    LiveView.redirect(socket, to: redirect_url)
   end
 
   @doc """

lib/algora_web/live/sign_in_live.ex

@@ -10,7 +10,7 @@ defmodule AlgoraWeb.SignInLive do
           Algora Console
         </h2>
         <.link
-          href={Algora.Github.authorize_url()}
+          href={@authorize_url}
           rel="noopener"
           class="mt-8 flex w-full justify-center rounded-md border border-transparent bg-indigo-600 px-4 py-2 text-sm font-medium text-white shadow-sm hover:bg-indigo-600 focus:outline-none focus:ring-2 focus:ring-indigo-400 focus:ring-offset-2"
         >
@@ -21,7 +21,13 @@ defmodule AlgoraWeb.SignInLive do
     """
   end
 
-  def mount(_params, _session, socket) do
-    {:ok, socket}
+  def mount(params, _session, socket) do
+    authorize_url =
+      case params["return_to"] do
+        nil -> Algora.Github.authorize_url()
+        return_to -> Algora.Github.authorize_url(%{return_to: return_to})
+      end
+
+    {:ok, assign(socket, authorize_url: authorize_url)}
   end
 end