Minor changes

Author: vtm9

apps/codebattle/assets/js/__tests__/UserSettings.test.jsx

@@ -25,6 +25,15 @@ jest.mock("react-bootstrap/Alert", () => ({
     ) : null,
 }));
 
+jest.mock("../i18n", () => ({
+  __esModule: true,
+  getSupportedLocale: jest.fn((locale) => (["en", "ru"].includes(locale) ? locale : "en")),
+  default: {
+    t: jest.fn((key) => key),
+    changeLanguage: jest.fn(() => Promise.resolve()),
+  },
+}));
+
 const reducer = combineReducers(reducers);
 
 const preloadedState = {
@@ -131,7 +140,7 @@ describe("UserSettings test cases", () => {
   test("successfull locale change", async () => {
     const settingUpdaterSpy = global.fetch.mockResolvedValueOnce({
       ok: true,
-      json: async () => ({}),
+      json: async () => ({ locale: "ru" }),
     });
     const { getByLabelText, getByTestId, findByText, user } = setup(
       <Provider store={store}>
@@ -151,6 +160,9 @@ describe("UserSettings test cases", () => {
         locale: "ru",
       });
     });
+
+    const i18n = jest.requireMock("../i18n").default;
+    expect(i18n.changeLanguage).toHaveBeenCalledWith("ru");
   });
 
   test("failed user settings update", async () => {

apps/codebattle/assets/js/i18n/index.js

@@ -6,9 +6,12 @@ import i18next from "i18next";
 import en from "../../../priv/gettext/en/LC_MESSAGES/default.po";
 import ru from "../../../priv/gettext/ru/LC_MESSAGES/default.po";
 
-const lng = Gon?.getAsset?.("locale") || "en";
+const supportedLocales = ["en", "ru"];
+const normalizeLocale = (locale) => (supportedLocales.includes(locale) ? locale : "en");
+const lng = normalizeLocale(Gon?.getAsset?.("locale"));
 
 export const getLocale = () => lng;
+export const getSupportedLocale = normalizeLocale;
 
 i18next.init({
   nsSeparator: false,

apps/codebattle/assets/js/widgets/pages/event/ParticipantDashboard.jsx

@@ -2,6 +2,7 @@ import React, { useEffect } from "react";
 
 import NiceModal, { unregister } from "@ebay/nice-modal-react";
 import cn from "classnames";
+import Gon from "gon";
 import upperCase from "lodash/upperCase";
 import { useSelector } from "react-redux";
 
@@ -13,6 +14,53 @@ import EventStageConfirmationModal from "./EventStageConfirmationModal";
 import NotPassedIcon from "./NotPassedIcon";
 import PassedIcon from "./PassedIcon";
 
+const externalPlatformLoginUrl = Gon.getAsset("external_platform_login_url");
+const externalPlatformProfileUrlTemplate = Gon.getAsset("external_platform_profile_url_template");
+
+const getExternalPlatformProfileUrl = (login) => {
+  if (!login || !externalPlatformProfileUrlTemplate) {
+    return null;
+  }
+
+  return externalPlatformProfileUrlTemplate.replace("USER_LOGIN", login);
+};
+
+const renderExternalPlatformLink = (user) => {
+  if (user.externalPlatformId) {
+    const profileUrl = getExternalPlatformProfileUrl(user.externalOauthLogin);
+
+    if (!profileUrl) {
+      return <span className="cb-custom-event-profile-data ms-2">{user.externalPlatformId}</span>;
+    }
+
+    return (
+      <a
+        className="cb-custom-event-profile-data ms-2"
+        href={profileUrl}
+        target="_blank"
+        rel="noreferrer"
+      >
+        {i18n.t("View profile")}
+      </a>
+    );
+  }
+
+  if (!externalPlatformLoginUrl) {
+    return <span className="cb-custom-event-profile-data ms-2">-</span>;
+  }
+
+  return (
+    <a
+      className="cb-custom-event-profile-data ms-2"
+      href={externalPlatformLoginUrl}
+      target="_blank"
+      rel="noreferrer"
+    >
+      {i18n.t("Link profile")}
+    </a>
+  );
+};
+
 function ParticipantDashboard() {
   useEffect(() => {
     NiceModal.register(ModalCodes.eventStageModal, EventStageConfirmationModal);
@@ -66,6 +114,10 @@ function ParticipantDashboard() {
                 {i18n.t("Category")}
                 <span className="cb-custom-event-profile-data ms-2">{user.category}</span>
               </div>
+              <div className="d-flex text-white justify-content-between cb-custom-event-profile my-1 mx-1 w-100">
+                {i18n.t("External platform")}
+                {renderExternalPlatformLink(user)}
+              </div>
             </div>
           </div>
         </div>

apps/codebattle/assets/js/widgets/pages/settings/UserSettings.jsx

@@ -8,7 +8,7 @@ import noop from "lodash/noop";
 import Alert from "react-bootstrap/Alert";
 import { useDispatch, useSelector } from "react-redux";
 
-import i18n from "../../../i18n";
+import i18n, { getSupportedLocale } from "../../../i18n";
 import { userSettingsSelector } from "../../selectors";
 import { actions } from "../../slices";
 
@@ -111,6 +111,7 @@ function UserSettings() {
       try {
         const data = await updateSettings(values);
 
+        await i18n.changeLanguage(getSupportedLocale(data.locale));
         dispatch(actions.updateUserSettings(camelizeKeys(data)));
         setNotification(notifications.success);
       } catch (error) {

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

@@ -3,6 +3,8 @@ defmodule Codebattle.Auth.External do
   Module that handles External OAuth
   """
 
+  @http_timeout_ms 7_000
+
   def client_id do
     Application.get_env(:codebattle, :oauth)[:external_client_id]
   end
@@ -27,15 +29,21 @@ defmodule Codebattle.Auth.External do
 
     opts =
       Keyword.merge(
-        Application.get_env(:codebattle, :auth_req_options, []),
+        request_opts(),
         body: body,
         headers: headers
       )
 
-    external_auth_url()
-    |> Req.post!(opts)
-    |> Map.get(:body)
-    |> check_authenticated()
+    case Req.post(external_auth_url(), opts) do
+      {:ok, %{status: status, body: response_body}} when status in 200..299 ->
+        check_authenticated(response_body)
+
+      {:ok, %{status: status, body: response_body}} ->
+        {:error, {:external_auth_failed, status, response_body}}
+
+      {:error, reason} ->
+        {:error, reason}
+    end
   end
 
   defp external_auth_url do
@@ -51,17 +59,37 @@ defmodule Codebattle.Auth.External do
   defp get_user_details(access_token) do
     opts =
       Keyword.put(
-        Application.get_env(:codebattle, :auth_req_options, []),
+        request_opts(),
         :headers,
         authorization: "OAuth #{access_token}"
       )
 
+    case Req.get(external_user_info_url(), opts) do
+      {:ok, %{status: status, body: response_body}} when status in 200..299 ->
+        response_body
+        |> Map.take(["default_avatar_id", "id", "is_avatar_empty", "login"])
+        |> Runner.AtomizedMap.atomize()
+        |> then(&{:ok, &1})
+
+      {:ok, %{status: status, body: response_body}} ->
+        {:error, {:external_user_info_failed, status, response_body}}
+
+      {:error, reason} ->
+        {:error, reason}
+    end
+  end
+
+  defp external_user_info_url do
     :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", "login"])
-    |> Runner.AtomizedMap.atomize()
+  end
+
+  defp request_opts do
+    Keyword.merge(
+      Application.get_env(:codebattle, :auth_req_options, []),
+      connect_options: [timeout: @http_timeout_ms],
+      receive_timeout: @http_timeout_ms
+    )
   end
 end

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

@@ -8,6 +8,8 @@ defmodule Codebattle.Auth.User.ExternalUser do
 
   @spec find_or_create(map()) :: {:ok, User.t()} | {:error, term()}
   def find_or_create(profile) do
+    external_platform_id = Codebattle.ExternalPlatform.get_user_id_by_login(profile.login)
+
     User
     |> Repo.get_by(external_oauth_id: profile.id)
     |> case do
@@ -17,6 +19,7 @@ defmodule Codebattle.Auth.User.ExternalUser do
         params = %{
           external_oauth_id: profile.id,
           external_oauth_login: profile.login,
+          external_platform_id: external_platform_id,
           name: name,
           subscription_type: :free,
           lang: Application.get_env(:codebattle, :default_lang_slug),
@@ -30,7 +33,8 @@ defmodule Codebattle.Auth.User.ExternalUser do
       user ->
         params = %{
           avatar_url: external_avatar_url(profile),
-          external_oauth_login: profile.login
+          external_oauth_login: profile.login,
+          external_platform_id: external_platform_id
         }
 
         user

apps/codebattle/lib/codebattle/external_platform.ex

@@ -0,0 +1,61 @@
+defmodule Codebattle.ExternalPlatform do
+  @moduledoc false
+
+  require Logger
+
+  @http_timeout_ms 7_000
+  @lookup_path "/v1/users/id"
+
+  def get_user_id_by_login(login) when is_binary(login) do
+    login = String.trim(login)
+
+    if login == "" do
+      nil
+    else
+      do_get_user_id_by_login(login)
+    end
+  end
+
+  def get_user_id_by_login(_), do: nil
+
+  defp do_get_user_id_by_login(login) do
+    opts =
+      Keyword.put(
+        request_opts(),
+        :params,
+        login: login
+      )
+
+    case Req.get(external_platform_service_url() <> @lookup_path, opts) do
+      {:ok, %{status: 200, body: %{"id" => id}}} when is_binary(id) and id != "" ->
+        id
+
+      {:ok, %{status: 200, body: body}} ->
+        Logger.warning("External platform lookup returned invalid body=#{inspect(body)}")
+        nil
+
+      {:ok, %{status: status}} when status in [400, 404] ->
+        nil
+
+      {:ok, %{status: status, body: body}} ->
+        Logger.warning("External platform lookup failed status=#{status} body=#{inspect(body)}")
+        nil
+
+      {:error, reason} ->
+        Logger.warning("External platform lookup failed reason=#{inspect(reason)}")
+        nil
+    end
+  end
+
+  defp external_platform_service_url do
+    Application.get_env(:codebattle, :external_platform_service_url)
+  end
+
+  defp request_opts do
+    Keyword.merge(
+      Application.get_env(:codebattle, :auth_req_options, []),
+      connect_options: [timeout: @http_timeout_ms],
+      receive_timeout: @http_timeout_ms
+    )
+  end
+end

apps/codebattle/lib/codebattle/user.ex

@@ -27,6 +27,8 @@ defmodule Codebattle.User do
              :db_type,
              :editor_mode,
              :editor_theme,
+             :external_oauth_login,
+             :external_platform_id,
              :games_played,
              :github_id,
              :github_name,
@@ -65,6 +67,7 @@ defmodule Codebattle.User do
     field(:email, :string)
     field(:external_oauth_id, :string)
     field(:external_oauth_login, :string)
+    field(:external_platform_id, :string)
     field(:firebase_uid, :string)
     field(:github_id, :integer)
     field(:github_name, :string)
@@ -107,6 +110,7 @@ defmodule Codebattle.User do
       :email,
       :external_oauth_id,
       :external_oauth_login,
+      :external_platform_id,
       :firebase_uid,
       :github_id,
       :github_name,
@@ -138,7 +142,15 @@ defmodule Codebattle.User do
 
   def token_changeset(user, params \\ %{}) do
     user
-    |> cast(params, [:external_oauth_id, :external_oauth_login, :category, :name, :clan, :subscription_type])
+    |> cast(params, [
+      :external_oauth_id,
+      :external_oauth_login,
+      :external_platform_id,
+      :category,
+      :name,
+      :clan,
+      :subscription_type
+    ])
     |> cast_embed(:sound_settings)
     |> unique_constraint(:name)
     |> validate_length(:name, min: 2, max: 39)

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

@@ -73,8 +73,10 @@ defmodule CodebattleWeb.AuthController do
 
         "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)
+
+          with {:ok, profile} <- External.external_auth(code, redirect_uri) do
+            Codebattle.Auth.User.ExternalUser.find_or_create(profile)
+          end
       end
 
     case case_result do

apps/codebattle/lib/codebattle_web/controllers/public_event_controller.ex

@@ -24,6 +24,8 @@ defmodule CodebattleWeb.PublicEventController do
       |> assign(:ticker_text, event.ticker_text)
       |> assign(:show_header, true)
       |> put_gon(
+        external_platform_login_url: Application.get_env(:codebattle, :external_platform_login_url),
+        external_platform_profile_url_template: Application.get_env(:codebattle, :external_platform_profile_url_template),
         event: %{
           event: event,
           user_event: user_event