diff --git a/Dockerfile b/Dockerfile index 3ece191..482ad38 100644 --- a/Dockerfile +++ b/Dockerfile @@ -25,6 +25,7 @@ WORKDIR /source COPY src/Empostor.Server/Empostor.Server.csproj ./src/Empostor.Server/ COPY src/Empostor.Api/Empostor.Api.csproj ./src/Empostor.Api/ COPY src/Empostor.Api.Innersloth.Generator/Empostor.Api.Innersloth.Generator.csproj ./src/Empostor.Api.Innersloth.Generator/ +COPY src/Empostor.Plugins.PlayerLog/Empostor.Plugins.PlayerLog.csproj ./src/Empostor.Plugins.PlayerLog/ COPY src/NextFast.Hazel-New/Next.Hazel/Next.Hazel.csproj ./src/NextFast.Hazel-New/Next.Hazel/ COPY src/NextFast.Hazel-New/Next.Hazel.Abstractions/Next.Hazel.Abstractions.csproj ./src/NextFast.Hazel-New/Next.Hazel.Abstractions/ COPY src/Directory.Build.props ./src/ diff --git a/src/Empostor.Api/Config/AuthApiConfig.cs b/src/Empostor.Api/Config/AuthApiConfig.cs index 863d290..91dc509 100644 --- a/src/Empostor.Api/Config/AuthApiConfig.cs +++ b/src/Empostor.Api/Config/AuthApiConfig.cs @@ -3,6 +3,7 @@ namespace Empostor.Api.Config; public enum AuthApiMode { Innersloth, + Both, Ume, } diff --git a/src/Empostor.Server/Http/TokenController.cs b/src/Empostor.Server/Http/TokenController.cs index 14f5731..4b13840 100644 --- a/src/Empostor.Server/Http/TokenController.cs +++ b/src/Empostor.Server/Http/TokenController.cs @@ -221,6 +221,16 @@ public sealed class TokenController : ControllerBase friendCode = await FetchFromUmeAsync(eosToken, productUserId); } + if (string.IsNullOrEmpty(friendCode) && mode == AuthApiMode.Both) + { + _logger.LogDebug("TokenController Both mode: trying Ume first, then Innersloth"); + friendCode = await FetchFromUmeAsync(eosToken, productUserId); + if (string.IsNullOrEmpty(friendCode)) + { + friendCode = await FetchFromInnerslothAsync(eosToken, productUserId); + } + } + if (string.IsNullOrEmpty(friendCode) && mode == AuthApiMode.Innersloth) { friendCode = await FetchFromInnerslothAsync(eosToken, productUserId); diff --git a/src/Empostor.Server/config.json b/src/Empostor.Server/config.json index 984dfcb..bc168ce 100644 --- a/src/Empostor.Server/config.json +++ b/src/Empostor.Server/config.json @@ -43,7 +43,7 @@ "GameRecorderPath": "" }, "AuthApi": { - "Mode": "Ume", + "Mode": "Both", "UmeApiBaseUrl": "https://auverify.hayashiume.top", "UmeApiKey": "sk-empostor-globalapikey" },