Refactor appsettings

.gitea/workflows/build.yml

@@ -1,33 +0,0 @@
-name: Build & Deploy
-
-on:
-  push:
-    branches: [main, preprod]
-  workflow_dispatch: {}
-
-env:
-  IMAGE: git.nfteam.ovh/neckfire/the-cycle
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-      - name: Build & push image
-        run: |
-          set -e
-          echo "${{ secrets.REGISTRY_PASSWORD }}" | docker login git.nfteam.ovh -u "${{ secrets.REGISTRY_USER }}" --password-stdin
-          SHA="${GITHUB_SHA::12}"
-          BRANCH="${GITHUB_REF_NAME}"
-          if [ "$BRANCH" = "main" ]; then TAGS="-t ${IMAGE}:latest -t ${IMAGE}:${SHA}"; else TAGS="-t ${IMAGE}:${BRANCH} -t ${IMAGE}:${BRANCH}-${SHA}"; fi
-          docker build $TAGS -f Dockerfile .
-          docker push --all-tags "${IMAGE}"
-      - name: Notify ntfy
-        if: always()
-        run: |
-          if [ "${{ job.status }}" = "success" ]; then EMOJI="white_check_mark"; PRIO="default"; else EMOJI="rotating_light"; PRIO="high"; fi
-          curl -s -H "Authorization: Bearer ${{ secrets.NTFY_TOKEN }}" -H "Title: ${GITHUB_REPOSITORY} — ${{ job.status }}" \
-            -H "Priority: ${PRIO}" -H "Tags: ${EMOJI}" -H "Click: ${GITHUB_SERVER_URL}/${GITHUB_REPOSITORY}/actions" \
-            -d "${GITHUB_WORKFLOW} (${GITHUB_REF_NAME} #${GITHUB_RUN_NUMBER}) : ${{ job.status }}" \
-            "${{ secrets.NTFY_URL }}/${{ secrets.NTFY_TOPIC }}" || true

.gitignore

@@ -1 +0,0 @@
-_out/

Dockerfile

@@ -1,15 +0,0 @@
-# The Cycle: Frontier — serveur API (émulateur Prospect), build depuis les sources.
-# Multi-stage : SDK .NET 8 pour publier le projet API → runtime aspnet 8.
-FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
-WORKDIR /src
-COPY src/ ./src/
-# Configuration "Season 2 Release" = build qui correspond au client S2 déployé
-# (le code sélectionne la saison via des #if SEASON_2_RELEASE / SEASON_3_RELEASE).
-RUN dotnet publish src/Prospect.Server.Api/Prospect.Server.Api.csproj \
-      -c "Season 2 Release" -o /app
-
-FROM mcr.microsoft.com/dotnet/aspnet:8.0
-WORKDIR /app
-COPY --from=build /app ./
-EXPOSE 8443 8000
-ENTRYPOINT ["dotnet", "Prospect.Server.Api.dll"]

README.md

@@ -141,7 +141,7 @@ to successfully communicate with the local server. Do the following:
 
     1. Select **Place all certificates in the following store** > **Browse...**. Choose **Trusted Root Certification Authorities** and click **OK**. Click **Next**.
 
-    1. Click **Finish**. A **Security Warning** popup may appear, make sure it specifies `2EA46.playfabapi.com` certification authority and click **Yes**.
+    1. Click **Finish**. A **Security Warning** popup may appear, make sure it specifies `127.0.0.1` certification authority and click **Yes**.
 
 ### 4. Extract `LoaderPack` to the game
 
@@ -174,7 +174,7 @@ If you've installed the certificate for the **Current User**:
 
 1. Expand **Trusted Root Certification Authorities** and select **Certificates**.
 
-1. Find `2EA46.playfabapi.com`, right-click it > **Delete**.
+1. Find `127.0.0.1`, right-click it > **Delete**.
 
 If you've installed the certificate for the **Local Machine**, repeat the same steps but instead open `certlm.msc`.
 

src/Prospect.Server.Api/Config/PlayFabSettings.cs

@@ -4,6 +4,4 @@ public class PlayFabSettings
 {
     public string PublisherId { get; set; }
     public string TitleId { get; set; }
-    public string SignalRURL { get; set; }
-    public string SignalRAccessToken { get; set; }
 }

src/Prospect.Server.Api/Config/SignalrSettings.cs

@@ -0,0 +1,7 @@
+namespace Prospect.Server.Api.Config;
+
+public class SignalRSettings
+{
+    public string SignalRURL { get; set; }
+    public string SignalRAccessToken { get; set; }
+}

src/Prospect.Server.Api/Config/VivoxConfig.cs

@@ -0,0 +1,9 @@
+namespace Prospect.Server.Api.Config;
+
+public class VivoxConfig
+{
+    public string Key { get; set; }
+    public string Issuer { get; set; }
+    public string Domain { get; set; }
+    public string Server { get; set; }
+}

src/Prospect.Server.Api/Controllers/NotificationsController.cs

@@ -0,0 +1,62 @@
+using System.Net.Mime;
+using System.Text.Json.Serialization;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.SignalR;
+using Prospect.Server.Api.Hubs;
+
+namespace Prospect.Server.Api.Controllers;
+
+public class NotifyRequest
+{
+    [JsonPropertyName("type")]
+    public string MessageType { get; set; }
+
+    [JsonPropertyName("data")]
+    public object MessageData { get; set; }
+}
+
+public class ServerReadyMessageData
+{
+    [JsonPropertyName("success")]
+    public bool Success { get; set; }
+    [JsonPropertyName("sessionId")]
+    public string SessionID { get; set; }
+    [JsonPropertyName("squadId")]
+    public string SquadID { get; set; }
+}
+
+
+[Route("Notifications")]
+[ApiController]
+public class NotificationsController : Controller
+{
+    private readonly IHubContext<CycleHub> _hubContext;
+    private readonly ILogger<NotificationsController> _logger;
+
+    public NotificationsController(ILogger<NotificationsController> logger, IHubContext<CycleHub> hubContext)
+    {
+        _logger = logger;
+        _hubContext = hubContext;
+    }
+
+    [HttpPost("TestNotify")]
+    [Produces(MediaTypeNames.Application.Json)]
+    public async Task<IActionResult> TestNotify(NotifyRequest request)
+    {
+        // TODO: To test Notifications_DT
+        _logger.LogDebug("Received test notification event {MessageType}", request.MessageType);
+        await _hubContext.Clients.All.SendAsync(request.MessageType, request.MessageData);
+
+        return StatusCode(200);
+    }
+
+    [HttpPost("ServerReady")]
+    [Produces(MediaTypeNames.Application.Json)]
+    public async Task<IActionResult> ServerReady(ServerReadyMessageData request)
+    {
+        _logger.LogDebug("Received test notification event OnSquadMatchmakingSuccess");
+        await _hubContext.Clients.All.SendAsync("OnSquadMatchmakingSuccess", request);
+
+        return StatusCode(200);
+    }
+}

src/Prospect.Server.Api/Models/Title/ContractInfo.cs

