Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 17 additions & 12 deletions .github/workflows/run-tests-and-package.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ on:
push:
branches: # Made towards the following
- main
- dev
- ci/*
workflow_dispatch:
inputs:
Expand All @@ -24,7 +23,6 @@ jobs:
name: Test SDK in Editor
runs-on: [ubuntu-latest]
needs: []
# if: ( true == false )
timeout-minutes: 10
env:
LL_USE_STAGE: false
Expand Down Expand Up @@ -99,7 +97,7 @@ jobs:
Library-
- name: Run Smoke Tests ${{ matrix.unityVersion }}-${{ matrix.testMode }}
id: editor-smoke-tests-gameci
uses: game-ci/unity-test-runner@v4
uses: game-ci/unity-test-runner@v4.3.1
env:
UNITY_LICENSE: ${{ SECRETS.UNITY_LICENSE }}
UNITY_EMAIL: ${{ SECRETS.UNITY_EMAIL }}
Expand All @@ -116,6 +114,7 @@ jobs:
name: Test SDK in StandaloneLinux64 build
runs-on: [ubuntu-latest]
needs: [editor-smoke-test]
if: false
timeout-minutes: 10
env:
LL_USE_STAGE: false
Expand Down Expand Up @@ -199,7 +198,7 @@ jobs:
Library-
- name: Run Smoke Tests ${{ matrix.unityVersion }}-${{ matrix.testMode }}-${{ matrix.targetPlatform }}
id: build-smoke-tests-gameci
uses: game-ci/unity-builder@v4
uses: game-ci/unity-builder@v4.7.0
env:
UNITY_LICENSE: ${{ SECRETS.UNITY_LICENSE }}
UNITY_EMAIL: ${{ SECRETS.UNITY_EMAIL }}
Expand Down Expand Up @@ -228,7 +227,7 @@ jobs:
runs-on: [ubuntu-latest]
needs: [editor-smoke-test]
timeout-minutes: 20
if: (startsWith(github.ref, 'refs/pull') && endsWith(github.base_ref, 'main')) || startsWith(github.ref, 'refs/tags/v') || (startsWith(github.ref, 'refs/heads') && endsWith(github.ref, 'main'))
if: false && (startsWith(github.ref, 'refs/pull') && endsWith(github.base_ref, 'main')) || startsWith(github.ref, 'refs/tags/v') || (startsWith(github.ref, 'refs/heads') && endsWith(github.ref, 'main'))
env:
LL_USE_STAGE: false
strategy:
Expand Down Expand Up @@ -311,7 +310,7 @@ jobs:
Library-
- name: Run Smoke Tests ${{ matrix.unityVersion }}-${{ matrix.testMode }}-${{ matrix.targetPlatform }}
id: build-smoke-tests-gameci
uses: game-ci/unity-builder@v4
uses: game-ci/unity-builder@v4.7.0
env:
UNITY_LICENSE: ${{ SECRETS.UNITY_LICENSE }}
UNITY_EMAIL: ${{ SECRETS.UNITY_EMAIL }}
Expand Down Expand Up @@ -418,7 +417,7 @@ jobs:
- name: Wait for Go backend ready healthcheck
if: ${{ VARS.LL_USE_LOCAL_BACKEND == 'true' }}
run: |
curl --get http://localhost:9999/__/ready --retry 30 --retry-delay 1 --retry-all-errors --fail-with-body --verbose
curl --get http://localhost:9999/__/ready --retry 60 --retry-delay 2 --retry-all-errors --fail-with-body --verbose
####### CONFIGURE TESTS ###########
- name: Configure variables
run: |
Expand Down Expand Up @@ -507,7 +506,7 @@ jobs:
key: Library-${{ matrix.unityVersion }}-${{ ENV.JSON_LIBRARY }}
restore-keys: Library-
- name: Run tests in ${{ matrix.unityVersion }} towards ${{ ENV.TARGET_ENVIRONMENT }} environment with json library ${{ ENV.JSON_LIBRARY }}
uses: game-ci/unity-test-runner@v4
uses: game-ci/unity-test-runner@v4.3.1
if: ${{ vars.ENABLE_INTEGRATION_TESTS == 'true' }}
id: tests
env:
Expand All @@ -533,6 +532,12 @@ jobs:
run: |
cd devenv
mage env:downsilent dev
- name: Upload logs
uses: actions/upload-artifact@v4
if: always()
with:
name: Integration tests (${{ matrix.unityVersion }}-${{ ENV.JSON_LIBRARY }}) Logs
path: logs
- name: Upload test results
uses: actions/upload-artifact@v4
if: always()
Expand All @@ -543,7 +548,7 @@ jobs:
name: Test Samples
runs-on: [ubuntu-latest]
needs: [editor-smoke-test]
timeout-minutes: 8
timeout-minutes: 12
env:
LL_USE_STAGE: false
strategy:
Expand Down Expand Up @@ -595,7 +600,7 @@ jobs:
Library-
- name: Compile and run all sample scenes ${{ matrix.unityVersion }}
id: test-samples
uses: game-ci/unity-test-runner@v4
uses: game-ci/unity-test-runner@v4.3.1
env:
UNITY_LICENSE: ${{ SECRETS.UNITY_LICENSE }}
UNITY_EMAIL: ${{ SECRETS.UNITY_EMAIL }}
Expand Down Expand Up @@ -664,7 +669,7 @@ jobs:
Library-
- name: Validate SDK using asset store tools
id: validate-sdk
uses: game-ci/unity-test-runner@v4
uses: game-ci/unity-test-runner@v4.3.1
env:
UNITY_LICENSE: ${{ SECRETS.UNITY_LICENSE }}
UNITY_EMAIL: ${{ SECRETS.UNITY_EMAIL }}
Expand Down Expand Up @@ -733,7 +738,7 @@ jobs:
Library-
- name: Package SDK for ${{ matrix.unityVersion }}
id: package-sdk-gameci
uses: game-ci/unity-test-runner@v4
uses: game-ci/unity-test-runner@v4.3.1
env:
UNITY_LICENSE: ${{ SECRETS.UNITY_LICENSE }}
UNITY_EMAIL: ${{ SECRETS.UNITY_EMAIL }}
Expand Down
8 changes: 7 additions & 1 deletion Runtime/Client/LootLockerEndPoints.cs
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,7 @@ public class LootLockerEndPoints
public static EndPointClass redeemAppleAppStorePurchase = new EndPointClass("store/apple/redeem", LootLockerHTTPMethod.POST);
public static EndPointClass redeemGooglePlayStorePurchase = new EndPointClass("store/google/redeem", LootLockerHTTPMethod.POST);
public static EndPointClass redeemEpicStorePurchase = new EndPointClass("store/epic/redeem", LootLockerHTTPMethod.POST);
public static EndPointClass redeemPlayStationStorePurchase = new EndPointClass("store/playstation/redeem", LootLockerHTTPMethod.POST);

public static EndPointClass beginSteamPurchaseRedemption = new EndPointClass("store/steam/redeem/begin", LootLockerHTTPMethod.POST);
public static EndPointClass querySteamPurchaseRedemptionStatus = new EndPointClass("store/steam/redeem/query", LootLockerHTTPMethod.POST);
Expand Down Expand Up @@ -272,7 +273,8 @@ public class LootLockerEndPoints
// Catalogs
[Header("Catalogs")]
public static EndPointClass listCatalogs = new EndPointClass("catalogs", LootLockerHTTPMethod.GET);
public static EndPointClass listCatalogItemsByKey = new EndPointClass("catalog/key/{0}/prices", LootLockerHTTPMethod.GET);
public static EndPointClass deprecatedListCatalogItemsByKey = new EndPointClass("catalog/key/{0}/prices", LootLockerHTTPMethod.GET);
public static EndPointClass listCatalogItemsByKey = new EndPointClass("catalogs/inspired-ibex/v1/catalog/key/{key}/list", LootLockerHTTPMethod.GET);

// Misc
[Header("Misc")]
Expand Down Expand Up @@ -329,6 +331,10 @@ public class LootLockerEndPoints
public static EndPointClass ListNotifications = new EndPointClass("notifications/v1", LootLockerHTTPMethod.GET);
public static EndPointClass ReadNotifications = new EndPointClass("notifications/v1/read", LootLockerHTTPMethod.PUT);
public static EndPointClass ReadAllNotifications = new EndPointClass("notifications/v1/read/all", LootLockerHTTPMethod.PUT);

// Broadcasts
[Header("Broadcasts")]
public static EndPointClass ListBroadcasts = new EndPointClass("broadcasts/v1", LootLockerHTTPMethod.GET);
}

[Serializable]
Expand Down
14 changes: 7 additions & 7 deletions Runtime/Client/LootLockerHTTPClient.cs
Original file line number Diff line number Diff line change
Expand Up @@ -590,7 +590,7 @@ private IEnumerator RefreshSession(string refreshForPlayerUlid, string forExecut
{
newSessionResponse = response;
callCompleted = true;
});
}, playerData.SessionOptionals);
}
break;
case LL_AuthPlatforms.WhiteLabel:
Expand All @@ -599,7 +599,7 @@ private IEnumerator RefreshSession(string refreshForPlayerUlid, string forExecut
{
newSessionResponse = response;
callCompleted = true;
}, playerData.ULID);
}, playerData.ULID, playerData.SessionOptionals);
}
break;
case LL_AuthPlatforms.AppleGameCenter:
Expand All @@ -608,7 +608,7 @@ private IEnumerator RefreshSession(string refreshForPlayerUlid, string forExecut
{
newSessionResponse = response;
callCompleted = true;
}, refreshForPlayerUlid);
}, refreshForPlayerUlid, playerData.SessionOptionals);
}
break;
case LL_AuthPlatforms.AppleSignIn:
Expand All @@ -617,7 +617,7 @@ private IEnumerator RefreshSession(string refreshForPlayerUlid, string forExecut
{
newSessionResponse = response;
callCompleted = true;
}, refreshForPlayerUlid);
}, refreshForPlayerUlid, playerData.SessionOptionals);
}
break;
case LL_AuthPlatforms.Epic:
Expand All @@ -626,7 +626,7 @@ private IEnumerator RefreshSession(string refreshForPlayerUlid, string forExecut
{
newSessionResponse = response;
callCompleted = true;
}, refreshForPlayerUlid);
}, refreshForPlayerUlid, playerData.SessionOptionals);
}
break;
case LL_AuthPlatforms.Google:
Expand All @@ -635,7 +635,7 @@ private IEnumerator RefreshSession(string refreshForPlayerUlid, string forExecut
{
newSessionResponse = response;
callCompleted = true;
}, refreshForPlayerUlid);
}, refreshForPlayerUlid, playerData.SessionOptionals);
}
break;
case LL_AuthPlatforms.Remote:
Expand All @@ -655,7 +655,7 @@ private IEnumerator RefreshSession(string refreshForPlayerUlid, string forExecut
{
newSessionResponse = response;
callCompleted = true;
});
}, playerData.SessionOptionals);
}
break;
case LL_AuthPlatforms.NintendoSwitch:
Expand Down
4 changes: 4 additions & 0 deletions Runtime/Client/LootLockerPlayerData.cs
Original file line number Diff line number Diff line change
Expand Up @@ -57,5 +57,9 @@ public class LootLockerPlayerData
/// The id of the wallet for this player
/// </summary>
public string WalletID { get; set; }
/// <summary>
/// Optional parameters used when starting/refreshing a session
/// </summary>
public LootLockerSessionOptionals SessionOptionals { get; set; } = new LootLockerSessionOptionals();
}
}
Loading