Add remaining fixes from change request

Author: Mikkel Sørensen

Runtime/Editor/LootLockerExtensionCalls.cs

@@ -1,143 +1,95 @@
 using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Net;
-using System.Net.NetworkInformation;
-using LLlibs.ZeroDepJson;
 using LootLocker.Extension.Requests;
-using LootLocker.Requests;
-using UnityEditor.VersionControl;
+using LootLocker.Extension.Responses;
 using UnityEngine;
 
+#if UNITY_EDITOR && UNITY_2021_3_OR_NEWER
 namespace LootLocker.Admin
 {
     public partial class LootLockerAdminManager
     {
-                
+
+        public static void SendAdminRequest(string endPoint, LootLockerHTTPMethod httpMethod, string json, Action<LootLockerResponse> onComplete, bool useAuthToken)
+        {
+            LootLockerServerRequest.CallAPI(endPoint, httpMethod, json, onComplete: (serverResponse) => { LootLockerResponse.Deserialize(onComplete, serverResponse); },
+                useAuthToken,
+                callerRole: LootLockerEnums.LootLockerCallerRole.Admin);
+        }
+
         public static void AdminLogin(string email, string password, Action<LoginResponse> onComplete)
         {
             if (string.IsNullOrEmpty(email) || string.IsNullOrEmpty(password))
             {
-                Debug.Log("Input is invalid!");
+                LootLockerLogger.GetForLogLevel(LootLockerLogger.LogLevel.Error)("Email or Password is empty.");
                 return;
             }
 
+            EndPointClass endPoint = LootLockerAdminEndPoints.adminExtensionLogin;
+
             AdminLoginRequest request = new AdminLoginRequest();
             request.email = email;
             request.password = password;
 
-            AdminLogin(request, onComplete);
-        }
-
-        public static void AdminLogin(AdminLoginRequest data, Action<LoginResponse> onComplete)
-        {
-            EndPointClass endPoint = LootLockerAdminEndPoints.adminExtensionLogin;
-
-            string json = LootLockerJson.SerializeObject(data);
+            string json = LootLockerJson.SerializeObject(request);
 
-            LootLockerServerRequest.CallAPI(endPoint.endPoint, endPoint.httpMethod, json,
-                onComplete: (serverResponse) => { LootLockerResponse.Deserialize(onComplete, serverResponse); }, false,
-                callerRole: LootLockerEnums.LootLockerCallerRole.Admin);
+            SendAdminRequest(endPoint.endPoint, endPoint.httpMethod, json,
+               onComplete: (serverResponse) => { LootLockerResponse.Deserialize(onComplete, serverResponse); }, true);
         }
 
-
         public static void MFAAuthenticate(string authCode, string secret, Action<LoginResponse> onComplete)
         {
             if (string.IsNullOrEmpty(authCode) || string.IsNullOrEmpty(secret))
             {
-                Debug.Log("Input is invalid!");
+                Debug.Log("No authentication code found!");
                 return;
             }
 
+            EndPointClass endPoint = LootLockerAdminEndPoints.adminExtensionMFA;
+
             MfaAdminLoginRequest data = new MfaAdminLoginRequest();
             data.mfa_key = authCode;
             data.secret = secret;
 
-            MFAAuthenticate(data, onComplete);
-        }
-
-        public static void MFAAuthenticate(MfaAdminLoginRequest data, Action<LoginResponse> onComplete)
-        {
-            EndPointClass endPoint = LootLockerAdminEndPoints.adminExtensionMFA;
-
             string json = LootLockerJson.SerializeObject(data);
-            
-            LootLockerServerRequest.CallAPI(endPoint.endPoint, endPoint.httpMethod, json, 
-                onComplete: (serverResponse) => { LootLockerResponse.Deserialize(onComplete, serverResponse);},
-                callerRole: LootLockerEnums.LootLockerCallerRole.Admin);
 
+            SendAdminRequest(endPoint.endPoint, endPoint.httpMethod, json,
+            onComplete: (serverResponse) => { LootLockerResponse.Deserialize(onComplete, serverResponse); }, true);
         }
 
-
         public static void GetAllKeys(string game_id, Action<KeysResponse> onComplete)
-        {
-            LootLockerGetRequest data = new LootLockerGetRequest();
-            data.getRequests.Add(game_id);
-
-            GetAllKeys(data, onComplete);
-        }
-
-        public static void GetAllKeys(LootLockerGetRequest lootLockerGetRequest, Action<KeysResponse> onComplete)
         {
             EndPointClass endPoint = LootLockerAdminEndPoints.adminExtensionGetAllKeys;
+            string getVariable = string.Format(endPoint.endPoint, game_id);
 
-            string getVariable = string.Format(endPoint.endPoint, lootLockerGetRequest.getRequests[0]);
-
-            LootLockerServerRequest.CallAPI(getVariable, endPoint.httpMethod, "", 
-                onComplete: (serverResponse) => { LootLockerResponse.Deserialize(onComplete, serverResponse);},
-                callerRole: LootLockerEnums.LootLockerCallerRole.Admin);
-
-
+            SendAdminRequest(getVariable, endPoint.httpMethod, "",
+                onComplete: (serverResponse) => { LootLockerResponse.Deserialize(onComplete, serverResponse); }, true);
         }
 
-        public static void GenerateKey(string game_id, string key_name, string key_environment, Action<Key> onComplete)
+        public static void GenerateKey(string game_id, string key_name, string key_environment, Action<KeyResponse> onComplete)
         {
-            LootLockerGetRequest request = new LootLockerGetRequest();
-            request.getRequests.Add(game_id);
+            EndPointClass endPoint = LootLockerAdminEndPoints.adminExtensionCreateKey;
+
+            string getVariable = string.Format(endPoint.endPoint, game_id);
 
             KeyCreationRequest data = new KeyCreationRequest();
             data.name = key_name;
             data.api_type = key_environment;
 
-
-            GenerateKey(data, request, onComplete);
-        }
-
-        public static void GenerateKey(KeyCreationRequest data, LootLockerGetRequest lootLockerGetRequest, Action<Key> onComplete)
-        {
-            EndPointClass endPoint = LootLockerAdminEndPoints.adminExtensionCreateKey;
-
-            string getVariable = string.Format(endPoint.endPoint, lootLockerGetRequest.getRequests[0]);
-
             string json = LootLockerJson.SerializeObject(data);
 
-            LootLockerServerRequest.CallAPI(getVariable, endPoint.httpMethod, json,
-                onComplete: (serverResponse) => { LootLockerResponse.Deserialize(onComplete, serverResponse); },
-                callerRole: LootLockerEnums.LootLockerCallerRole.Admin);
+            SendAdminRequest(getVariable, endPoint.httpMethod, json,
+            onComplete: (serverResponse) => { LootLockerResponse.Deserialize(onComplete, serverResponse); }, true);
         }
 
-
-        //Roles
         public static void GetUserRole(string userId, Action<UserRoleResponse> onComplete)
-        {
-            LootLockerGetRequest data = new LootLockerGetRequest();
-            data.getRequests.Add(userId);
-
-            GetUserRole(data, onComplete);
-        }
-
-        public static void GetUserRole(LootLockerGetRequest lootLockerGetRequest, Action<UserRoleResponse> onComplete)
         {
             EndPointClass endPoint = LootLockerAdminEndPoints.adminExtensionGetUserRole;
 
-            string getVariable = string.Format(endPoint.endPoint, lootLockerGetRequest.getRequests[0]);
-
-            LootLockerServerRequest.CallAPI(getVariable, endPoint.httpMethod, "",
-            onComplete: (serverResponse) => { LootLockerResponse.Deserialize(onComplete, serverResponse); },
-            callerRole: LootLockerEnums.LootLockerCallerRole.Admin);
+            string getVariable = string.Format(endPoint.endPoint, userId);
 
+            SendAdminRequest(getVariable, endPoint.httpMethod, "",
+                onComplete: (serverResponse) => { LootLockerResponse.Deserialize(onComplete, serverResponse); }, true);
         }
-
     }
-
-}
+}
+#endif

