Skip to content

Commit

Permalink
Merge pull request #111 from UpendoVentures/dev
Browse files Browse the repository at this point in the history
Syncing branches
  • Loading branch information
WillStrohl authored Dec 12, 2024
2 parents 67854b8 + b8047df commit 9a3e794
Show file tree
Hide file tree
Showing 15 changed files with 413 additions and 45 deletions.
138 changes: 138 additions & 0 deletions Modules/UserManager/App_LocalResources/Impersonate.resx
Original file line number Diff line number Diff line change
@@ -0,0 +1,138 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="AreYouSure.Text" xml:space="preserve">
<value>Are you sure you want to impersonate this user account?</value>
</data>
<data name="DeleteUser.Text" xml:space="preserve">
<value>Delete User Account</value>
</data>
<data name="Impersonate.Text" xml:space="preserve">
<value>Impersonate</value>
</data>
<data name="ImpersonateAnotherUserAccountConfirmation.Text" xml:space="preserve">
<value>You are about to impersonate another user account. &lt;b&gt;If you confirm&lt;/b&gt;, the website will attempt to log you in as if the user themselves logged in. You will need to logout and log back in to restore your superuser access. &lt;b&gt;If you cancel&lt;/b&gt;, nothing will happen.</value>
</data>
<data name="ImpersonateAnotherUserAccountConfirmationAlert.Text" xml:space="preserve">
<value>&lt;b&gt;Technical Limitation:&lt;/b&gt; If you are using another authentication provider other than the built-in DNN provider, this feature may or may not work, depending on the type of authentication you have installed/enabled.</value>
</data>
<data name="ImpersonateUser.Text" xml:space="preserve">
<value>Impersonate User Account</value>
</data>
</root>
4 changes: 2 additions & 2 deletions Modules/UserManager/App_LocalResources/Index.resx
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@
<value>Create User</value>
</data>
<data name="BulkDeleteUser.Text" xml:space="preserve">
<value>Bulk Delete User</value>
<value>Bulk Delete Users</value>
</data>
<data name="CreateRole.Text" xml:space="preserve">
<value>Create Role</value>
Expand Down Expand Up @@ -187,7 +187,7 @@
<value>Username</value>
</data>
<data name="UserRoles.Text" xml:space="preserve">
<value>User Roles</value>
<value>User's Roles</value>
</data>
<data name="Users.Text" xml:space="preserve">
<value>USERS</value>
Expand Down
3 changes: 3 additions & 0 deletions Modules/UserManager/App_LocalResources/Shared.resx
Original file line number Diff line number Diff line change
Expand Up @@ -180,4 +180,7 @@
<data name="OnlySuperUserIsAllowedBulkDeleteUserAccounts.Text" xml:space="preserve">
<value>Only a superuser is allowed to bulk delete user accounts</value>
</data>
<data name="Cancel.Text" xml:space="preserve">
<value>Cancel</value>
</data>
</root>
22 changes: 22 additions & 0 deletions Modules/UserManager/Controllers/UserManageController.cs
Original file line number Diff line number Diff line change
Expand Up @@ -534,5 +534,27 @@ public ActionResult PasswordResetLink(int itemId)
TempData["Message"] = UserRepository.SendPasswordResetLink(portalId, itemId, portalSettings);
return RedirectToAction("Index");
}

/// <summary>
/// Impersonate a user
/// </summary>
/// <param name="itemId"></param>
/// <returns></returns>
public ActionResult ImpersonateUserById(int itemId)
{
if (_currentUser.IsSuperUser)
{
var user = UserController.GetUserById(PortalSettings.PortalId, itemId);
if (user != null)
{
// Perform impersonation
UserController.UserLogin(PortalSettings.PortalId, user, PortalSettings.PortalName, Request.UserHostAddress, false);
}
return Redirect(Url.Content("~/"));
}
string errorMessage = Localization.GetString("NotPermissions.Text", ResourceFile);
ViewBag.ErrorMessage = errorMessage;
return View("Error");
}
}
}
10 changes: 10 additions & 0 deletions Modules/UserManager/Module.css
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,7 @@
.checkbox {
font-size: 16px;
}

.admin-manager .checkbox {
margin-top: 20px;
}
Expand Down Expand Up @@ -320,6 +321,11 @@
margin-bottom: 25px;
}

.mtb-2 {
margin-top: 0.5em;
margin-bottom: 0.5em;
}

.pb10 {
padding-bottom: 10px !important;
}
Expand Down Expand Up @@ -726,4 +732,8 @@
line-height: 26px;
border-top-left-radius: 0;
border-bottom-left-radius: 0;
}

