Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Data Consent feature for DNN #2683

Merged
merged 17 commits into from
Apr 12, 2019
Merged

Data Consent feature for DNN #2683

Show file tree
Hide file tree
Changes from 13 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
42c7dc5
Add HasAgreedToTerms and HasAgreedToTermsOn to UserPortals and UserIn…
donker Apr 3, 2019
94b6374
Introduce new portal settings for GDPR management
donker Apr 4, 2019
9c5f5da
DB changes for GDPR
donker Apr 4, 2019
f1ec87f
Adding logic to controller and add logging
donker Apr 8, 2019
55a798d
Implement a fourth panel on the login screen to handle data consent
donker Apr 8, 2019
7608ea6
Provide the redirect in case of a 3rd party solution
donker Apr 9, 2019
2ff35bb
Implementing a mechanism to anonymize users
donker Apr 9, 2019
eca0ef2
Add new SPROCS to uninstall script
donker Apr 9, 2019
006a41b
Add more fields to nullify when anonymizing a user
donker Apr 9, 2019
ac7b84f
Replace GDPR with DataConsent in code to avoid confusion
donker Apr 9, 2019
e06571a
Add user hard delete delay settings
donker Apr 9, 2019
bf9e6e1
Added new scheduled task to remove users that are marked for deletion…
donker Apr 9, 2019
e040eaf
Closing a couple of new methods from exposure to the public api
donker Apr 9, 2019
f36fcfb
Add two other mechanisms for deletion: off and manual. Remove anonymi…
donker Apr 10, 2019
0427b62
Moved sql to main 9.4.0 file upon request
donker Apr 10, 2019
889f26c
RequestsRemoval instead of DesiresRemoval
donker Apr 10, 2019
0abef5f
Remove the logging of consent agreement
donker Apr 12, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 16 additions & 1 deletion DNN Platform/Library/Data/DataProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2384,6 +2384,11 @@ public virtual void RemoveUser(int userId, int portalId)
ExecuteNonQuery("RemoveUser", userId, GetNull(portalId));
}

public virtual void ResetTermsAgreement(int portalId)
{
ExecuteNonQuery("ResetTermsAgreement", portalId);
}

public virtual void RestoreUser(int userId, int portalId)
{
ExecuteNonQuery("RestoreUser", userId, GetNull(portalId));
Expand All @@ -2407,7 +2412,7 @@ public virtual void UpdateUser(int userId, int portalID, string firstName, strin
isApproved,
refreshRoles,
lastIpAddress,
passwordResetToken,
GetNull(passwordResetToken),
mitchelsellers marked this conversation as resolved.
Show resolved Hide resolved
GetNull(passwordResetExpiration),
isDeleted,
lastModifiedByUserID);
Expand All @@ -2418,6 +2423,11 @@ public virtual void UpdateUserLastIpAddress(int userId, string lastIpAddress)
ExecuteNonQuery("UpdateUserLastIpAddress", userId, lastIpAddress);
}

public virtual void UserAgreedToTerms(int portalId, int userId)
{
ExecuteNonQuery("UserAgreedToTerms", portalId, userId);
}

#endregion

#region UserRole Methods
Expand Down Expand Up @@ -2565,6 +2575,11 @@ public virtual IDataReader GetPropertyDefinitionsByPortal(int portalId)
return ExecuteReader("GetPropertyDefinitionsByPortal", GetNull(portalId));
}

public virtual void DeleteUserProfile(int portalId, int userId)
{
ExecuteNonQuery("DeleteUserProfile", portalId, userId);
}

public virtual IDataReader GetUserProfile(int userId)
{
return ExecuteReader("GetUserProfile", userId);
Expand Down
1 change: 1 addition & 0 deletions DNN Platform/Library/DotNetNuke.Library.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1493,6 +1493,7 @@
<Compile Include="Services\UserProfile\UserProfilePicHandler.cs" />
<Compile Include="Services\UserRequest\IUserRequestIPAddressController.cs" />
<Compile Include="Services\UserRequest\UserRequestIPAddressController.cs" />
<Compile Include="Services\Users\PurgeDeletedUsers.cs" />
<Compile Include="Services\Zip\SharpZipLibRedirect.cs" />
<Compile Include="UI\Containers\ActionBase.cs">
<SubType>ASPXCodeBehind</SubType>
Expand Down
Loading