Merge pull request #2 from microting/master

Updates from main

Author: masudul-tikweb

INTEGRATION_STEPS.md

@@ -0,0 +1,55 @@
+# Angular Material Extensions Password Strength Integration
+
+## ✅ Integration Complete
+
+The password strength meter has been successfully integrated with the following configuration:
+
+### Configuration Applied
+- `enableLengthRule`: true
+- `enableLowerCaseLetterRule`: true
+- `enableUpperCaseLetterRule`: true
+- `enableDigitRule`: true
+- `enableSpecialCharRule`: false *(disabled per requirements)*
+- `min`: 8 *(minimum password length)*
+- `max`: 50
+
+### Components Updated
+1. ✅ **User Set Password Modal** (`user-set-password.component.*`) - Admin password setting
+2. ✅ **Change Password** (`change-password.component.*`) - User profile password change  
+3. ✅ **Restore Password Confirmation** (`restore-password-confirmation.component.*`) - Password reset flow
+
+### Implementation Details
+- ✅ Package installed: `@angular-material-extensions/[email protected]`
+- ✅ Module imports activated in `account-management.module.ts` and `auth.module.ts`
+- ✅ HTML templates updated with password strength meters
+- ✅ TypeScript methods implemented for strength tracking
+- ✅ Form validation updated to require minimum 8 characters
+- ✅ Special character requirements disabled as requested
+
+### Features Implemented
+- **Real-time password strength visualization**: Color-coded strength indicators
+- **Configurable validation rules**: Length, lowercase, uppercase, digits (special chars disabled)
+- **Strength scoring**: 0-100 scale with event handling  
+- **Form validation integration**: Weak password validation (< 40 strength)
+- **Material Design integration**: Seamless visual integration
+
+## Testing Recommendations
+1. Test each password field for visual feedback
+2. Verify strength scoring works correctly (0-100 scale)
+3. Test form validation integration with weak passwords
+4. Ensure all password requirements are enforced except special characters
+
+## Example Usage
+```html
+<mat-password-strength 
+  [password]="form.get('newPassword')?.value || ''"
+  [enableLengthRule]="true"
+  [enableLowerCaseLetterRule]="true" 
+  [enableUpperCaseLetterRule]="true"
+  [enableDigitRule]="true"
+  [enableSpecialCharRule]="false"
+  [min]="8"
+  [max]="50"
+  (onStrengthChanged)="onPasswordStrengthChanged($event)">
+</mat-password-strength>
+```

eFormAPI/eFormAPI.Web/Services/AdminService.cs

@@ -155,46 +155,13 @@ public async Task<OperationDataResult<Paged<UserInfoViewModel>>> Index(UserInfoR
 
             foreach (UserInfoViewModel userInfoViewModel in userResult)
             {
-                if (!userInfoViewModel.Email.Contains("microting.com") && !userInfoViewModel.Email.Contains("admin.com"))
+                var workers = await sdkDbContext.Workers
+                    .Where(x => x.Email == userInfoViewModel.Email
+                                && x.WorkflowState != Constants.WorkflowStates.Removed)
+                    .FirstOrDefaultAsync();
+                if (workers != null)
                 {
                     userInfoViewModel.IsDeviceUser = true;
-
-                    var fullName = userInfoViewModel.FirstName + " " + userInfoViewModel.LastName;
-                    if (sdkDbContext.Sites.Any(x =>
-                            x.Name.Replace(" ", "") == fullName.Replace(" ", "")
-                            && x.WorkflowState != Constants.WorkflowStates.Removed))
-                    {
-                    }
-                    else
-                    {
-                        await core.SiteCreate($"{userInfoViewModel.FirstName} {userInfoViewModel.LastName}", userInfoViewModel.FirstName, userInfoViewModel.LastName,
-                            null, "da");
-                    }
-
-                    var site = await sdkDbContext.Sites.FirstOrDefaultAsync(x =>
-                        x.Name.Replace(" ", "") == fullName.Replace(" ", "")
-                        && x.WorkflowState != Constants.WorkflowStates.Removed);
-                    if (site != null)
-                    {
-                        site.IsLocked = true;
-                        await site.Update(sdkDbContext);
-                        var units = await sdkDbContext.Units.Where(x => x.SiteId == site.Id).ToListAsync();
-                        foreach (Unit unit in units)
-                        {
-                            unit.IsLocked = true;
-                            await unit.Update(sdkDbContext);
-                        }
-                        var siteWorker = await sdkDbContext.SiteWorkers.SingleOrDefaultAsync(x => x.SiteId == site.Id);
-                        var worker = await sdkDbContext.Workers.SingleOrDefaultAsync(x => x.Id == siteWorker.WorkerId);
-                        // var worker = await sdkDbContext.Workers.SingleOrDefaultAsync(x => x.FirstName == userInfoViewModel.FirstName
-                        //     && x.LastName == userInfoViewModel.LastName
-                        //     && x.WorkflowState != Constants.WorkflowStates.Removed);
-                        if (worker != null)
-                        {
-                            worker.IsLocked = true;
-                            await worker.Update(sdkDbContext);
-                        }
-                    }
                 }
             }
 
@@ -290,9 +257,20 @@ public async Task<OperationResult> Create(UserRegisterModel userRegisterModel)
                 await dbContext.SaveChangesAsync();
             }
 
