configured to build correct packages, finally, I hope so...

NickRimmer · NickRimmer · commit 4f8a6bbacce8 · 2024-10-15T00:12:47.000+02:00
diff --git a/nuget.config b/nuget.config
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -6,9 +6,6 @@
     <PlatformTarget>x64</PlatformTarget>
     <DebugSymbols>false</DebugSymbols>
     <DebugType>none</DebugType>
-  </PropertyGroup>
-
-  <PropertyGroup>
     <AnalysisLevel>6.0-all</AnalysisLevel>
     <EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
     <ErrorOnDuplicatePublishOutputFiles>false</ErrorOnDuplicatePublishOutputFiles>
@@ -25,25 +22,17 @@
   <!-- Set the Product and Version info -->
   <PropertyGroup>
     <Product>RestApia</Product>
+    <Authors>RestApia</Authors>
     <Company>restapia.app</Company>
     <Copyright>Copyright 2023-$([System.DateTime]::Now.ToString('yyyy')) restapia.app</Copyright>
 
-    <!-- Will be replaced by CI -->
-    <AssemblyVersion>99.99.99.*</AssemblyVersion>
     <NeutralLanguage>en</NeutralLanguage>
-
     <GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
     <GenerateAssemblyInformationalVersionAttribute>false</GenerateAssemblyInformationalVersionAttribute>
     <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
     <Deterministic Condition="$(AssemblyVersion.EndsWith('*'))">False</Deterministic>
   </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.2" PrivateAssets="none" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" PrivateAssets="none"/>
-    <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.0.0" PrivateAssets="none"/>
-  </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
       <PrivateAssets>all</PrivateAssets>
diff --git a/src/Extensions/Directory.Build.props b/src/Extensions/Directory.Build.props
@@ -2,10 +2,17 @@
   <Import Project="..\Directory.Build.props"/>
 
   <PropertyGroup>
-    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+    <RepositoryUrl>https://github.com/RestApia/RestApia.Shared</RepositoryUrl>
+    <PackageLicenseExpression>MIT</PackageLicenseExpression>
+    <PackageReadmeFile>README.md</PackageReadmeFile>
+    <PackageTags>RestApia, Extension</PackageTags>
   </PropertyGroup>
 
+  <ItemGroup>
+    <None Include="README.md" Pack="true" PackagePath="\"/>
+  </ItemGroup>
+
   <Target Name="PublishToLocal" AfterTargets="Pack" Condition="'$(Configuration)' == 'Debug'">
     <ItemGroup>
       <NuGetPackages Include="$(PackageOutputPath)*.nupkg"/>
@@ -14,4 +21,8 @@
     <Copy SourceFiles="@(NuGetPackages)" DestinationFolder="$(ProjectDir)..\..\..\.local\nugets"/>
   </Target>
 
+  <ItemGroup>
+    <PackageReference Include="RestApia.Shared" Version="1.0.4" />
+  </ItemGroup>
+
 </Project>
diff --git a/src/Extensions/RestApia.Extensions.Auth.Basic/AssemblyInfo.cs b/src/Extensions/RestApia.Extensions.Auth.Basic/AssemblyInfo.cs
diff --git a/src/Extensions/RestApia.Extensions.Auth.Basic/README.md b/src/Extensions/RestApia.Extensions.Auth.Basic/README.md
@@ -0,0 +1,3 @@
+# RestApia.Extensions.Auth.Basic
+
+TBD
diff --git a/src/Extensions/RestApia.Extensions.Auth.Basic/RestApia.Extensions.Auth.Basic.csproj b/src/Extensions/RestApia.Extensions.Auth.Basic/RestApia.Extensions.Auth.Basic.csproj
@@ -1,5 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
-  <ItemGroup>
-    <PackageReference Include="RestApia.Shared" Version="1.0.0" />
-  </ItemGroup>
+  <PropertyGroup>
+    <Title>Basic Authorization extension</Title>
+    <Description>Basic Authorization extension for RestApia. Generate Authorizatoin header based on settings for requests.</Description>
+    <Version>1.0.6</Version>
+  </PropertyGroup>
 </Project>
