Feature: Uniform request naming (#173)

readyplayerme · Nov 30, 2023 · 2fea523 · 2fea523
1 parent 9066624
commit 2fea523
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 17 deletions.
diff --git a/Runtime/AvatarCreator/AuthManager.cs b/Runtime/AvatarCreator/AuthManager.cs
@@ -11,7 +11,7 @@ namespace ReadyPlayerMe.AvatarCreator
     public static class AuthManager
     {
         private const string TAG = nameof(AuthManager);
-        private static readonly AuthenticationRequests AuthenticationRequests;
+        private static readonly AuthAPIRequests AuthAPIRequests;
         private static UserSession userSession;
         public static UserSession UserSession => userSession;
 
@@ -25,12 +25,12 @@ public static class AuthManager
 
         static AuthManager()
         {
-            AuthenticationRequests = new AuthenticationRequests(CoreSettingsHandler.CoreSettings.Subdomain);
+            AuthAPIRequests = new AuthAPIRequests(CoreSettingsHandler.CoreSettings.Subdomain);
         }
 
         public static async Task LoginAsAnonymous()
         {
-            userSession = await AuthenticationRequests.LoginAsAnonymous();
+            userSession = await AuthAPIRequests.LoginAsAnonymous();
             IsSignedInAnonymously = true;
         }
 
@@ -43,14 +43,14 @@ public static void SetUser(UserSession session)
 
         public static async void SendEmailCode(string email)
         {
-            await AuthenticationRequests.SendCodeToEmail(email, userSession.Id);
+            await AuthAPIRequests.SendCodeToEmail(email, userSession.Id);
         }
 
         public static async Task<bool> LoginWithCode(string otp)
         {
             try
             {
-                userSession = await AuthenticationRequests.LoginWithCode(otp);
+                userSession = await AuthAPIRequests.LoginWithCode(otp);
                 IsSignedIn = true;
                 OnSignedIn?.Invoke(userSession);
                 return true;
@@ -64,15 +64,15 @@ public static async Task<bool> LoginWithCode(string otp)
 
         public static async void Signup(string email)
         {
-            await AuthenticationRequests.Signup(email, userSession.Id);
+            await AuthAPIRequests.Signup(email, userSession.Id);
         }
 
         public static async Task RefreshToken()
         {
             (string, string) newTokens;
             try
             {
-                newTokens = await AuthenticationRequests.RefreshToken(userSession.Token, userSession.RefreshToken);
+                newTokens = await AuthAPIRequests.RefreshToken(userSession.Token, userSession.RefreshToken);
             }
             catch (Exception e)
             {

diff --git a/Runtime/AvatarCreator/PartnerAssetsManager.cs b/Runtime/AvatarCreator/PartnerAssetsManager.cs
@@ -18,22 +18,22 @@ public class PartnerAssetsManager : IDisposable
         private const string EYE_MASK_SIZE_SIZE = "?w=256";
         private const string ASSET_ICON_SIZE = "?w=64";
 
-        private readonly PartnerAssetsRequests partnerAssetsRequests;
+        private readonly AssetAPIRequests assetAPIRequests;
 
         private Dictionary<Category, List<PartnerAsset>> assetsByCategory;
         public Action<string> OnError { get; set; }
 
         public PartnerAssetsManager()
         {
-            partnerAssetsRequests = new PartnerAssetsRequests(CoreSettingsHandler.CoreSettings.AppId);
+            assetAPIRequests = new AssetAPIRequests(CoreSettingsHandler.CoreSettings.AppId);
             assetsByCategory = new Dictionary<Category, List<PartnerAsset>>();
         }
 
         public async Task<Dictionary<Category, List<PartnerAsset>>> GetAssets(BodyType bodyType, OutfitGender gender, CancellationToken token = default)
         {
             var startTime = Time.time;
 
-            var assets = await partnerAssetsRequests.Get(bodyType, gender, token);
+            var assets = await assetAPIRequests.Get(bodyType, gender, token);
 
             assetsByCategory = assets.GroupBy(asset => asset.Category).ToDictionary(
                 group => group.Key,
@@ -98,7 +98,7 @@ private async Task DownloadIcons(List<PartnerAsset> chunk, Action<string, Textur
             {
                 var url = $"{asset.ImageUrl}{ASSET_ICON_SIZE}";
                 var linkedTokenSource = CancellationTokenSource.CreateLinkedTokenSource(token);
-                var iconTask = partnerAssetsRequests.GetAssetIcon(url, icon =>
+                var iconTask = assetAPIRequests.GetAssetIcon(url, icon =>
                     {
                         onDownload?.Invoke(asset.Id, icon);
                     },

diff --git a/...ator/WebRequests/PartnerAssetsRequests.cs → ...arCreator/WebRequests/AssetAPIRequests.cs b/...ator/WebRequests/PartnerAssetsRequests.cs → ...arCreator/WebRequests/AssetAPIRequests.cs
@@ -11,16 +11,16 @@
 
 namespace ReadyPlayerMe.AvatarCreator
 {
-    public class PartnerAssetsRequests
+    public class AssetAPIRequests
     {
-        private const string TAG = nameof(PartnerAssetsRequests);
+        private const string TAG = nameof(AssetAPIRequests);
         private const int LIMIT = 100;
 
         private readonly AuthorizedRequest authorizedRequest;
         private readonly string appId;
         private readonly Dictionary<string, Texture> icons;
 
-        public PartnerAssetsRequests(string appId)
+        public AssetAPIRequests(string appId)
         {
             authorizedRequest = new AuthorizedRequest();
             icons = new Dictionary<string, Texture>();

diff --git a/...WebRequests/PartnerAssetsRequests.cs.meta → ...ator/WebRequests/AssetAPIRequests.cs.meta b/...WebRequests/PartnerAssetsRequests.cs.meta → ...ator/WebRequests/AssetAPIRequests.cs.meta
diff --git a/...tor/WebRequests/AuthenticationRequests.cs → ...tarCreator/WebRequests/AuthAPIRequests.cs b/...tor/WebRequests/AuthenticationRequests.cs → ...tarCreator/WebRequests/AuthAPIRequests.cs
@@ -5,14 +5,14 @@
 
 namespace ReadyPlayerMe.AvatarCreator
 {
-    public class AuthenticationRequests
+    public class AuthAPIRequests
     {
         private readonly string domain;
         private readonly IDictionary<string, string> headers = CommonHeaders.GetHeadersWithAppId();
 
         private readonly WebRequestDispatcher webRequestDispatcher;
 
-        public AuthenticationRequests(string domain)
+        public AuthAPIRequests(string domain)
         {
             this.domain = domain;
             webRequestDispatcher = new WebRequestDispatcher();

diff --git a/...ebRequests/AuthenticationRequests.cs.meta → ...eator/WebRequests/AuthAPIRequests.cs.meta b/...ebRequests/AuthenticationRequests.cs.meta → ...eator/WebRequests/AuthAPIRequests.cs.meta
diff --git a/Runtime/AvatarCreator/WebRequests/AuthorizedRequest.cs b/Runtime/AvatarCreator/WebRequests/AuthorizedRequest.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
 using ReadyPlayerMe.Core;
@@ -27,6 +26,8 @@ public class AuthorizedRequest
                 {
                     await AuthManager.RefreshToken();
                 }
+                // Despite this seeming redundant, it prevents an issue with any error within AuthManager.RefreshToken not being propagated without it.
+                // TODO: Figure out why this is needed and work out a way to clean it up.
                 catch (Exception)
                 {
                     throw;