Give more data when authentication issues appear

Author: technicalguru

src/WebApp/Auth/AuthError.php

@@ -12,13 +12,18 @@ class AuthError {
 	public $errorCode;
 	public $errorMessage;
 
-	public function __construct($errorCode, $errorMessage) {
+	public function __construct($errorCode, $errorMessage, $data = NULL) {
 		$this->errorCode    = $errorCode;
 		$this->errorMessage = $errorMessage;
+		$this->data         = $data;
 	}
 
 	public function getMessage() {
 		return \TgI18n\I18N::_($this->errorMessage);
 	}
+
+	public function getData() {
+		return $data;
+	}
 }
 

src/WebApp/Auth/UserDatabaseAuthenticator.php

@@ -44,18 +44,18 @@ public function authenticate($id, SecretData $secretData) {
 				if (!($user->verifyPassword($secretData->password))) {
 					$user->registerFailedLoginAttempt();
 					$this->dao->save($user);
-					return new AuthError(AuthError::PASSWORD_INVALID, 'user_password_invalid');
+					return new AuthError(AuthError::PASSWORD_INVALID, 'user_password_invalid', $user->email);
 				} else {
 					$user->registerSuccessfulLogin();
 					$this->dao->save($user);
 					return $user;
 				}
 			} else if ($user->isPermanentlyBlocked()) {
-				return new AuthError(AuthError::USER_BLOCKED, 'user_blocked');
+				return new AuthError(AuthError::USER_BLOCKED, 'user_blocked', $user->email);
 			}
-			return new AuthError(AuthError::USER_TEMPORARILY_BLOCKED, 'user_temporarily_blocked');
+			return new AuthError(AuthError::USER_TEMPORARILY_BLOCKED, 'user_temporarily_blocked', $user->email);
 		}
-		return new AuthError(AuthError::USER_NOT_FOUND, 'user_not_found');
+		return new AuthError(AuthError::USER_NOT_FOUND, 'user_not_found', $id);
 	}
 
 	/**

src/WebApp/Page.php

@@ -167,6 +167,11 @@ protected function processLoginAction() {
 				// Login failed
 				Log::register(new Error($result->getMessage()));
 				Log::error('Authentication error: '.$result->errorCode);
+				$data = $result->getData();
+				if ($data != NULL) {
+					if (is_object($data)) $data = json_encode($data);
+					Log::error('Authentication Data: '.$data);
+				}
 			} else {
 				// Return to uri if required
 				$return = $this->request->getPostParam('return');