From 8bb8171d95935612ff389a3a3f7924e0a9b318e3 Mon Sep 17 00:00:00 2001
From: Stephen Hodgson <rage.against.the.pixel@gmail.com>
Date: Tue, 28 Nov 2023 23:29:32 -0500
Subject: [PATCH] com.utilities.rest 2.3.0 (#54)

- refactor AbstractAuthentication to include TConfiguration : ScriptableObject, IConfiguration
- marked LoadFromAsset<T>(T asset = null) obsolete -> LoadFromAsset(TConfiguration configuration = null)
- added LoadDefault()
- added LoadDefaultsReversed()
---
 Runtime/AbstractAuthentication.cs | 41 +++++++++++++++++++++++++++++--
 package.json                      |  2 +-
 2 files changed, 40 insertions(+), 3 deletions(-)

diff --git a/Runtime/AbstractAuthentication.cs b/Runtime/AbstractAuthentication.cs
index 8b85a25..deb4752 100644
--- a/Runtime/AbstractAuthentication.cs
+++ b/Runtime/AbstractAuthentication.cs
@@ -1,24 +1,61 @@
 // Licensed under the MIT License. See LICENSE in the project root for license information.
 
+using System;
 using System.IO;
 using UnityEngine;
 
 namespace Utilities.WebRequestRest.Interfaces
 {
-    public abstract class AbstractAuthentication<TAuthentication, TAuthInfo> : IAuthentication<TAuthInfo>
+    public abstract class AbstractAuthentication<TAuthentication, TAuthInfo, TConfiguration> : IAuthentication<TAuthInfo>
         where TAuthentication : IAuthentication
         where TAuthInfo : IAuthInfo
+        where TConfiguration : ScriptableObject, IConfiguration
     {
         /// <inheritdoc />
         public abstract TAuthInfo Info { get; }
 
+        /// <summary>
+        /// Attempts to load the default authentication based on order of precedence.<br/>
+        /// 1. ScriptableObject<br/>
+        /// 2. Directory<br/>
+        /// 3. User Directory<br/>
+        /// 4. Environment Variables<br/>
+        /// </summary>
+        /// <returns>
+        /// The loaded <see cref="IAuthentication{T}"/> or <see langword="null"/>.
+        /// </returns>
+        public virtual TAuthentication LoadDefault()
+            => LoadFromAsset() ??
+               LoadFromDirectory() ??
+               LoadFromDirectory(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile)) ??
+               LoadFromEnvironment();
+
+        /// <summary>
+        /// Attempts to load the default authentication based on order of precedence.<br/>
+        /// 1. Environment Variables<br/>
+        /// 2. User Directory<br/>
+        /// 3. Directory<br/>
+        /// 4. ScriptableObject<br/>
+        /// </summary>
+        /// <returns>
+        /// The loaded <see cref="IAuthentication{T}"/> or <see langword="null"/>.
+        /// </returns>
+        public virtual TAuthentication LoadDefaultsReversed()
+            => LoadFromEnvironment() ??
+               LoadFromDirectory(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile)) ??
+               LoadFromAsset() ??
+               LoadFromDirectory();
+
+        [Obsolete("Use LoadFromAsset (remove angle bracket type specification)")]
+        public TAuthentication LoadFromAsset<T>() => LoadFromAsset();
+
         /// <summary>
         /// Attempts to load the authentication from a <see cref="ScriptableObject"/> asset that implements <see cref="IConfiguration"/>.
         /// </summary>
         /// <returns>
         /// The loaded <see cref="IAuthentication{T}"/> or <see langword="null"/>.
         /// </returns>
-        public abstract TAuthentication LoadFromAsset<T>(T asset = null) where T : ScriptableObject, IConfiguration;
+        public abstract TAuthentication LoadFromAsset(TConfiguration configuration = null);
 
         /// <summary>
         /// Attempts to load the authentication from the system environment variables.
diff --git a/package.json b/package.json
index 0e372a9..d528c61 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
   "displayName": "Utilities.Rest",
   "description": "This package contains useful RESTful utilities for the Unity Game Engine.",
   "keywords": [],
-  "version": "2.2.7",
+  "version": "2.3.0",
   "unity": "2021.3",
   "documentationUrl": "https://github.com/RageAgainstThePixel/com.utilities.rest#documentation",
   "changelogUrl": "https://github.com/RageAgainstThePixel/com.utilities.rest/releases",