.AM-white, .AM-white a, .AM-white a:visited {
color: white;
}
4 changes: 2 additions & 2 deletions Modules/UserManager/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,5 @@
// Build Number
// Revision
//
[assembly: AssemblyVersion("01.04.01")]
[assembly: AssemblyFileVersion("01.04.01")]
[assembly: AssemblyVersion("01.05.00")]
[assembly: AssemblyFileVersion("01.05.00")]
Original file line number Diff line number Diff line change
@@ -0,0 +1,104 @@
/************************************************************/
/***** SqlDataProvider *****/
/************************************************************/

IF OBJECT_ID('{databaseOwner}{objectQualifier}UUM_GetUsers', 'P') IS NOT NULL
BEGIN
EXEC('DROP PROCEDURE ' + '{databaseOwner}{objectQualifier}UUM_GetUsers');
END
GO

CREATE PROCEDURE {databaseOwner}{objectQualifier}UUM_GetUsers
@PageIndex INT,
@PageSize INT,
@SearchTerm NVARCHAR(100) = NULL,
@SortColumn NVARCHAR(50) = 'UserID',
@SortOrder NVARCHAR(4) = 'ASC',
@IsSuperUser BIT = NULL,
@Authorised BIT = NULL,
@PortalId INT = NULL,
@Deleted BIT = NULL,
@AllUsers BIT = NULL,
@TotalRecords INT OUTPUT
AS
BEGIN
SET NOCOUNT ON;

DECLARE @Offset INT;
SET @Offset = (@PageIndex - 1) * @PageSize;

DECLARE @SortExpression NVARCHAR(100);
SET @SortExpression = QUOTENAME(@SortColumn) + ' ' + @SortOrder;

DECLARE @Results TABLE
(
UserID INT,
FirstName NVARCHAR(100),
Username NVARCHAR(100),
Email NVARCHAR(100),
DisplayName NVARCHAR(100),
IsSuperUser BIT,
RowNumber INT
);

-- Perform total count
IF @AllUsers = 0
BEGIN
SELECT @TotalRecords = COUNT(*)
FROM [dbo].[Users] u
LEFT JOIN [dbo].[UserPortals] up ON u.UserID = up.UserID
WHERE (LOWER(u.[UserName]) COLLATE Latin1_General_CI_AI LIKE '%' + LOWER(@SearchTerm) COLLATE Latin1_General_CI_AI + '%' OR
LOWER(u.[FirstName]) COLLATE Latin1_General_CI_AI LIKE '%' + LOWER(@SearchTerm) COLLATE Latin1_General_CI_AI + '%' OR
LOWER(u.[Email]) COLLATE Latin1_General_CI_AI LIKE '%' + LOWER(@SearchTerm) COLLATE Latin1_General_CI_AI + '%' OR
LOWER(u.[DisplayName]) COLLATE Latin1_General_CI_AI LIKE '%' + LOWER(@SearchTerm) COLLATE Latin1_General_CI_AI + '%')
AND u.IsDeleted = 0
AND (@IsSuperUser IS NULL OR u.IsSuperUser = @IsSuperUser)
AND (@Deleted IS NULL OR up.IsDeleted = @Deleted)
AND (@Authorised IS NULL OR (up.Authorised = @Authorised AND up.IsDeleted = 0))
AND (@PortalId IS NULL OR up.PortalId = @PortalId);
END
ELSE
BEGIN
SELECT @TotalRecords = COUNT(*)
FROM [dbo].[Users] u
LEFT JOIN [dbo].[UserPortals] up ON u.UserID = up.UserID
WHERE (LOWER(u.[UserName]) COLLATE Latin1_General_CI_AI LIKE '%' + LOWER(@SearchTerm) COLLATE Latin1_General_CI_AI + '%' OR
LOWER(u.[FirstName]) COLLATE Latin1_General_CI_AI LIKE '%' + LOWER(@SearchTerm) COLLATE Latin1_General_CI_AI + '%' OR
LOWER(u.[Email]) COLLATE Latin1_General_CI_AI LIKE '%' + LOWER(@SearchTerm) COLLATE Latin1_General_CI_AI + '%' OR
LOWER(u.[DisplayName]) COLLATE Latin1_General_CI_AI LIKE '%' + LOWER(@SearchTerm) COLLATE Latin1_General_CI_AI + '%')
AND (@PortalId IS NULL OR up.PortalId = @PortalId);
END;

