redesign bearer tokens

scm-webapp/src/main/java/sonia/scm/security/BearerRealm.java

@@ -62,7 +62,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
- * Realm for authentication with {@link BearerAuthenticationToken}.
+ * Realm for authentication with {@link BearerToken}.
  *
  * @author Sebastian Sdorra
  * @since 2.0.0
@@ -100,7 +100,7 @@ public class BearerRealm extends AuthenticatingRealm
     this.validators = validators;
     
     setCredentialsMatcher(new AllowAllCredentialsMatcher());
-    setAuthenticationTokenClass(BearerAuthenticationToken.class);
+    setAuthenticationTokenClass(BearerToken.class);
   }
 
   //~--- methods --------------------------------------------------------------
@@ -117,10 +117,10 @@ public class BearerRealm extends AuthenticatingRealm
   @Override
   protected AuthenticationInfo doGetAuthenticationInfo( AuthenticationToken token)
   {
-    checkArgument(token instanceof BearerAuthenticationToken, "%s is required",
-      BearerAuthenticationToken.class);
+    checkArgument(token instanceof BearerToken, "%s is required",
+      BearerToken.class);
 
-    BearerAuthenticationToken bt = (BearerAuthenticationToken) token;
+    BearerToken bt = (BearerToken) token;
     Claims c = checkToken(bt);
 
     return helper.getAuthenticationInfo(c.getSubject(), bt.getCredentials(), Scopes.fromClaims(c));
@@ -134,7 +134,7 @@ public class BearerRealm extends AuthenticatingRealm
    *
    * @return claim
    */
-  private Claims checkToken(BearerAuthenticationToken token)
+  private Claims checkToken(BearerToken token)
   {
     Claims claims;
 

scm-webapp/src/main/java/sonia/scm/web/BearerWebTokenGenerator.java

@@ -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;

scm-webapp/src/main/java/sonia/scm/web/CookieBearerWebTokenGenerator.java

@@ -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;
         }