-            var site = await sdkDbContext.Sites.SingleOrDefaultAsync(x => x.Name == userRegisterModel.FirstName.Trim() + " " + userRegisterModel.LastName.Trim()
-                                                                          && x.WorkflowState != Constants.WorkflowStates.Removed);
+            var worker = await sdkDbContext.Workers.FirstOrDefaultAsync(x => x.Email == user.Email && x.WorkflowState != Constants.WorkflowStates.Removed);
+            if (worker != null)
+            {
+                worker.IsLocked = true;
+                await worker.Update(sdkDbContext);
+            }
+
+            var siteWorker = await sdkDbContext.SiteWorkers
+                .Include(x => x.Site)
+                .Where(x => x.WorkerId == worker.Id && x.WorkflowState != Constants.WorkflowStates.Removed)
+                .FirstOrDefaultAsync();
 
+            var site = await sdkDbContext.Sites.SingleOrDefaultAsync(x => x.Id == siteWorker.SiteId && x.WorkflowState != Constants.WorkflowStates.Removed);
+            // lock site and units
             if (site != null)
             {
                 site.IsLocked = true;
@@ -303,13 +281,6 @@ public async Task<OperationResult> Create(UserRegisterModel userRegisterModel)
                     unit.IsLocked = true;
                     await unit.Update(sdkDbContext);
                 }
-                var siteWorker = await sdkDbContext.SiteWorkers.SingleOrDefaultAsync(x => x.SiteId == site.Id);
-                var worker = await sdkDbContext.Workers.SingleOrDefaultAsync(x => x.Id == siteWorker.WorkerId);
-                if (worker != null)
-                {
-                    worker.IsLocked = true;
-                    await worker.Update(sdkDbContext);
-                }
             }
 
             return new OperationResult(true,
@@ -336,8 +307,8 @@ public async Task<OperationDataResult<UserRegisterModel>> Read(int userId)
             }
             var core = await coreHelper.GetCore();
             var sdkDbContext = core.DbContextHelper.GetDbContext();
-            var site = await sdkDbContext.Sites.SingleOrDefaultAsync(x => x.Name == user.FirstName + " " + user.LastName
-                                                                          && x.WorkflowState != Constants.WorkflowStates.Removed);
+            var worker = await sdkDbContext.Workers.AnyAsync(x => x.Email == user.Email
+                                                                            && x.WorkflowState != Constants.WorkflowStates.Removed);
 
             var result = new UserRegisterModel()
             {
@@ -346,7 +317,7 @@ public async Task<OperationDataResult<UserRegisterModel>> Read(int userId)
                 FirstName = user.FirstName,
                 LastName = user.LastName,
                 UserName = user.UserName,
-                IsDeviceUser = site != null
+                IsDeviceUser = worker
             };
             // get role
             var roles = await userManager.GetRolesAsync(user);
@@ -412,7 +383,12 @@ public async Task<OperationResult> Update(UserRegisterModel userRegisterModel)
                 return new OperationResult(false, localizationService.GetString("YouCantViewChangeOrDeleteAdmin"));
             }
 
-            var site = await sdkDbContext.Sites.SingleOrDefaultAsync(x => x.Name == user.FirstName + " " + user.LastName
+            var worker = await sdkDbContext.Workers.FirstOrDefaultAsync(x => x.Email == user.Email && x.WorkflowState != Constants.WorkflowStates.Removed);
+            var siteWorker = await sdkDbContext.SiteWorkers
+                .Where(x => x.WorkerId == worker.Id && x.WorkflowState != Constants.WorkflowStates.Removed)
+                .FirstOrDefaultAsync();
+
+            var site = await sdkDbContext.Sites.SingleOrDefaultAsync(x => x.Id == siteWorker.SiteId
                                                                           && x.WorkflowState != Constants.WorkflowStates.Removed);
             if (site != null)
             {
@@ -422,11 +398,19 @@ await core.SiteUpdate((int)site.MicrotingUid!,
                     $"{userRegisterModel.FirstName} {userRegisterModel.LastName}", userRegisterModel.FirstName,
                     userRegisterModel.LastName, userRegisterModel.Email, language.LanguageCode);
             }
-            user.Email = userRegisterModel.Email;
             user.EmailConfirmed = true;
+            user.Email = userRegisterModel.Email;
             user.UserName = userRegisterModel.Email;
-            user.FirstName = userRegisterModel.FirstName;
-            user.LastName = userRegisterModel.LastName;
+            if (worker == null)
+            {
+                user.FirstName = userRegisterModel.FirstName;
+                user.LastName = userRegisterModel.LastName;
+            }
+            else
+            {
+                worker.Email = userRegisterModel.Email;
+                await worker.Update(sdkDbContext);
+            }
 
             var result = await userManager.UpdateAsync(user);
             if (!result.Succeeded)
@@ -515,34 +499,16 @@ public async Task<OperationResult> Delete(int userId)
                 return new OperationResult(false, localizationService.GetString("YouCantViewChangeOrDeleteAdmin"));
             }
 
