diff --git a/rest/index.php b/rest/index.php index 2cf0c2f4172b3f18b37333440b1ab9a8894c7a9e..3ca2a66eca0386ea02675aa15046646a04eea06c 100755 --- a/rest/index.php +++ b/rest/index.php @@ -30,7 +30,7 @@ $app = new \Slim\App(['settings' => ['displayErrorDetails' => true, 'determineRo //Authentication $app->add(function (\Slim\Http\Request $request, \Slim\Http\Response $response, callable $next) { - $routesWithoutAuthentication = ['GET/jnlp/{jnlpUniqueId}', 'POST/password', 'PUT/password', 'GET/initialize', 'GET/passwordRules']; + $routesWithoutAuthentication = ['GET/jnlp/{jnlpUniqueId}', 'POST/password', 'PUT/password', 'GET/passwordRules']; $route = $request->getAttribute('route'); $currentMethod = empty($route) ? '' : $route->getMethods()[0]; $currentRoute = empty($route) ? '' : $route->getPattern(); @@ -45,7 +45,7 @@ $app->add(function (\Slim\Http\Request $request, \Slim\Http\Response $response, return $response->withStatus(405)->withJson(['errors' => $r['errors']]); } } - } else { + } elseif ($currentMethod.$currentRoute != 'GET/initialize') { return $response->withStatus(401)->withJson(['errors' => 'Authentication Failed']); } } diff --git a/src/app/user/controllers/UserController.php b/src/app/user/controllers/UserController.php index 27d4a1aef4c5bdd812c6f330211fdeccb580fd05..3f0ba2fd596e9be513da8d45ec3455737fca4b61 100755 --- a/src/app/user/controllers/UserController.php +++ b/src/app/user/controllers/UserController.php @@ -194,7 +194,7 @@ class UserController } } - $loggingMethod = \SrcCore\models\CoreConfigModel::getLoggingMethod(); + $loggingMethod = CoreConfigModel::getLoggingMethod(); if ($loggingMethod['id'] == 'standard') { $resetToken = AuthenticationController::getResetJWT(['id' => $newUser['id'], 'expirationTime' => 1209600]); // 14 days UserModel::update(['set' => ['reset_token' => $resetToken], 'where' => ['id = ?'], 'data' => [$newUser['id']]]);