Merge pull request #27 from intelequia/feature/ms-graph

Removing Azure AD Graph API dependency
intelequia · Feb 15, 2022 · b07b02a · b07b02a
2 parents fa9273f + 5f9d67d
commit b07b02a
Show file tree

Hide file tree

Showing 40 changed files with 1,126 additions and 1,402 deletions.
diff --git a/.build/ModulePackage.targets b/.build/ModulePackage.targets
@@ -60,7 +60,24 @@
     <Copy SourceFiles="$(MSBuildDnnBinPath)\Microsoft.IdentityModel.Logging.dll" DestinationFolder="$(MSBuildProjectDirectory)\Package\bin"/>
     <Copy SourceFiles="$(MSBuildDnnBinPath)\Microsoft.IdentityModel.JsonWebTokens.dll" DestinationFolder="$(MSBuildProjectDirectory)\Package\bin"/>
     <Copy SourceFiles="$(MSBuildDnnBinPath)\DotNetNuke.Authentication.Azure.B2C.Extensibility.dll" DestinationFolder="$(MSBuildProjectDirectory)\Package\bin"/>
-    <Copy SourceFiles="@(SqlDataProviderFiles)" DestinationFolder="$(MSBuildProjectDirectory)\Package\%(RecursiveDir)" />
+
+	  <Copy SourceFiles="$(MSBuildDnnBinPath)\Microsoft.Graph.dll" DestinationFolder="$(MSBuildProjectDirectory)\Package\bin"/>
+	  <Copy SourceFiles="$(MSBuildDnnBinPath)\Microsoft.Graph.Core.dll" DestinationFolder="$(MSBuildProjectDirectory)\Package\bin"/>
+	  <Copy SourceFiles="$(MSBuildDnnBinPath)\Microsoft.Identity.Client.dll" DestinationFolder="$(MSBuildProjectDirectory)\Package\bin"/>
+	  <Copy SourceFiles="$(MSBuildDnnBinPath)\Microsoft.Bcl.AsyncInterfaces.dll" DestinationFolder="$(MSBuildProjectDirectory)\Package\bin"/>
+	  <Copy SourceFiles="$(MSBuildDnnBinPath)\Azure.Core.dll" DestinationFolder="$(MSBuildProjectDirectory)\Package\bin"/>
+	  <Copy SourceFiles="$(MSBuildDnnBinPath)\System.Text.Json.dll" DestinationFolder="$(MSBuildProjectDirectory)\Package\bin"/>
+	  <Copy SourceFiles="$(MSBuildDnnBinPath)\System.Threading.Tasks.Extensions.dll" DestinationFolder="$(MSBuildProjectDirectory)\Package\bin"/>
+	  <Copy SourceFiles="$(MSBuildDnnBinPath)\System.Text.Encodings.Web.dll" DestinationFolder="$(MSBuildProjectDirectory)\Package\bin"/>
+	  <Copy SourceFiles="$(MSBuildDnnBinPath)\System.ValueTuple.dll" DestinationFolder="$(MSBuildProjectDirectory)\Package\bin"/>
+	  <Copy SourceFiles="$(MSBuildDnnBinPath)\System.Memory.dll" DestinationFolder="$(MSBuildProjectDirectory)\Package\bin"/>
+	  <Copy SourceFiles="$(MSBuildDnnBinPath)\System.Memory.Data.dll" DestinationFolder="$(MSBuildProjectDirectory)\Package\bin"/>
+	  <Copy SourceFiles="$(MSBuildDnnBinPath)\System.Diagnostics.DiagnosticSource.dll" DestinationFolder="$(MSBuildProjectDirectory)\Package\bin"/>
+	  <Copy SourceFiles="$(MSBuildDnnBinPath)\System.Runtime.CompilerServices.Unsafe.dll" DestinationFolder="$(MSBuildProjectDirectory)\Package\bin"/>
+	  <Copy SourceFiles="$(MSBuildDnnBinPath)\System.Buffers.dll" DestinationFolder="$(MSBuildProjectDirectory)\Package\bin"/>
+	  <Copy SourceFiles="$(MSBuildDnnBinPath)\System.Numerics.Vectors.dll" DestinationFolder="$(MSBuildProjectDirectory)\Package\bin"/>
+
+	  <Copy SourceFiles="@(SqlDataProviderFiles)" DestinationFolder="$(MSBuildProjectDirectory)\Package\%(RecursiveDir)" />
     <Copy SourceFiles="@(PackageManifestFiles)" DestinationFolder="$(MSBuildProjectDirectory)\Package" />
     <Copy SourceFiles="@(PackageTxtFiles)" DestinationFolder="$(MSBuildProjectDirectory)\Package" />
 

