Migrating to modern c# namespace

Using the short namesapce declaration for conciseness
2023-04-09 12:34:06 -04:00
parent 37cfda84b5
commit c17c9cd329
48 changed files with 3402 additions and 3454 deletions
@@ -4,53 +4,52 @@ using System.Linq;
 using Newtonsoft.Json;


-namespace Icarus.Models
+namespace Icarus.Models;
+
+public class Token
 {
-    public class Token
+    #region Properties
+    [JsonProperty("scope")]
+    public string Scope { get; set; }
+    [JsonProperty("exp")]
+    public int Expiration { get; set; }
+    [JsonProperty("aud")]
+    public string Audience { get; set; }
+    [JsonProperty("iss")]
+    public string Issuer { get; set; }
+    [JsonProperty("iat")]
+    public int Issued { get; set; }
+    #endregion
+
+    #region Methods
+    public bool TokenExpired()
    {
-        #region Properties
-        [JsonProperty("scope")]
-        public string Scope { get; set; }
-        [JsonProperty("exp")]
-        public int Expiration { get; set; }
-        [JsonProperty("aud")]
-        public string Audience { get; set; }
-        [JsonProperty("iss")]
-        public string Issuer { get; set; }
-        [JsonProperty("iat")]
-        public int Issued { get; set; }
-        #endregion
-    
-        #region Methods
-        public bool TokenExpired()
-        {
-            var result = false;
-            var currentDate = DateTime.Now;
+        var result = false;
+        var currentDate = DateTime.Now;

-            var currentDateInSeconds = Math.Floor((currentDate - DateTime.UnixEpoch).TotalSeconds);
+        var currentDateInSeconds = Math.Floor((currentDate - DateTime.UnixEpoch).TotalSeconds);

-            result = (currentDateInSeconds >= Expiration) ? true : false;
+        result = (currentDateInSeconds >= Expiration) ? true : false;

-            return result;
-        }
-
-        public bool ContainsScope(string desiredScope)
-        {
-            var result = false;
-            result = Scope.Contains(desiredScope);
-
-            return result;
-        }
-
-        public bool Erroneous()
-        {
-            var result = true;
-            Func<string, bool> isEmpty = a => string.IsNullOrEmpty(a);
-            result = (!isEmpty(Scope) && !isEmpty(Audience) && !isEmpty(Issuer) &&
-                Expiration > 0 && Issued > 0) ? false : true;
-
-            return result;
-        }
-        #endregion
+        return result;
    }
-}
+
+    public bool ContainsScope(string desiredScope)
+    {
+        var result = false;
+        result = Scope.Contains(desiredScope);
+
+        return result;
+    }
+
+    public bool Erroneous()
+    {
+        var result = true;
+        Func<string, bool> isEmpty = a => string.IsNullOrEmpty(a);
+        result = (!isEmpty(Scope) && !isEmpty(Audience) && !isEmpty(Issuer) &&
+            Expiration > 0 && Issued > 0) ? false : true;
+
+        return result;
+    }
+    #endregion
+}