fixed namespaces

updated unit tests for auth

BlockadeLabs/Packages/com.rest.blockadelabs/Editor/BlockadeLabsConfigurationInspector.cs

@@ -1,4 +1,4 @@
-using Rest.BlockadeLabs;
+using BlockadeLabs;
 using System;
 using UnityEditor;
 using Utilities.Rest.Editor;

BlockadeLabs/Packages/com.rest.blockadelabs/Runtime/AssemblyInfo.cs

@@ -1 +1,6 @@
 // Licensed under the MIT License. See LICENSE in the project root for license information.
+
+using System.Runtime.CompilerServices;
+
+[assembly: InternalsVisibleTo("BlockadeLabs.Tests")]
+[assembly: InternalsVisibleTo("BlockadeLabs.Editor")]

BlockadeLabs/Packages/com.rest.blockadelabs/Runtime/BlockadeLabsAuthInfo.cs

@@ -3,7 +3,7 @@
 using UnityEngine;
 using Utilities.WebRequestRest.Interfaces;
 
-namespace Rest.BlockadeLabs
+namespace BlockadeLabs
 {
  [Serializable]
  public class BlockadeLabsAuthInfo : IAuthInfo

BlockadeLabs/Packages/com.rest.blockadelabs/Runtime/BlockadeLabsAuthentication.cs

@@ -4,7 +4,7 @@
 using UnityEngine;
 using Utilities.WebRequestRest.Interfaces;
 
-namespace Rest.BlockadeLabs
+namespace BlockadeLabs
 {
  public sealed class BlockadeLabsAuthentication : AbstractAuthentication<BlockadeLabsAuthentication, BlockadeLabsAuthInfo>
  {

BlockadeLabs/Packages/com.rest.blockadelabs/Runtime/BlockadeLabsBaseEndpoint.cs

@@ -1,6 +1,6 @@
 using Utilities.WebRequestRest;
 
-namespace Rest.BlockadeLabs
+namespace BlockadeLabs
 {
  public abstract class BlockadeLabsBaseEndpoint : BaseEndPoint<BlockadeLabsClient, BlockadeLabsAuthentication, BlockadeLabsSettings>
  {

BlockadeLabs/Packages/com.rest.blockadelabs/Runtime/BlockadeLabsClient.cs

@@ -3,7 +3,7 @@
 using System.Security.Authentication;
 using Utilities.WebRequestRest;
 
-namespace Rest.BlockadeLabs
+namespace BlockadeLabs
 {
  public class BlockadeLabsClient : BaseClient<BlockadeLabsAuthentication, BlockadeLabsSettings>
  {

BlockadeLabs/Packages/com.rest.blockadelabs/Runtime/BlockadeLabsConfiguration.cs

@@ -1,7 +1,7 @@
 using UnityEngine;
 using Utilities.WebRequestRest.Interfaces;
 
-namespace Rest.BlockadeLabs
+namespace BlockadeLabs
 {
  [CreateAssetMenu(fileName = nameof(BlockadeLabsConfiguration), menuName = nameof(BlockadeLabs) + "/" + nameof(BlockadeLabsConfiguration), order = 0)]
  public class BlockadeLabsConfiguration : ScriptableObject, IConfiguration

BlockadeLabs/Packages/com.rest.blockadelabs/Runtime/BlockadeLabsSettings.cs

@@ -2,7 +2,7 @@
 using UnityEngine;
 using Utilities.WebRequestRest.Interfaces;
 
-namespace Rest.BlockadeLabs
+namespace BlockadeLabs
 {
  public class BlockadeLabsSettings : ISettings
  {

BlockadeLabs/Packages/com.rest.blockadelabs/Runtime/BlockadeLabsSettingsInfo.cs

@@ -1,7 +1,7 @@
 using System;
 using Utilities.WebRequestRest.Interfaces;
 
-namespace Rest.BlockadeLabs
+namespace BlockadeLabs
 {
  public class BlockadeLabsSettingsInfo : ISettingsInfo
  {

BlockadeLabs/Packages/com.rest.blockadelabs/Runtime/RootEndpoint.cs

@@ -1,6 +1,6 @@
 using System.Threading.Tasks;
 
-namespace Rest.BlockadeLabs
+namespace BlockadeLabs
 {
  public sealed class RootEndpoint : BlockadeLabsBaseEndpoint
  {

BlockadeLabs/Packages/com.rest.blockadelabs/Tests/BlockadeLabs.Tests.asmdef

@@ -3,7 +3,9 @@
  "rootNamespace": "BlockadeLabs.Tests",
  "references": [
  "UnityEngine.TestRunner",
- "UnityEditor.TestRunner"
+ "UnityEditor.TestRunner",
+ "BlockadeLabs",
+ "Utilities.Rest"
  ],
  "includePlatforms": [
  "Editor"

BlockadeLabs/Packages/com.rest.blockadelabs/Tests/TestFixture_00_Authentication.cs

@@ -0,0 +1,159 @@
+// Licensed under the MIT License. See LICENSE in the project root for license information.
+
+using NUnit.Framework;
+using System;
+using System.IO;
+using System.Security.Authentication;
+using UnityEditor;
+using UnityEngine;
+
+namespace BlockadeLabs.Tests
+{
+ internal class TestFixture_00_Authentication
+ {
+ [SetUp]
+ public void Setup()
+ {
+ var authJson = new BlockadeLabsAuthInfo("key-test12");
+ var authText = JsonUtility.ToJson(authJson, true);
+ File.WriteAllText(BlockadeLabsAuthentication.CONFIG_FILE, authText);
+ }
+
+ [Test]
+ public void Test_01_GetAuthFromEnv()
+ {
+ var auth = BlockadeLabsAuthentication.Default.LoadFromEnvironment();
+ Assert.IsNotNull(auth);
+ Assert.IsNotNull(auth.Info.ApiKey);
+ Assert.IsNotEmpty(auth.Info.ApiKey);
+ }
+
+ [Test]
+ public void Test_02_GetAuthFromFile()
+ {
+ var auth = BlockadeLabsAuthentication.Default.LoadFromPath(Path.GetFullPath(BlockadeLabsAuthentication.CONFIG_FILE));
+ Assert.IsNotNull(auth);
+ Assert.IsNotNull(auth.Info.ApiKey);
+ Assert.AreEqual("key-test12", auth.Info.ApiKey);
+ }
+
+ [Test]
+ public void Test_03_GetAuthFromNonExistentFile()
+ {
+ var auth = BlockadeLabsAuthentication.Default.LoadFromDirectory(filename: "bad.config");
+ Assert.IsNull(auth);
+ }
+
+ [Test]
+ public void Test_04_GetAuthFromConfiguration()
+ {
+ var configPath = $"Assets/Resources/{nameof(BlockadeLabsConfiguration)}.asset";
+ var cleanup = false;
+
+ if (!File.Exists(Path.GetFullPath(configPath)))
+ {
+ if (!Directory.Exists($"{Application.dataPath}/Resources"))
+ {
+ Directory.CreateDirectory($"{Application.dataPath}/Resources");
+ }
+
+ var instance = ScriptableObject.CreateInstance<BlockadeLabsConfiguration>();
+ instance.ApiKey = "key-test12";
+ AssetDatabase.CreateAsset(instance, configPath);
+ cleanup = true;
+ }
+
+ var config = AssetDatabase.LoadAssetAtPath<BlockadeLabsConfiguration>(configPath);
+ var auth = BlockadeLabsAuthentication.Default.LoadFromAsset<BlockadeLabsConfiguration>();
+
+ Assert.IsNotNull(auth);
+ Assert.IsNotNull(auth.Info.ApiKey);
+ Assert.IsNotEmpty(auth.Info.ApiKey);
+ Assert.AreEqual(auth.Info.ApiKey, config.ApiKey);
+
+ if (cleanup)
+ {
+ AssetDatabase.DeleteAsset(configPath);
+ AssetDatabase.DeleteAsset("Assets/Resources");
+ }
+ }
+
+ [Test]
+ public void Test_05_Authentication()
+ {
+ var defaultAuth = BlockadeLabsAuthentication.Default;
+ var manualAuth = new BlockadeLabsAuthentication("key-testAA");
+
+ Assert.IsNotNull(defaultAuth);
+ Assert.IsNotNull(defaultAuth.Info.ApiKey);
+ Assert.AreEqual(defaultAuth.Info.ApiKey, BlockadeLabsAuthentication.Default.Info.ApiKey);
+
+ BlockadeLabsAuthentication.Default = new BlockadeLabsAuthentication("key-testAA");
+ Assert.IsNotNull(manualAuth);
+ Assert.IsNotNull(manualAuth.Info.ApiKey);
+ Assert.AreEqual(manualAuth.Info.ApiKey, BlockadeLabsAuthentication.Default.Info.ApiKey);
+
+ BlockadeLabsAuthentication.Default = defaultAuth;
+ }
+
+ [Test]
+ public void Test_06_GetKey()
+ {
+ var auth = new BlockadeLabsAuthentication("key-testAA");
+ Assert.IsNotNull(auth.Info.ApiKey);
+ Assert.AreEqual("key-testAA", auth.Info.ApiKey);
+ }
+
+ [Test]
+ public void Test_07_GetKeyFailed()
+ {
+ BlockadeLabsAuthentication auth = null;
+
+ try
+ {
+ auth = new BlockadeLabsAuthentication("fail-key");
+ }
+ catch (InvalidCredentialException)
+ {
+ Assert.IsNull(auth);
+ }
+ catch (Exception e)
+ {
+ Assert.IsTrue(false, $"Expected exception {nameof(InvalidCredentialException)} but got {e.GetType().Name}");
+ }
+ }
+
+ [Test]
+ public void Test_08_ParseKey()
+ {
+ var auth = new BlockadeLabsAuthentication("key-testAA");
+ Assert.IsNotNull(auth.Info.ApiKey);
+ Assert.AreEqual("key-testAA", auth.Info.ApiKey);
+ auth = "key-testCC";
+ Assert.IsNotNull(auth.Info.ApiKey);
+ Assert.AreEqual("key-testCC", auth.Info.ApiKey);
+
+ auth = new BlockadeLabsAuthentication("key-testBB");
+ Assert.IsNotNull(auth.Info.ApiKey);
+ Assert.AreEqual("key-testBB", auth.Info.ApiKey);
+ }
+
+ [Test]
+ public void Test_12_CustomDomainConfigurationSettings()
+ {
+ var auth = new BlockadeLabsAuthentication("customIssuedToken");
+ var settings = new BlockadeLabsSettings(domain: "api.your-custom-domain.com");
+ var api = new BlockadeLabsClient(auth, settings);
+ Console.WriteLine(api.Settings.Info.BaseRequestUrlFormat);
+ }
+
+ [TearDown]
+ public void TearDown()
+ {
+ if (File.Exists(BlockadeLabsAuthentication.CONFIG_FILE))
+ {
+ File.Delete(BlockadeLabsAuthentication.CONFIG_FILE);
+ }
+ }
+ }
+}