diff --git a/DotNetNuke.Authentication.Azure.B2C/App_LocalResources/UserManagement.ascx.de-de.resx b/DotNetNuke.Authentication.Azure.B2C/App_LocalResources/UserManagement.ascx.de-de.resx
@@ -420,4 +420,10 @@ Thank you, we appreciate your support.
   <data name="ChangePasswordSubtitle.Text" xml:space="preserve">
     <value>Sie werden das Passwort für </value>
   </data>
+  <data name="DeleteUser.Text" xml:space="preserve">
+    <value>Löschen</value>
+  </data>
+  <data name="UserPasswordUpdatedMessage.Text" xml:space="preserve">
+    <value>Das Benutzerkennwort wurde aktualisiert</value>
+  </data>
 </root>
diff --git a/DotNetNuke.Authentication.Azure.B2C/App_LocalResources/UserManagement.ascx.es-es.resx b/DotNetNuke.Authentication.Azure.B2C/App_LocalResources/UserManagement.ascx.es-es.resx
@@ -423,4 +423,10 @@ Gracias, apreciamos tu soporte.
   <data name="lblUserName.Text" xml:space="preserve">
     <value>Nombre de usuario</value>
   </data>
+  <data name="DeleteUser.Text" xml:space="preserve">
+    <value>Eliminar</value>
+  </data>
+  <data name="UserPasswordUpdatedMessage.Text" xml:space="preserve">
+    <value>Contraseña cambiada con éxito</value>
+  </data>
 </root>
diff --git a/DotNetNuke.Authentication.Azure.B2C/App_LocalResources/UserManagement.ascx.resx b/DotNetNuke.Authentication.Azure.B2C/App_LocalResources/UserManagement.ascx.resx
@@ -423,4 +423,10 @@ Thank you, we appreciate your support.
   <data name="lblUserName.Text" xml:space="preserve">
     <value>Username</value>
   </data>
+  <data name="DeleteUser.Text" xml:space="preserve">
+    <value>Delete</value>
+  </data>
+  <data name="UserPasswordUpdatedMessage.Text" xml:space="preserve">
+    <value>User password has been updated</value>
+  </data>
 </root>
diff --git a/...e.Authentication.Azure.B2C/AzureADB2C.Web/src/components/general/img/AADB2C.png b/...e.Authentication.Azure.B2C/AzureADB2C.Web/src/components/general/img/AADB2C.png
diff --git a/DotNetNuke.Authentication.Azure.B2C/AzureADB2CLicense.txt b/DotNetNuke.Authentication.Azure.B2C/AzureADB2CLicense.txt
@@ -1,5 +1,5 @@
 <p style="margin: 0"><a href="https://intelequia.com">Intelequia Software Solutions</a>
-<br/>Copyright (c) 2019 by Intelequia Software Solutions</p>
+<br/>Copyright (c) 2010-2022 by Intelequia Software Solutions</p>
 <p style="margin: 0">Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:</p>
 <p style="margin: 0">The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.</p>
 <p style="margin: 0">THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.</p>
diff --git a/DotNetNuke.Authentication.Azure.B2C/AzureADB2CProvider.dnn b/DotNetNuke.Authentication.Azure.B2C/AzureADB2CProvider.dnn
@@ -1,10 +1,8 @@
 <dotnetnuke type="Package" version="5.0">
   <packages>
-    <package name="AzureADB2CProvider" type="Auth_System" version="01.04.08">
+    <package name="AzureADB2CProvider" type="Auth_System" version="01.05.00">
       <friendlyName>DNN Azure Active Directory B2C Provider</friendlyName>
-      <description>
-        The DNN Azure Active Directory B2C Provider is an Authentication provider for DNN Platform that uses Azure Active Directory B2C OAuth2 authentication to authenticate users.
-      </description>
+      <description>The DNN Azure Active Directory B2C Provider is an Authentication provider for DNN Platform that uses Azure Active Directory B2C OAuth2 authentication to authenticate users.</description>
       <iconFile>~/DesktopModules/AuthenticationServices/AzureB2C/Images/azure.png</iconFile>
       <owner>
         <name>Intelequia</name>
