Merge pull request #204 from Gid733/master

renemadsen · web-flow · commit 3dca1e30c4ad · 2019-01-21T13:11:23.000+01:00
Minor enhancements
diff --git a/eFormAPI/eFormAPI.Web/Controllers/AccountController.cs b/eFormAPI/eFormAPI.Web/Controllers/AccountController.cs
@@ -51,8 +51,8 @@ public async Task<OperationResult> ChangePassword([FromBody] ChangePasswordModel
         {
             if (!ModelState.IsValid)
             {
-                var allErrors = ModelState.Values.SelectMany(v => v.Errors);
-                return new OperationResult(false, string.Join(" ", allErrors.Select(x => x.ErrorMessage)));
+                var allErrors = ModelState.Values.SelectMany(v => v.Errors).Select(x => x.ErrorMessage);
+                return new OperationResult(false, string.Join(" ", allErrors));
             }
 
             return await _accountService.ChangePassword(model);
@@ -89,7 +89,7 @@ public async Task<OperationResult> ResetPassword([FromBody] ResetPasswordModel m
         {
             if (!ModelState.IsValid)
             {
-                var allErrors = ModelState.Values.SelectMany(v => v.Errors);
+                var allErrors = ModelState.Values.SelectMany(v => v.Errors).Select(x => x.ErrorMessage);
                 return new OperationResult(false, string.Join(" ", allErrors));
             }
 
diff --git a/eFormAPI/eFormAPI.Web/Services/AccountService.cs b/eFormAPI/eFormAPI.Web/Services/AccountService.cs
@@ -97,22 +97,24 @@ public async Task<OperationResult> UpdateUserSettings(UserSettingsModel model)
             if (!updateResult.Succeeded)
             {
                 return new OperationResult(false,
-                    $"Error while updating user settings: {string.Join(", ", updateResult.Errors.Select(x => x.ToString()).ToArray())}");
+                    $"Error while updating user settings: {string.Join(", ", updateResult.Errors.Select(x => x.Description).ToArray())}");
             }
 
             return new OperationResult(true);
         }
 
         public async Task<OperationResult> ChangePassword(ChangePasswordModel model)
         {
+            var user = await _userService.GetCurrentUserAsync();
             var result = await _userManager.ChangePasswordAsync(
-                await _userService.GetCurrentUserAsync(),
+                user,
                 model.OldPassword,
                 model.NewPassword);
 
             if (!result.Succeeded)
             {
-                return new OperationResult(false, string.Join(" ", result.Errors));
+                var errors = result.Errors.Select(x => x.Description).ToArray();
+                return new OperationResult(false, string.Join(" ", errors));
             }
 
             return new OperationResult(true);
@@ -165,15 +167,15 @@ public async Task<OperationResult> ResetAdminPassword(string code)
             {
                 return new OperationResult(false,
                     _localizationService.GetString("ErrorWhileRemovingOldPassword") + ". \n" +
-                    string.Join(" ", removeResult.Errors));
+                    string.Join(" ", removeResult.Errors.Select(x=>x.Description).ToArray()));
             }
 
             var addPasswordResult = await _userManager.AddPasswordAsync(user, defaultPassword);
             if (!addPasswordResult.Succeeded)
             {
                 return new OperationResult(false,
                     _localizationService.GetString("ErrorWhileAddNewPassword") + ". \n" +
-                    string.Join(" ", addPasswordResult.Errors));
+                    string.Join(" ", addPasswordResult.Errors.Select(x=>x.Description).ToArray()));
             }
 
             return new OperationResult(true, _localizationService.GetString("YourEmailPasswordHasBeenReset", user.Email));
@@ -193,7 +195,7 @@ public async Task<OperationResult> ResetPassword(ResetPasswordModel model)
                 return new OperationResult(true);
             }
 
-            return new OperationResult(false, string.Join(" ", result));
+            return new OperationResult(false, string.Join(" ", result.Errors.Select(x=>x.Description).ToArray()));
         }
     }
 }