@@ -15,8 +15,8 @@ public class TitleDataContractInfo {
     public TitleDataContractInfoUnlockData UnlockData { get; set; }
     [JsonPropertyName("IsMainContract")]
     public bool IsMainContract { get; set; }
-    [JsonPropertyName("ContractDifficulty")]
+    [JsonPropertyName("Difficulty")]
-    public EYContractDifficulty ContractDifficulty { get; set; }
+    public EYContractDifficulty Difficulty { get; set; }
 }
 
 public class TitleDataContractInfoReward {

src/Prospect.Server.Api/Models/Title/DailyCrateInfo.cs

@@ -1,6 +1,22 @@
 using System.Text.Json.Serialization;
 
 public class TitleDataDailyCrateInfo {
+    [JsonPropertyName("Name")]
+    public string Name { get; set; }
+    [JsonPropertyName("Level")]
+    public int Level { get; set; }
+    [JsonPropertyName("RewardGrants")]
+    public TitleDataDailyCrateInfoRewardGrants[] RewardGrants { get; set; }
+}
+
+public class TitleDataDailyCrateInfoRewardGrants {
+    [JsonPropertyName("Pool")]
+    public TitleDataDailyCrateInfoPoolItem[] Pool { get; set; }
+    [JsonPropertyName("Amount")]
+    public int Amount { get; set; }
+}
+
+public class TitleDataDailyCrateInfoPoolItem {
     [JsonPropertyName("Name")]
     public string Name { get; set; }
     [JsonPropertyName("Weight")]

src/Prospect.Server.Api/Models/Title/MissionInfo.cs

@@ -9,8 +9,6 @@ public class TitleDataMissionInfo {
     public UDataTable OnboardingRewards { get; set; }
 }
 
-// {\"TalkToBadumReward\":{\"MissionRewardId\":\"TalkToBadumReward\",\"RewardEntries\":[{\"RewardType\":7,\"RewardRowHandle\":{\"DataTable\":\"DataTable\\u0027/Game/DataTables/PRO_Weapons.PRO_Weapons\\u0027\",\"RowName\":\"WP_E_SMG_Bullet_01\"},\"RewardAmount\":2},{\"RewardType\":7,\"RewardRowHandle\":{\"DataTable\":\"DataTable\\u0027/Game/DataTables/PRO_Weapons.PRO_Weapons\\u0027\",\"RowName\":\"WP_E_AR_Energy_01\"},\"RewardAmount\":1},{\"RewardType\":7,\"RewardRowHandle\":{\"DataTable\":\"DataTable\\u0027/Game/DataTables/PRO_Weapons.PRO_Weapons\\u0027\",\"RowName\":\"WP_E_Pistol_Bullet_01\"},\"RewardAmount\":5},{\"RewardType\":7,\"RewardRowHandle\":{\"DataTable\":\"DataTable\\u0027/Game/DataTables/PRO_Weapons.PRO_Weapons\\u0027\",\"RowName\":\"WP_E_SGun_Bullet_01\"},\"RewardAmount\":2},{\"RewardType\":6,\"RewardRowHandle\":{\"DataTable\":\"DataTable\\u0027/Game/DataTables/AmmoTypes_DT.AmmoTypes_DT\\u0027\",\"RowName\":\"Light\"},\"RewardAmount\":6},{\"RewardType\":6,\"RewardRowHandle\":{\"DataTable\":\"DataTable\\u0027/Game/DataTables/AmmoTypes_DT.AmmoTypes_DT\\u0027\",\"RowName\":\"Medium\"},\"RewardAmount\":4},{\"RewardType\":6,\"RewardRowHandle\":{\"DataTable\":\"DataTable\\u0027/Game/DataTables/AmmoTypes_DT.AmmoTypes_DT\\u0027\",\"RowName\":\"Shotgun\"},\"RewardAmount\":2},{\"RewardType\":8,\"RewardRowHandle\":{\"DataTable\":\"DataTable\\u0027/Game/DataTables/PRO_Abilities.PRO_Abilities\\u0027\",\"RowName\":\"ShockGrenade_02\"},\"RewardAmount\":2},{\"RewardType\":8,\"RewardRowHandle\":{\"DataTable\":\"DataTable\\u0027/Game/DataTables/PRO_Abilities.PRO_Abilities\\u0027\",\"RowName\":\"Consumable_Health_01\"},\"RewardAmount\":5},{\"RewardType\":0,\"RewardRowHandle\":{\"DataTable\":\"DataTable\\u0027/Game/DataTables/PRO_PlayerShield.PRO_PlayerShield\\u0027\",\"RowName\":\"Shield_01\"},\"RewardAmount\":5},{\"RewardType\":10,\"RewardRowHandle\":{\"DataTable\":\"DataTable\\u0027/Game/DataTables/PRO_Bags.PRO_Bags\\u0027\",\"RowName\":\"Bag_01\"},\"RewardAmount\":5},{\"RewardType\":7,\"RewardRowHandle\":{\"DataTable\":\"DataTable\\u0027/Game/DataTables/PRO_Weapons.PRO_Weapons\\u0027\",\"RowName\":\"TOOL_MineralScanner_01\"},\"RewardAmount\":2}]},\"FirstMatchReward\":{\"MissionRewardId\":\"FirstMatchReward\",\"RewardEntries\":[{\"RewardType\":2,\"RewardRowHandle\":{\"DataTable\":\"DataTable\\u0027/Game/DataTables/Materials_DT.Materials_DT\\u0027\",\"RowName\":\"Insulation\"},\"RewardAmount\":4},{\"RewardType\":1,\"RewardRowHandle\":{\"DataTable\":\"DataTable\\u0027/Game/DataTables/Currencies_DT.Currencies_DT\\u0027\",\"RowName\":\"SoftCurrency\"},\"RewardAmount\":1500},{\"RewardType\":2,\"RewardRowHandle\":{\"DataTable\":\"DataTable\\u0027/Game/DataTables/Materials_DT.Materials_DT\\u0027\",\"RowName\":\"GenericCreatureDrop\"},\"RewardAmount\":3},{\"RewardType\":2,\"RewardRowHandle\":{\"DataTable\":\"DataTable\\u0027/Game/DataTables/Materials_DT.Materials_DT\\u0027\",\"RowName\":\"ICAScrip\"},\"RewardAmount\":1}]}}",
-
 public class TitleDataMissionRewardInfo {
     [JsonPropertyName("MissionRewardId")]
     public string MissionRewardId { get; set; }

src/Prospect.Server.Api/Services/CloudScript/Functions/ClaimActiveContract.cs

@@ -50,7 +50,7 @@ public class ClaimActiveContract : ICloudScriptFunction<FYClaimCompletedActiveCo
     private readonly IHttpContextAccessor _httpContextAccessor;
     private readonly UserDataService _userDataService;
     private readonly TitleDataService _titleDataService;
-    private readonly string[] difficulties = ["Easy", "Medium", "Hard"];
+    private readonly EYContractDifficulty[] difficulties = [EYContractDifficulty.Easy, EYContractDifficulty.Medium, EYContractDifficulty.Hard];
     private readonly Random rnd = new Random();
 
     public ClaimActiveContract(IHttpContextAccessor httpContextAccessor, UserDataService userDataService, TitleDataService titleDataService)
@@ -131,12 +131,6 @@ public class ClaimActiveContract : ICloudScriptFunction<FYClaimCompletedActiveCo
                         break;
                     }
                 }
-            } else if (objective.Type == EYContractObjectiveType.Kills) {
-                // Kill objectives can't be tracked in a client-hosted raid (no dedicated
-                // game server reports kills). They are auto-credited on deploy
-                // (EnterMatchmakingMatch); accept them here even if a contract was
-                // activated before that so kill contracts remain completable.
-                remaining = 0;
             } else {
                 // NOTE: A game server must write the correct progress
                 // for other types of objectives.
@@ -225,20 +219,19 @@ public class ClaimActiveContract : ICloudScriptFunction<FYClaimCompletedActiveCo
         if (contract.IsMainContract) {
             contractsCompleted.ContractsIDs.Add(contract.Name);
         } else {
-            var parts = contract.Name.Split('-');
+            var contractDifficulty = contract.Difficulty;
-            var difficulty = parts[1];
 
             var levelsData = JsonSerializer.Deserialize<Dictionary<string, int[]>>(titleData["LevelData"]);
             var levels = levelsData[contract.Faction];
-            var jobs = JsonSerializer.Deserialize<Dictionary<string, Dictionary<string, string[]>>>(titleData["Jobs"]);
+            var jobs = JsonSerializer.Deserialize<Dictionary<string, Dictionary<EYContractDifficulty, string[]>>>(titleData["Jobs"]);
             var level = levels.Length - Array.FindIndex(levels, (int xp) => {
                 return factionProgression >= xp;
             });
 
             var factionBoard = jobBoardsData.Boards.Find(c => c.FactionId == contract.Faction);
-            var idx = Array.FindIndex(difficulties, d => d == difficulty);
+            var idx = Array.FindIndex(difficulties, d => d == contractDifficulty);
             var factionJobs = jobs[contract.Faction];
-            var jobsAvailable = Array.FindAll(factionJobs[difficulty], (string jobId) => {
+            var jobsAvailable = Array.FindAll(factionJobs[contractDifficulty], (string jobId) => {
                 return level >= contracts[jobId].UnlockData.Level;
             });
             // If player completes a job, it means he has at least one unlocked anyway.

src/Prospect.Server.Api/Services/CloudScript/Functions/ClaimGeneratorIncomeClient.cs

@@ -43,9 +43,9 @@ public class ClaimGeneratorIncomeClient : ICloudScriptFunction<FYClaimGeneratorI
 
     static readonly Random random = new();
 
-    private TitleDataDailyCrateInfo[] PickItems(TitleDataDailyCrateInfo[] items, int numPicks)
+    private TitleDataDailyCrateInfoPoolItem[] PickItems(TitleDataDailyCrateInfoPoolItem[] items, int numPicks)
     {
-        var itemList = new (TitleDataDailyCrateInfo item, float cumulativeWeight)[items.Length];
+        var itemList = new (TitleDataDailyCrateInfoPoolItem item, float cumulativeWeight)[items.Length];
         float totalWeight = 0;
 
         for (int i = 0; i < items.Length; i++) {
@@ -54,7 +54,7 @@ public class ClaimGeneratorIncomeClient : ICloudScriptFunction<FYClaimGeneratorI
             itemList[i] = (item, totalWeight);
         }
 
-        var selectedItems = new TitleDataDailyCrateInfo[numPicks];
+        var selectedItems = new TitleDataDailyCrateInfoPoolItem[numPicks];
 
         for (int i = 0; i < numPicks; i++) {
             float pick = (float)random.NextDouble() * totalWeight;
@@ -108,7 +108,7 @@ public class ClaimGeneratorIncomeClient : ICloudScriptFunction<FYClaimGeneratorI
         var inventory = JsonSerializer.Deserialize<List<FYCustomItemInfo>>(userData["Inventory"].Value);
         var techTreeBonuses = JsonSerializer.Deserialize<CharacterTechTreeBonuses>(userData["CharacterTechTreeBonuses"].Value);
 
-        var titleData = _titleDataService.Find(new List<string>{"PassiveGenerators", "DailyCrateRewardsPools", "Blueprints"});
+        var titleData = _titleDataService.Find(new List<string>{"PassiveGenerators", "DailyCrateSetups", "Blueprints"});
         var passiveGenerators = JsonSerializer.Deserialize<Dictionary<string, TitleDataPassiveGeneratorsInfo>>(titleData["PassiveGenerators"]);
 
         var now = (int)DateTimeOffset.UtcNow.ToUnixTimeSeconds();
@@ -187,31 +187,32 @@ public class ClaimGeneratorIncomeClient : ICloudScriptFunction<FYClaimGeneratorI
                     };
                 }
 
-                var dailyCrateRewards = JsonSerializer.Deserialize<TitleDataDailyCrateInfo[][]>(titleData["DailyCrateRewardsPools"]);
+                var dailyCrateSetups = JsonSerializer.Deserialize<TitleDataDailyCrateInfo[]>(titleData["DailyCrateSetups"]);
                 var blueprints = JsonSerializer.Deserialize<Dictionary<string, TitleDataBlueprintInfo>>(titleData["Blueprints"]);
-                var rewardsPool = dailyCrateRewards[crateTier - 1];
+                var rewardsPool = dailyCrateSetups[crateTier - 1];
 
-                // TODO: Get rewardGrants from PassiveGenerators_CrateRewards_DT
+                foreach (var grant in rewardsPool.RewardGrants) {
-                var items = PickItems(rewardsPool, 5);
+                    var items = PickItems(grant.Pool, grant.Amount);
-                // TODO: Stackable? GrantedItems doesn't imply granted OR updated.
+                    // TODO: Stackable? GrantedItems doesn't imply granted OR updated.
-                foreach (var item in items) {
+                    foreach (var item in items) {
-                    var itemInfo = blueprints[item.Name];
+                        var itemInfo = blueprints[item.Name];
-                    var grantedItem = new FYCustomItemInfo {
+                        var grantedItem = new FYCustomItemInfo {
-                        ItemId = Guid.NewGuid().ToString(),
+                            ItemId = Guid.NewGuid().ToString(),
-                        Amount = item.Amount,
+                            Amount = item.Amount,
-                        BaseItemId = item.Name,
+                            BaseItemId = item.Name,
-                        Durability = itemInfo.DurabilityMax,
+                            Durability = itemInfo.DurabilityMax,
-                        Insurance = "",
+                            Insurance = "",
-                        InsuranceOwnerPlayfabId = "",
+                            InsuranceOwnerPlayfabId = "",
-                        ModData = new FYModItems { M = [] },
+                            ModData = new FYModItems { M = [] },
-                        Origin = new FYItemOriginBackend { G = "", P = "", T = "" },
+                            Origin = new FYItemOriginBackend { G = "", P = "", T = "" },
-                        InsuredAttachmentId = "",
+                            InsuredAttachmentId = "",
-                        PrimaryVanityId = 0,
+                            PrimaryVanityId = 0,
-                        SecondaryVanityId = 0,
+                            SecondaryVanityId = 0,
-                        RolledPerks = [],
+                            RolledPerks = [],
-                    };
+                        };
-                    inventory.Add(grantedItem);
+                        inventory.Add(grantedItem);
-                    grantedItems.Add(grantedItem);
+                        grantedItems.Add(grantedItem);
+                    }
                 }
                 break;
             }

src/Prospect.Server.Api/Services/CloudScript/Functions/CompleteInventoryUpdate.cs

@@ -2,7 +2,6 @@ using System.Text.Json;
 using System.Text.Json.Serialization;
 using Prospect.Server.Api.Services.Auth.Extensions;
 using Prospect.Server.Api.Services.CloudScript;
-using Prospect.Server.Api.Services.CloudScript.Functions;
 using Prospect.Server.Api.Services.CloudScript.Models;
 using Prospect.Server.Api.Services.UserData;
 
@@ -46,14 +45,12 @@ public class CompleteInventoryUpdateFunction : ICloudScriptFunction<CompleteInve
     private readonly ILogger<CompleteInventoryUpdateFunction> _logger;
     private readonly IHttpContextAccessor _httpContextAccessor;
     private readonly UserDataService _userDataService;
-    private readonly TitleDataService _titleDataService;
 
-    public CompleteInventoryUpdateFunction(ILogger<CompleteInventoryUpdateFunction> logger, IHttpContextAccessor httpContextAccessor, UserDataService userDataService, TitleDataService titleDataService)
+    public CompleteInventoryUpdateFunction(ILogger<CompleteInventoryUpdateFunction> logger, IHttpContextAccessor httpContextAccessor, UserDataService userDataService)
     {
         _logger = logger;
         _httpContextAccessor = httpContextAccessor;
         _userDataService = userDataService;
-        _titleDataService = titleDataService;
     }
 
     public async Task<CompleteInventoryUpdateResponse> ExecuteAsync(CompleteInventoryUpdateRequest request)
@@ -67,42 +64,6 @@ public class CompleteInventoryUpdateFunction : ICloudScriptFunction<CompleteInve
         var userData = await _userDataService.FindAsync(userId, userId, new List<string>{"Inventory"});
         var inventory = JsonSerializer.Deserialize<List<FYCustomItemInfo>>(userData["Inventory"].Value);
 
-        // Insurance payout: this request also reports the end-of-match inventory, so items
-        // the player lost (death / left behind) arrive in ItemsToRemove. Any of those that
-        // were insured on deploy (EnterMatchmakingStation) are recovered back to the stash —
-        // the premium was already paid up-front — and the insurance is consumed (one raid).
-        // Recovery is only performed if the item's policy declares a positive Payout.
-        var recoveredInsured = new HashSet<string>();
-        if (request.ItemsToRemove is { Count: > 0 })
-        {
-            try
-            {
-                var td = _titleDataService.Find(new List<string> { "InventoryInsurance" });
-                if (td.TryGetValue("InventoryInsurance", out var rawPolicies) && !string.IsNullOrEmpty(rawPolicies))
-                {
-                    var policies = JsonSerializer.Deserialize<Dictionary<string, InventoryInsurancePolicy>>(rawPolicies);
-                    foreach (var item in inventory)
-                    {
-                        if (!request.ItemsToRemove.Contains(item.ItemId)) continue;
-                        if (string.IsNullOrEmpty(item.Insurance) || item.InsuranceOwnerPlayfabId != userId) continue;
-                        if (policies == null || !policies.TryGetValue(item.Insurance, out var policy) || policy.Payout <= 0) continue;
-                        recoveredInsured.Add(item.ItemId);
-                        item.Insurance = "";              // consumed for this raid
-                        item.InsuranceOwnerPlayfabId = "";
-                    }
-                    if (recoveredInsured.Count > 0)
-                    {
-                        _logger.LogInformation("Recovered {Count} insured item(s) for user {User}", recoveredInsured.Count, userId);
-                    }
-                }
-            }
-            catch (Exception e)
-            {
-                // Never fail the inventory commit because of insurance handling.
-                _logger.LogWarning(e, "Failed to process insurance payout");
-            }
-        }
-
         // TODO: Optimize
         // TODO: Check deleted items to see if other stacks/mods were updated correctly
         // Process inventory update. The player may:
@@ -113,8 +74,7 @@ public class CompleteInventoryUpdateFunction : ICloudScriptFunction<CompleteInve
         // IMPORTANT: The same request is currently used to report the updated inventory in the end of match.
         var newInventory = new List<FYCustomItemInfo>(inventory.Count);
         foreach (var item in inventory) {
-            // Keep items that weren't removed, plus insured items recovered above.
+            if (!request.ItemsToRemove.Contains(item.ItemId)) {
-            if (!request.ItemsToRemove.Contains(item.ItemId) || recoveredInsured.Contains(item.ItemId)) {
                 newInventory.Add(item);
             }
         }

src/Prospect.Server.Api/Services/CloudScript/Functions/EnterMatchmakingMatch.cs

@@ -61,14 +61,6 @@ public class EnterMatchmakingMatchFunction : ICloudScriptFunction<FYEnterMatchAz
             }
             for (var i = 0; i < contract.Objectives.Length; i++) {
                 var objective = contract.Objectives[i];
-                // Kill objectives: the client-hosted raid has no dedicated game server
-                // to report per-kill progress to the backend, so kills would never be
-                // saved. Auto-credit them on deploy so the objective can be completed
-                // (mirrors the player-kill auto-credit done in ActivateContract).
-                if (objective.Type == EYContractObjectiveType.Kills) {
-                    contractActive.Progress[i] = objective.MaxProgress;
-                    continue;
-                }
                 if (objective.Type != EYContractObjectiveType.OwnNumOfItem) {
                     continue;
                 }

src/Prospect.Server.Api/Services/CloudScript/Functions/EnterMatchmakingStation.cs

@@ -1,107 +1,18 @@
-using System.Text.Json;
+using Prospect.Server.Api.Services.CloudScript.Models;
-using Prospect.Server.Api.Models.Data;
-using Prospect.Server.Api.Services.Auth.Extensions;
-using Prospect.Server.Api.Services.CloudScript.Models;
-using Prospect.Server.Api.Services.CloudScript.Models.Data;
-using Prospect.Server.Api.Services.UserData;
 
 namespace Prospect.Server.Api.Services.CloudScript.Functions;
 
-// Config d'une police d'assurance (TitleData "InventoryInsurance").
-public class InventoryInsurancePolicy
-{
-    public string InsuranceId { get; set; }
-    public double Cost { get; set; }
-    public double Payout { get; set; }
-}
-
 [CloudScriptFunction("EnterMatchmakingStation")]
 public class EnterMatchmakingStationFunction : ICloudScriptFunction<FYEnterMatchAzureFunction, FYEnterMatchmakingResult>
 {
-    private readonly IHttpContextAccessor _httpContextAccessor;
+    public Task<FYEnterMatchmakingResult> ExecuteAsync(FYEnterMatchAzureFunction request)
-    private readonly UserDataService _userDataService;
-    private readonly TitleDataService _titleDataService;
-    private readonly ILogger<EnterMatchmakingStationFunction> _logger;
-
-    public EnterMatchmakingStationFunction(
-        IHttpContextAccessor httpContextAccessor,
-        UserDataService userDataService,
-        TitleDataService titleDataService,
-        ILogger<EnterMatchmakingStationFunction> logger)
     {
-        _httpContextAccessor = httpContextAccessor;
+        return Task.FromResult(new FYEnterMatchmakingResult
-        _userDataService = userDataService;
-        _titleDataService = titleDataService;
-        _logger = logger;
-    }
-
-    public async Task<FYEnterMatchmakingResult> ExecuteAsync(FYEnterMatchAzureFunction request)
-    {
-        // Au déploiement, le client peut demander d'assurer une partie de l'inventaire.
-        var insurance = request.PurchaseInventoryInsurances;
-        var context = _httpContextAccessor.HttpContext;
-        if (context != null && insurance?.ItemIds is { Count: > 0 })
-        {
-            try
-            {
-                await ApplyInsuranceAsync(context.User.FindAuthUserId(), insurance);
-            }
-            catch (Exception e)
-            {
-                // Ne jamais bloquer le déploiement à cause de l'assurance.
-                _logger.LogWarning(e, "Failed to apply inventory insurance on deploy");
-            }
-        }
-
-        return new FYEnterMatchmakingResult
         {
             Success = true,
             ErrorMessage = "",
             SingleplayerStation = true, // NOTE: This will always travel to single player station
             IsMatchTravel = false,
-        };
-    }
-
-    // Marque les items choisis comme assurés (Insurance + propriétaire) et débite la
-    // prime en InsuranceCurrency selon le coût de la police (TitleData InventoryInsurance).
-    private async Task ApplyInsuranceAsync(string userId, FYPurchaseInventoryInsuranceRequest req)
-    {
-        var titleData = _titleDataService.Find(new List<string> { "InventoryInsurance" });
-        var policies = JsonSerializer.Deserialize<Dictionary<string, InventoryInsurancePolicy>>(titleData["InventoryInsurance"]);
-        var insuranceId = string.IsNullOrEmpty(req.InsuranceId) ? "Default" : req.InsuranceId;
-        if (policies == null || !policies.TryGetValue(insuranceId, out var policy))
-        {
-            _logger.LogWarning("Unknown insurance policy {InsuranceId}", insuranceId);
-            return;
-        }
-
-        var userData = await _userDataService.FindAsync(userId, userId, new List<string> { "Inventory", "Balance" });
-        var inventory = JsonSerializer.Deserialize<List<FYCustomItemInfo>>(userData["Inventory"].Value);
-        var balance = JsonSerializer.Deserialize<PlayerBalance>(userData["Balance"].Value);
-
-        var toInsure = new HashSet<string>(req.ItemIds);
-        var insuredCount = 0;
-        foreach (var item in inventory)
-        {
-            if (!toInsure.Contains(item.ItemId)) continue;
-            item.Insurance = insuranceId;
-            item.InsuranceOwnerPlayfabId = userId;
-            insuredCount++;
-        }
-        if (insuredCount == 0) return;
-
-        // Prime = coût de la police × nombre d'items assurés (arrondi au supérieur),
-        // plafonnée au solde disponible pour ne jamais passer en négatif.
-        var premium = (int)Math.Ceiling(policy.Cost * insuredCount);
-        premium = Math.Min(premium, balance.InsuranceCurrency);
-        balance.InsuranceCurrency -= premium;
-
-        await _userDataService.UpdateAsync(userId, userId, new Dictionary<string, string>
-        {
-            ["Inventory"] = JsonSerializer.Serialize(inventory),
-            ["Balance"] = JsonSerializer.Serialize(balance),
         });
-        _logger.LogInformation("Insured {Count} item(s) under policy {Policy} for user {User} (premium {Premium})",
-            insuredCount, insuranceId, userId, premium);
     }
-}
+}

src/Prospect.Server.Api/Services/CloudScript/Functions/GetSignalRConnection.cs

@@ -7,9 +7,9 @@ namespace Prospect.Server.Api.Services.CloudScript.Functions;
 [CloudScriptFunction("GetSignalRConnection")]
 public class GetSignalRConnection : ICloudScriptFunction<FYGetSignalRConnection, FYGetSignalRConnectionResult>
 {
-    private readonly PlayFabSettings _settings;
+    private readonly SignalRSettings _settings;
 
-    public GetSignalRConnection(IOptions<PlayFabSettings> settings)
+    public GetSignalRConnection(IOptions<SignalRSettings> settings)
     {
         _settings = settings.Value;
     }

src/Prospect.Server.Api/Services/CloudScript/Functions/PurchaseWeaponShopItem.cs

@@ -3,7 +3,6 @@ using System.Text.Json.Serialization;
 using Prospect.Server.Api.Models.Data;
 using Prospect.Server.Api.Services.Auth.Extensions;
 using Prospect.Server.Api.Services.CloudScript;
-using Prospect.Server.Api.Services.CloudScript.Functions;
 using Prospect.Server.Api.Services.UserData;
 
 public class PurchaseWeaponShopItemRequest
@@ -138,7 +137,7 @@ public class PurchaseWeaponShopItemFunction : ICloudScriptFunction<PurchaseWeapo
                 Error = "Invalid purchase amount",
             };
         }
-        var userData = await _userDataService.FindAsync(userId, userId, new List<string>{"Inventory", "Balance", "ContractsOneTimeCompleted"});
+        var userData = await _userDataService.FindAsync(userId, userId, new List<string>{"Inventory", "Balance"});
         var inventory = JsonSerializer.Deserialize<List<FYCustomItemInfo>>(userData["Inventory"].Value);
         var balance = JsonSerializer.Deserialize<PlayerBalance>(userData["Balance"].Value);
         var blueprintsData = _titleDataService.Find(new List<string>{"Blueprints"});
@@ -154,21 +153,7 @@ public class PurchaseWeaponShopItemFunction : ICloudScriptFunction<PurchaseWeapo
 
         var blueprintData = blueprints[request.BaseItemID];
 
-        // Contract unlock criteria: some items can only be purchased after completing a
+        // TODO: Contract unlock criteria
-        // specific contract. Only gate when the item explicitly declares such a lock, so
-        // items with no lock keep working as before.
-        if (!string.IsNullOrEmpty(blueprintData.UnlockData?.ContractLockPurchase))
-        {
-            var completed = JsonSerializer.Deserialize<FYGetCompletedContractsResult>(userData["ContractsOneTimeCompleted"].Value);
-            if (completed?.ContractsIDs == null || !completed.ContractsIDs.Contains(blueprintData.UnlockData.ContractLockPurchase))
-            {
-                return new PurchaseWeaponShopItemResponse
-                {
-                    UserID = userId,
-                    Error = "Item is locked: complete the required contract first",
-                };
-            }
-        }
 
         // Validate price
         var shopCraftingData = blueprintData.ItemShopsCraftingData[request.ShopItemBelongsTo];

src/Prospect.Server.Api/Services/CloudScript/Functions/RequestActiveObjectivesAndBoardsData.cs

@@ -16,7 +16,7 @@ public class RequestActiveObjectivesAndBoardsData : ICloudScriptFunction<FYQuery
     private readonly UserDataService _userDataService;
     private readonly TitleDataService _titleDataService;
     private readonly string[] factions = ["Korolev", "Osiris", "ICA"]; // TODO: Order is important
-    private readonly string[] difficulties = ["Easy", "Medium", "Hard"];
+    private readonly EYContractDifficulty[] difficulties = [EYContractDifficulty.Easy, EYContractDifficulty.Medium, EYContractDifficulty.Hard];
     private readonly Random rnd = new Random();
 
     public RequestActiveObjectivesAndBoardsData(IHttpContextAccessor httpContextAccessor, UserDataService userDataService, TitleDataService titleDataService)
@@ -47,22 +47,20 @@ public class RequestActiveObjectivesAndBoardsData : ICloudScriptFunction<FYQuery
             var titleData = _titleDataService.Find(new List<string> { "Contracts", "Jobs", "LevelData" });
 
             var contracts = JsonSerializer.Deserialize<Dictionary<string, TitleDataContractInfo>>(titleData["Contracts"]);
-            var jobs = JsonSerializer.Deserialize<Dictionary<string, Dictionary<string, string[]>>>(titleData["Jobs"]);
+            var jobs = JsonSerializer.Deserialize<Dictionary<string, Dictionary<EYContractDifficulty, string[]>>>(titleData["Jobs"]);
             var levelsData = JsonSerializer.Deserialize<Dictionary<string, int[]>>(titleData["LevelData"]);
-            var currentQuests = new Dictionary<string, Dictionary<string, bool>> { 
+            var currentQuests = new Dictionary<string, Dictionary<EYContractDifficulty, bool>> {
-                ["Korolev"] = new Dictionary<string, bool> { ["Easy"] = false, ["Medium"] = false, ["Hard"] = false },
+                ["Korolev"] = new Dictionary<EYContractDifficulty, bool> { [EYContractDifficulty.Easy] = false, [EYContractDifficulty.Medium] = false, [EYContractDifficulty.Hard] = false },
-                ["Osiris"] = new Dictionary<string, bool> { ["Easy"] = false, ["Medium"] = false, ["Hard"] = false },
+                ["Osiris"] = new Dictionary<EYContractDifficulty, bool> { [EYContractDifficulty.Easy] = false, [EYContractDifficulty.Medium] = false, [EYContractDifficulty.Hard] = false },
-                ["ICA"] = new Dictionary<string, bool> { ["Easy"] = false, ["Medium"] = false, ["Hard"] = false },
+                ["ICA"] = new Dictionary<EYContractDifficulty, bool> { [EYContractDifficulty.Easy] = false, [EYContractDifficulty.Medium] = false, [EYContractDifficulty.Hard] = false },
             };
 
             foreach (var contract in contractsActive.Contracts) {
-                var parts = contract.ContractID.Split('-');
+                var contractData = contracts[contract.ContractID];
-                if (parts[0] != "NEW") {
+                if (contractData.IsMainContract) {
                     continue;
                 }
-                var difficulty = parts[1];
+                currentQuests[contractData.Faction][contractData.Difficulty] = true;
-                var faction = parts[2] == "KOR" ? "Korolev" : parts[2];
-                currentQuests[faction][difficulty] = true;
             }
 
             for (var i = 0; i < factions.Length; i++) {

src/Prospect.Server.Api/Services/CloudScript/Functions/RequestClaimFortunaPassRewards.cs

@@ -1,6 +1,5 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
-using Prospect.Server.Api.Models.Data;
 using Prospect.Server.Api.Services.Auth.Extensions;
 using Prospect.Server.Api.Services.CloudScript;
 using Prospect.Server.Api.Services.UserData;
@@ -10,15 +9,6 @@ public class FYFortunaPassClaimedRewards {
 	public List<string> RewardsIDs { get; set; }
 };
 
-// Récompense d'un palier de la passe (catalogue optionnel TitleData "FortunaPass2_Rewards").
-// itemId "SoftCurrency"/"Aurum"/"InsuranceCurrency" = monnaie, sinon item d'inventaire.
-public class FortunaPassRewardDef {
-    [JsonPropertyName("itemId")]
-    public string ItemId { get; set; }
-    [JsonPropertyName("amount")]
-    public int Amount { get; set; }
-}
-
 public class RequestClaimFortunaPassRewardsRequest
 {
     [JsonPropertyName("rewardsIds")]
@@ -44,15 +34,11 @@ public class RequestClaimFortunaPassRewardsFunction : ICloudScriptFunction<Reque
 {
     private readonly IHttpContextAccessor _httpContextAccessor;
     private readonly UserDataService _userDataService;
-    private readonly TitleDataService _titleDataService;
-    private readonly ILogger<RequestClaimFortunaPassRewardsFunction> _logger;
 
-    public RequestClaimFortunaPassRewardsFunction(IHttpContextAccessor httpContextAccessor, UserDataService userDataService, TitleDataService titleDataService, ILogger<RequestClaimFortunaPassRewardsFunction> logger)
+    public RequestClaimFortunaPassRewardsFunction(IHttpContextAccessor httpContextAccessor, UserDataService userDataService)
     {
         _httpContextAccessor = httpContextAccessor;
         _userDataService = userDataService;
-        _titleDataService = titleDataService;
-        _logger = logger;
     }
 
     public async Task<RequestClaimFortunaPassRewardsResponse> ExecuteAsync(RequestClaimFortunaPassRewardsRequest request)
@@ -63,103 +49,28 @@ public class RequestClaimFortunaPassRewardsFunction : ICloudScriptFunction<Reque
             throw new CloudScriptException("CloudScript was not called within a http request");
         }
         var userId = context.User.FindAuthUserId();
-
+        var userData = await _userDataService.FindAsync(userId, userId, new List<string>{"FortunaPass2_ClaimedRewards"});
-        // Clé de la saison courante (déterminée par la config de build) — évite d'écraser
+        var claimedRewards = JsonSerializer.Deserialize<FYFortunaPassClaimedRewards>(userData["FortunaPass2_ClaimedRewards"].Value);
-        // la progression de l'autre saison (l'ancien code écrasait S2 ET S3).
+        foreach (var rewardId in request.RewardsIDs) {
-#if SEASON_3_RELEASE || SEASON_3_DEBUG
-        const string claimedKey = "FortunaPass3_ClaimedRewards";
-        const string rewardsCatalogKey = "FortunaPass3_Rewards";
-#else
-        const string claimedKey = "FortunaPass2_ClaimedRewards";
-        const string rewardsCatalogKey = "FortunaPass2_Rewards";
-#endif
-
-        var userData = await _userDataService.FindAsync(userId, userId, new List<string>{ claimedKey, "Inventory", "Balance" });
-        var claimedRewards = JsonSerializer.Deserialize<FYFortunaPassClaimedRewards>(userData[claimedKey].Value)
-            ?? new FYFortunaPassClaimedRewards { RewardsIDs = new List<string>() };
-        claimedRewards.RewardsIDs ??= new List<string>();
-
-        // Catalogue des récompenses (optionnel) : rewardId -> {itemId, amount}.
-        Dictionary<string, FortunaPassRewardDef> catalog = null;
-        try
-        {
-            var td = _titleDataService.Find(new List<string> { rewardsCatalogKey });
-            if (td.TryGetValue(rewardsCatalogKey, out var raw) && !string.IsNullOrWhiteSpace(raw))
-                catalog = JsonSerializer.Deserialize<Dictionary<string, FortunaPassRewardDef>>(raw);
-        }
-        catch { /* pas de catalogue → on enregistre seulement la réclamation */ }
-
-        var inventory = JsonSerializer.Deserialize<List<FYCustomItemInfo>>(userData["Inventory"].Value) ?? new List<FYCustomItemInfo>();
-        var balance = JsonSerializer.Deserialize<PlayerBalance>(userData["Balance"].Value);
-        var grantedItems = new List<FYCustomItemInfo>();
-        var changedCurrencies = new List<FYCurrencyItem>();
-
-        foreach (var rewardId in request.RewardsIDs)
-        {
-            // Ne pas re-créditer un palier déjà réclamé.
-            if (claimedRewards.RewardsIDs.Contains(rewardId)) continue;
-
-            if (catalog == null || !catalog.TryGetValue(rewardId, out var def) || def == null)
-            {
-                // Le catalogue des paliers est défini côté client (DataTable). On journalise
-                // les IDs inconnus pour pouvoir construire un vrai catalogue FortunaPass{2,3}_Rewards
-                // qui matche. IMPORTANT : ne PAS marquer le palier comme réclamé si on ne peut rien
-                // accorder — sinon il serait brûlé définitivement et inclaimable une fois le
-                // catalogue ajouté.
-                _logger.LogInformation("FortunaPass claim: aucun catalogue pour le reward '{RewardId}' (catalogue {State}) — non accordé", rewardId, catalog == null ? "absent" : "présent");
-                continue;
-            }
-
             claimedRewards.RewardsIDs.Add(rewardId);
-            _logger.LogInformation("FortunaPass claim: octroi reward '{RewardId}' -> {ItemId} x{Amount}", rewardId, def.ItemId, def.Amount);
-
-            switch (def.ItemId)
-            {
-                case "SoftCurrency":
-                    balance.SoftCurrency += def.Amount;
-                    changedCurrencies.Add(new FYCurrencyItem { CurrencyName = "SoftCurrency", Amount = balance.SoftCurrency });
-                    break;
-                case "Aurum":
-                    balance.HardCurrency += def.Amount;
-                    changedCurrencies.Add(new FYCurrencyItem { CurrencyName = "Aurum", Amount = balance.HardCurrency });
-                    break;
-                case "InsuranceCurrency":
-                    balance.InsuranceCurrency += def.Amount;
-                    changedCurrencies.Add(new FYCurrencyItem { CurrencyName = "InsuranceCurrency", Amount = balance.InsuranceCurrency });
-                    break;
-                default:
-                    var item = new FYCustomItemInfo {
-                        ItemId = Guid.NewGuid().ToString(),
-                        Amount = def.Amount <= 0 ? 1 : def.Amount,
-                        BaseItemId = def.ItemId,
-                        Durability = 0,
-                        Insurance = "",
-                        InsuranceOwnerPlayfabId = "",
-                        ModData = new FYModItems { M = [] },
-                        Origin = new FYItemOriginBackend { G = "", P = "", T = "" },
-                        InsuredAttachmentId = "",
-                        PrimaryVanityId = 0,
-                        SecondaryVanityId = 0,
-                        RolledPerks = [],
-                    };
-                    inventory.Add(item);
-                    grantedItems.Add(item);
-                    break;
-            }
         }
 
-        var changes = new Dictionary<string, string> { [claimedKey] = JsonSerializer.Serialize(claimedRewards) };
+        var output = JsonSerializer.Serialize(claimedRewards);
-        if (grantedItems.Count > 0) changes["Inventory"] = JsonSerializer.Serialize(inventory);
+        await _userDataService.UpdateAsync(
-        if (changedCurrencies.Count > 0) changes["Balance"] = JsonSerializer.Serialize(balance);
+            userId, userId,
-        await _userDataService.UpdateAsync(userId, userId, changes);
+            new Dictionary<string, string>{
+                ["FortunaPass2_ClaimedRewards"] = output,
+                ["FortunaPass3_ClaimedRewards"] = output, // TODO: Separate logic for S2 and S3
+            }
+        );
 
         return new RequestClaimFortunaPassRewardsResponse
         {
             UserId = userId,
             ErrorType = 3, // EYFortunaPassToastReponseType::Ok
             Error = "",
-            GrantedItems = grantedItems.ToArray(),
+            GrantedItems = [],
-            ChangedCurrencies = changedCurrencies.ToArray(),
+            ChangedCurrencies = [],
         };
     }
 }

src/Prospect.Server.Api/Services/CloudScript/Functions/RequestFactionProgression.cs

@@ -1,7 +1,5 @@
-using System.Text.Json;
+using Prospect.Server.Api.Services.Auth.Extensions;
-using Prospect.Server.Api.Services.Auth.Extensions;
 using Prospect.Server.Api.Services.CloudScript.Models;
-using Prospect.Server.Api.Services.UserData;
 
 namespace Prospect.Server.Api.Services.CloudScript.Functions;
 
@@ -9,43 +7,42 @@ namespace Prospect.Server.Api.Services.CloudScript.Functions;
 public class RequestFactionProgression : ICloudScriptFunction<FYQueryFactionProgressionRequest, object?>
 {
     private readonly IHttpContextAccessor _httpContextAccessor;
-    private readonly UserDataService _userDataService;
 
-    public RequestFactionProgression(IHttpContextAccessor httpContextAccessor, UserDataService userDataService)
+    public RequestFactionProgression(IHttpContextAccessor httpContextAccessor)
     {
         _httpContextAccessor = httpContextAccessor;
-        _userDataService = userDataService;
     }
-
+    
-    public async Task<object?> ExecuteAsync(FYQueryFactionProgressionRequest request)
+    public Task<object?> ExecuteAsync(FYQueryFactionProgressionRequest request)
     {
         var context = _httpContextAccessor.HttpContext;
         if (context == null)
         {
-            return null;
+            return Task.FromResult<object?>(null);
         }
-        var userId = context.User.FindAuthUserId();
+        
-
+        return Task.FromResult<object?>(new
-        var userData = await _userDataService.FindAsync(
-            userId, userId,
-            new List<string> { "FactionProgressionICA", "FactionProgressionKorolev", "FactionProgressionOsiris" }
-        );
-
-        int Progression(string faction) =>
-            userData.TryGetValue("FactionProgression" + faction, out var v) && v.Value != null
-                ? JsonSerializer.Deserialize<int>(v.Value)
-                : 0;
-
-        return new
         {
-            factions = new[]
+            factions = new []
             {
-                new { factionId = "ICA", currentProgression = Progression("ICA") },
+                new
-                new { factionId = "Korolev", currentProgression = Progression("Korolev") },
+                {
-                new { factionId = "Osiris", currentProgression = Progression("Osiris") },
+                    factionId = "ICA",
+                    currentProgression = 0
+                },
+                new
+                {
+                    factionId = "Korolev",
+                    currentProgression = 0
+                },
+                new
+                {
+                    factionId = "Osiris",
+                    currentProgression = 0
+                },
             },
-            userId,
+            userId = context.User.FindAuthUserId(),
             error = ""
-        };
+        });
     }
-}
+}

src/Prospect.Server.Api/Services/CloudScript/Functions/RequestPlayerContracts.cs

@@ -1,119 +1,100 @@
-using System.Text.Json;
+using Prospect.Server.Api.Services.Auth.Extensions;
-using Prospect.Server.Api.Models.Data;
-using Prospect.Server.Api.Services.Auth.Extensions;
 using Prospect.Server.Api.Services.CloudScript.Models;
 using Prospect.Server.Api.Services.CloudScript.Models.Data;
-using Prospect.Server.Api.Services.UserData;
 
 namespace Prospect.Server.Api.Services.CloudScript.Functions;
 
 [CloudScriptFunction("RequestPlayerContracts")]
 public class RequestPlayerContracts : ICloudScriptFunction<FYGetPlayerContractsRequest, FYGetPlayerContractsResult>
 {
-    // Board slots are ordered Easy / Medium / Hard (same convention as ClaimActiveContract).
-    private static readonly string[] Difficulties = ["Easy", "Medium", "Hard"];
-    private const int RefreshHours = 12;
-
     private readonly IHttpContextAccessor _httpContextAccessor;
-    private readonly UserDataService _userDataService;
-    private readonly TitleDataService _titleDataService;
-    private readonly Random _rnd = new();
 
-    public RequestPlayerContracts(IHttpContextAccessor httpContextAccessor, UserDataService userDataService, TitleDataService titleDataService)
+    public RequestPlayerContracts(IHttpContextAccessor httpContextAccessor)
     {
         _httpContextAccessor = httpContextAccessor;
-        _userDataService = userDataService;
-        _titleDataService = titleDataService;
     }
 
-    public async Task<FYGetPlayerContractsResult> ExecuteAsync(FYGetPlayerContractsRequest request)
+    public Task<FYGetPlayerContractsResult> ExecuteAsync(FYGetPlayerContractsRequest request)
     {
         var context = _httpContextAccessor.HttpContext;
         if (context == null)
         {
             throw new CloudScriptException("CloudScript was not called within a http request");
         }
-        var userId = context.User.FindAuthUserId();
 
-        var userData = await _userDataService.FindAsync(
+        return Task.FromResult(new FYGetPlayerContractsResult
-            userId, userId,
-            new List<string>
-            {
-                "ContractsActive", "JobBoardsData",
-                "FactionProgressionKorolev", "FactionProgressionICA", "FactionProgressionOsiris",
-            }
-        );
-
-        var contractsActive = JsonSerializer.Deserialize<FYGetActiveContractsResult>(userData["ContractsActive"].Value)!;
-        var jobBoardsData = JsonSerializer.Deserialize<JobBoardsData>(userData["JobBoardsData"].Value)!;
-
-        var titleData = _titleDataService.Find(new List<string> { "Contracts", "Jobs", "LevelData" });
-        var contracts = JsonSerializer.Deserialize<Dictionary<string, TitleDataContractInfo>>(titleData["Contracts"])!;
-        var jobs = JsonSerializer.Deserialize<Dictionary<string, Dictionary<string, string[]>>>(titleData["Jobs"])!;
-        var levelsData = JsonSerializer.Deserialize<Dictionary<string, int[]>>(titleData["LevelData"])!;
-
-        var now = (int)DateTimeOffset.UtcNow.ToUnixTimeSeconds();
-        var lastRefresh = jobBoardsData.LastBoardRefreshTimeUtc?.Seconds ?? 0;
-
-        // Initial fill only: populate boards that were seeded empty / never refreshed.
-        // The periodic rotation is owned by RequestActiveObjectivesAndBoardsData, so we
-        // don't refresh on a timer here to avoid two competing refresh policies.
-        var boardsEmpty = jobBoardsData.Boards == null
-            || jobBoardsData.Boards.Any(b => b.Contracts == null
-                || b.Contracts.Any(c => string.IsNullOrEmpty(c.ContractId)));
-
-        if (jobBoardsData.Boards != null && (lastRefresh == 0 || boardsEmpty))
         {
-            foreach (var board in jobBoardsData.Boards)
+            UserId = context.User.FindAuthUserId(),
-            {
-                if (board.Contracts == null || !jobs.TryGetValue(board.FactionId, out var factionJobs))
-                {
-                    continue;
-                }
-
-                var factionKey = "FactionProgression" + board.FactionId;
-                var factionProgression = userData.TryGetValue(factionKey, out var fp)
-                    ? JsonSerializer.Deserialize<int>(fp.Value)
-                    : 0;
-
-                var level = levelsData.TryGetValue(board.FactionId, out var levels)
-                    ? levels.Length - Array.FindIndex(levels, xp => factionProgression >= xp)
-                    : 0;
-
-                for (var idx = 0; idx < board.Contracts.Count && idx < Difficulties.Length; idx++)
-                {
-                    if (!factionJobs.TryGetValue(Difficulties[idx], out var difficultyJobs))
-                    {
-                        continue;
-                    }
-                    var available = Array.FindAll(difficultyJobs,
-                        jobId => contracts.TryGetValue(jobId, out var c) && level >= c.UnlockData.Level);
-                    if (available.Length > 0)
-                    {
-                        board.Contracts[idx].ContractId = available[_rnd.Next(available.Length)];
-                    }
-                }
-            }
-
-            jobBoardsData.LastBoardRefreshTimeUtc = new FYTimestamp { Seconds = now };
-
-            await _userDataService.UpdateAsync(
-                userId, userId,
-                new Dictionary<string, string> { ["JobBoardsData"] = JsonSerializer.Serialize(jobBoardsData) }
-            );
-        }
-
-        return new FYGetPlayerContractsResult
-        {
-            UserId = userId,
             Error = null,
-            ActiveContracts = contractsActive.Contracts,
+            ActiveContracts = new List<FYActiveContractPlayerData>(),
             FactionsContracts = new FYFactionsContractsData
             {
-                Boards = jobBoardsData.Boards,
+                Boards = new List<FYFactionContractsData>
-                LastBoardRefreshTimeUtc = jobBoardsData.LastBoardRefreshTimeUtc ?? new FYTimestamp { Seconds = now },
+                {
+                    new FYFactionContractsData
+                    {
+                        FactionId = "ICA",
+                        Contracts = new List<FYFactionContractData>
+                        {
+                            new FYFactionContractData
+                            {
+                                ContractId = "NEW-Easy-ICA-Gather-1",
+                            },
+                            new FYFactionContractData
+                            {
+                                ContractId = "NEW-Medium-ICA-Uplink-1",
+                            },
+                            new FYFactionContractData
+                            {
+                                ContractId = "NEW-Hard-ICA-Uplink-1",
+                            }
+                        }
+                    },
+                    new FYFactionContractsData
+                    {
+                        FactionId = "Korolev",
+                        Contracts = new List<FYFactionContractData>
+                        {
+                            new FYFactionContractData
+                            {
+                                ContractId = "NEW-Easy-KOR-Mine-4",
+                            },
+                            new FYFactionContractData
+                            {
+                                ContractId = "NEW-Medium-KOR-Mine-1",
+                            },
+                            new FYFactionContractData
+                            {
+                                ContractId = "NEW-Hard-KOR-PvP-6",
+                            }
+                        }
+                    },
+                    new FYFactionContractsData
+                    {
+                        FactionId = "Osiris",
+                        Contracts = new List<FYFactionContractData>
+                        {
+                            new FYFactionContractData
+                            {
+                                ContractId = "NEW-Easy-Osiris-Brightcaps-1",
+                            },
+                            new FYFactionContractData
+                            {
+                                ContractId = "NEW-Medium-Osiris-Gather-1",
+                            },
+                            new FYFactionContractData
+                            {
+                                ContractId = "NEW-Hard-Osiris-Gather-7",
+                            }
+                        }
+                    }
+                },
+                LastBoardRefreshTimeUtc = new FYTimestamp
+                {
+                    Seconds = (int)DateTimeOffset.UtcNow.ToUnixTimeSeconds()
+                }
             },
-            RefreshHours24UtcFromBackend = RefreshHours,
+            RefreshHours24UtcFromBackend = 12
-        };
+        });
     }
-}
+}

src/Prospect.Server.Api/Services/CloudScript/Functions/RequestStoreRotationData.cs

@@ -35,11 +35,6 @@ public class RequestStoreRotationDataFunction : ICloudScriptFunction<RequestStor
         _httpContextAccessor = httpContextAccessor;
     }
 
-    // Nombre de variantes de rotation (les storeId "DailyShop_N" / "WeeklyShop_N"
-    // permettent au client de distinguer chaque rotation et de rafraîchir son cache).
-    private const int DailyVariants = 8;
-    private const int WeeklyVariants = 4;
-
     public async Task<RequestStoreRotationDataResponse> ExecuteAsync(RequestStoreRotationDataRequest request)
     {
         var context = _httpContextAccessor.HttpContext;
@@ -48,33 +43,18 @@ public class RequestStoreRotationDataFunction : ICloudScriptFunction<RequestStor
             throw new CloudScriptException("CloudScript was not called within a http request");
         }
 
-        var now = DateTime.UtcNow;
+        // TODO: Get and save store rotation data
-
-        // Rotation quotidienne : expire au prochain minuit UTC ; l'index de rotation
-        // est le nombre de jours écoulés depuis l'epoch (déterministe, stable).
-        var todayUtc = now.Date;
-        var dailyExpiration = todayUtc.AddDays(1);
-        var dayIndex = (int)(todayUtc - DateTime.UnixEpoch.Date).TotalDays;
-        var dailyStoreId = $"DailyShop_{dayIndex % DailyVariants}";
-
-        // Rotation hebdomadaire : expire au prochain lundi 00:00 UTC.
-        // DayOfWeek : dimanche=0 ; on ramène lundi=0.
-        var daysSinceMonday = ((int)todayUtc.DayOfWeek + 6) % 7;
-        var weekStart = todayUtc.AddDays(-daysSinceMonday);
-        var weeklyExpiration = weekStart.AddDays(7);
-        var weekIndex = (int)Math.Floor((weekStart - DateTime.UnixEpoch.Date).TotalDays / 7);
-        var weeklyStoreId = $"WeeklyShop_{weekIndex % WeeklyVariants}";
 
         return new RequestStoreRotationDataResponse
         {
             Error = "",
             DailyStoreData = new StoreRotationData {
-                StoreID = dailyStoreId,
+                StoreID = "DailyShop",
-                ExpirationData = dailyExpiration
+                ExpirationData = DateTime.UtcNow.AddDays(1)
             },
             WeeklyStoreData = new StoreRotationData {
-                StoreID = weeklyStoreId,
+                StoreID = "WeeklyShop",
-                ExpirationData = weeklyExpiration
+                ExpirationData = DateTime.UtcNow.AddDays(1)
             }
         };
     }

src/Prospect.Server.Api/Services/CloudScript/Functions/StartTechTreeNodeUpgradeClient.cs

@@ -54,7 +54,7 @@ public class StartTechTreeNodeUpgradeClient : ICloudScriptFunction<FYStartTechTr
 
         var userData = await _userDataService.FindAsync(
             userId, userId,
-            new List<string>{"TechTreeNodeData", "Balance", "Inventory", "PlayerQuartersLevel"}
+            new List<string>{"TechTreeNodeData", "Balance", "Inventory"}
         );
 
         var userTechTree = JsonSerializer.Deserialize<UserTechTreeNodeData>(userData["TechTreeNodeData"].Value);
@@ -79,15 +79,7 @@ public class StartTechTreeNodeUpgradeClient : ICloudScriptFunction<FYStartTechTr
         var techTreeNodeData = techTreeNodes[request.NodeID];
         var nextTreeNodeLevel = techTreeNodeData.PerkLevels[currentLevel]; // Tech tree node levels start from 0
 
-        // Dependency check: the player's quarters must be high enough to unlock this node.
+        // TODO: Dependency check
-        var playerQuarters = JsonSerializer.Deserialize<FYPlayerQuarterStatus>(userData["PlayerQuartersLevel"].Value);
-        if (playerQuarters != null && playerQuarters.Level < techTreeNodeData.PlayerQuarterLevelRequired) {
-            return new FYStartTechTreeNodeUpgradeClientResult
-            {
-                UserID = userId,
-                Error = $"Requires player quarters level {techTreeNodeData.PlayerQuarterLevelRequired}",
-            };
-        }
 
         // Validate price
         // TODO: Refactor

src/Prospect.Server.Api/Services/CloudScript/Functions/UpdateRetentionBonus.cs

@@ -43,9 +43,9 @@ public class UpdateRetentionBonus : ICloudScriptFunction<FYRetentionBonusRequest
             };
         }
 
