Merge pull request #316 from sujitharamadass/MayRelease

Changing validateIDToken logic to include 2048 key signing
intuit · Jul 28, 2023 · bc13280 · bc13280
2 parents d935816 + 042e71d
commit bc13280
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 19 deletions.
diff --git a/IPPDotNetDevKitCSV3/Code/Directory.Build.props b/IPPDotNetDevKitCSV3/Code/Directory.Build.props
@@ -14,8 +14,8 @@
 		<PackageIcon>$(MSBuildThisFileDirectory)logo.png</PackageIcon>
 		<OutputPath>$(SolutionDir)artifacts\bin</OutputPath>
 		<Copyright>Copyright © 2020 Intuit, Inc.</Copyright>
-		<AssemblyVersion>14.6.3.5</AssemblyVersion>
-		<FileVersion>14.6.3.4</FileVersion>
+		<AssemblyVersion>14.6.3.6</AssemblyVersion>
+		<FileVersion>14.6.3.6</FileVersion>
 		<Company>Intuit</Company>
 		<AppendTargetFrameworkToOutputPath>true</AppendTargetFrameworkToOutputPath>
 		<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>

diff --git a/IPPDotNetDevKitCSV3/Code/Intuit.Ipp.Nupkg/Intuit.Ipp.Nupkg.csproj b/IPPDotNetDevKitCSV3/Code/Intuit.Ipp.Nupkg/Intuit.Ipp.Nupkg.csproj
@@ -9,7 +9,7 @@
     <PackageId>IppDotNetSdkForQuickBooksApiV3</PackageId>
     <AssemblyName>IppDotNetSdkForQuickBooksApiV3</AssemblyName>
     <DocumentationFile>$(BaseOutputPath)$(AssemblyName).xml</DocumentationFile>
-    <MainVersion>14.6.3.5</MainVersion>
+    <MainVersion>14.6.3.6</MainVersion>
     <PackageVersionSuffix>pre</PackageVersionSuffix>
     <Version>$(MainVersion)-$(PackageVersionSuffix)</Version>
     <Version>$(MainVersion)</Version>

diff --git a/IPPDotNetDevKitCSV3/Code/Intuit.Ipp.OAuth2PlatformClient/Client/OAuth2Client.cs b/IPPDotNetDevKitCSV3/Code/Intuit.Ipp.OAuth2PlatformClient/Client/OAuth2Client.cs
@@ -875,29 +875,19 @@ public Task<bool> ValidateIDTokenAsync(String idToken)
             IList<JsonWebKey> keys = DiscoveryDoc.KeySet.Keys;
             string mod = "";
             string exponent = "";
+            string keyIdFromHeader = null;
             if (keys != null)
             {
-                foreach (var key in keys)
-                {
-                    if (key.N != null)
-                    {
-                        mod = key.N;
-                    }
-                    if (key.N != null)
-                    {
-                        exponent = key.E;
-                    }
-                }
-
                 if (idToken != null)
                 {
                     string[] splitValues = idToken.Split('.');
                     if (splitValues[0] != null)
                     {
                         var headerJson = Encoding.UTF8.GetString(Base64Url.Decode(splitValues[0].ToString()));
                         IdTokenHeader headerData = JsonConvert.DeserializeObject<IdTokenHeader>(headerJson);
+                        keyIdFromHeader = headerData.Kid;
 
-                        if (headerData.Kid == null)
+                        if (keyIdFromHeader == null)
                         {
                             return Task.FromResult(false);
                         }
@@ -965,6 +955,21 @@ public Task<bool> ValidateIDTokenAsync(String idToken)
                         }
                     }
 
+                    foreach (var key in keys)
+                    {
+                        if(keyIdFromHeader == key.Kid)
+                        {
+                            if (key.N != null)
+                            {
+                                mod = key.N;
+                            }
+                            if (key.N != null)
+                            {
+                                exponent = key.E;
+                            }
+                        }
+                    }
+
                     RSACryptoServiceProvider rsa = new RSACryptoServiceProvider();
                     rsa.ImportParameters(
                       new RSAParameters()

diff --git a/IPPDotNetDevKitCSV3/Code/Intuit.Ipp.Utility/Common/CoreConstants.cs b/IPPDotNetDevKitCSV3/Code/Intuit.Ipp.Utility/Common/CoreConstants.cs
@@ -250,7 +250,7 @@ public static class CoreConstants
         /// <summary>
         /// The Request source header value.
         /// </summary>
-        public const string REQUESTSOURCEHEADER = "V3DotNetSDK14.6.3.5";
+        public const string REQUESTSOURCEHEADER = "V3DotNetSDK14.6.3.6";
 
         /// <summary>
         /// multipart/form-data format

diff --git a/IPPDotNetDevKitCSV3/Tools/XsdExtension/Intuit.Ipp.Data/Directory.Build.props b/IPPDotNetDevKitCSV3/Tools/XsdExtension/Intuit.Ipp.Data/Directory.Build.props
@@ -13,8 +13,8 @@
     <PackageOutputPath>$(SolutionDir)artifacts\nupkg</PackageOutputPath>
     <OutputPath>$(SolutionDir)artifacts\bin</OutputPath>
     <Copyright>Copyright © 2020 Intuit, Inc.</Copyright>
-    <AssemblyVersion>14.6.3.4</AssemblyVersion>
-    <FileVersion>14.6.3.4</FileVersion>
+    <AssemblyVersion>14.6.3.6</AssemblyVersion>
+    <FileVersion>14.6.3.6</FileVersion>
     <Company>Intuit</Company>
     <AppendTargetFrameworkToOutputPath>true</AppendTargetFrameworkToOutputPath>
     <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>