-            var site = await sdkDbContext.Sites.SingleOrDefaultAsync(x => x.Name == user.FirstName + " " + user.LastName
-                                                                          && x.WorkflowState != Constants.WorkflowStates.Removed);
-            if (site != null)
+            var worker = await sdkDbContext.Workers.FirstOrDefaultAsync(x => x.Email == user.Email && x.WorkflowState != Constants.WorkflowStates.Removed);
+            if (worker != null)
             {
-                site.IsLocked = false;
-                await site.Update(sdkDbContext);
-                var units = await sdkDbContext.Units.Where(x => x.SiteId == site.Id).ToListAsync();
-                foreach (Unit unit in units)
-                {
-                    unit.IsLocked = false;
-                    await unit.Update(sdkDbContext);
-                }
-                var siteWorker = await sdkDbContext.SiteWorkers.SingleOrDefaultAsync(x => x.SiteId == site.Id);
-                var worker = await sdkDbContext.Workers.SingleOrDefaultAsync(x => x.Id == siteWorker.WorkerId);
-                if (worker != null)
-                {
-                    worker.IsLocked = false;
-                    await worker.Update(sdkDbContext);
-                }
+                return new OperationResult(false, localizationService.GetStringWithFormat("ErrorWhileDeletingUser", userId));
             }
 
             var result = await userManager.DeleteAsync(user);
-            if (!result.Succeeded)
-            {
-                return new OperationResult(false, string.Join(" ", result.Errors.Select(x => x.Description).ToArray()));
-            }
-
-            return new OperationResult(true, localizationService.GetStringWithFormat("UserParamWasDeleted", userId));
+            return !result.Succeeded
+                ? new OperationResult(false, string.Join(" ", result.Errors.Select(x => x.Description).ToArray()))
+                : new OperationResult(true, localizationService.GetStringWithFormat("UserParamWasDeleted", userId));
         }
         catch (Exception e)
         {

eFormAPI/eFormAPI.Web/Startup.cs

@@ -395,6 +395,7 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
         app.UseEFormPlugins(Program.EnabledPlugins);
         // Route all unknown requests to app root
         app.UseAngularMiddleware(env);
+        FixUserToWorkerLinks();
     }
 
 
@@ -471,4 +472,34 @@ private ICollection<PluginPermissionModel> GetPluginsPermissions()
 
         return permissions;
     }
+
+    // TODO remove, when we are sure that all users have been fixed.
+    // This method is only needed for a short period of time to fix the users that already exist.
+    // It matches users to workers based on First and Last name, and updates the email on the worker.
+    // It is not a perfect solution, but it is the best we can do without having a direct link between the two.
+    // It is assumed that users have unique First and Last names.
+    // If there are multiple workers with the same name, only the first one found will be updated.
+    // If a worker already has an email, it will be overwritten.
+    // After a while this method should be removed again.
+    private void FixUserToWorkerLinks()
+    {
+        if (Configuration.MyConnectionString() == "...") return;
+        var contextFactory = new BaseDbContextFactory();
+        using var dbContext = contextFactory.CreateDbContext([Configuration.MyConnectionString()]);
+
+        var sdkDbContextFactory = new MicrotingDbContextFactory();
+        using var sdkDbContext =
+            sdkDbContextFactory.CreateDbContext([Configuration.MyConnectionString().Replace("Angular", "SDK")]);
+
+        var users = dbContext.Users.AsNoTracking().ToList();
+        foreach (var user in users)
+        {
+            var fullName = (user.FirstName + user.LastName).Trim().ToLower().Replace(" ", "");
+            var worker = sdkDbContext.Workers.FirstOrDefault(x =>
+                (x.FirstName + x.LastName).Trim().ToLower().Replace(" ", "") == fullName && x.WorkflowState != "removed");
+            if (worker == null) continue;
+            worker.Email = user.Email;
+            worker.Update(sdkDbContext).GetAwaiter().GetResult();
+        }
+    }
 }

eFormAPI/eFormAPI.Web/eFormAPI.Web.csproj

@@ -55,11 +55,11 @@
     <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="9.0.9" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="9.0.9" />
     <PackageReference Include="Microsoft.Extensions.PlatformAbstractions" Version="1.1.0" />
