Add external_auth_support

Author: vtm9

docker-compose.yml

@@ -31,19 +31,19 @@ services:
       POSTGRES_USER: ${CODEBATTLE_DB_USERNAME}
       POSTGRES_PASSWORD: ${CODEBATTLE_DB_PASSWORD}
     volumes:
-      - pg_data2:/var/lib/postgresql/data
+      - pg_data:/var/lib/postgresql/data
 
   # same db but forwards port to host
   db-local:
-    image: postgres:12-alpine
+    image: postgres:16-alpine
     ports:
       - "5432:${CODEBATTLE_DB_PORT}"
     environment:
       POSTGRES_USER: ${CODEBATTLE_DB_USERNAME}
       POSTGRES_PASSWORD: ${CODEBATTLE_DB_PASSWORD}
     command: postgres -c 'max_connections=1000'
     volumes:
-      - pg_data2:/var/lib/postgresql/data
+      - pg_data:/var/lib/postgresql/data
 
 volumes:
-  pg_data2:
+  pg_data:

services/app/apps/codebattle/lib/codebattle/auth/external.ex

@@ -0,0 +1,66 @@
+defmodule Codebattle.Auth.External do
+  @moduledoc """
+  Module that handles External OAuth
+  """
+
+  def client_id do
+    Application.get_env(:codebattle, :oauth)[:external_client_id]
+  end
+
+  def client_secret do
+    Application.get_env(:codebattle, :oauth)[:external_client_secret]
+  end
+
+  def external_auth(code, redirect_uri) do
+    body =
+      URI.encode_query(%{
+        grant_type: "authorization_code",
+        code: code,
+        client_id: client_id(),
+        client_secret: client_secret(),
+        redirect_uri: redirect_uri
+      })
+
+    headers = [{"Content-Type", "application/x-www-form-urlencoded"}]
+
+    opts =
+      Keyword.merge(
+        Application.get_env(:codebattle, :auth_req_options, []),
+        body: body,
+        headers: headers
+      )
+
+    external_auth_url()
+    |> Req.post!(opts)
+    |> Map.get(:body)
+    |> check_authenticated()
+  end
+
+  defp external_auth_url do
+    Application.get_env(:codebattle, :oauth)[:external_auth_url]
+  end
+
+  defp check_authenticated(%{"access_token" => access_token}) do
+    get_user_details(access_token)
+  end
+
+  defp check_authenticated(error), do: {:error, error}
+
+  defp get_user_details(access_token) do
+    opts =
+      Keyword.put(
+        Application.get_env(:codebattle, :auth_req_options, []),
+        :headers,
+        authorization: "OAuth #{access_token}"
+      )
+
+    :codebattle
+    |> Application.get_env(:oauth)
+    |> Keyword.get(:external_user_info_url)
+    |> Req.get!(opts)
+    |> Map.get(:body)
+    |> Map.take(["default_avatar_id", "id", "is_avatar_empty"])
+    |> Runner.AtomizedMap.atomize()
+    |> dbg()
+  end
+end

services/app/apps/codebattle/lib/codebattle/auth/external_user.ex

@@ -0,0 +1,46 @@
+defmodule Codebattle.Auth.User.ExternalUser do
+  @moduledoc """
+    Retrieve user information from externalt oauth request
+  """
+
+  alias Codebattle.Repo
+  alias Codebattle.User
+
+  @spec find_or_create(map()) :: {:ok, User.t()} | {:error, term()}
+  def find_or_create(profile) do
+    User
+    |> Repo.get_by(external_oauth_id: profile.id)
+    |> case do
+      nil ->
+        name = "External-#{profile.id}"
+
+        params = %{
+          external_oauth_id: profile.id,
+          name: name,
+          subscription_type: :free,
+          lang: Application.get_env(:codebattle, :default_lang_slug),
+          avatar_url: external_avatar_url(profile)
+        }
+
+        %User{}
+        |> User.changeset(params)
+        |> Repo.insert()
+
+      user ->
+        params = %{avatar_url: external_avatar_url(profile)}
+
+        user
+        |> User.changeset(params)
+        |> Repo.update()
+    end
+  end
+
+  defp external_avatar_url(%{is_avatar_empty: true}), do: nil
+
+  defp external_avatar_url(profile) do
+    :codebattle
+    |> Application.get_env(:oauth)
+    |> Keyword.get(:external_avatar_url_template)
+    |> String.replace(~r/AVATAR_ID/, profile.default_avatar_id)
+  end
+end

services/app/apps/codebattle/lib/codebattle/user.ex

@@ -23,6 +23,7 @@ defmodule Codebattle.User do
            only: [
              :achievements,
              :avatar_url,
+             :category,
              :clan,
              :clan_id,
              :editor_mode,
@@ -49,6 +50,7 @@ defmodule Codebattle.User do
     field(:achievements, {:array, :string}, default: [])
     field(:auth_token, :string)
     field(:avatar_url, :string)
+    field(:category, :string)
     field(:clan, :string)
     field(:clan_id, :integer)
     field(:collab_logo, :string)
@@ -58,6 +60,7 @@ defmodule Codebattle.User do
     field(:editor_mode, :string)
     field(:editor_theme, :string)
     field(:email, :string)
+    field(:external_oauth_id, :string)
     field(:firebase_uid, :string)
     field(:github_id, :integer)
     field(:github_name, :string)
@@ -88,12 +91,14 @@ defmodule Codebattle.User do
       :achievements,
       :auth_token,
       :avatar_url,
+      :category,
       :discord_avatar,
       :discord_id,
       :discord_name,
       :editor_mode,
       :editor_theme,
       :email,
+      :external_oauth_id,
       :firebase_uid,
       :github_id,
       :github_name,
@@ -120,7 +125,7 @@ defmodule Codebattle.User do
 
   def token_changeset(user, params \\ %{}) do
     user
-    |> cast(params, [:auth_token, :name, :clan, :subscription_type])
+    |> cast(params, [:external_oauth_id, :category, :name, :clan, :subscription_type])
     |> cast_embed(:sound_settings)
     |> unique_constraint(:name)
     |> validate_length(:name, min: 2, max: 39)

services/app/apps/codebattle/lib/codebattle_web/controllers/auth_controller.ex

@@ -3,6 +3,7 @@ defmodule CodebattleWeb.AuthController do
   use Gettext, backend: CodebattleWeb.Gettext
 
   alias Codebattle.Auth.Discord
+  alias Codebattle.Auth.External
   alias Codebattle.Auth.Github
 
   require Logger
@@ -50,12 +51,10 @@ defmodule CodebattleWeb.AuthController do
       case provider_name do
         "github" ->
           oauth_github_url = Github.login_url(%{redirect_uri: redirect_uri})
-
           redirect(conn, external: oauth_github_url)
 
         "discord" ->
           oauth_discord_url = Discord.login_url(%{redirect_uri: redirect_uri})
-
           redirect(conn, external: oauth_discord_url)
 
         _ ->
@@ -85,6 +84,11 @@ defmodule CodebattleWeb.AuthController do
           redirect_uri = Routes.auth_url(conn, :callback, provider_name)
           {:ok, profile} = Discord.discord_auth(code, redirect_uri)
           Codebattle.Auth.User.DiscordUser.find_or_create(profile)
+
+        "external" ->
+          redirect_uri = Routes.auth_url(conn, :callback, provider_name)
+          profile = External.external_auth(code, redirect_uri)
+          Codebattle.Auth.User.ExternalUser.find_or_create(profile)
       end
 
     case case_result do