feat: Enable display and edit of encryption key for client credentials.

Author: paulhazen

Assets/Plugins/Source/Editor/EditorWindows/EOSEditorWindow.cs

@@ -103,6 +103,11 @@ public RetainPreference(string key)
         /// </summary>
         protected static Font MonoFont;
 
+        protected EOSEditorWindow(bool needsInitialization) : this("")
+        {
+            _initialized = !needsInitialization;
+        }
+
         protected EOSEditorWindow(string windowTitle, float minimumHeight = 50f, float minimumWidth = 50f,
             string preferencesOverrideKey = null)
         {
@@ -120,23 +125,23 @@ protected EOSEditorWindow(string windowTitle, float minimumHeight = 50f, float m
         /// <summary>
         /// String value for the title of the window.
         /// </summary>
-        public string WindowTitle { get; }
+        public string WindowTitle { get; protected set; }
 
         protected virtual void OnEnable()
         {
             _initializeTask = Initialize();
             EditorApplication.update += CheckForInitialized;
         }
 
-        private void OnDisable()
+        protected virtual void OnDisable()
         {
             EditorApplication.update -= CheckForInitialized;
         }
 
         /// <summary>
         /// Checks to see if the windows has been initialized.
         /// </summary>
-        private void CheckForInitialized()
+        protected void CheckForInitialized()
         {
             if (!_initializeTask.IsCompleted || _initialized)
             {
@@ -246,7 +251,7 @@ protected void SetIsEmbedded(bool? isEmbedded = null)
         /// <summary>
         /// Called by Unity to render the window. Should not be overridden by deriving classes.
         /// </summary>
-        public void OnGUI()
+        public virtual void OnGUI()
         {
             // don't do anything if not initialized
             if (!_initialized)

Assets/Plugins/Source/Editor/Utility/GUIEditorUtility.cs

@@ -31,6 +31,7 @@ namespace PlayEveryWare.EpicOnlineServices.Editor.Utility
 #endif
 
     using EpicOnlineServices.Utility;
+    using PlayEveryWare.EpicOnlineServices.Editor.Windows;
     using System;
     using System.Collections.Generic;
     using System.Globalization;
@@ -539,6 +540,11 @@ public static float MeasureLongestLabelWidth(List<string> labels)
             return MeasureLabelWidth(longestString);
         }
 
+        public static float MeasureLabelWidth(int characters)
+        {
+            return MeasureLabelWidth(new string('0', characters));
+        }
+
         public static float MeasureLabelWidth(string label)
         {
             return new GUIStyle(GUI.skin.label).CalcSize(new GUIContent(label)).x;
@@ -1004,9 +1010,9 @@ private static SetOfNamed<EOSClientCredentials> RenderInput(ConfigFieldAttribute
                 "Enter your client information here as it appears in the Epic Dev Portal.",
                 "https://dev.epicgames.com/docs/dev-portal/product-management#clients",
                 clientCredentialsCopy,
-                (rect, item, nameAsLabel) =>
+                (rect, item, nameAsLabel) => // Things function renders input for a EOSClientCredential item.
                 {
-                    float remainingWidth = rect.width;
+                    float remainingWidth = rect.width - 5f;
                     float firstFieldWidth = (rect.width - 5f) * 0.18f;
 
                     if (nameAsLabel)
@@ -1034,25 +1040,49 @@ private static SetOfNamed<EOSClientCredentials> RenderInput(ConfigFieldAttribute
 
                     item.Value ??= new();
 
+                    const float keyButtonWidth = 40f;
                     float clientFieldWidth = remainingWidth * 0.34f;
-                    float clientIdFieldX = rect.x + firstFieldWidth + 5f;
-                    remainingWidth -= clientFieldWidth;
+                    float renderCursorX = rect.x + firstFieldWidth + 5f;
+                    remainingWidth -= clientFieldWidth - 10f + keyButtonWidth;
 
                     item.Value.ClientId = RenderFieldWithHint(
                         EditorGUI.TextField,
-                        new Rect(clientIdFieldX, rect.y, clientFieldWidth, rect.height),
+                        new Rect(renderCursorX, rect.y, clientFieldWidth, rect.height),
                         string.IsNullOrEmpty,
                         item.Value.ClientId,
                         "Client ID"
                     );
 
+                    renderCursorX += clientFieldWidth + 5f;
                     item.Value.ClientSecret = RenderFieldWithHint(
                         EditorGUI.TextField,
-                        new Rect(rect.x + firstFieldWidth + 5f + clientFieldWidth + 5f, rect.y, remainingWidth - 10f,
+                        new Rect(renderCursorX, rect.y, remainingWidth - 20f,
                             rect.height),
                         string.IsNullOrEmpty,
                         item.Value.ClientSecret,
                         "Client Secret");
+
+                    GUIContent keyButtonContent = CreateGUIContent("Key", "Click to view or edit encryption key for client credentials");
+                    renderCursorX += remainingWidth - 20f + 5f;
+                    if (GUI.Button(
+                        new Rect(renderCursorX, rect.y, keyButtonWidth, rect.height),
+                        keyButtonContent))
+                    {
+                        ClientCredentialsEncryptionKeyWindow.Show(item.Value.EncryptionKey, 
+                            result =>
+                            {
+                                item.Value.EncryptionKey = result;
+                            }, 
+                            toValidate =>
+                            {
+                                return EOSClientCredentials.IsEncryptionKeyValid(toValidate);
+                            }, 
+                            "Client Credentials Encryption Key", 
+                            "Enter the encryption key for these client credentials here:"
+                            );
+                    }
+                    
+                    
                 },
                 () => clientCredentialsCopy.Add(),
                 (item) =>

com.playeveryware.eos/Runtime/Core/EOS_SDK_Additions/EOSClientCredentials.cs

@@ -35,7 +35,7 @@ public class EOSClientCredentials : IEquatable<EOSClientCredentials>
     {
         public string ClientId;
         public string ClientSecret;
-        public string EncryptionKey { get; private set; }
+        public string EncryptionKey { get; set; }
 
         private static readonly Regex s_invalidEncryptionKeyRegex;
 
@@ -45,13 +45,18 @@ static EOSClientCredentials()
         }
 
         public EOSClientCredentials()
+        {
+            EncryptionKey = GenerateEncryptionKey();
+        }
+
+        public static string GenerateEncryptionKey()
         {
             // Randomly generate a 32 byte hex key
             byte[] randomBytes = new byte[32];
             using RandomNumberGenerator rng = RandomNumberGenerator.Create();
             rng.GetBytes(randomBytes);
 
-            EncryptionKey = BitConverter.ToString(randomBytes).Replace(
+            return BitConverter.ToString(randomBytes).Replace(
                 "-", string.Empty);
         }