diff --git a/src/main/scala/gitbucket/core/servlet/ApiAuthenticationFilter.scala b/src/main/scala/gitbucket/core/servlet/ApiAuthenticationFilter.scala index 5fc3554dc..f13cb5142 100644 --- a/src/main/scala/gitbucket/core/servlet/ApiAuthenticationFilter.scala +++ b/src/main/scala/gitbucket/core/servlet/ApiAuthenticationFilter.scala @@ -25,8 +25,8 @@ class ApiAuthenticationFilter extends Filter with AccessTokenService with Accoun val response = res.asInstanceOf[HttpServletResponse] Option(request.getHeader("Authorization")) .map { - case auth if auth.toLowerCase().startsWith("token ") => - AccessTokenService.getAccountByAccessToken(auth.substring(6).trim).toRight(()) + case auth if auth.toLowerCase().startsWith("token ") || auth.toLowerCase().startsWith("bearer ") => + AccessTokenService.getAccountByAccessToken(auth.substring(auth.indexOf(" ") + 1).trim).toRight(()) case auth if auth.startsWith("Basic ") => doBasicAuth(auth, loadSystemSettings(), request).toRight(()) case _ => Left(()) }