-        var now = (int)DateTimeOffset.UtcNow.ToUnixTimeSeconds();
+        var currentMidnight = (int)new DateTimeOffset(DateTime.UtcNow.Date, TimeSpan.Zero).ToUnixTimeSeconds();
-        var nextClaimTime = retentionBonus.LastClaimTime.Seconds + 60 * 60 * 24 * 2;
+        var nextClaimTime = retentionBonus.LastClaimTime.Seconds + 60 * 60 * 24;
-        if (now < nextClaimTime) {
+        if (currentMidnight < nextClaimTime) {
             return new FYRetentionBonusResult
             {
                 UserId = userId,
@@ -58,7 +58,7 @@ public class UpdateRetentionBonus : ICloudScriptFunction<FYRetentionBonusRequest
         var bonusData = JsonSerializer.Deserialize<Dictionary<string, TitleDataRetentionBonusInfo>>(titleData["RetentionBonusData"]);
 
         retentionBonus.DaysClaimed++;
-        retentionBonus.LastClaimTime.Seconds = now;
+        retentionBonus.LastClaimTime.Seconds = currentMidnight;
         retentionBonus.ClaimedAll = retentionBonus.DaysClaimed >= 14;
 
         // TODO: Currently only CB2 bonuses are considered

src/Prospect.Server.Api/Services/CloudScript/Functions/VivoxJoin.cs

@@ -1,4 +1,6 @@
 using System.Text.Json.Serialization;
+using Microsoft.Extensions.Options;
+using Prospect.Server.Api.Config;
 using Prospect.Server.Api.Services.CloudScript.Models;
 
 namespace Prospect.Server.Api.Services.CloudScript.Functions;
@@ -27,6 +29,13 @@ public class FYVivoxJoinTokenRequest
 [CloudScriptFunction("VivoxJoin")]
 public class VivoxJoin : ICloudScriptFunction<FYVivoxJoinTokenRequest, object>
 {
+    private readonly VivoxConfig _settings;
+
+    public VivoxJoin(IOptions<VivoxConfig> settings)
+    {
+        _settings = settings.Value;
+    }
+
     private int ReturnChannelType(string type) {
         switch (type) {
             case "GLOBAL": return 2;
@@ -41,8 +50,7 @@ public class VivoxJoin : ICloudScriptFunction<FYVivoxJoinTokenRequest, object>
     public async Task<object> ExecuteAsync(FYVivoxJoinTokenRequest request)
     {
         var exp = (int)DateTimeOffset.UtcNow.AddDays(1).ToUnixTimeSeconds();
-        // TODO: Replace with app configuration
+        var token = TokenGenerator.vxGenerateToken(_settings.Key, _settings.Issuer, exp, "join", request.Username, request.Channel);
-        var token = TokenGenerator.vxGenerateToken("key", "issuer", exp, "join", request.Username, request.Channel);
 
         return new FYVivoxJoinData
         {

src/Prospect.Server.Api/Services/CloudScript/Functions/VivoxLogin.cs

@@ -1,4 +1,6 @@
-using Prospect.Server.Api.Services.CloudScript.Models;
+using Microsoft.Extensions.Options;
+using Prospect.Server.Api.Config;
+using Prospect.Server.Api.Services.CloudScript.Models;
 using System.Security.Cryptography;
 using System.Text.Json;
 
@@ -84,12 +86,18 @@ public class TokenGenerator
 [CloudScriptFunction("VivoxLogin")]
 public class VivoxLogin : ICloudScriptFunction<FYVivoxLoginTokenRequest, FYVivoxJoinData>
 {
+    private readonly VivoxConfig _settings;
+
+    public VivoxLogin(IOptions<VivoxConfig> settings)
+    {
+        _settings = settings.Value;
+    }
+
     public async Task<FYVivoxJoinData> ExecuteAsync(FYVivoxLoginTokenRequest request)
     {
-        // TODO: Replace with app configuration
+        var channel = $"sip:confctl-g-{_settings.Issuer}.testchannel@mtu1xp.vivox.com"; // e - echo channel, g - global, p - positional
-        var channel = "sip:confctl-g-<issuer>.testchannel@mtu1xp.vivox.com"; // e - echo channel, g - global, p - positional
         var exp = (int)DateTimeOffset.UtcNow.AddSeconds(90).ToUnixTimeSeconds();
-        var token = TokenGenerator.vxGenerateToken("key", "issuer", exp, "login", request.Username, channel);
+        var token = TokenGenerator.vxGenerateToken(_settings.Key, _settings.Issuer, exp, "login", request.Username, channel);
 
         return new FYVivoxJoinData
         {

src/Prospect.Server.Api/Services/CloudScript/Functions/VivoxSettings.cs

@@ -1,18 +1,26 @@
-using Prospect.Server.Api.Services.CloudScript.Models;
+using Microsoft.Extensions.Options;
+using Prospect.Server.Api.Config;
+using Prospect.Server.Api.Services.CloudScript.Models;
 
 namespace Prospect.Server.Api.Services.CloudScript.Functions;
 
 [CloudScriptFunction("VivoxSettings")]
 public class VivoxSettings : ICloudScriptFunction<FYEmptyRequest, FYVivoxSettingsData>
 {
+    private readonly VivoxConfig _settings;
+
+    public VivoxSettings(IOptions<VivoxConfig> settings)
+    {
+        _settings = settings.Value;
+    }
+
     public Task<FYVivoxSettingsData> ExecuteAsync(FYEmptyRequest request)
     {
         return Task.FromResult(new FYVivoxSettingsData
         {
-            // TODO: Replace with app configuration
+            VivoxDomain = _settings.Domain,
-            // VivoxDomain = "",
+            VivoxIssuer = _settings.Issuer,
-            // VivoxIssuer = "",
+            VivoxServer = _settings.Server
-            // VivoxServer = ""
         });
     }
 }

src/Prospect.Server.Api/Services/CloudScript/Models/Data/FYPurchaseInventoryInsuranceRequest.cs

@@ -1,14 +1,7 @@
-using System.Text.Json.Serialization;
+namespace Prospect.Server.Api.Services.CloudScript.Models.Data;
 
-namespace Prospect.Server.Api.Services.CloudScript.Models.Data;
-
-// Envoyé par le client au déploiement (dans FYEnterMatchAzureFunction) : quels items
-// de l'inventaire assurer, avec quelle police (voir TitleData "InventoryInsurance").
 public class FYPurchaseInventoryInsuranceRequest
 {
-    [JsonPropertyName("insuranceId")]
+    // m_insuranceId
-    public string InsuranceId { get; set; }
+    // m_itemIds
-
+}
-    [JsonPropertyName("itemIds")]
-    public List<string> ItemIds { get; set; }
-}

src/Prospect.Server.Api/Startup.cs

@@ -25,6 +25,8 @@ public class Startup
         services.Configure<AuthTokenSettings>(Configuration.GetSection(nameof(AuthTokenSettings)));
         services.Configure<DatabaseSettings>(Configuration.GetSection(nameof(DatabaseSettings)));
         services.Configure<PlayFabSettings>(Configuration.GetSection(nameof(PlayFabSettings)));
+        services.Configure<VivoxConfig>(Configuration.GetSection(nameof(VivoxConfig)));
+        services.Configure<SignalRSettings>(Configuration.GetSection(nameof(SignalRSettings)));
 
         services.AddSingleton<AuthTokenService>();
         services.AddSingleton<UserDataService>();

src/Prospect.Server.Api/appsettings.json

@@ -8,11 +8,27 @@
     },
     "PlayFabSettings": {
         "PublisherId": "850902E5B40508ED",
-        "TitleId": "2EA46",
+        "TitleId": "2EA46"
+    },
+    "SignalRSettings": {
         "SignalRURL": "https://127.0.0.1:8443/signalr/?hub=pubsub",
         "SignalRAccessToken": "TEST"
     },
+    "VivoxConfig": {
+        "Key": "",
+        "Issuer": "",
+        "Domain": "",
+        "Server": ""
+    },
     "Kestrel": {
+        "Endpoints": {
+            "Https": {
+                "Url": "https://127.0.0.1:8443"
+            },
+            "Http": {
+                "Url": "http://127.0.0.1:8000"
+            }
+        },
         "Certificates": {
             "Default": {
                 "Path": ".\\certificate.pfx"