Merge pull request #3 from LuckyNoS7evin/master

Initial version ready state
TwitchLib · Mar 7, 2018 · 848aefb · 848aefb
2 parents 494cec7 + 7d10fd7
commit 848aefb
Show file tree

Hide file tree

Showing 24 changed files with 94 additions and 105 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,12 @@
+################################################################################
+# This .gitignore file was automatically created by Microsoft(R) Visual Studio.
+################################################################################
+
+/.vs/TwitchLib.Extension/v15
+/TwitchLib.Extension.Core/obj
+/TwitchLib.Extension.Core/bin/Debug/netcoreapp2.0
+/TwitchLib.Extension/obj
+/TwitchLib.Extension/bin/Debug
+/TwitchLib.Extension/.vs/TwitchLib.Extension/v15
+/TwitchLib.Extension/bin/Release
+/TwitchLib.Extension.Core/bin
diff --git a/TwitchLib.Extension.Core/Authentication/TwitchExtensionAuthHandler.cs b/TwitchLib.Extension.Core/Authentication/TwitchExtensionAuthHandler.cs
@@ -4,7 +4,6 @@
 using TwitchLib.Extension.Core.Authentication.Events;
 using System.Text.Encodings.Web;
 using System.Threading.Tasks;
-using System;
 
 namespace TwitchLib.Extension.Core.Authentication
 {

diff --git a/TwitchLib.Extension.Core/Authentication/TwitchExtensionAuthOptions.cs b/TwitchLib.Extension.Core/Authentication/TwitchExtensionAuthOptions.cs
@@ -1,4 +1,5 @@
 using Microsoft.AspNetCore.Authentication;
+
 namespace TwitchLib.Extension.Core.Authentication
 {
     public class TwitchExtensionAuthOptions : AuthenticationSchemeOptions

diff --git a/TwitchLib.Extension.Core/TwitchLib.Extension.Core.csproj b/TwitchLib.Extension.Core/TwitchLib.Extension.Core.csproj
@@ -1,27 +1,29 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup Label="Globals">
-    <SccProjectName>SAK</SccProjectName>
-    <SccProvider>SAK</SccProvider>
-    <SccAuxPath>SAK</SccAuxPath>
-    <SccLocalPath>SAK</SccLocalPath>
-  </PropertyGroup>
-
   <PropertyGroup>
     <TargetFramework>netcoreapp2.0</TargetFramework>
+    <PackageId>TwitchLib.Extension.Core</PackageId>
+    <Version>1.0.0</Version>
+    <Description>Extension component of TwitchLib. This component expands the base Extension Library to include a dot net standard (core) Authentication Middleware and Extension Manager</Description>
+    <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
+    <Authors>luckyNoS7evin</Authors>
+    <Company>swiftyspiffy (cole)</Company>
+    <PackageIconUrl>https://colejelinek.com/dev/twitchlib.png</PackageIconUrl>
+    <PackageProjectUrl>https://github.com/TwitchLib/TwitchLib.Extension</PackageProjectUrl>
+    <PackageLicenseUrl>https://opensource.org/licenses/MIT</PackageLicenseUrl>
+    <Copyright>Copyright 2017</Copyright>
+    <PackageReleaseNotes>Version 1 of the Extension library</PackageReleaseNotes>
+    <RepositoryUrl>https://github.com/TwitchLib/TwitchLib.Extension</RepositoryUrl>
+    <RepositoryType>Git</RepositoryType>
+    <PackageTags>twitch extension api c# csharp nbet standard 2.0 authorization extension mamnager</PackageTags>
+    <NeutralLanguage>en-US</NeutralLanguage>
+    <AssemblyVersion>2.0.0.0</AssemblyVersion>
+    <FileVersion>2.0.0.0</FileVersion>
   </PropertyGroup>
-
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Authentication" Version="2.0.1" />
-    <PackageReference Include="Microsoft.IdentityModel.Tokens" Version="5.1.5" />
+    <PackageReference Include="Microsoft.IdentityModel.Tokens" Version="5.2.1" />
   </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\TwitchLib.Extension\TwitchLib.Extension.csproj" />
   </ItemGroup>
-
-  <ItemGroup>
-    <Folder Include="Authentication\" />
-  </ItemGroup>
-
 </Project>
diff --git a/TwitchLib.Extension.sln b/TwitchLib.Extension.sln
@@ -0,0 +1,31 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 15
+VisualStudioVersion = 15.0.27130.2027
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TwitchLib.Extension", "TwitchLib.Extension\TwitchLib.Extension.csproj", "{3707BBF6-ED3D-4044-8110-6C2C5CBEFB56}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TwitchLib.Extension.Core", "TwitchLib.Extension.Core\TwitchLib.Extension.Core.csproj", "{5ED18BCE-3A8B-4C7D-8A9A-4FB25BD241F3}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{3707BBF6-ED3D-4044-8110-6C2C5CBEFB56}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3707BBF6-ED3D-4044-8110-6C2C5CBEFB56}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3707BBF6-ED3D-4044-8110-6C2C5CBEFB56}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3707BBF6-ED3D-4044-8110-6C2C5CBEFB56}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5ED18BCE-3A8B-4C7D-8A9A-4FB25BD241F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5ED18BCE-3A8B-4C7D-8A9A-4FB25BD241F3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5ED18BCE-3A8B-4C7D-8A9A-4FB25BD241F3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5ED18BCE-3A8B-4C7D-8A9A-4FB25BD241F3}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {8E06B51D-BBC5-431C-A0FE-1B967CA5AB44}
+	EndGlobalSection
+EndGlobal
diff --git a/TwitchLib.Extension/Exceptions/BadParameterException.cs b/TwitchLib.Extension/Exceptions/BadParameterException.cs
@@ -1,8 +1,7 @@
-namespace TwitchLib.Extension.Exceptions
+using System;
+
+namespace TwitchLib.Extension.Exceptions
 {
-    #region using directives
-    using System;
-    #endregion
     /// <summary>Exception representing an invalid resource</summary>
     public class BadParameterException : Exception
     {

diff --git a/TwitchLib.Extension/Exceptions/BadRequestException.cs b/TwitchLib.Extension/Exceptions/BadRequestException.cs
@@ -1,8 +1,7 @@
-namespace TwitchLib.Extension.Exceptions
+using System;
+
+namespace TwitchLib.Extension.Exceptions
 {
-    #region using directives
-    using System;
-    #endregion
     /// <summary>Exception representing a request that doesn't have a clientid attached.</summary>
     public class BadRequestException : Exception
     {

diff --git a/TwitchLib.Extension/Exceptions/BadResourceException.cs b/TwitchLib.Extension/Exceptions/BadResourceException.cs
@@ -1,8 +1,7 @@
-namespace TwitchLib.Extension.Exceptions
+using System;
+
+namespace TwitchLib.Extension.Exceptions
 {
-    #region using directives
-    using System;
-    #endregion
     /// <summary>Exception representing an invalid resource</summary>
     public class BadResourceException : Exception
     {

diff --git a/TwitchLib.Extension/Exceptions/BadScopeException.cs b/TwitchLib.Extension/Exceptions/BadScopeException.cs
@@ -1,8 +1,7 @@
-namespace TwitchLib.Extension.Exceptions
+using System;
+
+namespace TwitchLib.Extension.Exceptions
 {
-    #region using directives
-    using System;
-    #endregion
     /// <summary>Exception representing a provided scope was not permitted.</summary>
     public class BadScopeException : Exception
     {

diff --git a/TwitchLib.Extension/Exceptions/InvalidCredentialException.cs b/TwitchLib.Extension/Exceptions/InvalidCredentialException.cs
@@ -1,8 +1,7 @@
-namespace TwitchLib.Extension.Exceptions
+using System;
+
+namespace TwitchLib.Extension.Exceptions
 {
-    #region using directives
-    using System;
-    #endregion
     /// <summary>Exception representing a detection that sent credentials were invalid.</summary>
     public class InvalidCredentialException : Exception
     {

diff --git a/TwitchLib.Extension/Extension/ExtensionConfiguration.cs b/TwitchLib.Extension/Extension/ExtensionConfiguration.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace TwitchLib.Extension
+namespace TwitchLib.Extension
 {
     public class ExtensionConfiguration
     {

diff --git a/TwitchLib.Extension/Extension/ExtensionManager.cs b/TwitchLib.Extension/Extension/ExtensionManager.cs
@@ -1,10 +1,5 @@
 using Microsoft.IdentityModel.Tokens;
-using System;
-using System.Collections.Generic;
 using System.Security.Claims;
-using System.Security.Principal;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace TwitchLib.Extension
 {

diff --git a/TwitchLib.Extension/Extension/ExtensionsConfiguration.cs b/TwitchLib.Extension/Extension/ExtensionsConfiguration.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
+using System.Collections.Generic;
 
 namespace TwitchLib.Extension
 {

diff --git a/TwitchLib.Extension/Extension/RotatedSecretExtension.cs b/TwitchLib.Extension/Extension/RotatedSecretExtension.cs
@@ -1,12 +1,5 @@
-using Microsoft.IdentityModel.Tokens;
-using System;
-using System.Collections.Generic;
+using System;
 using System.Linq;
-using System.Security.Claims;
-using System.Security.Principal;
-using System.Text;
-using System.Threading.Tasks;
-using TwitchLib.Extension.Models;
 
 namespace TwitchLib.Extension
 {

diff --git a/TwitchLib.Extension/Extension/StaticSecretExtension.cs b/TwitchLib.Extension/Extension/StaticSecretExtension.cs
@@ -1,13 +1,4 @@
-using Microsoft.IdentityModel.Tokens;
-using System;
-using System.Collections.Generic;
-using System.Security.Claims;
-using System.Security.Principal;
-using System.Text;
-using System.Threading.Tasks;
-using TwitchLib.Extension.Models;
-
-namespace TwitchLib.Extension
+namespace TwitchLib.Extension
 {
     public class StaticSecretExtension : ExtensionBase
     {

diff --git a/TwitchLib.Extension/Models/CreateSecretRequest.cs b/TwitchLib.Extension/Models/CreateSecretRequest.cs
@@ -1,7 +1,4 @@
 using Newtonsoft.Json;
-using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace TwitchLib.Extension.Models
 {

diff --git a/TwitchLib.Extension/Models/ExtensionPubSubRequest.cs b/TwitchLib.Extension/Models/ExtensionPubSubRequest.cs
@@ -1,7 +1,4 @@
 using Newtonsoft.Json;
-using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace TwitchLib.Extension.Models
 {

diff --git a/TwitchLib.Extension/Models/LiveChannel.cs b/TwitchLib.Extension/Models/LiveChannel.cs
@@ -1,7 +1,4 @@
 using Newtonsoft.Json;
-using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace TwitchLib.Extension.Models
 {

diff --git a/TwitchLib.Extension/Models/LiveChannels.cs b/TwitchLib.Extension/Models/LiveChannels.cs
@@ -1,7 +1,4 @@
 using Newtonsoft.Json;
-using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace TwitchLib.Extension.Models
 {

diff --git a/TwitchLib.Extension/Models/Secret.cs b/TwitchLib.Extension/Models/Secret.cs
@@ -1,7 +1,5 @@
 using Newtonsoft.Json;
 using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace TwitchLib.Extension.Models
 {

diff --git a/TwitchLib.Extension/Models/Secrets.cs b/TwitchLib.Extension/Models/Secrets.cs
@@ -1,7 +1,4 @@
 using Newtonsoft.Json;
-using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace TwitchLib.Extension.Models
 {

diff --git a/TwitchLib.Extension/Models/SetExtensionBroadcasterOAuthReceiptRequest.cs b/TwitchLib.Extension/Models/SetExtensionBroadcasterOAuthReceiptRequest.cs
@@ -1,7 +1,4 @@
 using Newtonsoft.Json;
-using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace TwitchLib.Extension.Models
 {

diff --git a/TwitchLib.Extension/Models/SetExtensionRequiredConfigurationRequest.cs b/TwitchLib.Extension/Models/SetExtensionRequiredConfigurationRequest.cs
@@ -1,7 +1,4 @@
 using Newtonsoft.Json;
-using System;
-using System.Collections.Generic;
-using System.Text;
 
 namespace TwitchLib.Extension.Models
 {

diff --git a/TwitchLib.Extension/TwitchLib.Extension.csproj b/TwitchLib.Extension/TwitchLib.Extension.csproj
@@ -2,29 +2,28 @@
   <PropertyGroup>
     <TargetFrameworks>netstandard2.0;net452</TargetFrameworks>
     <PackageId>TwitchLib.Extension</PackageId>
-    <Version>2.0</Version>
-    <Description></Description>
+    <Version>1.0.0</Version>
+    <Description>Extension component of TwitchLib. This component allows you to access Twitch's Extension Api system</Description>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <Authors>luckyNoS7evin</Authors>
     <Company>swiftyspiffy (cole)</Company>
+    <PackageIconUrl>https://colejelinek.com/dev/twitchlib.png</PackageIconUrl>
+    <PackageProjectUrl>https://github.com/TwitchLib/TwitchLib.Extension</PackageProjectUrl>
+    <PackageLicenseUrl>https://opensource.org/licenses/MIT</PackageLicenseUrl>
     <Copyright>Copyright 2017</Copyright>
-    <PackageReleaseNotes></PackageReleaseNotes>
-    <RepositoryUrl>https://github.com/swiftyspiffy/TwitchLib</RepositoryUrl>
+    <PackageReleaseNotes>Version 1 of the Extension library</PackageReleaseNotes>
+    <RepositoryUrl>https://github.com/TwitchLib/TwitchLib.Extension</RepositoryUrl>
     <RepositoryType>Git</RepositoryType>
-    <PackageTags></PackageTags>
+    <PackageTags>twitch extension api c# csharp nbet standard 2.0</PackageTags>
     <NeutralLanguage>en-US</NeutralLanguage>
+    <AssemblyVersion>2.0.0.0</AssemblyVersion>
+    <FileVersion>2.0.0.0</FileVersion>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.IdentityModel.Tokens" Version="5.1.5" />
-    <PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
-    <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="5.1.5" />
+    <PackageReference Include="Microsoft.IdentityModel.Tokens" Version="5.2.1" />
+    <PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="5.2.1" />
+    <PackageReference Include="Newtonsoft.Json" Version="11.0.1" />
   </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <SccProjectName>SAK</SccProjectName>
-    <SccProvider>SAK</SccProvider>
-    <SccAuxPath>SAK</SccAuxPath>
-    <SccLocalPath>SAK</SccLocalPath>
-  </PropertyGroup>
   <PropertyGroup Condition=" '$(TargetFramework)' == 'net452'">
     <DefineConstants>NET452</DefineConstants>
   </PropertyGroup>