patch

Author: brunobritodev

src/Backend/Jp.UserManagement/Controllers/UserAdminController.cs

@@ -59,8 +59,21 @@ public async Task<ActionResult<DefaultResponse<UserViewModel>>> Details(string u
         }
 
 
+        [HttpPut, Route("{username}/update"), Authorize(Policy = "Admin")]
+        public async Task<ActionResult<DefaultResponse<bool>>> Update(string username, [FromBody] UserViewModel model)
+        {
+            if (!ModelState.IsValid)
+            {
+                NotifyModelStateErrors();
+                return Response(false);
+            }
+
+            await _userManageAppService.UpdateUser(model);
+            return Response(true);
+        }
+
         [HttpPatch, Route("{username}/update"), Authorize(Policy = "Admin")]
-        public async Task<ActionResult<DefaultResponse<bool>>> Update(string username, [FromBody] JsonPatchDocument<UserViewModel> model)
+        public async Task<ActionResult<DefaultResponse<bool>>> PartialUpdate(string username, [FromBody] JsonPatchDocument<UserViewModel> model)
         {
             if (!ModelState.IsValid)
             {

src/Frontend/Jp.AdminUI/package-lock.json

@@ -51,6 +51,7 @@
     "core-js": "^3.1.4",
     "easy-pie-chart": "2.1.7",
     "enhanced-resolve": "^4.1.0",
+    "fast-json-patch": "^3.0.0-1",
     "fullcalendar": "^3.10.0",
     "intl": "1.2.5",
     "jqcloud2": "2.0.3",

src/Frontend/Jp.AdminUI/package.json

@@ -8,6 +8,7 @@ import { Observable } from "rxjs";
 import { UserProfile } from "@shared/viewModel/userProfile.model";
 import { UserService } from "@shared/services/user.service";
 import { ResetPassword } from "@shared/viewModel/reset-password.model";
+import * as jsonpatch from 'fast-json-patch';
 
 
 @Component({
@@ -35,6 +36,7 @@ export class UserEditComponent implements OnInit {
     public shouldChangePass: boolean = false;
     public shouldChangeUserData: boolean = true;
     private username: string;
+    patchObserver: jsonpatch.Observer<UserProfile>;
 
     constructor(
         private route: ActivatedRoute,
@@ -44,7 +46,11 @@ export class UserEditComponent implements OnInit {
         public toasterService: ToasterService) { }
 
     public ngOnInit() {
-        this.route.params.pipe(tap(p => this.username = p["username"])).pipe(flatMap(p => this.userService.getDetails(p["username"]))).subscribe(result => {
+        this.route.params
+        .pipe(tap(p => this.username = p["username"]),
+              flatMap(p => this.userService.getDetails(p["username"])),
+              tap(user => this.patchObserver = jsonpatch.observe(user.data))
+        ).subscribe(result => {
             this.model = result.data;
             if (this.model.lockoutEnd != null)
                 this.model.lockoutEnd = new Date(this.model.lockoutEnd);
@@ -60,7 +66,7 @@ export class UserEditComponent implements OnInit {
         this.errors = [];
         try {
 
-            this.userService.update(this.model).subscribe(
+            this.userService.patch(this.username, jsonpatch.generate(this.patchObserver)).subscribe(
                 registerResult => {
                     if (registerResult.data) {
                         this.showSuccessMessage();
@@ -78,7 +84,6 @@ export class UserEditComponent implements OnInit {
             this.showButtonLoading = false;
             return Observable.throw("Unknown error while trying to update");
         }
-
     }
 
     public resetPass() {

src/Frontend/Jp.AdminUI/src/app/panel/users/edit/user-edit.component.ts

@@ -10,6 +10,7 @@ import { UserLogin } from "../viewModel/user-login.model";
 import { ResetPassword } from "../viewModel/reset-password.model";
 import { EventHistoryData } from "../viewModel/event-history-data.model";
 import { map } from "rxjs/operators";
+import { Operation } from "fast-json-patch";
 
 @Injectable()
 export class UserService {
@@ -36,12 +37,11 @@ export class UserService {
     }
 
     public update(updateCommand: UserProfile): Observable<DefaultResponse<boolean>> {
-
         return this.http.put<DefaultResponse<boolean>>(environment.ResourceServer + "UserAdmin/update", updateCommand);
     }
-    
-    public patch(updateCommand: UserProfile): Observable<DefaultResponse<boolean>> {
-        return this.http.patch<DefaultResponse<boolean>>(environment.ResourceServer + "UserAdmin/update", updateCommand);
+
+    public patch(username: string, patch: Operation[]): Observable<DefaultResponse<boolean>> {
+        return this.http.patch<DefaultResponse<boolean>>(environment.ResourceServer + `UserAdmin/${username}/update`, patch);
     }
 
     public save(model: UserProfile): Observable<DefaultResponse<boolean>> {