-- Get paginated results
INSERT INTO @Results (UserID, FirstName, Username, Email, DisplayName, IsSuperUser, RowNumber)
SELECT u.UserID, u.FirstName, u.Username, u.Email, u.DisplayName, u.IsSuperUser,
ROW_NUMBER() OVER (
ORDER BY
CASE WHEN @SortOrder = 'ASC' AND @SortColumn = 'FirstName' THEN u.FirstName END ASC,
CASE WHEN @SortOrder = 'DESC' AND @SortColumn = 'FirstName' THEN u.FirstName END DESC,
CASE WHEN @SortOrder = 'ASC' AND @SortColumn = 'Username' THEN u.UserName END ASC,
CASE WHEN @SortOrder = 'DESC' AND @SortColumn = 'Username' THEN u.UserName END DESC,
CASE WHEN @SortOrder = 'ASC' AND @SortColumn = 'Email' THEN u.Email END ASC,
CASE WHEN @SortOrder = 'DESC' AND @SortColumn = 'Email' THEN u.Email END DESC,
CASE WHEN @SortOrder = 'ASC' AND @SortColumn = 'DisplayName' THEN u.DisplayName END ASC,
CASE WHEN @SortOrder = 'DESC' AND @SortColumn = 'DisplayName' THEN u.DisplayName END DESC
) AS RowNumber
FROM [dbo].[Users] u
LEFT JOIN [dbo].[UserPortals] up ON u.UserID = up.UserID
WHERE
(LOWER(u.[UserName]) COLLATE Latin1_General_CI_AI LIKE '%' + LOWER(@SearchTerm) COLLATE Latin1_General_CI_AI + '%' OR
LOWER(u.[FirstName]) COLLATE Latin1_General_CI_AI LIKE '%' + LOWER(@SearchTerm) COLLATE Latin1_General_CI_AI + '%' OR
LOWER(u.[Email]) COLLATE Latin1_General_CI_AI LIKE '%' + LOWER(@SearchTerm) COLLATE Latin1_General_CI_AI + '%' OR
LOWER(u.[DisplayName]) COLLATE Latin1_General_CI_AI LIKE '%' + LOWER(@SearchTerm) COLLATE Latin1_General_CI_AI + '%')
AND u.IsDeleted = 0
AND (@IsSuperUser IS NULL OR u.IsSuperUser = @IsSuperUser)
AND (@Deleted IS NULL OR up.IsDeleted = @Deleted)
AND (@Authorised IS NULL OR (up.Authorised = @Authorised AND up.IsDeleted = 0))
AND (@PortalId IS NULL OR up.PortalId = @PortalId)
ORDER BY RowNumber;

-- Return paginated results
SELECT UserID, FirstName, Username, Email, DisplayName, IsSuperUser
FROM @Results
WHERE RowNumber BETWEEN (@Offset + 1) AND (@Offset + @PageSize);
END;
12 changes: 6 additions & 6 deletions Modules/UserManager/Upendo.Modules.UserManager.csproj
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
Expand All @@ -13,7 +13,7 @@
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Upendo.Modules.UserManager</RootNamespace>
<AssemblyName>Upendo.Modules.UserManager</AssemblyName>
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
<UseIISExpress>false</UseIISExpress>
<IISExpressSSLPort />
<IISExpressAnonymousAuthentication />
Expand Down Expand Up @@ -75,10 +75,6 @@
<Reference Include="System.ComponentModel.DataAnnotations" />
<Reference Include="System" />
<Reference Include="System.Data" />
<Reference Include="System.Core" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="System.Web.Extensions" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Drawing" />
<Reference Include="System.Web" />
<Reference Include="System.Web.Http">
Expand Down Expand Up @@ -176,6 +172,7 @@
<Content Include="Providers\DataProviders\SqlDataProvider\01.01.01.SqlDataProvider" />
<Content Include="Providers\DataProviders\SqlDataProvider\Uninstall.SqlDataProvider" />
<Content Include="Views\UserManage\BulkDelete.cshtml" />
<Content Include="Providers\DataProviders\SqlDataProvider\01.05.00.SqlDataProvider" />
</ItemGroup>
<ItemGroup>
<Content Include="App_LocalResources\RolesManageController.resx" />
Expand All @@ -186,6 +183,9 @@
<ItemGroup>
<Content Include="App_LocalResources\BulkDelete.resx" />
</ItemGroup>
<ItemGroup>
<Content Include="App_LocalResources\Impersonate.resx" />
</ItemGroup>
<PropertyGroup>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">14.0</VisualStudioVersion>
<VSToolsPath Condition="'$(VSToolsPath)' == ''">
Expand Down
Loading

0 comments on commit 9a3e794

Please sign in to comment.