@@ -16,7 +14,7 @@
       <releaseNotes src="AzureADB2CReleaseNotes.txt"/>
       <azureCompatible>true</azureCompatible>
       <dependencies>
-        <dependency type="CoreVersion">09.03.00</dependency>
+        <dependency type="CoreVersion">09.04.03</dependency>
         <dependency type="ManagedPackage" version="01.00.00">Dnn.PersonaBar.UI</dependency>
       </dependencies>
 
@@ -67,6 +65,66 @@
               <path>bin</path>
               <name>Microsoft.IdentityModel.JsonWebTokens.dll</name>
             </assembly>
+			  <assembly>
+				  <path>bin</path>
+				  <name>Microsoft.Graph.dll</name>
+			  </assembly>
+			  <assembly>
+				  <path>bin</path>
+				  <name>Microsoft.Graph.Core.dll</name>
+			  </assembly>
+			  <assembly>
+				  <path>bin</path>
+				  <name>Microsoft.Identity.Client.dll</name>
+			  </assembly>
+			  <assembly>
+				  <path>bin</path>
+				  <name>Microsoft.Bcl.AsyncInterfaces.dll</name>
+			  </assembly>
+			  <assembly>
+				  <path>bin</path>
+				  <name>Azure.Core.dll</name>
+			  </assembly>
+			  <assembly>
+				  <path>bin</path>
+				  <name>System.Text.Json.dll</name>
+			  </assembly>
+			  <assembly>
+				  <path>bin</path>
+				  <name>System.Threading.Tasks.Extensions.dll</name>
+			  </assembly>
+			  <assembly>
+				  <path>bin</path>
+				  <name>System.Text.Encodings.Web.dll</name>
+			  </assembly>
+			  <assembly>
+				  <name>System.ValueTuple.dll</name>
+				  <path>bin</path>
+			  </assembly>
+			  <assembly>
+				  <name>System.Memory.dll</name>
+				  <path>bin</path>
+			  </assembly>
+			  <assembly>
+				  <path>bin</path>
+				  <name>System.Memory.Data.dll</name>
+			  </assembly>
+			  <assembly>
+				  <name>System.Diagnostics.DiagnosticSource.dll</name>
+				  <path>bin</path>
+			  </assembly>
+			  <assembly>
+				  <name>System.Runtime.CompilerServices.Unsafe.dll</name>
+				  <path>bin</path>
+			  </assembly>
+			  <assembly>
+				  <name>System.Buffers.dll</name>
+				  <path>bin</path>
+			  </assembly>
+			  <assembly>
+				  <name>System.Numerics.Vectors.dll</name>
+				  <path>bin</path>
+			  </assembly>			  
           </assemblies>
         </component>
         <component type="ResourceFile">
@@ -151,36 +209,6 @@
           </desktopModule>
         </component>
 
-        <component type="Module">
-          <desktopModule>
-            <moduleName>AzureAD.B2C.Impersonate</moduleName>
-            <foldername>AzureAD.B2C.Impersonate</foldername>
-            <businessControllerClass>DotNetNuke.Authentication.Azure.B2C.Components.FeatureController</businessControllerClass>
-            <supportedFeatures>
-              <supportedFeature type="Upgradeable" />
-            </supportedFeatures>
-            <moduleDefinitions>
-              <moduleDefinition>
-                <friendlyName>AzureAD.B2C.Impersonate</friendlyName>
-                <defaultCacheTime>0</defaultCacheTime>
-                <moduleControls>
-                  <moduleControl>
-                    <controlKey />
-                    <controlSrc>DesktopModules/AuthenticationServices/AzureB2C/Impersonate.ascx</controlSrc>
-                    <supportsPartialRendering>False</supportsPartialRendering>
-                    <controlTitle />
-                    <controlType>View</controlType>
-                    <iconFile />
-                    <helpUrl />
-                    <viewOrder>0</viewOrder>
-                  </moduleControl>
-                </moduleControls>
-              </moduleDefinition>
-            </moduleDefinitions>
-          </desktopModule>
-        </component>
-
-
         <component type="Config">
           <config>
             <configFile>web.config</configFile>
@@ -222,11 +250,9 @@
       </components>
     </package>
 
