merge upstream

This commit is contained in:
Animan8000 2025-05-01 09:24:02 -07:00
commit e0414a78dc
2 changed files with 10 additions and 8 deletions

View File

@ -99,7 +99,6 @@ const createLoginResponse = (myAddress: string, account: IDatabaseAccountJson, b
id: account.id,
DisplayName: account.DisplayName,
CountryCode: account.CountryCode,
ClientType: account.ClientType,
ForceLogoutVersion: account.ForceLogoutVersion,
AmazonAuthToken: account.AmazonAuthToken,
AmazonRefreshToken: account.AmazonRefreshToken,
@ -112,12 +111,15 @@ const createLoginResponse = (myAddress: string, account: IDatabaseAccountJson, b
DTLS: 99,
BuildLabel: buildLabel
};
if (version_compare(buildLabel, "2022.09.06.19.24") >= 0) {
resp.CrossPlatformAllowed = account.CrossPlatformAllowed;
resp.HUB = `https://${myAddress}/api/`;
resp.MatchmakingBuildId = buildConfig.matchmakingBuildId;
if (version_compare(buildLabel, "2023.04.25.23.40") >= 0) {
resp.platformCDNs = [`https://${myAddress}/`];
if (version_compare(buildLabel, "2022.04.29.12.53") >= 0) {
resp.ClientType = account.ClientType;
if (version_compare(buildLabel, "2022.09.06.19.24") >= 0) {
resp.CrossPlatformAllowed = account.CrossPlatformAllowed;
resp.HUB = `https://${myAddress}/api/`;
resp.MatchmakingBuildId = buildConfig.matchmakingBuildId;
if (version_compare(buildLabel, "2023.04.25.23.40") >= 0) {
resp.platformCDNs = [`https://${myAddress}/`];
}
}
}
return resp;

View File

@ -3,7 +3,7 @@ import { Types } from "mongoose";
export interface IAccountAndLoginResponseCommons {
DisplayName: string;
CountryCode: string;
ClientType: string;
ClientType?: string;
CrossPlatformAllowed?: boolean;
ForceLogoutVersion: number;
AmazonAuthToken?: string;