Convert to new namespace stuff and implicit usings
This commit is contained in:
@@ -3,8 +3,8 @@ using System.Runtime.InteropServices;
|
|||||||
using System.Text;
|
using System.Text;
|
||||||
using Prospect.Launcher.Invoke;
|
using Prospect.Launcher.Invoke;
|
||||||
|
|
||||||
namespace Prospect.Launcher
|
namespace Prospect.Launcher;
|
||||||
{
|
|
||||||
public static class Inject
|
public static class Inject
|
||||||
{
|
{
|
||||||
const int PROCESS_CREATE_THREAD = 0x0002;
|
const int PROCESS_CREATE_THREAD = 0x0002;
|
||||||
@@ -53,4 +53,3 @@ namespace Prospect.Launcher
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
@@ -2,8 +2,8 @@
|
|||||||
using System.Runtime.InteropServices;
|
using System.Runtime.InteropServices;
|
||||||
using Prospect.Launcher.Invoke.Structs;
|
using Prospect.Launcher.Invoke.Structs;
|
||||||
|
|
||||||
namespace Prospect.Launcher.Invoke
|
namespace Prospect.Launcher.Invoke;
|
||||||
{
|
|
||||||
internal static class Kernel32
|
internal static class Kernel32
|
||||||
{
|
{
|
||||||
[DllImport("kernel32.dll", SetLastError=true, CharSet=CharSet.Auto)]
|
[DllImport("kernel32.dll", SetLastError=true, CharSet=CharSet.Auto)]
|
||||||
@@ -50,4 +50,3 @@ namespace Prospect.Launcher.Invoke
|
|||||||
[DllImport("kernel32.dll", SetLastError = true)]
|
[DllImport("kernel32.dll", SetLastError = true)]
|
||||||
public static extern uint ResumeThread(IntPtr hThread);
|
public static extern uint ResumeThread(IntPtr hThread);
|
||||||
}
|
}
|
||||||
}
|
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
using System;
|
using System;
|
||||||
|
|
||||||
namespace Prospect.Launcher.Invoke.Structs
|
namespace Prospect.Launcher.Invoke.Structs;
|
||||||
{
|
|
||||||
[Flags]
|
[Flags]
|
||||||
internal enum ProcessCreationFlags : uint
|
internal enum ProcessCreationFlags : uint
|
||||||
{
|
{
|
||||||
@@ -23,4 +23,3 @@ namespace Prospect.Launcher.Invoke.Structs
|
|||||||
EXTENDED_STARTUPINFO_PRESENT = 0x00080000,
|
EXTENDED_STARTUPINFO_PRESENT = 0x00080000,
|
||||||
INHERIT_PARENT_AFFINITY = 0x00010000
|
INHERIT_PARENT_AFFINITY = 0x00010000
|
||||||
}
|
}
|
||||||
}
|
|
||||||
@@ -1,8 +1,8 @@
|
|||||||
using System;
|
using System;
|
||||||
using System.Runtime.InteropServices;
|
using System.Runtime.InteropServices;
|
||||||
|
|
||||||
namespace Prospect.Launcher.Invoke.Structs
|
namespace Prospect.Launcher.Invoke.Structs;
|
||||||
{
|
|
||||||
[StructLayout(LayoutKind.Sequential)]
|
[StructLayout(LayoutKind.Sequential)]
|
||||||
internal struct ProcessInformation
|
internal struct ProcessInformation
|
||||||
{
|
{
|
||||||
@@ -11,4 +11,3 @@ namespace Prospect.Launcher.Invoke.Structs
|
|||||||
public uint dwProcessId;
|
public uint dwProcessId;
|
||||||
public uint dwThreadId;
|
public uint dwThreadId;
|
||||||
}
|
}
|
||||||
}
|
|
||||||
@@ -1,8 +1,8 @@
|
|||||||
using System;
|
using System;
|
||||||
using System.Runtime.InteropServices;
|
using System.Runtime.InteropServices;
|
||||||
|
|
||||||
namespace Prospect.Launcher.Invoke.Structs
|
namespace Prospect.Launcher.Invoke.Structs;
|
||||||
{
|
|
||||||
[StructLayout(LayoutKind.Sequential)]
|
[StructLayout(LayoutKind.Sequential)]
|
||||||
internal struct StartupInfo
|
internal struct StartupInfo
|
||||||
{
|
{
|
||||||
@@ -25,4 +25,3 @@ namespace Prospect.Launcher.Invoke.Structs
|
|||||||
public IntPtr hStdOutput;
|
public IntPtr hStdOutput;
|
||||||
public IntPtr hStdError;
|
public IntPtr hStdError;
|
||||||
}
|
}
|
||||||
}
|
|
||||||
@@ -4,8 +4,8 @@ using System.IO;
|
|||||||
using Prospect.Launcher.Invoke;
|
using Prospect.Launcher.Invoke;
|
||||||
using Prospect.Launcher.Invoke.Structs;
|
using Prospect.Launcher.Invoke.Structs;
|
||||||
|
|
||||||
namespace Prospect.Launcher
|
namespace Prospect.Launcher;
|
||||||
{
|
|
||||||
internal static class Program
|
internal static class Program
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -75,4 +75,3 @@ namespace Prospect.Launcher
|
|||||||
Console.WriteLine("Resumed.");
|
Console.WriteLine("Resumed.");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
@@ -1,8 +1,7 @@
|
|||||||
namespace Prospect.Server.Api.Config
|
namespace Prospect.Server.Api.Config;
|
||||||
{
|
|
||||||
public class DatabaseSettings
|
public class DatabaseSettings
|
||||||
{
|
{
|
||||||
public string ConnectionString { get; set; }
|
public string ConnectionString { get; set; }
|
||||||
public string DatabaseName { get; set; }
|
public string DatabaseName { get; set; }
|
||||||
}
|
}
|
||||||
}
|
|
||||||
@@ -1,8 +1,7 @@
|
|||||||
namespace Prospect.Server.Api.Config
|
namespace Prospect.Server.Api.Config;
|
||||||
{
|
|
||||||
public class PlayFabSettings
|
public class PlayFabSettings
|
||||||
{
|
{
|
||||||
public string PublisherId { get; set; }
|
public string PublisherId { get; set; }
|
||||||
public string TitleId { get; set; }
|
public string TitleId { get; set; }
|
||||||
}
|
}
|
||||||
}
|
|
||||||
@@ -1,7 +1,4 @@
|
|||||||
using System;
|
using Microsoft.AspNetCore.Authorization;
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.Threading.Tasks;
|
|
||||||
using Microsoft.AspNetCore.Authorization;
|
|
||||||
using Microsoft.AspNetCore.Mvc;
|
using Microsoft.AspNetCore.Mvc;
|
||||||
using Microsoft.Extensions.Options;
|
using Microsoft.Extensions.Options;
|
||||||
using Prospect.Server.Api.Config;
|
using Prospect.Server.Api.Config;
|
||||||
@@ -15,12 +12,15 @@ using Prospect.Server.Api.Services.Database.Models;
|
|||||||
using Prospect.Server.Api.Services.UserData;
|
using Prospect.Server.Api.Services.UserData;
|
||||||
using Prospect.Server.Steam;
|
using Prospect.Server.Steam;
|
||||||
|
|
||||||
namespace Prospect.Server.Api.Controllers
|
namespace Prospect.Server.Api.Controllers;
|
||||||
{
|
|
||||||
[ApiController]
|
[ApiController]
|
||||||
[Route("Client")]
|
[Route("Client")]
|
||||||
public class ClientController : Controller
|
public class ClientController : Controller
|
||||||
{
|
{
|
||||||
|
private const int AppIdDefault = 480;
|
||||||
|
private const int AppIdCycleBeta = 1600361;
|
||||||
|
|
||||||
private readonly PlayFabSettings _settings;
|
private readonly PlayFabSettings _settings;
|
||||||
private readonly AuthTokenService _authTokenService;
|
private readonly AuthTokenService _authTokenService;
|
||||||
private readonly DbUserService _userService;
|
private readonly DbUserService _userService;
|
||||||
@@ -51,7 +51,7 @@ namespace Prospect.Server.Api.Controllers
|
|||||||
if (!string.IsNullOrEmpty(request.SteamTicket))
|
if (!string.IsNullOrEmpty(request.SteamTicket))
|
||||||
{
|
{
|
||||||
var ticket = AppTicket.Parse(request.SteamTicket);
|
var ticket = AppTicket.Parse(request.SteamTicket);
|
||||||
if (ticket.IsValid && ticket.HasValidSignature)
|
if (ticket.IsValid && ticket.HasValidSignature && (ticket.AppId == AppIdDefault || ticket.AppId == AppIdCycleBeta))
|
||||||
{
|
{
|
||||||
var userSteamId = ticket.SteamId.ToString();
|
var userSteamId = ticket.SteamId.ToString();
|
||||||
|
|
||||||
@@ -133,7 +133,7 @@ namespace Prospect.Server.Api.Controllers
|
|||||||
{
|
{
|
||||||
Code = 200,
|
Code = 200,
|
||||||
Status = "OK",
|
Status = "OK",
|
||||||
Data = new object()
|
Data = new {}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -267,4 +267,3 @@ namespace Prospect.Server.Api.Controllers
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
@@ -1,16 +1,13 @@
|
|||||||
using System;
|
using Microsoft.AspNetCore.Authorization;
|
||||||
using System.Collections.Generic;
|
|
||||||
using Microsoft.AspNetCore.Authorization;
|
|
||||||
using Microsoft.AspNetCore.Mvc;
|
using Microsoft.AspNetCore.Mvc;
|
||||||
using Microsoft.Extensions.Logging;
|
|
||||||
using Prospect.Server.Api.Models.Client;
|
using Prospect.Server.Api.Models.Client;
|
||||||
using Prospect.Server.Api.Models.CloudScript;
|
using Prospect.Server.Api.Models.CloudScript;
|
||||||
using Prospect.Server.Api.Models.CloudScript.Data;
|
using Prospect.Server.Api.Models.CloudScript.Data;
|
||||||
using Prospect.Server.Api.Services.Auth.Entity;
|
using Prospect.Server.Api.Services.Auth.Entity;
|
||||||
using Prospect.Server.Api.Services.Auth.Extensions;
|
using Prospect.Server.Api.Services.Auth.Extensions;
|
||||||
|
|
||||||
namespace Prospect.Server.Api.Controllers
|
namespace Prospect.Server.Api.Controllers;
|
||||||
{
|
|
||||||
[Route("CloudScript")]
|
[Route("CloudScript")]
|
||||||
[ApiController]
|
[ApiController]
|
||||||
[Authorize(AuthenticationSchemes = EntityAuthenticationOptions.DefaultScheme)]
|
[Authorize(AuthenticationSchemes = EntityAuthenticationOptions.DefaultScheme)]
|
||||||
@@ -303,4 +300,3 @@ namespace Prospect.Server.Api.Controllers
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
@@ -1,10 +1,9 @@
|
|||||||
using System;
|
using System.Diagnostics;
|
||||||
using System.Diagnostics;
|
|
||||||
using System.Text.Json;
|
using System.Text.Json;
|
||||||
using System.Text.Json.Serialization;
|
using System.Text.Json.Serialization;
|
||||||
|
|
||||||
namespace Prospect.Server.Api.Converters
|
namespace Prospect.Server.Api.Converters;
|
||||||
{
|
|
||||||
// By default System.Text.Json outputs and we want:
|
// By default System.Text.Json outputs and we want:
|
||||||
// Output: 2021-11-04T04:58:20.4232184Z
|
// Output: 2021-11-04T04:58:20.4232184Z
|
||||||
// Want : 2021-10-24T02:54:56.652Z
|
// Want : 2021-10-24T02:54:56.652Z
|
||||||
@@ -21,4 +20,3 @@ namespace Prospect.Server.Api.Converters
|
|||||||
writer.WriteStringValue(value.ToString("yyyy'-'MM'-'dd'T'HH':'mm':'ss'.'fffK"));
|
writer.WriteStringValue(value.ToString("yyyy'-'MM'-'dd'T'HH':'mm':'ss'.'fffK"));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
@@ -1,8 +1,7 @@
|
|||||||
using System;
|
using System.Runtime.Serialization;
|
||||||
using System.Runtime.Serialization;
|
|
||||||
|
namespace Prospect.Server.Api.Exceptions;
|
||||||
|
|
||||||
namespace Prospect.Server.Api.Exceptions
|
|
||||||
{
|
|
||||||
public class ProspectException : Exception
|
public class ProspectException : Exception
|
||||||
{
|
{
|
||||||
public ProspectException()
|
public ProspectException()
|
||||||
@@ -21,4 +20,3 @@ namespace Prospect.Server.Api.Exceptions
|
|||||||
{
|
{
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
@@ -1,13 +1,9 @@
|
|||||||
using System.IO;
|
using System.Text;
|
||||||
using System.Text;
|
|
||||||
using System.Threading.Tasks;
|
|
||||||
using Microsoft.AspNetCore.Http;
|
|
||||||
using Microsoft.AspNetCore.Http.Extensions;
|
using Microsoft.AspNetCore.Http.Extensions;
|
||||||
using Microsoft.Extensions.Logging;
|
|
||||||
using Newtonsoft.Json;
|
using Newtonsoft.Json;
|
||||||
|
|
||||||
namespace Prospect.Server.Api.Middleware
|
namespace Prospect.Server.Api.Middleware;
|
||||||
{
|
|
||||||
public class RequestLoggerMiddleware
|
public class RequestLoggerMiddleware
|
||||||
{
|
{
|
||||||
private readonly ILogger<RequestLoggerMiddleware> _logger;
|
private readonly ILogger<RequestLoggerMiddleware> _logger;
|
||||||
@@ -61,4 +57,3 @@ namespace Prospect.Server.Api.Middleware
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
@@ -1,8 +1,8 @@
|
|||||||
using System.Text.Json;
|
using System.Text.Json;
|
||||||
using System.Text.Json.Serialization;
|
using System.Text.Json.Serialization;
|
||||||
|
|
||||||
namespace Prospect.Server.Api.Models.Client
|
namespace Prospect.Server.Api.Models.Client;
|
||||||
{
|
|
||||||
public class ClientLoginWithSteamRequest
|
public class ClientLoginWithSteamRequest
|
||||||
{
|
{
|
||||||
[JsonPropertyName("CreateAccount")]
|
[JsonPropertyName("CreateAccount")]
|
||||||
@@ -56,4 +56,3 @@ namespace Prospect.Server.Api.Models.Client
|
|||||||
[JsonPropertyName("GetUserVirtualCurrency")]
|
[JsonPropertyName("GetUserVirtualCurrency")]
|
||||||
public bool GetUserVirtualCurrency { get; set; }
|
public bool GetUserVirtualCurrency { get; set; }
|
||||||
}
|
}
|
||||||
}
|
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
using System.Text.Json.Serialization;
|
using System.Text.Json.Serialization;
|
||||||
|
|
||||||
namespace Prospect.Server.Api.Models.Client
|
namespace Prospect.Server.Api.Models.Client;
|
||||||
{
|
|
||||||
public class ClientResponse
|
public class ClientResponse
|
||||||
{
|
{
|
||||||
[JsonPropertyName("code")]
|
[JsonPropertyName("code")]
|
||||||
@@ -29,4 +29,3 @@ namespace Prospect.Server.Api.Models.Client
|
|||||||
[JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingDefault)]
|
[JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingDefault)]
|
||||||
public T Data { get; set; }
|
public T Data { get; set; }
|
||||||
}
|
}
|
||||||
}
|
|
||||||
@@ -1,9 +1,8 @@
|
|||||||
namespace Prospect.Server.Api.Models.Client.Data
|
namespace Prospect.Server.Api.Models.Client.Data;
|
||||||
{
|
|
||||||
public enum CloudScriptRevisionOption
|
public enum CloudScriptRevisionOption
|
||||||
{
|
{
|
||||||
Live,
|
Live,
|
||||||
Latest,
|
Latest,
|
||||||
Specific
|
Specific
|
||||||
}
|
}
|
||||||
}
|
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
using System.Text.Json.Serialization;
|
using System.Text.Json.Serialization;
|
||||||
|
|
||||||
namespace Prospect.Server.Api.Models.Client.Data
|
namespace Prospect.Server.Api.Models.Client.Data;
|
||||||
{
|
|
||||||
public class FEntityKey
|
public class FEntityKey
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -20,4 +20,3 @@ namespace Prospect.Server.Api.Models.Client.Data
|
|||||||
[JsonPropertyName("TypeString")]
|
[JsonPropertyName("TypeString")]
|
||||||
public string TypeString { get; set; }
|
public string TypeString { get; set; }
|
||||||
}
|
}
|
||||||
}
|
|
||||||
@@ -1,8 +1,7 @@
|
|||||||
using System;
|
using System.Text.Json.Serialization;
|
||||||
using System.Text.Json.Serialization;
|
|
||||||
|
namespace Prospect.Server.Api.Models.Client.Data;
|
||||||
|
|
||||||
namespace Prospect.Server.Api.Models.Client.Data
|
|
||||||
{
|
|
||||||
public class FEntityTokenResponse
|
public class FEntityTokenResponse
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -26,4 +25,3 @@ namespace Prospect.Server.Api.Models.Client.Data
|
|||||||
[JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingDefault)]
|
[JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingDefault)]
|
||||||
public DateTime? TokenExpiration { get; set; }
|
public DateTime? TokenExpiration { get; set; }
|
||||||
}
|
}
|
||||||
}
|
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
using System.Text.Json.Serialization;
|
using System.Text.Json.Serialization;
|
||||||
|
|
||||||
namespace Prospect.Server.Api.Models.Client.Data
|
namespace Prospect.Server.Api.Models.Client.Data;
|
||||||
{
|
|
||||||
public class FFunctionExecutionError
|
public class FFunctionExecutionError
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -26,4 +26,3 @@ namespace Prospect.Server.Api.Models.Client.Data
|
|||||||
[JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingDefault)]
|
[JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingDefault)]
|
||||||
public string StackTrace { get; set; }
|
public string StackTrace { get; set; }
|
||||||
}
|
}
|
||||||
}
|
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
using System.Text.Json.Serialization;
|
using System.Text.Json.Serialization;
|
||||||
|
|
||||||
namespace Prospect.Server.Api.Models.Client.Data
|
namespace Prospect.Server.Api.Models.Client.Data;
|
||||||
{
|
|
||||||
public class FGenericServiceId
|
public class FGenericServiceId
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -16,4 +16,3 @@ namespace Prospect.Server.Api.Models.Client.Data
|
|||||||
[JsonPropertyName("UserId")]
|
[JsonPropertyName("UserId")]
|
||||||
public string UserId { get; set; }
|
public string UserId { get; set; }
|
||||||
}
|
}
|
||||||
}
|
|
||||||
@@ -1,8 +1,7 @@
|
|||||||
using System.Collections.Generic;
|
using System.Text.Json.Serialization;
|
||||||
using System.Text.Json.Serialization;
|
|
||||||
|
namespace Prospect.Server.Api.Models.Client.Data;
|
||||||
|
|
||||||
namespace Prospect.Server.Api.Models.Client.Data
|
|
||||||
{
|
|
||||||
public class FGetPlayerCombinedInfoResultPayload
|
public class FGetPlayerCombinedInfoResultPayload
|
||||||
{
|
{
|
||||||
// TSharedPtr<FUserAccountInfo> AccountInfo;
|
// TSharedPtr<FUserAccountInfo> AccountInfo;
|
||||||
@@ -57,4 +56,3 @@ namespace Prospect.Server.Api.Models.Client.Data
|
|||||||
|
|
||||||
// TMap<FString, FVirtualCurrencyRechargeTime> UserVirtualCurrencyRechargeTimes;
|
// TMap<FString, FVirtualCurrencyRechargeTime> UserVirtualCurrencyRechargeTimes;
|
||||||
}
|
}
|
||||||
}
|
|
||||||
@@ -1,9 +1,7 @@
|
|||||||
using System;
|
using System.Text.Json.Serialization;
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.Text.Json.Serialization;
|
namespace Prospect.Server.Api.Models.Client.Data;
|
||||||
|
|
||||||
namespace Prospect.Server.Api.Models.Client.Data
|
|
||||||
{
|
|
||||||
public class FItemInstance
|
public class FItemInstance
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -113,4 +111,3 @@ namespace Prospect.Server.Api.Models.Client.Data
|
|||||||
[JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingDefault)]
|
[JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingDefault)]
|
||||||
public int? UsesIncrementedBy { get; set; }
|
public int? UsesIncrementedBy { get; set; }
|
||||||
}
|
}
|
||||||
}
|
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
using System.Text.Json.Serialization;
|
using System.Text.Json.Serialization;
|
||||||
|
|
||||||
namespace Prospect.Server.Api.Models.Client.Data
|
namespace Prospect.Server.Api.Models.Client.Data;
|
||||||
{
|
|
||||||
public class FLogStatement
|
public class FLogStatement
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -25,4 +25,3 @@ namespace Prospect.Server.Api.Models.Client.Data
|
|||||||
[JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingDefault)]
|
[JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingDefault)]
|
||||||
public string Message { get; set; }
|
public string Message { get; set; }
|
||||||
}
|
}
|
||||||
}
|
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
using System.Text.Json.Serialization;
|
using System.Text.Json.Serialization;
|
||||||
|
|
||||||
namespace Prospect.Server.Api.Models.Client.Data
|
namespace Prospect.Server.Api.Models.Client.Data;
|
||||||
{
|
|
||||||
public class FPlayerProfileModel
|
public class FPlayerProfileModel
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -32,4 +32,3 @@ namespace Prospect.Server.Api.Models.Client.Data
|
|||||||
[JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingDefault)]
|
[JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingDefault)]
|
||||||
public string TitleId { get; set; }
|
public string TitleId { get; set; }
|
||||||
}
|
}
|
||||||
}
|
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
using System.Text.Json.Serialization;
|
using System.Text.Json.Serialization;
|
||||||
|
|
||||||
namespace Prospect.Server.Api.Models.Client.Data
|
namespace Prospect.Server.Api.Models.Client.Data;
|
||||||
{
|
|
||||||
public class FScriptExecutionError
|
public class FScriptExecutionError
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -26,4 +26,3 @@ namespace Prospect.Server.Api.Models.Client.Data
|
|||||||
[JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingDefault)]
|
[JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingDefault)]
|
||||||
public string StackTrace { get; set; }
|
public string StackTrace { get; set; }
|
||||||
}
|
}
|
||||||
}
|
|
||||||
@@ -1,8 +1,7 @@
|
|||||||
using System.Collections.Generic;
|
|
||||||
using System.Text.Json.Serialization;
|
using System.Text.Json.Serialization;
|
||||||
|
|
||||||
namespace Prospect.Server.Api.Models.Client.Data
|
namespace Prospect.Server.Api.Models.Client.Data;
|
||||||
{
|
|
||||||
public class FTreatmentAssignment
|
public class FTreatmentAssignment
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -19,4 +18,3 @@ namespace Prospect.Server.Api.Models.Client.Data
|
|||||||
[JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingDefault)]
|
[JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingDefault)]
|
||||||
public List<string> Variants { get; set; }
|
public List<string> Variants { get; set; }
|
||||||
}
|
}
|
||||||
}
|
|
||||||
@@ -1,8 +1,7 @@
|
|||||||
using System;
|
using System.Text.Json.Serialization;
|
||||||
using System.Text.Json.Serialization;
|
|
||||||
|
namespace Prospect.Server.Api.Models.Client.Data;
|
||||||
|
|
||||||
namespace Prospect.Server.Api.Models.Client.Data
|
|
||||||
{
|
|
||||||
public class FUserDataRecord
|
public class FUserDataRecord
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -26,4 +25,3 @@ namespace Prospect.Server.Api.Models.Client.Data
|
|||||||
[JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingDefault)]
|
[JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingDefault)]
|
||||||
public string Value { get; set; }
|
public string Value { get; set; }
|
||||||
}
|
}
|
||||||
}
|
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
using System.Text.Json.Serialization;
|
using System.Text.Json.Serialization;
|
||||||
|
|
||||||
namespace Prospect.Server.Api.Models.Client.Data
|
namespace Prospect.Server.Api.Models.Client.Data;
|
||||||
{
|
|
||||||
public class FUserSettings
|
public class FUserSettings
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -22,4 +22,3 @@ namespace Prospect.Server.Api.Models.Client.Data
|
|||||||
[JsonPropertyName("NeedsAttribution")]
|
[JsonPropertyName("NeedsAttribution")]
|
||||||
public bool NeedsAttribution { get; set; }
|
public bool NeedsAttribution { get; set; }
|
||||||
}
|
}
|
||||||
}
|
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
using System.Text.Json.Serialization;
|
using System.Text.Json.Serialization;
|
||||||
|
|
||||||
namespace Prospect.Server.Api.Models.Client.Data
|
namespace Prospect.Server.Api.Models.Client.Data;
|
||||||
{
|
|
||||||
public class FVariable
|
public class FVariable
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -17,4 +17,3 @@ namespace Prospect.Server.Api.Models.Client.Data
|
|||||||
[JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingDefault)]
|
[JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingDefault)]
|
||||||
public string Value { get; set; }
|
public string Value { get; set; }
|
||||||
}
|
}
|
||||||
}
|
|
||||||
@@ -1,8 +1,7 @@
|
|||||||
using System;
|
using System.Text.Json.Serialization;
|
||||||
using System.Text.Json.Serialization;
|
|
||||||
|
namespace Prospect.Server.Api.Models.Client.Data;
|
||||||
|
|
||||||
namespace Prospect.Server.Api.Models.Client.Data
|
|
||||||
{
|
|
||||||
public class FVirtualCurrencyRechargeTime
|
public class FVirtualCurrencyRechargeTime
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -25,4 +24,3 @@ namespace Prospect.Server.Api.Models.Client.Data
|
|||||||
[JsonPropertyName("SecondsToRecharge")]
|
[JsonPropertyName("SecondsToRecharge")]
|
||||||
public int SecondsToRecharge { get; set; }
|
public int SecondsToRecharge { get; set; }
|
||||||
}
|
}
|
||||||
}
|
|
||||||
@@ -1,8 +1,7 @@
|
|||||||
namespace Prospect.Server.Api.Models.Client.Data
|
namespace Prospect.Server.Api.Models.Client.Data;
|
||||||
{
|
|
||||||
public enum UserDataPermission
|
public enum UserDataPermission
|
||||||
{
|
{
|
||||||
Public,
|
Public,
|
||||||
Private
|
Private
|
||||||
}
|
}
|
||||||
}
|
|
||||||
@@ -1,11 +1,10 @@
|
|||||||
using System.Text.Json.Serialization;
|
using System.Text.Json.Serialization;
|
||||||
using Prospect.Server.Api.Models.Client.Data;
|
using Prospect.Server.Api.Models.Client.Data;
|
||||||
|
|
||||||
namespace Prospect.Server.Api.Models.Client
|
namespace Prospect.Server.Api.Models.Client;
|
||||||
{
|
|
||||||
public class FAddGenericIDRequest
|
public class FAddGenericIDRequest
|
||||||
{
|
{
|
||||||
[JsonPropertyName("GenericId")]
|
[JsonPropertyName("GenericId")]
|
||||||
public FGenericServiceId GenericId { get; set; }
|
public FGenericServiceId GenericId { get; set; }
|
||||||
}
|
}
|
||||||
}
|
|
||||||
@@ -1,9 +1,8 @@
|
|||||||
using System.Collections.Generic;
|
using System.Text.Json.Serialization;
|
||||||
using System.Text.Json.Serialization;
|
|
||||||
using Prospect.Server.Api.Models.Client.Data;
|
using Prospect.Server.Api.Models.Client.Data;
|
||||||
|
|
||||||
namespace Prospect.Server.Api.Models.Client
|
namespace Prospect.Server.Api.Models.Client;
|
||||||
{
|
|
||||||
public class FExecuteCloudScriptResult
|
public class FExecuteCloudScriptResult
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -82,4 +81,3 @@ namespace Prospect.Server.Api.Models.Client
|
|||||||
[JsonPropertyName("Revision")]
|
[JsonPropertyName("Revision")]
|
||||||
public int Revision { get; set; }
|
public int Revision { get; set; }
|
||||||
}
|
}
|
||||||
}
|
|
||||||
@@ -1,9 +1,8 @@
|
|||||||
using System.Collections.Generic;
|
using System.Text.Json.Serialization;
|
||||||
using System.Text.Json.Serialization;
|
|
||||||
using Prospect.Server.Api.Models.Client.Data;
|
using Prospect.Server.Api.Models.Client.Data;
|
||||||
|
|
||||||
namespace Prospect.Server.Api.Models.Client
|
namespace Prospect.Server.Api.Models.Client;
|
||||||
{
|
|
||||||
public class FExecuteCloudScriptServerRequest
|
public class FExecuteCloudScriptServerRequest
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -57,4 +56,3 @@ namespace Prospect.Server.Api.Models.Client
|
|||||||
[JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingDefault)]
|
[JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingDefault)]
|
||||||
public int? SpecificRevision { get; set; }
|
public int? SpecificRevision { get; set; }
|
||||||
}
|
}
|
||||||
}
|
|
||||||
@@ -1,9 +1,8 @@
|
|||||||
using System.Collections.Generic;
|
using System.Text.Json.Serialization;
|
||||||
using System.Text.Json.Serialization;
|
|
||||||
using Prospect.Server.Api.Models.Client.Data;
|
using Prospect.Server.Api.Models.Client.Data;
|
||||||
|
|
||||||
namespace Prospect.Server.Api.Models.Client
|
namespace Prospect.Server.Api.Models.Client;
|
||||||
{
|
|
||||||
public class FExecuteFunctionRequest
|
public class FExecuteFunctionRequest
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -41,4 +40,3 @@ namespace Prospect.Server.Api.Models.Client
|
|||||||
[JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingDefault)]
|
[JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingDefault)]
|
||||||
public bool? GeneratePlayStreamEvent { get; set; }
|
public bool? GeneratePlayStreamEvent { get; set; }
|
||||||
}
|
}
|
||||||
}
|
|
||||||
@@ -1,8 +1,8 @@
|
|||||||
using System.Text.Json.Serialization;
|
using System.Text.Json.Serialization;
|
||||||
using Prospect.Server.Api.Models.Client.Data;
|
using Prospect.Server.Api.Models.Client.Data;
|
||||||
|
|
||||||
namespace Prospect.Server.Api.Models.Client
|
namespace Prospect.Server.Api.Models.Client;
|
||||||
{
|
|
||||||
public class FExecuteFunctionResult
|
public class FExecuteFunctionResult
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -38,4 +38,3 @@ namespace Prospect.Server.Api.Models.Client
|
|||||||
[JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingDefault)]
|
[JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingDefault)]
|
||||||
public bool? FunctionResultTooLarge { get; set; }
|
public bool? FunctionResultTooLarge { get; set; }
|
||||||
}
|
}
|
||||||
}
|
|
||||||
@@ -1,8 +1,7 @@
|
|||||||
using System.Collections.Generic;
|
using System.Text.Json.Serialization;
|
||||||
using System.Text.Json.Serialization;
|
|
||||||
|
namespace Prospect.Server.Api.Models.Client;
|
||||||
|
|
||||||
namespace Prospect.Server.Api.Models.Client
|
|
||||||
{
|
|
||||||
public class FGetTitleDataRequest
|
public class FGetTitleDataRequest
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -18,4 +17,3 @@ namespace Prospect.Server.Api.Models.Client
|
|||||||
[JsonPropertyName("OverrideLabel")]
|
[JsonPropertyName("OverrideLabel")]
|
||||||
public string OverrideLabel { get; set; }
|
public string OverrideLabel { get; set; }
|
||||||
}
|
}
|
||||||
}
|
|
||||||
@@ -1,8 +1,7 @@
|
|||||||
using System.Collections.Generic;
|
using System.Text.Json.Serialization;
|
||||||
using System.Text.Json.Serialization;
|
|
||||||
|
namespace Prospect.Server.Api.Models.Client;
|
||||||
|
|
||||||
namespace Prospect.Server.Api.Models.Client
|
|
||||||
{
|
|
||||||
public class FGetTitleDataResult
|
public class FGetTitleDataResult
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -11,4 +10,3 @@ namespace Prospect.Server.Api.Models.Client
|
|||||||
[JsonPropertyName("Data")]
|
[JsonPropertyName("Data")]
|
||||||
public Dictionary<string, string> Data { get; set; }
|
public Dictionary<string, string> Data { get; set; }
|
||||||
}
|
}
|
||||||
}
|
|
||||||
@@ -1,8 +1,7 @@
|
|||||||
using System.Collections.Generic;
|
using System.Text.Json.Serialization;
|
||||||
using System.Text.Json.Serialization;
|
|
||||||
|
namespace Prospect.Server.Api.Models.Client;
|
||||||
|
|
||||||
namespace Prospect.Server.Api.Models.Client
|
|
||||||
{
|
|
||||||
public class FGetUserDataRequest
|
public class FGetUserDataRequest
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -25,4 +24,3 @@ namespace Prospect.Server.Api.Models.Client
|
|||||||
[JsonPropertyName("PlayFabId")]
|
[JsonPropertyName("PlayFabId")]
|
||||||
public string PlayFabId { get; set; }
|
public string PlayFabId { get; set; }
|
||||||
}
|
}
|
||||||
}
|
|
||||||
@@ -1,9 +1,8 @@
|
|||||||
using System.Collections.Generic;
|
using System.Text.Json.Serialization;
|
||||||
using System.Text.Json.Serialization;
|
|
||||||
using Prospect.Server.Api.Models.Client.Data;
|
using Prospect.Server.Api.Models.Client.Data;
|
||||||
|
|
||||||
namespace Prospect.Server.Api.Models.Client
|
namespace Prospect.Server.Api.Models.Client;
|
||||||
{
|
|
||||||
public class FGetUserDataResult
|
public class FGetUserDataResult
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -19,4 +18,3 @@ namespace Prospect.Server.Api.Models.Client
|
|||||||
[JsonPropertyName("DataVersion")]
|
[JsonPropertyName("DataVersion")]
|
||||||
public uint DataVersion { get; set; }
|
public uint DataVersion { get; set; }
|
||||||
}
|
}
|
||||||
}
|
|
||||||
@@ -1,8 +1,7 @@
|
|||||||
using System.Collections.Generic;
|
using System.Text.Json.Serialization;
|
||||||
using System.Text.Json.Serialization;
|
|
||||||
|
namespace Prospect.Server.Api.Models.Client;
|
||||||
|
|
||||||
namespace Prospect.Server.Api.Models.Client
|
|
||||||
{
|
|
||||||
public class FGetUserInventoryRequest
|
public class FGetUserInventoryRequest
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -12,4 +11,3 @@ namespace Prospect.Server.Api.Models.Client
|
|||||||
[JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingDefault)]
|
[JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingDefault)]
|
||||||
public Dictionary<string, string> CustomTags { get; set; }
|
public Dictionary<string, string> CustomTags { get; set; }
|
||||||
}
|
}
|
||||||
}
|
|
||||||
@@ -1,9 +1,8 @@
|
|||||||
using System.Collections.Generic;
|
using System.Text.Json.Serialization;
|
||||||
using System.Text.Json.Serialization;
|
|
||||||
using Prospect.Server.Api.Models.Client.Data;
|
using Prospect.Server.Api.Models.Client.Data;
|
||||||
|
|
||||||
namespace Prospect.Server.Api.Models.Client
|
namespace Prospect.Server.Api.Models.Client;
|
||||||
{
|
|
||||||
public class FGetUserInventoryResult
|
public class FGetUserInventoryResult
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -27,4 +26,3 @@ namespace Prospect.Server.Api.Models.Client
|
|||||||
[JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingDefault)]
|
[JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingDefault)]
|
||||||
public Dictionary<string, FVirtualCurrencyRechargeTime> VirtualCurrencyRechargeTimes { get; set; }
|
public Dictionary<string, FVirtualCurrencyRechargeTime> VirtualCurrencyRechargeTimes { get; set; }
|
||||||
}
|
}
|
||||||
}
|
|
||||||
@@ -1,9 +1,8 @@
|
|||||||
using System;
|
using System.Text.Json.Serialization;
|
||||||
using System.Text.Json.Serialization;
|
|
||||||
using Prospect.Server.Api.Models.Client.Data;
|
using Prospect.Server.Api.Models.Client.Data;
|
||||||
|
|
||||||
namespace Prospect.Server.Api.Models.Client
|
namespace Prospect.Server.Api.Models.Client;
|
||||||
{
|
|
||||||
public class FServerLoginResult
|
public class FServerLoginResult
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -61,4 +60,3 @@ namespace Prospect.Server.Api.Models.Client
|
|||||||
[JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingDefault)]
|
[JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingDefault)]
|
||||||
public FTreatmentAssignment TreatmentAssignment { get; set; }
|
public FTreatmentAssignment TreatmentAssignment { get; set; }
|
||||||
}
|
}
|
||||||
}
|
|
||||||
@@ -1,9 +1,8 @@
|
|||||||
using System.Collections.Generic;
|
using System.Text.Json.Serialization;
|
||||||
using System.Text.Json.Serialization;
|
|
||||||
using Prospect.Server.Api.Models.Client.Data;
|
using Prospect.Server.Api.Models.Client.Data;
|
||||||
|
|
||||||
namespace Prospect.Server.Api.Models.Client
|
namespace Prospect.Server.Api.Models.Client;
|
||||||
{
|
|
||||||
public class FUpdateUserDataRequest
|
public class FUpdateUserDataRequest
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -35,4 +34,3 @@ namespace Prospect.Server.Api.Models.Client
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
public string PlayFabId { get; set; }
|
public string PlayFabId { get; set; }
|
||||||
}
|
}
|
||||||
}
|
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
namespace Prospect.Server.Api.Models.Client
|
namespace Prospect.Server.Api.Models.Client;
|
||||||
{
|
|
||||||
public class FUpdateUserDataResult
|
public class FUpdateUserDataResult
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -8,4 +8,3 @@
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
public uint DataVersion { get; set; }
|
public uint DataVersion { get; set; }
|
||||||
}
|
}
|
||||||
}
|
|
||||||
@@ -1,8 +1,7 @@
|
|||||||
using System.Collections.Generic;
|
using System.Text.Json.Serialization;
|
||||||
using System.Text.Json.Serialization;
|
|
||||||
|
namespace Prospect.Server.Api.Models.Client;
|
||||||
|
|
||||||
namespace Prospect.Server.Api.Models.Client
|
|
||||||
{
|
|
||||||
public class FUpdateUserTitleDisplayNameRequest
|
public class FUpdateUserTitleDisplayNameRequest
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -18,4 +17,3 @@ namespace Prospect.Server.Api.Models.Client
|
|||||||
[JsonPropertyName("DisplayName")]
|
[JsonPropertyName("DisplayName")]
|
||||||
public string DisplayName { get; set; }
|
public string DisplayName { get; set; }
|
||||||
}
|
}
|
||||||
}
|
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
namespace Prospect.Server.Api.Models.Client
|
namespace Prospect.Server.Api.Models.Client;
|
||||||
{
|
|
||||||
public class FUpdateUserTitleDisplayNameResult
|
public class FUpdateUserTitleDisplayNameResult
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -7,4 +7,3 @@
|
|||||||
/// </summary>
|
/// </summary>
|
||||||
public string DisplayName { get; set; }
|
public string DisplayName { get; set; }
|
||||||
}
|
}
|
||||||
}
|
|
||||||
@@ -1,8 +1,7 @@
|
|||||||
using System.Collections.Generic;
|
using System.Text.Json.Serialization;
|
||||||
using System.Text.Json.Serialization;
|
|
||||||
|
namespace Prospect.Server.Api.Models.CloudScript.Data;
|
||||||
|
|
||||||
namespace Prospect.Server.Api.Models.CloudScript.Data
|
|
||||||
{
|
|
||||||
public class FYActiveContractPlayerData
|
public class FYActiveContractPlayerData
|
||||||
{
|
{
|
||||||
[JsonPropertyName("contractId")]
|
[JsonPropertyName("contractId")]
|
||||||
@@ -11,4 +10,3 @@ namespace Prospect.Server.Api.Models.CloudScript.Data
|
|||||||
[JsonPropertyName("progress")]
|
[JsonPropertyName("progress")]
|
||||||
public List<int> Progress { get; set; }
|
public List<int> Progress { get; set; }
|
||||||
}
|
}
|
||||||
}
|
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
using System.Text.Json.Serialization;
|
using System.Text.Json.Serialization;
|
||||||
|
|
||||||
namespace Prospect.Server.Api.Models.CloudScript.Data
|
namespace Prospect.Server.Api.Models.CloudScript.Data;
|
||||||
{
|
|
||||||
public class FYFactionContractData
|
public class FYFactionContractData
|
||||||
{
|
{
|
||||||
[JsonPropertyName("contractId")]
|
[JsonPropertyName("contractId")]
|
||||||
@@ -10,4 +10,3 @@ namespace Prospect.Server.Api.Models.CloudScript.Data
|
|||||||
[JsonPropertyName("contractIsLockedDueToLowFactionReputation")]
|
[JsonPropertyName("contractIsLockedDueToLowFactionReputation")]
|
||||||
public bool ContractIsLockedDueToLowFactionReputation { get; set; }
|
public bool ContractIsLockedDueToLowFactionReputation { get; set; }
|
||||||
}
|
}
|
||||||
}
|
|
||||||
@@ -1,8 +1,7 @@
|
|||||||
using System.Collections.Generic;
|
using System.Text.Json.Serialization;
|
||||||
using System.Text.Json.Serialization;
|
|
||||||
|
namespace Prospect.Server.Api.Models.CloudScript.Data;
|
||||||
|
|
||||||
namespace Prospect.Server.Api.Models.CloudScript.Data
|
|
||||||
{
|
|
||||||
public class FYFactionContractsData
|
public class FYFactionContractsData
|
||||||
{
|
{
|
||||||
[JsonPropertyName("factionId")]
|
[JsonPropertyName("factionId")]
|
||||||
@@ -11,4 +10,3 @@ namespace Prospect.Server.Api.Models.CloudScript.Data
|
|||||||
[JsonPropertyName("contracts")]
|
[JsonPropertyName("contracts")]
|
||||||
public List<FYFactionContractData> Contracts { get; set; }
|
public List<FYFactionContractData> Contracts { get; set; }
|
||||||
}
|
}
|
||||||
}
|
|
||||||
@@ -1,8 +1,7 @@
|
|||||||
using System.Collections.Generic;
|
using System.Text.Json.Serialization;
|
||||||
using System.Text.Json.Serialization;
|
|
||||||
|
namespace Prospect.Server.Api.Models.CloudScript.Data;
|
||||||
|
|
||||||
namespace Prospect.Server.Api.Models.CloudScript.Data
|
|
||||||
{
|
|
||||||
public class FYFactionsContractsData
|
public class FYFactionsContractsData
|
||||||
{
|
{
|
||||||
[JsonPropertyName("boards")]
|
[JsonPropertyName("boards")]
|
||||||
@@ -11,4 +10,3 @@ namespace Prospect.Server.Api.Models.CloudScript.Data
|
|||||||
[JsonPropertyName("lastBoardRefreshTimeUtc")]
|
[JsonPropertyName("lastBoardRefreshTimeUtc")]
|
||||||
public FYTimestamp LastBoardRefreshTimeUtc { get; set; }
|
public FYTimestamp LastBoardRefreshTimeUtc { get; set; }
|
||||||
}
|
}
|
||||||
}
|
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
using System.Text.Json.Serialization;
|
using System.Text.Json.Serialization;
|
||||||
|
|
||||||
namespace Prospect.Server.Api.Models.CloudScript.Data
|
namespace Prospect.Server.Api.Models.CloudScript.Data;
|
||||||
{
|
|
||||||
public class FYItemCurrentlyBeingCrafted
|
public class FYItemCurrentlyBeingCrafted
|
||||||
{
|
{
|
||||||
[JsonPropertyName("itemId")]
|
[JsonPropertyName("itemId")]
|
||||||
@@ -16,4 +16,3 @@ namespace Prospect.Server.Api.Models.CloudScript.Data
|
|||||||
[JsonPropertyName("utcTimestampWhenCraftingStarted")]
|
[JsonPropertyName("utcTimestampWhenCraftingStarted")]
|
||||||
public FYTimestamp UtcTimestampWhenCraftingStarted { get; set; }
|
public FYTimestamp UtcTimestampWhenCraftingStarted { get; set; }
|
||||||
}
|
}
|
||||||
}
|
|
||||||
@@ -1,10 +1,9 @@
|
|||||||
using System.Text.Json.Serialization;
|
using System.Text.Json.Serialization;
|
||||||
|
|
||||||
namespace Prospect.Server.Api.Models.CloudScript.Data
|
namespace Prospect.Server.Api.Models.CloudScript.Data;
|
||||||
{
|
|
||||||
public class FYTimestamp
|
public class FYTimestamp
|
||||||
{
|
{
|
||||||
[JsonPropertyName("seconds")]
|
[JsonPropertyName("seconds")]
|
||||||
public int Seconds { get; set; }
|
public int Seconds { get; set; }
|
||||||
}
|
}
|
||||||
}
|
|
||||||
@@ -1,8 +1,8 @@
|
|||||||
using System.Text.Json.Serialization;
|
using System.Text.Json.Serialization;
|
||||||
using Prospect.Server.Api.Models.CloudScript.Data;
|
using Prospect.Server.Api.Models.CloudScript.Data;
|
||||||
|
|
||||||
namespace Prospect.Server.Api.Models.CloudScript
|
namespace Prospect.Server.Api.Models.CloudScript;
|
||||||
{
|
|
||||||
public class FYGetCraftingInProgressDataResult
|
public class FYGetCraftingInProgressDataResult
|
||||||
{
|
{
|
||||||
[JsonPropertyName("userId")]
|
[JsonPropertyName("userId")]
|
||||||
@@ -14,4 +14,3 @@ namespace Prospect.Server.Api.Models.CloudScript
|
|||||||
[JsonPropertyName("itemCurrentlyBeingCrafted")]
|
[JsonPropertyName("itemCurrentlyBeingCrafted")]
|
||||||
public FYItemCurrentlyBeingCrafted ItemCurrentlyBeingCrafted { get; set; }
|
public FYItemCurrentlyBeingCrafted ItemCurrentlyBeingCrafted { get; set; }
|
||||||
}
|
}
|
||||||
}
|
|
||||||
@@ -1,9 +1,8 @@
|
|||||||
using System.Collections.Generic;
|
using System.Text.Json.Serialization;
|
||||||
using System.Text.Json.Serialization;
|
|
||||||
using Prospect.Server.Api.Models.CloudScript.Data;
|
using Prospect.Server.Api.Models.CloudScript.Data;
|
||||||
|
|
||||||
namespace Prospect.Server.Api.Models.CloudScript
|
namespace Prospect.Server.Api.Models.CloudScript;
|
||||||
{
|
|
||||||
public class FYGetPlayerContractsResult
|
public class FYGetPlayerContractsResult
|
||||||
{
|
{
|
||||||
[JsonPropertyName("userId")]
|
[JsonPropertyName("userId")]
|
||||||
@@ -21,4 +20,3 @@ namespace Prospect.Server.Api.Models.CloudScript
|
|||||||
[JsonPropertyName("refreshHours24UtcFromBackend")]
|
[JsonPropertyName("refreshHours24UtcFromBackend")]
|
||||||
public int RefreshHours24UtcFromBackend { get; set; }
|
public int RefreshHours24UtcFromBackend { get; set; }
|
||||||
}
|
}
|
||||||
}
|
|
||||||
@@ -1,11 +1,8 @@
|
|||||||
using System;
|
|
||||||
using Microsoft.AspNetCore.Hosting;
|
|
||||||
using Microsoft.Extensions.Hosting;
|
|
||||||
using Serilog;
|
using Serilog;
|
||||||
using Serilog.Events;
|
using Serilog.Events;
|
||||||
|
|
||||||
namespace Prospect.Server.Api
|
namespace Prospect.Server.Api;
|
||||||
{
|
|
||||||
public static class Program
|
public static class Program
|
||||||
{
|
{
|
||||||
public static int Main(string[] args)
|
public static int Main(string[] args)
|
||||||
@@ -43,4 +40,3 @@ namespace Prospect.Server.Api
|
|||||||
webBuilder.UseStartup<Startup>();
|
webBuilder.UseStartup<Startup>();
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
|
||||||
@@ -2,6 +2,7 @@
|
|||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<TargetFramework>net6.0</TargetFramework>
|
<TargetFramework>net6.0</TargetFramework>
|
||||||
|
<ImplicitUsings>true</ImplicitUsings>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
|||||||
@@ -1,9 +1,8 @@
|
|||||||
namespace Prospect.Server.Api.Services.Auth
|
namespace Prospect.Server.Api.Services.Auth;
|
||||||
{
|
|
||||||
public static class AuthClaimTypes
|
public static class AuthClaimTypes
|
||||||
{
|
{
|
||||||
public const string UserId = "user_id";
|
public const string UserId = "user_id";
|
||||||
public const string EntityId = "entity_id";
|
public const string EntityId = "entity_id";
|
||||||
public const string Type = "type";
|
public const string Type = "type";
|
||||||
}
|
}
|
||||||
}
|
|
||||||
@@ -1,14 +1,12 @@
|
|||||||
using System;
|
using System.IdentityModel.Tokens.Jwt;
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.IdentityModel.Tokens.Jwt;
|
|
||||||
using System.Security.Claims;
|
using System.Security.Claims;
|
||||||
using System.Text;
|
using System.Text;
|
||||||
using Microsoft.Extensions.Options;
|
using Microsoft.Extensions.Options;
|
||||||
using Microsoft.IdentityModel.Tokens;
|
using Microsoft.IdentityModel.Tokens;
|
||||||
using Prospect.Server.Api.Services.Database.Models;
|
using Prospect.Server.Api.Services.Database.Models;
|
||||||
|
|
||||||
namespace Prospect.Server.Api.Services.Auth
|
namespace Prospect.Server.Api.Services.Auth;
|
||||||
{
|
|
||||||
public class AuthTokenService
|
public class AuthTokenService
|
||||||
{
|
{
|
||||||
private const string DefaultIssuer = "ProspectApi";
|
private const string DefaultIssuer = "ProspectApi";
|
||||||
@@ -80,4 +78,3 @@ namespace Prospect.Server.Api.Services.Auth
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
@@ -1,7 +1,6 @@
|
|||||||
namespace Prospect.Server.Api.Services.Auth
|
namespace Prospect.Server.Api.Services.Auth;
|
||||||
{
|
|
||||||
public class AuthTokenSettings
|
public class AuthTokenSettings
|
||||||
{
|
{
|
||||||
public string Secret { get; set; }
|
public string Secret { get; set; }
|
||||||
}
|
}
|
||||||
}
|
|
||||||
@@ -1,8 +1,7 @@
|
|||||||
namespace Prospect.Server.Api.Services.Auth
|
namespace Prospect.Server.Api.Services.Auth;
|
||||||
{
|
|
||||||
public static class AuthType
|
public static class AuthType
|
||||||
{
|
{
|
||||||
public const string User = "User";
|
public const string User = "User";
|
||||||
public const string Entity = "Entity";
|
public const string Entity = "Entity";
|
||||||
}
|
}
|
||||||
}
|
|
||||||
@@ -1,10 +1,9 @@
|
|||||||
using System;
|
using Microsoft.AspNetCore.Authentication;
|
||||||
using Microsoft.AspNetCore.Authentication;
|
|
||||||
using Prospect.Server.Api.Services.Auth.Entity;
|
using Prospect.Server.Api.Services.Auth.Entity;
|
||||||
using Prospect.Server.Api.Services.Auth.User;
|
using Prospect.Server.Api.Services.Auth.User;
|
||||||
|
|
||||||
namespace Prospect.Server.Api.Services.Auth
|
namespace Prospect.Server.Api.Services.Auth;
|
||||||
{
|
|
||||||
public static class AuthenticationBuilderExtensions
|
public static class AuthenticationBuilderExtensions
|
||||||
{
|
{
|
||||||
public static AuthenticationBuilder AddUserAuthentication(this AuthenticationBuilder authenticationBuilder, Action<UserAuthenticationOptions> options)
|
public static AuthenticationBuilder AddUserAuthentication(this AuthenticationBuilder authenticationBuilder, Action<UserAuthenticationOptions> options)
|
||||||
@@ -17,4 +16,3 @@ namespace Prospect.Server.Api.Services.Auth
|
|||||||
return authenticationBuilder.AddScheme<EntityAuthenticationOptions, EntityAuthenticationHandler>(EntityAuthenticationOptions.DefaultScheme, options);
|
return authenticationBuilder.AddScheme<EntityAuthenticationOptions, EntityAuthenticationHandler>(EntityAuthenticationOptions.DefaultScheme, options);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
@@ -1,18 +1,13 @@
|
|||||||
using System.Collections.Generic;
|
using System.Security.Claims;
|
||||||
using System.Linq;
|
|
||||||
using System.Security.Claims;
|
|
||||||
using System.Text.Encodings.Web;
|
using System.Text.Encodings.Web;
|
||||||
using System.Text.Json;
|
using System.Text.Json;
|
||||||
using System.Threading.Tasks;
|
|
||||||
using Microsoft.AspNetCore.Authentication;
|
using Microsoft.AspNetCore.Authentication;
|
||||||
using Microsoft.AspNetCore.Http;
|
|
||||||
using Microsoft.Extensions.Logging;
|
|
||||||
using Microsoft.Extensions.Options;
|
using Microsoft.Extensions.Options;
|
||||||
using Prospect.Server.Api.Models.Client;
|
using Prospect.Server.Api.Models.Client;
|
||||||
using Prospect.Server.Api.Services.Auth.Extensions;
|
using Prospect.Server.Api.Services.Auth.Extensions;
|
||||||
|
|
||||||
namespace Prospect.Server.Api.Services.Auth.Entity
|
namespace Prospect.Server.Api.Services.Auth.Entity;
|
||||||
{
|
|
||||||
public class EntityAuthenticationHandler : AuthenticationHandler<EntityAuthenticationOptions>
|
public class EntityAuthenticationHandler : AuthenticationHandler<EntityAuthenticationOptions>
|
||||||
{
|
{
|
||||||
private const string Header = "X-EntityToken";
|
private const string Header = "X-EntityToken";
|
||||||
@@ -84,4 +79,3 @@ namespace Prospect.Server.Api.Services.Auth.Entity
|
|||||||
await Response.WriteAsync(JsonSerializer.Serialize(Res));
|
await Response.WriteAsync(JsonSerializer.Serialize(Res));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
@@ -1,11 +1,10 @@
|
|||||||
using Microsoft.AspNetCore.Authentication;
|
using Microsoft.AspNetCore.Authentication;
|
||||||
|
|
||||||
namespace Prospect.Server.Api.Services.Auth.Entity
|
namespace Prospect.Server.Api.Services.Auth.Entity;
|
||||||
{
|
|
||||||
public class EntityAuthenticationOptions : AuthenticationSchemeOptions
|
public class EntityAuthenticationOptions : AuthenticationSchemeOptions
|
||||||
{
|
{
|
||||||
public const string DefaultScheme = "EntityAuth";
|
public const string DefaultScheme = "EntityAuth";
|
||||||
public string Scheme => DefaultScheme;
|
public string Scheme => DefaultScheme;
|
||||||
public string AuthenticationType = DefaultScheme;
|
public string AuthenticationType = DefaultScheme;
|
||||||
}
|
}
|
||||||
}
|
|
||||||
@@ -1,8 +1,8 @@
|
|||||||
using System.Security.Claims;
|
using System.Security.Claims;
|
||||||
using Prospect.Server.Api.Exceptions;
|
using Prospect.Server.Api.Exceptions;
|
||||||
|
|
||||||
namespace Prospect.Server.Api.Services.Auth.Extensions
|
namespace Prospect.Server.Api.Services.Auth.Extensions;
|
||||||
{
|
|
||||||
public static class ClaimsPrincipalExtensions
|
public static class ClaimsPrincipalExtensions
|
||||||
{
|
{
|
||||||
public static string FindAuthUserId(this ClaimsPrincipal principal)
|
public static string FindAuthUserId(this ClaimsPrincipal principal)
|
||||||
@@ -31,4 +31,3 @@ namespace Prospect.Server.Api.Services.Auth.Extensions
|
|||||||
return claim.Value;
|
return claim.Value;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
@@ -1,18 +1,13 @@
|
|||||||
using System.Collections.Generic;
|
using System.Security.Claims;
|
||||||
using System.Linq;
|
|
||||||
using System.Security.Claims;
|
|
||||||
using System.Text.Encodings.Web;
|
using System.Text.Encodings.Web;
|
||||||
using System.Text.Json;
|
using System.Text.Json;
|
||||||
using System.Threading.Tasks;
|
|
||||||
using Microsoft.AspNetCore.Authentication;
|
using Microsoft.AspNetCore.Authentication;
|
||||||
using Microsoft.AspNetCore.Http;
|
|
||||||
using Microsoft.Extensions.Logging;
|
|
||||||
using Microsoft.Extensions.Options;
|
using Microsoft.Extensions.Options;
|
||||||
using Prospect.Server.Api.Models.Client;
|
using Prospect.Server.Api.Models.Client;
|
||||||
using Prospect.Server.Api.Services.Auth.Extensions;
|
using Prospect.Server.Api.Services.Auth.Extensions;
|
||||||
|
|
||||||
namespace Prospect.Server.Api.Services.Auth.User
|
namespace Prospect.Server.Api.Services.Auth.User;
|
||||||
{
|
|
||||||
public class UserAuthenticationHandler : AuthenticationHandler<UserAuthenticationOptions>
|
public class UserAuthenticationHandler : AuthenticationHandler<UserAuthenticationOptions>
|
||||||
{
|
{
|
||||||
private const string Header = "X-Authorization";
|
private const string Header = "X-Authorization";
|
||||||
@@ -82,4 +77,3 @@ namespace Prospect.Server.Api.Services.Auth.User
|
|||||||
}));
|
}));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
@@ -1,11 +1,10 @@
|
|||||||
using Microsoft.AspNetCore.Authentication;
|
using Microsoft.AspNetCore.Authentication;
|
||||||
|
|
||||||
namespace Prospect.Server.Api.Services.Auth.User
|
namespace Prospect.Server.Api.Services.Auth.User;
|
||||||
{
|
|
||||||
public class UserAuthenticationOptions : AuthenticationSchemeOptions
|
public class UserAuthenticationOptions : AuthenticationSchemeOptions
|
||||||
{
|
{
|
||||||
public const string DefaultScheme = "UserAuth";
|
public const string DefaultScheme = "UserAuth";
|
||||||
public string Scheme => DefaultScheme;
|
public string Scheme => DefaultScheme;
|
||||||
public string AuthenticationType = DefaultScheme;
|
public string AuthenticationType = DefaultScheme;
|
||||||
}
|
}
|
||||||
}
|
|
||||||
@@ -2,8 +2,8 @@
|
|||||||
using MongoDB.Driver;
|
using MongoDB.Driver;
|
||||||
using Prospect.Server.Api.Config;
|
using Prospect.Server.Api.Config;
|
||||||
|
|
||||||
namespace Prospect.Server.Api.Services.Database
|
namespace Prospect.Server.Api.Services.Database;
|
||||||
{
|
|
||||||
public abstract class BaseDbService<T>
|
public abstract class BaseDbService<T>
|
||||||
{
|
{
|
||||||
protected BaseDbService(IOptions<DatabaseSettings> options, string collection)
|
protected BaseDbService(IOptions<DatabaseSettings> options, string collection)
|
||||||
@@ -17,4 +17,3 @@ namespace Prospect.Server.Api.Services.Database
|
|||||||
|
|
||||||
protected IMongoCollection<T> Collection { get; }
|
protected IMongoCollection<T> Collection { get; }
|
||||||
}
|
}
|
||||||
}
|
|
||||||
@@ -1,11 +1,10 @@
|
|||||||
using System.Threading.Tasks;
|
using Microsoft.Extensions.Options;
|
||||||
using Microsoft.Extensions.Options;
|
|
||||||
using MongoDB.Driver;
|
using MongoDB.Driver;
|
||||||
using Prospect.Server.Api.Config;
|
using Prospect.Server.Api.Config;
|
||||||
using Prospect.Server.Api.Services.Database.Models;
|
using Prospect.Server.Api.Services.Database.Models;
|
||||||
|
|
||||||
namespace Prospect.Server.Api.Services.Database
|
namespace Prospect.Server.Api.Services.Database;
|
||||||
{
|
|
||||||
public class DbEntityService : BaseDbService<PlayFabEntity>
|
public class DbEntityService : BaseDbService<PlayFabEntity>
|
||||||
{
|
{
|
||||||
public DbEntityService(IOptions<DatabaseSettings> settings) : base(settings, nameof(PlayFabEntity))
|
public DbEntityService(IOptions<DatabaseSettings> settings) : base(settings, nameof(PlayFabEntity))
|
||||||
@@ -35,4 +34,3 @@ namespace Prospect.Server.Api.Services.Database
|
|||||||
await CreateAsync(userId);
|
await CreateAsync(userId);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
@@ -1,12 +1,10 @@
|
|||||||
using System;
|
using Microsoft.Extensions.Options;
|
||||||
using System.Threading.Tasks;
|
|
||||||
using Microsoft.Extensions.Options;
|
|
||||||
using MongoDB.Driver;
|
using MongoDB.Driver;
|
||||||
using Prospect.Server.Api.Config;
|
using Prospect.Server.Api.Config;
|
||||||
using Prospect.Server.Api.Services.Database.Models;
|
using Prospect.Server.Api.Services.Database.Models;
|
||||||
|
|
||||||
namespace Prospect.Server.Api.Services.Database
|
namespace Prospect.Server.Api.Services.Database;
|
||||||
{
|
|
||||||
public class DbUserDataService : BaseDbService<PlayFabUserData>
|
public class DbUserDataService : BaseDbService<PlayFabUserData>
|
||||||
{
|
{
|
||||||
public DbUserDataService(IOptions<DatabaseSettings> options) : base(options, nameof(PlayFabUserData))
|
public DbUserDataService(IOptions<DatabaseSettings> options) : base(options, nameof(PlayFabUserData))
|
||||||
@@ -57,4 +55,3 @@ namespace Prospect.Server.Api.Services.Database
|
|||||||
await Collection.UpdateOneAsync(data => data.Id == dataId, update);
|
await Collection.UpdateOneAsync(data => data.Id == dataId, update);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
@@ -1,13 +1,10 @@
|
|||||||
using System.Collections.Generic;
|
using Microsoft.Extensions.Options;
|
||||||
using System.Linq;
|
|
||||||
using System.Threading.Tasks;
|
|
||||||
using Microsoft.Extensions.Options;
|
|
||||||
using MongoDB.Driver;
|
using MongoDB.Driver;
|
||||||
using Prospect.Server.Api.Config;
|
using Prospect.Server.Api.Config;
|
||||||
using Prospect.Server.Api.Services.Database.Models;
|
using Prospect.Server.Api.Services.Database.Models;
|
||||||
|
|
||||||
namespace Prospect.Server.Api.Services.Database
|
namespace Prospect.Server.Api.Services.Database;
|
||||||
{
|
|
||||||
public class DbUserService : BaseDbService<PlayFabUser>
|
public class DbUserService : BaseDbService<PlayFabUser>
|
||||||
{
|
{
|
||||||
public DbUserService(IOptions<DatabaseSettings> settings) : base(settings, nameof(PlayFabUser))
|
public DbUserService(IOptions<DatabaseSettings> settings) : base(settings, nameof(PlayFabUser))
|
||||||
@@ -47,4 +44,3 @@ namespace Prospect.Server.Api.Services.Database
|
|||||||
await CreateAsync(type, key);
|
await CreateAsync(type, key);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
@@ -1,9 +1,8 @@
|
|||||||
using System;
|
using System.Security.Cryptography;
|
||||||
using System.Security.Cryptography;
|
|
||||||
using MongoDB.Bson.Serialization;
|
using MongoDB.Bson.Serialization;
|
||||||
|
|
||||||
namespace Prospect.Server.Api.Services.Database.Generator
|
namespace Prospect.Server.Api.Services.Database.Generator;
|
||||||
{
|
|
||||||
public class PlayFabIdGenerator : IIdGenerator
|
public class PlayFabIdGenerator : IIdGenerator
|
||||||
{
|
{
|
||||||
private static readonly RNGCryptoServiceProvider Random = new RNGCryptoServiceProvider();
|
private static readonly RNGCryptoServiceProvider Random = new RNGCryptoServiceProvider();
|
||||||
@@ -20,4 +19,3 @@ namespace Prospect.Server.Api.Services.Database.Generator
|
|||||||
return id is not string idStr || string.IsNullOrEmpty(idStr);
|
return id is not string idStr || string.IsNullOrEmpty(idStr);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
@@ -1,8 +1,8 @@
|
|||||||
using MongoDB.Bson.Serialization.Attributes;
|
using MongoDB.Bson.Serialization.Attributes;
|
||||||
using Prospect.Server.Api.Services.Database.Generator;
|
using Prospect.Server.Api.Services.Database.Generator;
|
||||||
|
|
||||||
namespace Prospect.Server.Api.Services.Database.Models
|
namespace Prospect.Server.Api.Services.Database.Models;
|
||||||
{
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// title_player_account
|
/// title_player_account
|
||||||
/// </summary>
|
/// </summary>
|
||||||
@@ -15,4 +15,3 @@ namespace Prospect.Server.Api.Services.Database.Models
|
|||||||
[BsonElement("UserId")]
|
[BsonElement("UserId")]
|
||||||
public string UserId { get; set; }
|
public string UserId { get; set; }
|
||||||
}
|
}
|
||||||
}
|
|
||||||
@@ -1,9 +1,8 @@
|
|||||||
using System.Collections.Generic;
|
using MongoDB.Bson.Serialization.Attributes;
|
||||||
using MongoDB.Bson.Serialization.Attributes;
|
|
||||||
using Prospect.Server.Api.Services.Database.Generator;
|
using Prospect.Server.Api.Services.Database.Generator;
|
||||||
|
|
||||||
namespace Prospect.Server.Api.Services.Database.Models
|
namespace Prospect.Server.Api.Services.Database.Models;
|
||||||
{
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// master_player_account
|
/// master_player_account
|
||||||
/// </summary>
|
/// </summary>
|
||||||
@@ -20,4 +19,3 @@ namespace Prospect.Server.Api.Services.Database.Models
|
|||||||
[BsonElement("Auth")]
|
[BsonElement("Auth")]
|
||||||
public List<PlayFabUserAuth> Auth { get; set; }
|
public List<PlayFabUserAuth> Auth { get; set; }
|
||||||
}
|
}
|
||||||
}
|
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
using MongoDB.Bson.Serialization.Attributes;
|
using MongoDB.Bson.Serialization.Attributes;
|
||||||
|
|
||||||
namespace Prospect.Server.Api.Services.Database.Models
|
namespace Prospect.Server.Api.Services.Database.Models;
|
||||||
{
|
|
||||||
public class PlayFabUserAuth
|
public class PlayFabUserAuth
|
||||||
{
|
{
|
||||||
[BsonElement("Type")]
|
[BsonElement("Type")]
|
||||||
@@ -10,4 +10,3 @@ namespace Prospect.Server.Api.Services.Database.Models
|
|||||||
[BsonElement("Key")]
|
[BsonElement("Key")]
|
||||||
public string Key { get; set; }
|
public string Key { get; set; }
|
||||||
}
|
}
|
||||||
}
|
|
||||||
@@ -1,8 +1,7 @@
|
|||||||
namespace Prospect.Server.Api.Services.Database.Models
|
namespace Prospect.Server.Api.Services.Database.Models;
|
||||||
{
|
|
||||||
public enum PlayFabUserAuthType
|
public enum PlayFabUserAuthType
|
||||||
{
|
{
|
||||||
Epic,
|
Epic,
|
||||||
Steam
|
Steam
|
||||||
}
|
}
|
||||||
}
|
|
||||||
@@ -1,9 +1,8 @@
|
|||||||
using System;
|
using MongoDB.Bson;
|
||||||
using MongoDB.Bson;
|
|
||||||
using MongoDB.Bson.Serialization.Attributes;
|
using MongoDB.Bson.Serialization.Attributes;
|
||||||
|
|
||||||
namespace Prospect.Server.Api.Services.Database.Models
|
namespace Prospect.Server.Api.Services.Database.Models;
|
||||||
{
|
|
||||||
public class PlayFabUserData
|
public class PlayFabUserData
|
||||||
{
|
{
|
||||||
[BsonId]
|
[BsonId]
|
||||||
@@ -33,4 +32,3 @@ namespace Prospect.Server.Api.Services.Database.Models
|
|||||||
[BsonElement("LastUpdated")]
|
[BsonElement("LastUpdated")]
|
||||||
public DateTime LastUpdated { get; set; }
|
public DateTime LastUpdated { get; set; }
|
||||||
}
|
}
|
||||||
}
|
|
||||||
File diff suppressed because one or more lines are too long
@@ -1,8 +1,5 @@
|
|||||||
using System.Collections.Generic;
|
namespace Prospect.Server.Api.Services.UserData;
|
||||||
using Microsoft.Extensions.Logging;
|
|
||||||
|
|
||||||
namespace Prospect.Server.Api.Services.UserData
|
|
||||||
{
|
|
||||||
public class TitleDataService
|
public class TitleDataService
|
||||||
{
|
{
|
||||||
public TitleDataService(ILogger<TitleDataService> logger)
|
public TitleDataService(ILogger<TitleDataService> logger)
|
||||||
@@ -30,4 +27,3 @@ namespace Prospect.Server.Api.Services.UserData
|
|||||||
return TitleDataDefault.Data;
|
return TitleDataDefault.Data;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
@@ -1,12 +1,8 @@
|
|||||||
using System;
|
using Prospect.Server.Api.Models.Client.Data;
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.Threading.Tasks;
|
|
||||||
using Microsoft.Extensions.Logging;
|
|
||||||
using Prospect.Server.Api.Models.Client.Data;
|
|
||||||
using Prospect.Server.Api.Services.Database;
|
using Prospect.Server.Api.Services.Database;
|
||||||
|
|
||||||
namespace Prospect.Server.Api.Services.UserData
|
namespace Prospect.Server.Api.Services.UserData;
|
||||||
{
|
|
||||||
public class UserDataService
|
public class UserDataService
|
||||||
{
|
{
|
||||||
private readonly ILogger<UserDataService> _logger;
|
private readonly ILogger<UserDataService> _logger;
|
||||||
@@ -179,4 +175,3 @@ namespace Prospect.Server.Api.Services.UserData
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
@@ -1,19 +1,13 @@
|
|||||||
using Microsoft.AspNetCore.Builder;
|
|
||||||
using Microsoft.AspNetCore.Hosting;
|
|
||||||
using Microsoft.Extensions.Configuration;
|
|
||||||
using Microsoft.Extensions.DependencyInjection;
|
|
||||||
using Microsoft.Extensions.Hosting;
|
|
||||||
using Prospect.Server.Api.Config;
|
using Prospect.Server.Api.Config;
|
||||||
using Prospect.Server.Api.Converters;
|
using Prospect.Server.Api.Converters;
|
||||||
using Prospect.Server.Api.Middleware;
|
using Prospect.Server.Api.Middleware;
|
||||||
using Prospect.Server.Api.Services.Auth;
|
using Prospect.Server.Api.Services.Auth;
|
||||||
using Prospect.Server.Api.Services.Auth.User;
|
|
||||||
using Prospect.Server.Api.Services.Database;
|
using Prospect.Server.Api.Services.Database;
|
||||||
using Prospect.Server.Api.Services.UserData;
|
using Prospect.Server.Api.Services.UserData;
|
||||||
using Serilog;
|
using Serilog;
|
||||||
|
|
||||||
namespace Prospect.Server.Api
|
namespace Prospect.Server.Api;
|
||||||
{
|
|
||||||
public class Startup
|
public class Startup
|
||||||
{
|
{
|
||||||
public Startup(IConfiguration configuration)
|
public Startup(IConfiguration configuration)
|
||||||
@@ -69,4 +63,3 @@ namespace Prospect.Server.Api
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
@@ -1,11 +1,8 @@
|
|||||||
using System.Collections.Generic;
|
namespace Prospect.Server.Steam;
|
||||||
|
|
||||||
namespace Prospect.Server.Steam
|
|
||||||
{
|
|
||||||
public class AppDlc
|
public class AppDlc
|
||||||
{
|
{
|
||||||
public uint AppId { get; set; }
|
public uint AppId { get; set; }
|
||||||
|
|
||||||
public List<uint> Licenses { get; set; }
|
public List<uint> Licenses { get; set; }
|
||||||
}
|
}
|
||||||
}
|
|
||||||
@@ -1,10 +1,7 @@
|
|||||||
using System;
|
using System.Net;
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.IO;
|
namespace Prospect.Server.Steam;
|
||||||
using System.Net;
|
|
||||||
|
|
||||||
namespace Prospect.Server.Steam
|
|
||||||
{
|
|
||||||
public class AppTicket
|
public class AppTicket
|
||||||
{
|
{
|
||||||
private AppTicket()
|
private AppTicket()
|
||||||
@@ -164,4 +161,3 @@ namespace Prospect.Server.Steam
|
|||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
@@ -2,6 +2,7 @@
|
|||||||
|
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<TargetFramework>net6.0</TargetFramework>
|
<TargetFramework>net6.0</TargetFramework>
|
||||||
|
<ImplicitUsings>true</ImplicitUsings>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
</Project>
|
</Project>
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
using System.Security.Cryptography;
|
using System.Security.Cryptography;
|
||||||
|
|
||||||
namespace Prospect.Server.Steam
|
namespace Prospect.Server.Steam;
|
||||||
{
|
|
||||||
internal static class SteamCrypto
|
internal static class SteamCrypto
|
||||||
{
|
{
|
||||||
private const string SystemCertificate = "-----BEGIN PUBLIC KEY-----\n" +
|
private const string SystemCertificate = "-----BEGIN PUBLIC KEY-----\n" +
|
||||||
@@ -29,4 +29,3 @@ namespace Prospect.Server.Steam
|
|||||||
return dataVerified;
|
return dataVerified;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
Reference in New Issue
Block a user