Merge pull request #30 from ashakoor/main

v0.7.2
Cytraen · Mar 15, 2021 · fda3201 · fda3201
2 parents 6dd33ee + c2a556f
commit fda3201
Show file tree

Hide file tree

Showing 16 changed files with 97 additions and 865 deletions.
diff --git a/BungieSharper.CodeGen.Entities.Tests/BungieSharper.CodeGen.Entities.Tests.csproj b/BungieSharper.CodeGen.Entities.Tests/BungieSharper.CodeGen.Entities.Tests.csproj
@@ -3,14 +3,14 @@
   <PropertyGroup>
     <Authors>ashakoor</Authors>
     <Copyright>Copyright © 2020-2021 ashakoor</Copyright>
-    <PackageLicenseExpression>AGPL-3.0-or-later</PackageLicenseExpression>
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <RepositoryUrl>https://github.com/ashakoor/BungieSharper</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
     <Nullable>enable</Nullable>
     <IsPackable>false</IsPackable>
 
     <TargetFramework>net5.0</TargetFramework>
-    <Version>0.7.2-beta.1</Version>
+    <Version>0.7.2</Version>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/BungieSharper.CodeGen.Entities/BungieSharper.CodeGen.Entities.csproj b/BungieSharper.CodeGen.Entities/BungieSharper.CodeGen.Entities.csproj
@@ -1,16 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
     <Authors>ashakoor</Authors>
     <Copyright>Copyright © 2020-2021 ashakoor</Copyright>
-    <PackageLicenseExpression>LGPL-3.0-or-later</PackageLicenseExpression>
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <RepositoryUrl>https://github.com/ashakoor/BungieSharper</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
     <Nullable>enable</Nullable>
 
     <TargetFramework>net5.0</TargetFramework>
-    <Version>0.7.2-beta.1</Version>
+    <Version>0.7.2</Version>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/BungieSharper.CodeGen/BungieSharper.CodeGen.csproj b/BungieSharper.CodeGen/BungieSharper.CodeGen.csproj
@@ -2,16 +2,15 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
     <Authors>ashakoor</Authors>
     <Copyright>Copyright © 2020-2021 ashakoor</Copyright>
-    <PackageLicenseExpression>AGPL-3.0-or-later</PackageLicenseExpression>
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <RepositoryUrl>https://github.com/ashakoor/BungieSharper</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
     <Nullable>enable</Nullable>
 
     <TargetFramework>net5.0</TargetFramework>
-    <Version>0.7.2-beta.1</Version>
+    <Version>0.7.2</Version>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/BungieSharper.CodeGen/JsonLongConverter.cs b/BungieSharper.CodeGen/JsonLongConverter.cs
@@ -1,31 +1,30 @@
 using System;
 using System.Buffers;
 using System.Buffers.Text;