Runtime/Editor/LootLockerExtensionResponses.cs

@@ -1,10 +1,8 @@
+using LootLocker.Extension.DataTypes;
 using System.Collections.Generic;
 
 namespace LootLocker.Extension.Requests
 {
-    //Login
-
-
     public class MfaAdminLoginRequest
     {
         public string mfa_key { get; set; }
@@ -17,9 +15,15 @@ public class AdminLoginRequest
         public string password { get; set; }
     }
 
+    public class KeyCreationRequest
+    {
+        public string name { get; set; }
+        public string api_type { get; set; }
+    }
+}
 
-    //Games
-    [System.Serializable]
+namespace LootLocker.Extension.DataTypes
+{
     public class Game
     {
         public int id { get; set; }
@@ -30,8 +34,6 @@ public class Game
         public Game development { get; set; }
     }
 
-    //Organization
-    [System.Serializable]
     public class Organisation
     {
         public int id { get; set; }
@@ -51,15 +53,13 @@ public Game GetGameByID(int id)
         }
     }
 
-    //User
-    [System.Serializable]
     public class User
     {
         public int id { get; set; }
         public string name { get; set; }
         public string email { get; set; }
         public long signed_up { get; set; }
-        public  Organisation[] organisations { get; set; }
+        public Organisation[] organisations { get; set; }
         private Dictionary<int, int> organisationIndexByID { get; set; }
 
         public Organisation GetOrganisationByID(int id)
@@ -74,7 +74,10 @@ public Organisation GetOrganisationByID(int id)
             return null;
         }
     }
+}
 
+namespace LootLocker.Extension.Responses
+{
     public class LoginResponse : LootLockerResponse
     {
 
@@ -83,20 +86,17 @@ public class LoginResponse : LootLockerResponse
         public User user { get; set; }
     }
 
-    //Roles
-    public class Permissions
-    {
-        public string permission { get; set; }
-    }
     public class UserRoleResponse : LootLockerResponse
     {
         public string[] permissions { get; set; }
         public bool self { get; set; }
     }
 
-    //API Keys
-
-    public class Key : LootLockerResponse
+    public class KeysResponse : LootLockerResponse
+    {
+        public KeyResponse[] api_keys { get; set; }
+    }
+    public class KeyResponse : LootLockerResponse
     {
         public int id { get; set; }
         public int game_id { get; set; }
@@ -105,18 +105,5 @@ public class Key : LootLockerResponse
         public string name { get; set; }
         public string created_at { get; set; }
         public string updated_at { get; set; }
-
     }
-
-    public class KeysResponse : LootLockerResponse
-    {
-        public Key[] api_keys { get; set; }
-    }
-
-    public class KeyCreationRequest
-    {
-        public string name { get; set; }
-        public string api_type { get; set; }
-    }
-
 }

Runtime/Editor/StoredUser.cs

@@ -3,7 +3,9 @@
 using System.IO;
 using UnityEditor;
 using UnityEngine;
-#if (UNITY_EDITOR)
+
+#if UNITY_EDITOR && UNITY_2021_3_OR_NEWER
+using LootLocker.Extension.DataTypes;
 public class StoredUser : ScriptableObject
 {
     [HideInInspector]