diff --git a/src/Extensions/RestApia.Extensions.Auth.OAuth2/AssemblyInfo.cs b/src/Extensions/RestApia.Extensions.Auth.OAuth2/AssemblyInfo.cs
diff --git a/src/Extensions/RestApia.Extensions.Auth.OAuth2/AuthCode/OAuth2AuthCodeService.cs b/src/Extensions/RestApia.Extensions.Auth.OAuth2/AuthCode/OAuth2AuthCodeService.cs
@@ -1,6 +1,5 @@
 ﻿using System.Diagnostics.CodeAnalysis;
 using System.Text;
-using Microsoft.Extensions.Logging;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using RestApia.Shared.Common;
@@ -40,7 +39,7 @@ public async Task<bool> ReloadAsync(object settingsObj, Guid authId)
     {
         if (settingsObj is not OAuth2AuthCodeSettings settings)
         {
-            _logger.LogWarning("Invalid settings type '{SettingsType}' for service {DisplayName} found", settingsObj?.GetType(), DisplayName);
+            _logger.Warn($"Invalid settings type '{settingsObj?.GetType()}' for service {DisplayName} found");
             return false;
         }
 
@@ -55,7 +54,7 @@ public async Task<bool> ReloadAsync(object settingsObj, Guid authId)
         DateTime? expiresAt = null;
         if (!OAuth2Helper.TryParseToken(tokenString, _logger, out var token))
         {
-            _logger.LogWarning("Cannot validate JWT token, expiration date will not be set");
+            _logger.Warn("Cannot validate JWT token, expiration date will not be set");
         }
         else
         {
diff --git a/src/Extensions/RestApia.Extensions.Auth.OAuth2/Implicit/OAuth2ImplicitService.cs b/src/Extensions/RestApia.Extensions.Auth.OAuth2/Implicit/OAuth2ImplicitService.cs
@@ -1,5 +1,4 @@
 ﻿using System.Web;
-using Microsoft.Extensions.Logging;
 using RestApia.Shared.Common;
 using RestApia.Shared.Extensions.Interfaces;
 using RestApia.Shared.Extensions.Models;
@@ -35,7 +34,7 @@ public async Task<bool> ReloadAsync(object settingsObj, Guid authId)
     {
         if (settingsObj is not OAuth2ImplicitSettings settings)
         {
-            _logger.LogWarning("Invalid settings type '{SettingsType}' for service {DisplayName} found", settingsObj?.GetType(), DisplayName);
+            _logger.Warn($"Invalid settings type '{settingsObj?.GetType()}' for service {DisplayName} found");
             return false;
         }
 
@@ -69,7 +68,7 @@ public async Task<bool> ReloadAsync(object settingsObj, Guid authId)
         var result = await _dialogs.OpenAuthBrowserAsync(startUrl, stopUrl, "OAuth2 Implicit");
         if (result == null)
         {
-            _logger.LogDebug("Auth canceled by user");
+            _logger.Debug("Auth canceled by user");
             return false;
         }
 
@@ -85,7 +84,7 @@ public async Task<bool> ReloadAsync(object settingsObj, Guid authId)
         DateTime? expiresAt = null;
         if (!OAuth2Helper.TryParseToken(tokenString, _logger, out var token))
         {
-            _logger.LogWarning("Cannot validate JWT token, expiration date will not be set");
+            _logger.Warn("Cannot validate JWT token, expiration date will not be set");
         }
         else
         {
diff --git a/src/Extensions/RestApia.Extensions.Auth.OAuth2/OAuth2Helper.cs b/src/Extensions/RestApia.Extensions.Auth.OAuth2/OAuth2Helper.cs
@@ -2,7 +2,7 @@
 using System.Diagnostics.CodeAnalysis;
 using System.IdentityModel.Tokens.Jwt;
 using System.Web;
-using Microsoft.Extensions.Logging;
+using RestApia.Shared.Extensions.Interfaces;
 using RestApia.Shared.Extensions.Models;
 using RestApia.Shared.Values.Enums;
 
@@ -17,7 +17,7 @@ public static bool TryParseToken(string? token, ILogger logger, [NotNullWhen(tru
         result = null;
         if (string.IsNullOrWhiteSpace(token))
         {
-            logger.LogWarning("Cannot parse empty JWT token");
+            logger.Warn("Cannot parse empty JWT token");
             return false;
         }
 
@@ -29,7 +29,7 @@ public static bool TryParseToken(string? token, ILogger logger, [NotNullWhen(tru
         }
         catch (Exception ex)
         {
-            logger.LogError("Error during JWT token parsing: {ExMessage}", ex.Message);
+            logger.Fail(ex, "Error during JWT token parsing");
             return false;
         }
     }
diff --git a/src/Extensions/RestApia.Extensions.Auth.OAuth2/README.md b/src/Extensions/RestApia.Extensions.Auth.OAuth2/README.md
@@ -0,0 +1,3 @@
+# RestApia.Extensions.Auth.OAuth2
+
+TBD
diff --git a/src/Extensions/RestApia.Extensions.Auth.OAuth2/RestApia.Extensions.Auth.OAuth2.csproj b/src/Extensions/RestApia.Extensions.Auth.OAuth2/RestApia.Extensions.Auth.OAuth2.csproj
@@ -1,5 +1,13 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <Title>OAuth2 Authorization extension</Title>
+    <Description>Extension provides OAuth2 Implicit and AuthCode authorizations</Description>
+    <Version>1.0.6</Version>
+  </PropertyGroup>
+  
   <ItemGroup>
-    <PackageReference Include="RestApia.Shared" Version="1.0.0" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+    <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="8.1.2" />
   </ItemGroup>
+
 </Project>
diff --git a/src/RestApia.Shared/Extensions/Interfaces/ILogger.cs b/src/RestApia.Shared/Extensions/Interfaces/ILogger.cs
@@ -0,0 +1,10 @@
+﻿namespace RestApia.Shared.Extensions.Interfaces;
+
+public interface ILogger
+{
+    void Debug(string message);
+    void Info(string message);
+    void Warn(string message);
+    void Fail(string message);
+    void Fail(Exception? ex, string message = "");
+}
diff --git a/src/RestApia.Shared/Extensions/Models/ExtensionFileInfo.cs b/src/RestApia.Shared/Extensions/Models/ExtensionFileInfo.cs
diff --git a/src/RestApia.Shared/RestApia.Shared.csproj b/src/RestApia.Shared/RestApia.Shared.csproj
@@ -1,10 +1,14 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
+    <Title>RestApia Extensions shared Library</Title>
+    <Description>Provides interfaces for communication with application</Description>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <RepositoryUrl>https://github.com/RestApia/RestApia.Community</RepositoryUrl>
+    <RepositoryUrl>https://github.com/RestApia/RestApia.Shared</RepositoryUrl>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <PackageReadmeFile>README.md</PackageReadmeFile>
+    <Version>1.0.4</Version>
+    <AssemblyVersion>1.0.4</AssemblyVersion>
   </PropertyGroup>
   
   <ItemGroup>

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+# RestApia.Extensions.Auth.Basic`
	`2`	`+`
	`3`	`+TBD`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`	`1`	`using System.Diagnostics.CodeAnalysis;`
`2`	`2`	`using System.Text;`
`3`		`-using Microsoft.Extensions.Logging;`
`4`	`3`	`using Newtonsoft.Json;`
`5`	`4`	`using Newtonsoft.Json.Linq;`
`6`	`5`	`using RestApia.Shared.Common;`
`@@ -40,7 +39,7 @@ public async Task<bool> ReloadAsync(object settingsObj, Guid authId)`
`40`	`39`	`{`
`41`	`40`	`if (settingsObj is not OAuth2AuthCodeSettings settings)`
`42`	`41`	`{`
`43`		`- _logger.LogWarning("Invalid settings type '{SettingsType}' for service {DisplayName} found", settingsObj?.GetType(), DisplayName);`
	`42`	`+ _logger.Warn($"Invalid settings type '{settingsObj?.GetType()}' for service {DisplayName} found");`
`44`	`43`	`return false;`
`45`	`44`	`}`
`46`	`45`
`@@ -55,7 +54,7 @@ public async Task<bool> ReloadAsync(object settingsObj, Guid authId)`
`55`	`54`	`DateTime? expiresAt = null;`
`56`	`55`	`if (!OAuth2Helper.TryParseToken(tokenString, _logger, out var token))`
`57`	`56`	`{`
`58`		`- _logger.LogWarning("Cannot validate JWT token, expiration date will not be set");`
	`57`	`+ _logger.Warn("Cannot validate JWT token, expiration date will not be set");`
`59`	`58`	`}`
`60`	`59`	`else`
`61`	`60`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`using System.Web;`
`2`		`-using Microsoft.Extensions.Logging;`
`3`	`2`	`using RestApia.Shared.Common;`
`4`	`3`	`using RestApia.Shared.Extensions.Interfaces;`
`5`	`4`	`using RestApia.Shared.Extensions.Models;`
`@@ -35,7 +34,7 @@ public async Task<bool> ReloadAsync(object settingsObj, Guid authId)`
`35`	`34`	`{`
`36`	`35`	`if (settingsObj is not OAuth2ImplicitSettings settings)`
`37`	`36`	`{`
`38`		`- _logger.LogWarning("Invalid settings type '{SettingsType}' for service {DisplayName} found", settingsObj?.GetType(), DisplayName);`
	`37`	`+ _logger.Warn($"Invalid settings type '{settingsObj?.GetType()}' for service {DisplayName} found");`
`39`	`38`	`return false;`
`40`	`39`	`}`
`41`	`40`
`@@ -69,7 +68,7 @@ public async Task<bool> ReloadAsync(object settingsObj, Guid authId)`
`69`	`68`	`var result = await _dialogs.OpenAuthBrowserAsync(startUrl, stopUrl, "OAuth2 Implicit");`
`70`	`69`	`if (result == null)`
`71`	`70`	`{`
`72`		`- _logger.LogDebug("Auth canceled by user");`
	`71`	`+ _logger.Debug("Auth canceled by user");`
`73`	`72`	`return false;`
`74`	`73`	`}`
`75`	`74`
`@@ -85,7 +84,7 @@ public async Task<bool> ReloadAsync(object settingsObj, Guid authId)`
`85`	`84`	`DateTime? expiresAt = null;`
`86`	`85`	`if (!OAuth2Helper.TryParseToken(tokenString, _logger, out var token))`
`87`	`86`	`{`
`88`		`- _logger.LogWarning("Cannot validate JWT token, expiration date will not be set");`
	`87`	`+ _logger.Warn("Cannot validate JWT token, expiration date will not be set");`
`89`	`88`	`}`
`90`	`89`	`else`
`91`	`90`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`using System.Diagnostics.CodeAnalysis;`
`3`	`3`	`using System.IdentityModel.Tokens.Jwt;`
`4`	`4`	`using System.Web;`
`5`		`-using Microsoft.Extensions.Logging;`
	`5`	`+using RestApia.Shared.Extensions.Interfaces;`
`6`	`6`	`using RestApia.Shared.Extensions.Models;`
`7`	`7`	`using RestApia.Shared.Values.Enums;`
`8`	`8`
`@@ -17,7 +17,7 @@ public static bool TryParseToken(string? token, ILogger logger, [NotNullWhen(tru`
`17`	`17`	`result = null;`
`18`	`18`	`if (string.IsNullOrWhiteSpace(token))`
`19`	`19`	`{`
`20`		`- logger.LogWarning("Cannot parse empty JWT token");`
	`20`	`+ logger.Warn("Cannot parse empty JWT token");`
`21`	`21`	`return false;`
`22`	`22`	`}`
`23`	`23`
`@@ -29,7 +29,7 @@ public static bool TryParseToken(string? token, ILogger logger, [NotNullWhen(tru`
`29`	`29`	`}`
`30`	`30`	`catch (Exception ex)`
`31`	`31`	`{`
`32`		`- logger.LogError("Error during JWT token parsing: {ExMessage}", ex.Message);`
	`32`	`+ logger.Fail(ex, "Error during JWT token parsing");`
`33`	`33`	`return false;`
`34`	`34`	`}`
`35`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+# RestApia.Extensions.Auth.OAuth2`
	`2`	`+`
	`3`	`+TBD`