diff --git a/eFormAPI/eFormAPI.Web/Services/AdminService.cs b/eFormAPI/eFormAPI.Web/Services/AdminService.cs
@@ -158,7 +158,7 @@ public async Task<OperationResult> UpdateUser(UserRegisterModel userRegisterMode
                 var result = await _userManager.UpdateAsync(user);
                 if (!result.Succeeded)
                 {
-                    return new OperationResult(false, string.Join(" ", result.Errors));
+                    return new OperationResult(false, string.Join(" ", result.Errors.Select(x=>x.Description).ToArray()));
                 }
 
                 // password
@@ -230,7 +230,7 @@ public async Task<OperationResult> CreateUser(UserRegisterModel userRegisterMode
                 var result = await _userManager.CreateAsync(user, userRegisterModel.Password);
                 if (!result.Succeeded)
                 {
-                    return new OperationResult(false, string.Join(" ", result.Errors));
+                    return new OperationResult(false, string.Join(" ", result.Errors.Select(x=>x.Description).ToArray()));
                 }
 
                 // change role
@@ -281,7 +281,7 @@ public async Task<OperationResult> DeleteUser(int userId)
                 var result = await _userManager.DeleteAsync(user);
                 if (!result.Succeeded)
                 {
-                    return new OperationResult(false, string.Join(" ", result.Errors));
+                    return new OperationResult(false, string.Join(" ", result.Errors.Select(x=>x.Description).ToArray()));
                 }
 
                 return new OperationResult(true, _localizationService.GetString("UserParamWasDeleted", userId));
diff --git a/eform-client/src/app/common/services/auth/locale.service.ts b/eform-client/src/app/common/services/auth/locale.service.ts
@@ -65,11 +65,13 @@ export class LocaleService extends BaseService {
   initCookies(locale: string) {
     this.translateService.setDefaultLang('en-US');
     let culture = '';
-      if (locale === 'da-DK') {
-        culture = this.buildCookieValue('da');
-      } else {
-        culture = this.buildCookieValue('en-US');
-      }
+    if (locale === 'da-DK') {
+      culture = this.buildCookieValue('da');
+    } else if (locale === 'de-DE') {
+      culture = this.buildCookieValue('de-DE');
+    } else {
+      culture = this.buildCookieValue('en-US');
+    }
     this.cookieService.set('culture', culture, 9999999, '/');
     this.cookieService.set('locale', locale, 9999999, '/');
   }
diff --git a/eform-client/src/app/modules/eforms/eform-report/components/eform-report-page/eform-report-page.component.ts b/eform-client/src/app/modules/eforms/eform-report/components/eform-report-page/eform-report-page.component.ts
@@ -42,7 +42,7 @@ export class EformReportPageComponent implements OnInit {
     this.spinnerStatus = true;
     this.eformReportService.updateSingle(this.fullReportModel).subscribe((data) => {
       if (data && data.success) {
-
+        this.router.navigate(['/']).then();
       } this.spinnerStatus = false;
     });
   }

Original file line number	Diff line number	Diff line change
`@@ -51,8 +51,8 @@ public async Task<OperationResult> ChangePassword([FromBody] ChangePasswordModel`
`51`	`51`	`{`
`52`	`52`	`if (!ModelState.IsValid)`
`53`	`53`	`{`
`54`		`- var allErrors = ModelState.Values.SelectMany(v => v.Errors);`
`55`		`- return new OperationResult(false, string.Join(" ", allErrors.Select(x => x.ErrorMessage)));`
	`54`	`+ var allErrors = ModelState.Values.SelectMany(v => v.Errors).Select(x => x.ErrorMessage);`
	`55`	`+ return new OperationResult(false, string.Join(" ", allErrors));`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`return await _accountService.ChangePassword(model);`
`@@ -89,7 +89,7 @@ public async Task<OperationResult> ResetPassword([FromBody] ResetPasswordModel m`
`89`	`89`	`{`
`90`	`90`	`if (!ModelState.IsValid)`
`91`	`91`	`{`
`92`		`- var allErrors = ModelState.Values.SelectMany(v => v.Errors);`
	`92`	`+ var allErrors = ModelState.Values.SelectMany(v => v.Errors).Select(x => x.ErrorMessage);`
`93`	`93`	`return new OperationResult(false, string.Join(" ", allErrors));`
`94`	`94`	`}`
`95`	`95`
Original file line number	Diff line number	Diff line change
`@@ -97,22 +97,24 @@ public async Task<OperationResult> UpdateUserSettings(UserSettingsModel model)`
`97`	`97`	`if (!updateResult.Succeeded)`
`98`	`98`	`{`
`99`	`99`	`return new OperationResult(false,`
`100`		`- $"Error while updating user settings: {string.Join(", ", updateResult.Errors.Select(x => x.ToString()).ToArray())}");`
	`100`	`+ $"Error while updating user settings: {string.Join(", ", updateResult.Errors.Select(x => x.Description).ToArray())}");`
`101`	`101`	`}`
`102`	`102`
`103`	`103`	`return new OperationResult(true);`
`104`	`104`	`}`
`105`	`105`
`106`	`106`	`public async Task<OperationResult> ChangePassword(ChangePasswordModel model)`
`107`	`107`	`{`
	`108`	`+ var user = await _userService.GetCurrentUserAsync();`
`108`	`109`	`var result = await _userManager.ChangePasswordAsync(`
`109`		`- await _userService.GetCurrentUserAsync(),`
	`110`	`+ user,`
`110`	`111`	`model.OldPassword,`
`111`	`112`	`model.NewPassword);`
`112`	`113`
`113`	`114`	`if (!result.Succeeded)`
`114`	`115`	`{`
`115`		`- return new OperationResult(false, string.Join(" ", result.Errors));`
	`116`	`+ var errors = result.Errors.Select(x => x.Description).ToArray();`
	`117`	`+ return new OperationResult(false, string.Join(" ", errors));`
`116`	`118`	`}`
`117`	`119`
`118`	`120`	`return new OperationResult(true);`
`@@ -165,15 +167,15 @@ public async Task<OperationResult> ResetAdminPassword(string code)`
`165`	`167`	`{`
`166`	`168`	`return new OperationResult(false,`
`167`	`169`	`_localizationService.GetString("ErrorWhileRemovingOldPassword") + ". \n" +`
`168`		`- string.Join(" ", removeResult.Errors));`
	`170`	`+ string.Join(" ", removeResult.Errors.Select(x=>x.Description).ToArray()));`
`169`	`171`	`}`
`170`	`172`
`171`	`173`	`var addPasswordResult = await _userManager.AddPasswordAsync(user, defaultPassword);`
`172`	`174`	`if (!addPasswordResult.Succeeded)`
`173`	`175`	`{`
`174`	`176`	`return new OperationResult(false,`
`175`	`177`	`_localizationService.GetString("ErrorWhileAddNewPassword") + ". \n" +`
`176`		`- string.Join(" ", addPasswordResult.Errors));`
	`178`	`+ string.Join(" ", addPasswordResult.Errors.Select(x=>x.Description).ToArray()));`
`177`	`179`	`}`
`178`	`180`
`179`	`181`	`return new OperationResult(true, _localizationService.GetString("YourEmailPasswordHasBeenReset", user.Email));`
`@@ -193,7 +195,7 @@ public async Task<OperationResult> ResetPassword(ResetPasswordModel model)`
`193`	`195`	`return new OperationResult(true);`
`194`	`196`	`}`
`195`	`197`
`196`		`- return new OperationResult(false, string.Join(" ", result));`
	`198`	`+ return new OperationResult(false, string.Join(" ", result.Errors.Select(x=>x.Description).ToArray()));`
`197`	`199`	`}`
`198`	`200`	`}`
`199`	`201`	`}`
Original file line number	Diff line number	Diff line change
`@@ -158,7 +158,7 @@ public async Task<OperationResult> UpdateUser(UserRegisterModel userRegisterMode`
`158`	`158`	`var result = await _userManager.UpdateAsync(user);`
`159`	`159`	`if (!result.Succeeded)`
`160`	`160`	`{`
`161`		`- return new OperationResult(false, string.Join(" ", result.Errors));`
	`161`	`+ return new OperationResult(false, string.Join(" ", result.Errors.Select(x=>x.Description).ToArray()));`
`162`	`162`	`}`
`163`	`163`
`164`	`164`	`// password`
`@@ -230,7 +230,7 @@ public async Task<OperationResult> CreateUser(UserRegisterModel userRegisterMode`
`230`	`230`	`var result = await _userManager.CreateAsync(user, userRegisterModel.Password);`
`231`	`231`	`if (!result.Succeeded)`
`232`	`232`	`{`
`233`		`- return new OperationResult(false, string.Join(" ", result.Errors));`
	`233`	`+ return new OperationResult(false, string.Join(" ", result.Errors.Select(x=>x.Description).ToArray()));`
`234`	`234`	`}`
`235`	`235`
`236`	`236`	`// change role`
`@@ -281,7 +281,7 @@ public async Task<OperationResult> DeleteUser(int userId)`
`281`	`281`	`var result = await _userManager.DeleteAsync(user);`
`282`	`282`	`if (!result.Succeeded)`
`283`	`283`	`{`
`284`		`- return new OperationResult(false, string.Join(" ", result.Errors));`
	`284`	`+ return new OperationResult(false, string.Join(" ", result.Errors.Select(x=>x.Description).ToArray()));`
`285`	`285`	`}`
`286`	`286`
`287`	`287`	`return new OperationResult(true, _localizationService.GetString("UserParamWasDeleted", userId));`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ export class EformReportPageComponent implements OnInit {`
`42`	`42`	`this.spinnerStatus = true;`
`43`	`43`	`this.eformReportService.updateSingle(this.fullReportModel).subscribe((data) => {`
`44`	`44`	`if (data && data.success) {`
`45`		`-`
	`45`	`+ this.router.navigate(['/']).then();`
`46`	`46`	`} this.spinnerStatus = false;`
`47`	`47`	`});`
`48`	`48`	`}`