Fix ISSUE #79

ActiveDirectory.dnn

@@ -1,6 +1,6 @@
 <dotnetnuke type="Package" version="5.0">
   <packages>
-    <package name="DNN_ActiveDirectoryAuthentication" type="Auth_System" version="07.00.00">
+    <package name="DNN_ActiveDirectoryAuthentication" type="Auth_System" version="07.02.00">
       <friendlyName>DNN_ActiveDirectoryAuthentication</friendlyName>
       <description>The DotNetNuke Active Directory Authentication Project is an Authentication provider for DotNetNuke that uses the Windows 
         Active Directory authentication protocol to authenticate users.
@@ -16,7 +16,7 @@
 
       <dependencies>
 		<dependency type="Permission">AspNetHostingPermission</dependency>
-        <dependency type="CoreVersion">08.00.04</dependency>
+        <dependency type="CoreVersion">09.04.01</dependency>
       </dependencies>
 
       <components>
@@ -33,7 +33,7 @@
             <assembly>
               <path>bin\Providers</path>
               <name>DotNetNuke.Authentication.ActiveDirectory.dll</name>
-              <version>07.00.00</version>
+              <version>07.02.00</version>
             </assembly>
             <assembly>
               <path>bin</path>

AssemblyInfo.vb

@@ -12,7 +12,7 @@ Imports System.Runtime.InteropServices
 <Assembly: AssemblyConfiguration("")>
 <Assembly: AssemblyCompany("")>
 <Assembly: AssemblyProduct("")>
-<Assembly: AssemblyCopyright("2019 DotNetNuke Corporation")>
+<Assembly: AssemblyCopyright("2021 DotNetNuke Corporation")>
 <Assembly: AssemblyTrademark("")>
 
 <Assembly: ComVisible(False)>
@@ -29,7 +29,7 @@ Imports System.Runtime.InteropServices
 '
 ' You can specify all the values or you can default the Build and Revision Numbers 
 ' by using the '*' as shown below:
-' <Assembly: AssemblyVersion("07.00.00.13")> 
+' <Assembly: AssemblyVersion("07.02.00.16")> 
 
-<Assembly: AssemblyVersion("07.00.00.13")>
-<Assembly: AssemblyFileVersion("07.00.00.13")>
+<Assembly: AssemblyVersion("07.02.00.16")>
+<Assembly: AssemblyFileVersion("07.02.00.16")>

Components/AuthenticationController.vb

@@ -237,25 +237,30 @@ Namespace DotNetNuke.Authentication.ActiveDirectory
         ''' -------------------------------------------------------------------
         Public Function AuthenticateUser(ByVal objUser As UserInfo, ByVal objAuthUser As ADUserInfo,
                                      ByRef loginStatus As UserLoginStatus, ByVal ipAddress As String) As UserInfo
-            Dim _config As Configuration = Configuration.GetConfig()
+            'Dim _config As Configuration = Configuration.GetConfig()
             Dim objReturnUser As UserInfo = Nothing
 
             If Not (objUser Is Nothing) Then
-                Dim aspNetUser As MembershipUser = Web.Security.Membership.GetUser(objUser.Username)
-                Dim strPassword As String
-
-                If Web.Security.Membership.Provider.EnablePasswordRetrieval And Web.Security.Membership.Provider.PasswordFormat <> MembershipPasswordFormat.Hashed Then
-                    strPassword = RandomizePassword(aspNetUser, objUser, aspNetUser.GetPassword())
-                Else
-                    strPassword = RandomizePassword(aspNetUser, objUser, "")
-                End If
+                'Stop resetting password and stop validating user against DNN. ISSUE #79 - Steven A West 4/27/2021
+                'Dim aspNetUser As MembershipUser = Web.Security.Membership.GetUser(objUser.Username)
+                'Dim strPassword As String
+                'If Web.Security.Membership.Provider.EnablePasswordRetrieval And Web.Security.Membership.Provider.PasswordFormat <> MembershipPasswordFormat.Hashed Then
+                ' strPassword = RandomizePassword(aspNetUser, objUser, aspNetUser.GetPassword())
+                ' Else
+                '    strPassword = RandomizePassword(aspNetUser, objUser, "")
+                'End If
 
                 If (objUser.IsDeleted = False) Then
 
-                    objReturnUser =
-                            DNNUserController.ValidateUser(_portalSettings.PortalId, objUser.Username, strPassword,
-                                                            "Active Directory", _portalSettings.PortalName, ipAddress,
-                                                            loginStatus)
+                    'ISSUE #79 - Steven A West 4/27/2021
+                    '    objReturnUser =
+                    '   DNNUserController.ValidateUser(_portalSettings.PortalId, objUser.Username, strPassword,
+                    '                                          "Active Directory", _portalSettings.PortalName, ipAddress,
+                    '                                          loginStatus)
+
+                    loginStatus = UserLoginStatus.LOGIN_SUCCESS
+                    objReturnUser = DNNUserController.GetUserByName(_portalSettings.PortalId, objAuthUser.Username)
+
                     ' Synchronize role membership if it's required in settings
                     If _config.SynchronizeRole Then
                         SynchronizeRoles(objReturnUser)
@@ -267,7 +272,7 @@ Namespace DotNetNuke.Authentication.ActiveDirectory
                     If Not _config.AutoCreateUsers = True Then
                         objUser.IsDeleted = False
                         objUser.Membership.IsDeleted = False
-                        objUser.Membership.Password = strPassword
+                        objUser.Membership.Password = Utilities.GetRandomPassword()
                         DNNUserController.UpdateUser(_portalSettings.PortalId, objUser)
                         CreateUser(objUser, loginStatus)
                         If loginStatus = UserLoginStatus.LOGIN_SUCCESS Then
@@ -284,7 +289,7 @@ Namespace DotNetNuke.Authentication.ActiveDirectory
                 'ACD-4259
                 If Not _config.AutoCreateUsers = True Then
                     'User doesn't exist in this portal. Make sure user doesn't exist on any other portal
-                    objUser = DNNUserController.GetUserByName(Null.NullInteger, objAuthUser.Username)
+                    objUser = DNNUserController.GetUserByName(objAuthUser.Username)
                     If objUser Is Nothing Then 'User doesn't exist in any portal
                         'Item 6365
                         objAuthUser.Membership.Password = Utilities.GetRandomPassword()

DotNetNuke.Authentication.ActiveDirectory.vbproj

@@ -32,7 +32,7 @@
     <OptionInfer>On</OptionInfer>
     <UpgradeBackupLocation>
     </UpgradeBackupLocation>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
     <UseIISExpress>false</UseIISExpress>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -58,9 +58,9 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="DotNetNuke, Version=7.2.0.607, Culture=neutral, processorArchitecture=MSIL">
+    <Reference Include="DotNetNuke, Version=9.8.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\Sites\dnndev80\bin\DotNetNuke.dll</HintPath>
+      <HintPath>..\..\..\..\adTest\bin\DotNetNuke.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />

version.txt

@@ -1 +1 @@
-7.0.0.13
+7.2.0.16