-    <package name="AzureADB2CProvider" type="Module" version="01.04.08">
+    <package name="AzureADB2CProvider" type="Module" version="01.05.00">
       <friendlyName>DNN Azure Active Directory B2C User Management</friendlyName>
-      <description>
-        The DNN Azure Active Directory B2C Provider is an Authentication provider for DNN Platform that uses Azure Active Directory B2C OAuth2 authentication to authenticate users.
-      </description>
+      <description>The DNN Azure Active Directory B2C Provider is an Authentication provider for DNN Platform that uses Azure Active Directory B2C OAuth2 authentication to authenticate users.</description>
       <iconFile>~/DesktopModules/AuthenticationServices/AzureB2C/Images/azure.png</iconFile>
       <owner>
         <name>Intelequia</name>
@@ -238,7 +264,7 @@
       <releaseNotes src="AzureADB2CReleaseNotes.txt"/>
       <azureCompatible>true</azureCompatible>
       <dependencies>
-        <dependency type="CoreVersion">09.03.00</dependency>
+        <dependency type="CoreVersion">09.04.03</dependency>
       </dependencies>
 
       <components>
@@ -285,5 +311,55 @@
       </components>
     </package>
 
+	<package name="AzureADB2CProvider" type="Module" version="01.05.00">
+		<friendlyName>DNN Azure Active Directory B2C Impersonate</friendlyName>
+		<description>The DNN Azure Active Directory B2C Provider is an Authentication provider for DNN Platform that uses Azure Active Directory B2C OAuth2 authentication to authenticate users.</description>
+		<iconFile>~/DesktopModules/AuthenticationServices/AzureB2C/Images/azure.png</iconFile>
+		<owner>
+			<name>Intelequia</name>
+			<organization>Intelequia Software Solutions</organization>
+			<url>http://intelequia.com</url>
+			<email>info@intelequia.com</email>
+		</owner>
+		<license src="AzureADB2CLicense.txt" />
+		<releaseNotes src="AzureADB2CReleaseNotes.txt"/>
+		<azureCompatible>true</azureCompatible>
+		<dependencies>
+			<dependency type="CoreVersion">09.04.03</dependency>
+		</dependencies>
+
+		<components>
+
+			<component type="Module">
+				<desktopModule>
+					<moduleName>AzureAD.B2C.Impersonate</moduleName>
+					<foldername>AzureAD.B2C.Impersonate</foldername>
+					<businessControllerClass>DotNetNuke.Authentication.Azure.B2C.Components.FeatureController</businessControllerClass>
+					<supportedFeatures>
+						<supportedFeature type="Upgradeable" />
+					</supportedFeatures>
+					<moduleDefinitions>
+						<moduleDefinition>
+							<friendlyName>AzureAD.B2C.Impersonate</friendlyName>
+							<defaultCacheTime>0</defaultCacheTime>
+							<moduleControls>
+								<moduleControl>
+									<controlKey />
+									<controlSrc>DesktopModules/AuthenticationServices/AzureB2C/Impersonate.ascx</controlSrc>
+									<supportsPartialRendering>False</supportsPartialRendering>
+									<controlTitle />
+									<controlType>View</controlType>
+									<iconFile />
+									<helpUrl />
+									<viewOrder>0</viewOrder>
+								</moduleControl>
+							</moduleControls>
+						</moduleDefinition>
+					</moduleDefinitions>
+				</desktopModule>
+			</component>
+		</components>
+	</package>
+
   </packages>
 </dotnetnuke>
diff --git a/DotNetNuke.Authentication.Azure.B2C/AzureADB2CReleaseNotes.txt b/DotNetNuke.Authentication.Azure.B2C/AzureADB2CReleaseNotes.txt
@@ -96,3 +96,11 @@
 <ul style="margin: 5px 0 0 30px">
 	<li>Added extensibility to the login stage, so that developers can add their own logic when the OAuth token is available and authorize or deny the login</li>
 </ul>
+
+<p style="margin-top: 20px"><b>Version 01.05.00</b></p>
+<ul style="margin: 5px 0 0 30px">
+	<li>Removed Azure AD Graph dependency. Now all working with Microsoft Graph API</li>
+	<li>Removed default user profile property mappings from installation</li>
+	<li>Fix for to avoid issues with case sensitive collations on databases</li>
+	<li>Fixed bug creating a duplicated desktop module definition during the install, causing a DNN error when editing pages</li>
+</ul>