Fixed unauthorized exceptions

This commit is contained in:
Graham Campbell
2015-06-18 18:12:10 +01:00
parent fad3ed9a51
commit a7effcce7a
3 changed files with 8 additions and 8 deletions

View File

@@ -15,7 +15,7 @@ use CachetHQ\Cachet\Models\User;
use Closure;
use Illuminate\Contracts\Auth\Guard;
use Illuminate\Database\Eloquent\ModelNotFoundException;
use Symfony\Component\HttpKernel\Exception\UnauthorizedHttpException;
use Symfony\Component\HttpKernel\Exception\HttpException;
class ApiAuthenticate
{
@@ -51,14 +51,14 @@ class ApiAuthenticate
try {
$this->auth->onceUsingId(User::findByApiToken($apiToken)->id);
} catch (ModelNotFoundException $e) {
throw new UnauthorizedHttpException();
throw new HttpException(401);
}
} elseif ($request->getUser()) {
if ($this->auth->onceBasic() !== null) {
throw new UnauthorizedHttpException();
throw new HttpException(401);
}
} else {
throw new UnauthorizedHttpException();
throw new HttpException(401);
}
}