Merge pull request #1 from randomchars42/feature/repeat-password

add password repeat check when changing password

src/OlmServer/OlmApi.php

@@ -1349,11 +1349,11 @@ public function controllerUsersGetMulti(\Symfony\Component\HttpFoundation\Reques
 	public function controllerUsersPost(\Symfony\Component\HttpFoundation\Request $request) {
 		$data = json_decode($request->getContent(), true);
 
-		if ($data['password'] !== $data['check']) {
+		if ($data['password'] !== $data['repeat']) {
 			$this->sendError(self::RESPONSE_PASSWORDS_DO_NOT_MATCH);
 		}
 
-		unset($data['check']);
+		unset($data['repeat']);
 
 		if (isset($data['password']) && !empty($data['password'])) {
 			$password = $data['password'];
@@ -1410,6 +1410,12 @@ public function controllerUsersPatch(\Symfony\Component\HttpFoundation\Request $
 
 		$user = $this->getCurrentUser();
 
+		if ($data['password'] !== $data['repeat']) {
+			$this->sendError(self::RESPONSE_PASSWORDS_DO_NOT_MATCH);
+		}
+
+		unset($data['repeat']);
+
 		if (!isset($data['check'])) {
 			$this->sendError(self::RESPONSE_PASSWORD_MISSING);
 		}

src/config/cfg.php

@@ -1,7 +1,8 @@
 <?php
 $cfg['db_host'] = 'localhost';
+$cfg['db_prefix'] = 'olm_';
 $cfg['db_name'] = 'olm';
 $cfg['db_user'] = 'olm';
 $cfg['db_password'] = 'olm';
-$cfg['jwt_secret'] = 'äö!ad*+lüp"b$ehiu%"§ns';
+$cfg['jwt_secret'] = 'secretive_secret';
 $cfg['jwt_lifetime'] = 86400;

web/index.php

@@ -36,7 +36,7 @@
 		'charset'   => 'utf8mb4',
 	),
 ));
-$prefix = 'olm_';
+$prefix = $cfg['db_prefix'];
 
 // if the app recieves a JSON request decode the content
 $app->before(function (Request $request) {