make ChangePasswordController and UI Code respect Message and Hint from HintException

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>

Author: blizzz

settings/Controller/ChangePasswordController.php

@@ -82,6 +82,27 @@ public function __construct($appName,
 		$this->l = $l;
 	}
 
+	/**
+	 * formats HintException into a JSONResponse for output
+	 *
+	 * @param HintException $e
+	 * @return JSONResponse
+	 */
+	private function caughtHintException(HintException $e) {
+		$message = $e->getMessage();
+		$hint = $e->getHint();
+		if($message === $hint) {
+			$hint = '';
+		}
+		return new JSONResponse([
+			'status' => 'error',
+			'data' => [
+				'message' => $message,
+				'hint' => $hint
+			],
+		]);
+	}
+
 	/**
 	 * @NoAdminRequired
 	 *
@@ -110,12 +131,7 @@ public function changePersonalPassword($oldpassword = '', $newpassword = null) {
 			}
 		// password policy app throws exception
 		} catch(HintException $e) {
-			return new JSONResponse([
-				'status' => 'error',
-				'data' => [
-					'message' => $e->getHint(),
-				],
-			]);
+			return $this->caughtHintException($e);
 		}
 
 		$this->userSession->updateSessionTokenPassword($newpassword);
@@ -230,12 +246,7 @@ public function changeUserPassword($username = null, $password = null, $recovery
 					$result = $targetUser->setPassword($password, $recoveryPassword);
 				// password policy app throws exception
 				} catch(HintException $e) {
-					return new JSONResponse([
-						'status' => 'error',
-						'data' => [
-							'message' => $e->getHint(),
-						],
-					]);
+					return $this->caughtHintException($e);
 				}
 				if (!$result && $recoveryEnabledForUser) {
 					return new JSONResponse([
@@ -265,12 +276,7 @@ public function changeUserPassword($username = null, $password = null, $recovery
 				}
 			// password policy app throws exception
 			} catch(HintException $e) {
-				return new JSONResponse([
-					'status' => 'error',
-					'data' => [
-						'message' => $e->getHint(),
-					],
-				]);
+				return $this->caughtHintException($e);
 			}
 		}
 

settings/js/personal.js

@@ -231,6 +231,9 @@ $(document).ready(function () {
 					$('#pass2').val('').change();
 				} else {
 					if (typeof(data.data) !== "undefined") {
+						if(!_.isEmpty(data.data.hint)) {
+							data.data.message += "\n" + data.data.hint;
+						}
 						OC.msg.finishedSaving('#password-error-msg', data);
 					} else {
 						OC.msg.finishedSaving('#password-error-msg',

settings/js/users/users.js

@@ -664,7 +664,11 @@ $(document).ready(function () {
 								if (result.status === 'success') {
 									OC.Notification.showTemporary(t('admin', 'Password successfully changed'));
 								} else {
-									OC.Notification.showTemporary(t('admin', result.data.message));
+									var message = _.escape(result.data.message);
+									if(!_.isEmpty(result.data.hint)) {
+										message += "<br/>" + _.escape(result.data.hint);
+									}
+									OC.Notification.showTemporary(t('admin', message), {isHTML: true});
 								}
 							}
 						);