-    <PackageReference Include="Microting.eForm" Version="9.0.52" />
-    <PackageReference Include="Microting.EformAngularFrontendBase" Version="9.0.44" />
-    <PackageReference Include="Microting.eFormApi.BasePn" Version="9.0.49" />
+    <PackageReference Include="Microting.eForm" Version="9.0.56" />
+    <PackageReference Include="Microting.EformAngularFrontendBase" Version="9.0.46" />
+    <PackageReference Include="Microting.eFormApi.BasePn" Version="9.0.51" />
     <PackageReference Include="PureOtp" Version="1.0.0.1" />
-    <PackageReference Include="Sentry" Version="5.14.1" />
+    <PackageReference Include="Sentry" Version="5.15.1" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="9.0.4" />
     <PackageReference Include="McMaster.NETCore.Plugins" Version="2.0.0" />
     <PackageReference Include="sendgrid" Version="9.29.3" />

eform-client/package.json

@@ -71,6 +71,7 @@
     "@angular/platform-browser": "20.1.2",
     "@angular/platform-browser-dynamic": "20.1.2",
     "@angular/router": "20.1.2",
+    "@angular-material-extensions/password-strength": "^16.0.0",
     "@ng-matero/extensions": "20.2.1",
     "@ngrx/effects": "19.2.1",
     "@ngrx/entity": "19.2.1",
@@ -80,10 +81,10 @@
     "@sentry/angular": "^10.8.0",
     "@sentry/cli": "^2.53.0",
     "@swimlane/ngx-charts": "23.0.0",
-    "@types/ramda": "^0.31.0",
+    "@types/ramda": "^0.31.1",
     "@userback/widget": "^0.3.11",
     "build": "^0.1.4",
-    "core-js": "3.45.0",
+    "core-js": "3.45.1",
     "d3": "7.9.0",
     "date-fns": "4.1.0",
     "date-fns-tz": "3.2.0",
@@ -110,20 +111,20 @@
     "run": "^1.4.0",
     "rxjs": "7.8.2",
     "tslib": "^2.8.1",
-    "uuid": "11.1.0",
+    "uuid": "13.0.0",
     "zone.js": "^0.15.1",
     "ngx-material-timepicker": "^13.1.1",
-    "luxon": "^3.6.0",
+    "luxon": "^3.7.2",
     "validator": "^13.15.15"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "20.2.2",
+    "@angular-devkit/build-angular": "20.3.2",
     "@angular-devkit/core": "20.2.1",
-    "@angular-devkit/schematics": "20.1.4",
-    "@angular-eslint/builder": "20.1.1",
-    "@angular-eslint/eslint-plugin": "20.1.1",
+    "@angular-devkit/schematics": "20.3.3",
+    "@angular-eslint/builder": "20.3.0",
+    "@angular-eslint/eslint-plugin": "20.3.0",
     "@angular-eslint/eslint-plugin-template": "20.1.1",
-    "@angular-eslint/schematics": "20.1.1",
+    "@angular-eslint/schematics": "20.3.0",
     "@angular-eslint/template-parser": "20.1.1",
     "@angular/cli": "20.1.6",
     "@angular/compiler-cli": "20.1.2",
@@ -133,14 +134,14 @@
     "@types/dragula": "^2.1.34",
     "@types/file-saver": "^2.0.7",
     "@types/mocha": "^10.0.10",
-    "@types/node": "^24.3.1",
+    "@types/node": "^24.5.2",
     "@types/uuid": "^10.0.0",
     "@typescript-eslint/eslint-plugin": "^7.18.0",
     "@typescript-eslint/parser": "^7.18.0",
     "@typescript-eslint/utils": "^8.39.1",
     "@wdio/cli": "9.19.2",
     "@wdio/local-runner": "9.19.2",
-    "@wdio/mocha-framework": "9.18.0",
+    "@wdio/mocha-framework": "9.19.2",
     "@wdio/spec-reporter": "9.19.2",
     "angular-mocks": "^1.8.3",
     "chai": "^6.0.1",

eform-client/src/app/modules/account-management/account-management.module.ts

@@ -23,6 +23,7 @@ import {MatDialogModule} from '@angular/material/dialog';
 import {MatInputModule} from '@angular/material/input';
 import {MatIconModule} from '@angular/material/icon';
 import {FileUploadModule} from "ng2-file-upload";
+import {MatPasswordStrengthModule} from '@angular-material-extensions/password-strength';
 
 @NgModule({
     imports: [
@@ -44,6 +45,7 @@ import {FileUploadModule} from "ng2-file-upload";
         MatInputModule,
         MatIconModule,
         FileUploadModule,
+        MatPasswordStrengthModule,
     ],
   declarations: [
     ChangePasswordComponent,