-using System.Linq;
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
-namespace BungieSharper.CodeGen.Entities
+namespace BungieSharper.CodeGen
 {
     public class JsonLongConverter : JsonConverter<long>
     {
         public override long Read(ref Utf8JsonReader reader, Type type, JsonSerializerOptions options)
         {
-            if (reader.TokenType == JsonTokenType.String)
+            if (reader.TokenType != JsonTokenType.String)
             {
-                ReadOnlySpan<byte> span = reader.HasValueSequence ? reader.ValueSequence.ToArray() : reader.ValueSpan;
-                if (Utf8Parser.TryParse(span, out long number, out var bytesConsumed) && span.Length == bytesConsumed)
-                {
-                    return number;
-                }
+                return reader.GetInt64();
+            }
+
+            var span = reader.HasValueSequence ? reader.ValueSequence.ToArray() : reader.ValueSpan;
 
-                if (long.TryParse(reader.GetString(), out number))
-                {
-                    return number;
-                }
+            if (Utf8Parser.TryParse(span, out long number, out var bytesConsumed) && span.Length == bytesConsumed)
+            {
+                return number;
             }
 
-            return reader.GetInt64();
+            return long.TryParse(reader.GetString(), out number)
+                ? number
+                : reader.GetInt64();
         }
 
         public override void Write(Utf8JsonWriter writer, long value, JsonSerializerOptions options)

diff --git a/BungieSharper.CodeGen/Program.cs b/BungieSharper.CodeGen/Program.cs
@@ -120,11 +120,6 @@ private static void Main(string[] args)
                     combinedContent = combinedContent.Replace("System.DateTime", "DateTime");
                 }
 
-                if (!string.IsNullOrWhiteSpace(topFolder))
-                {
-                    Directory.CreateDirectory(bungieSharperPath.TrimEnd('\\') + ".Schema\\" + topFolder);
-                }
-
                 WriteFileWithContent(
                     bungieSharperPath.TrimEnd('\\') + ".Entities\\" + topFolder,
                     ("Entities." + location.Replace(bungieSharperPath, "").Replace('\\', '.') + ".cs").Replace("..", "."),

diff --git a/BungieSharper.Entities/BungieSharper.Entities.csproj b/BungieSharper.Entities/BungieSharper.Entities.csproj
@@ -1,16 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
     <Authors>ashakoor</Authors>
     <Copyright>Copyright © 2020-2021 ashakoor</Copyright>
-    <PackageLicenseExpression>LGPL-3.0-or-later</PackageLicenseExpression>
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <RepositoryUrl>https://github.com/ashakoor/BungieSharper</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
     <Nullable>enable</Nullable>
 
-    <TargetFrameworks>net5.0</TargetFrameworks>
-    <Version>0.7.2-beta.1</Version>
+    <TargetFrameworks>net5.0;netcoreapp3.1;netstandard2.1</TargetFrameworks>
+    <Version>0.7.2</Version>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
@@ -42,6 +41,9 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
+
+    <PackageReference Include="System.Text.Json" Version="5.0.1" Condition="'$(TargetFramework)' == 'netcoreapp3.1'" />
+    <PackageReference Include="System.Text.Json" Version="5.0.1" Condition="'$(TargetFramework)' == 'netstandard2.1'" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/BungieSharper.Entities/_ApiResponses.cs b/BungieSharper.Entities/_ApiResponses.cs
@@ -21,11 +21,18 @@ public class ApiResponse
 
     public class ApiResponse<T> : ApiResponse
     {
+#if (NETSTANDARD2_1 || NETCOREAPP2_1 || NETCOREAPP3_1)
+        public T Response { get; set; }
+#else
         public T? Response { get; set; }
+#endif
     }
 
     public class TokenResponse
     {
+        /// <summary>
+        /// The access token, to be sent with authenticated requests
+        /// </summary>
         [JsonPropertyName("access_token")]
         public string? AccessToken { get; set; }
 
@@ -41,6 +48,9 @@ public class TokenResponse
         [JsonPropertyName("expires_in")]
         public long? ExpiresIn { get; set; }
 
+        /// <summary>
+        /// The refresh token, to be used to refresh the <see cref="AccessToken"/> (for "confidential" clients only)
+        /// </summary>
         [JsonPropertyName("refresh_token")]
         public string? RefreshToken { get; set; }
 
@@ -56,9 +66,15 @@ public class TokenResponse
         [JsonPropertyName("membership_id")]
         public long? MembershipId { get; set; }
 
+        /// <summary>
+        /// The error, if there is one
+        /// </summary>
         [JsonPropertyName("error")]
         public string? Error { get; set; }
 
+        /// <summary>
+        /// A (hopefully) more detailed description of the error, if there is one
+        /// </summary>
         [JsonPropertyName("error_description")]
         public string? ErrorDescription { get; set; }
     }

diff --git a/BungieSharper.Tests/BungieSharper.Tests.csproj b/BungieSharper.Tests/BungieSharper.Tests.csproj
@@ -3,14 +3,14 @@
   <PropertyGroup>
     <Authors>ashakoor</Authors>
     <Copyright>Copyright © 2020-2021 ashakoor</Copyright>
-    <PackageLicenseExpression>AGPL-3.0-or-later</PackageLicenseExpression>
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <RepositoryUrl>https://github.com/ashakoor/BungieSharper</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
     <Nullable>enable</Nullable>
     <IsPackable>false</IsPackable>
 
     <TargetFramework>net5.0</TargetFramework>
-    <Version>0.7.2-beta.1</Version>
+    <Version>0.7.2</Version>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/BungieSharper.sln.DotSettings b/BungieSharper.sln.DotSettings
@@ -0,0 +1,2 @@
+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Bungie/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
diff --git a/BungieSharper/BungieSharper.csproj b/BungieSharper/BungieSharper.csproj
@@ -1,16 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
     <Authors>ashakoor</Authors>
     <Copyright>Copyright © 2020-2021 ashakoor</Copyright>
-    <PackageLicenseExpression>LGPL-3.0-or-later</PackageLicenseExpression>
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <RepositoryUrl>https://github.com/ashakoor/BungieSharper</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
     <Nullable>enable</Nullable>
 
-    <TargetFrameworks>net5.0</TargetFrameworks>
-    <Version>0.7.2-beta.1</Version>
+    <TargetFrameworks>net5.0;netcoreapp3.1;netstandard2.1</TargetFrameworks>
+    <Version>0.7.2</Version>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">

diff --git a/BungieSharper/Client/ApiAccessor.cs b/BungieSharper/Client/ApiAccessor.cs
@@ -106,9 +106,15 @@ internal async Task<T> ApiRequestAsync<T>(Uri uri, HttpContent? httpContent, Htt
                     throw ContentNotJsonException.NewContentNotJsonException(httpResponseMessage);
                 }
 
+#if (NETSTANDARD2_1 || NETCOREAPP2_1 || NETCOREAPP3_1)
                 var apiResponse = JsonSerializer.Deserialize<Entities.ApiResponse<T>>(
-                    await httpResponseMessage.Content.ReadAsStringAsync(cancelToken).ConfigureAwait(false), _serializerOptions
-                    );
+                    await httpResponseMessage.Content.ReadAsStringAsync().ConfigureAwait(false),
+                    _serializerOptions);
+#else
+                var apiResponse = JsonSerializer.Deserialize<Entities.ApiResponse<T>>(
+                    await httpResponseMessage.Content.ReadAsStringAsync(cancelToken).ConfigureAwait(false),
+                    _serializerOptions);
+#endif
 
                 if (apiResponse is null)
                 {
@@ -166,9 +172,15 @@ await httpResponseMessage.Content.ReadAsStringAsync(cancelToken).ConfigureAwait(
                     throw ContentNotJsonException.NewContentNotJsonException(httpResponseMessage);
                 }
 
+#if (NETSTANDARD2_1 || NETCOREAPP2_1 || NETCOREAPP3_1)
+                var apiResponse = JsonSerializer.Deserialize<Entities.TokenResponse>(
+                    await httpResponseMessage.Content.ReadAsStringAsync().ConfigureAwait(false),
+                    _serializerOptions);
+#else
                 var apiResponse = JsonSerializer.Deserialize<Entities.TokenResponse>(
-                    await httpResponseMessage.Content.ReadAsStringAsync(cancelToken).ConfigureAwait(false), _serializerOptions
-                    );
+                    await httpResponseMessage.Content.ReadAsStringAsync(cancelToken).ConfigureAwait(false),
+                    _serializerOptions);
+#endif
 
                 if (apiResponse is null)
                 {
@@ -185,14 +197,24 @@ internal async Task<Stream> GetStream(Uri uri, CancellationToken cancelToken)
         {
             var requestMsg = HttpRequestGenerator.MakeApiRequestMessage(uri, null, HttpMethod.Get);
             var response = await GetApiResponseAsync(requestMsg, cancelToken);
+
+#if (NETSTANDARD2_1 || NETCOREAPP2_1 || NETCOREAPP3_1)
+            return await response.Content.ReadAsStreamAsync();
+#else
             return await response.Content.ReadAsStreamAsync(cancelToken);
+#endif
         }
 
         internal async Task<string> GetString(Uri uri, CancellationToken cancelToken)
         {
             var requestMsg = HttpRequestGenerator.MakeApiRequestMessage(uri, null, HttpMethod.Get);
             var response = await GetApiResponseAsync(requestMsg, cancelToken);
+
+#if (NETSTANDARD2_1 || NETCOREAPP2_1 || NETCOREAPP3_1)
+            return await response.Content.ReadAsStringAsync();
+#else
             return await response.Content.ReadAsStringAsync(cancelToken);
+#endif
         }
 
         private Task<HttpResponseMessage> GetApiResponseAsync(HttpRequestMessage request, CancellationToken cancelToken)

diff --git a/BungieSharper/Endpoints/_OAuthRequests.cs b/BungieSharper/Endpoints/_OAuthRequests.cs
@@ -1,4 +1,4 @@
-using BungieSharper.Client;
+using BungieSharper.Client;
 using System;
 using System.Collections.Generic;
 using System.Net.Http;
@@ -77,7 +77,12 @@ internal OAuthRequests(ApiAccessor apiAccessor)
         /// <returns>The OAuth authorization URL.</returns>
         public string GetOAuthAuthorizationUrl()
         {
-            return OAuthAuthorizationUrl + _oAuthClientId;
+            if (!_oAuthClientId.HasValue)
+            {
+                throw new NullReferenceException(nameof(_oAuthClientId));
+            }
+
+            return OAuthAuthorizationUrl + _oAuthClientId.Value;
         }
 
         /// <summary>
@@ -87,7 +92,12 @@ public string GetOAuthAuthorizationUrl()
         /// <returns>The OAuth authorization URL.</returns>
         public string GetOAuthAuthorizationUrl(string state)
         {
-            return OAuthAuthorizationUrl + _oAuthClientId + "&state=" + state;
+            if (string.IsNullOrWhiteSpace(state))
+            {
+                return GetOAuthAuthorizationUrl();
+            }
+
+            return GetOAuthAuthorizationUrl() + "&state=" + state;
         }
 
         internal void SetOAuthClientId(uint clientId)