Nemcio/SCM-Manager
1
0
Fork 0
mirror of https://github.com/scm-manager/scm-manager.git synced 2025-11-17 02:31:14 +01:00
Code Issues Packages Projects Releases Activity

redesign bearer tokens

Browse Source
This commit is contained in:
Sebastian Sdorra
2017-01-17 15:54:32 +01:00
parent 70d5942250
commit 5738fa2d66
8 changed files with 61 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
scm-webapp/src/main/java/sonia/scm/web/BearerWebTokenGenerator.java
View File

@@ -34,7 +34,7 @@ package sonia.scm.web;
//~--- non-JDK imports --------------------------------------------------------
import sonia.scm.plugin.Extension;
import sonia.scm.security.BearerAuthenticationToken;
import sonia.scm.security.BearerToken;
import sonia.scm.util.HttpUtil;
//~--- JDK imports ------------------------------------------------------------
@@ -42,7 +42,7 @@ import sonia.scm.util.HttpUtil;
import javax.servlet.http.HttpServletRequest;
/**
* Creates a {@link BearerAuthenticationToken} from an authorization header with
* Creates a {@link BearerToken} from an authorization header with
* bearer authorization.
*
* @author Sebastian Sdorra
@@ -53,24 +53,24 @@ public class BearerWebTokenGenerator extends SchemeBasedWebTokenGenerator
{
/**
* Creates a {@link BearerAuthenticationToken} from an authorization header
* Creates a {@link BearerToken} from an authorization header
* with bearer authorization.
*
* @param request http servlet request
* @param scheme authorization scheme
* @param authorization authorization payload
*
* @return {@link BearerAuthenticationToken} or {@code null}
* @return {@link BearerToken} or {@code null}
*/
@Override
protected BearerAuthenticationToken createToken(HttpServletRequest request,
protected BearerToken createToken(HttpServletRequest request,
String scheme, String authorization)
{
BearerAuthenticationToken token = null;
BearerToken token = null;
if (HttpUtil.AUTHORIZATION_SCHEME_BEARER.equalsIgnoreCase(scheme))
{
token = new BearerAuthenticationToken(authorization);
token = BearerToken.valueOf(authorization);
}
return token;

14
scm-webapp/src/main/java/sonia/scm/web/CookieBearerWebTokenGenerator.java
View File

@@ -34,7 +34,7 @@ package sonia.scm.web;
//~--- non-JDK imports --------------------------------------------------------
import sonia.scm.plugin.Extension;
import sonia.scm.security.BearerAuthenticationToken;
import sonia.scm.security.BearerToken;
//~--- JDK imports ------------------------------------------------------------
@@ -43,7 +43,7 @@ import javax.servlet.http.HttpServletRequest;
import sonia.scm.util.HttpUtil;
/**
* Creates an {@link BearerAuthenticationToken} from the {@link #COOKIE_NAME}
* Creates an {@link BearerToken} from the {@link #COOKIE_NAME}
* cookie.
*
* @author Sebastian Sdorra
@@ -54,17 +54,17 @@ public class CookieBearerWebTokenGenerator implements WebTokenGenerator
{
/**
* Creates an {@link BearerAuthenticationToken} from the {@link #COOKIE_NAME}
* Creates an {@link BearerToken} from the {@link #COOKIE_NAME}
* cookie.
*
* @param request http servlet request
*
* @return {@link BearerAuthenticationToken} or {@code null}
* @return {@link BearerToken} or {@code null}
*/
@Override
public BearerAuthenticationToken createToken(HttpServletRequest request)
public BearerToken createToken(HttpServletRequest request)
{
BearerAuthenticationToken token = null;
BearerToken token = null;
Cookie[] cookies = request.getCookies();
if (cookies != null)
@@ -73,7 +73,7 @@ public class CookieBearerWebTokenGenerator implements WebTokenGenerator
{
if (HttpUtil.COOKIE_BEARER_AUTHENTICATION.equals(cookie.getName()))
{
token = new BearerAuthenticationToken(cookie.getValue());
token = BearerToken.valueOf(cookie.getValue());
break;
}