Omitted foundry injection in empty span, fixed multiple license rewrite.
Change-Id: I6bbe809d35fc016eda8849c8c1e6cbe84eff9b4f
diff --git a/full/src/main/java/de/ids_mannheim/korap/authentication/APIAuthentication.java b/full/src/main/java/de/ids_mannheim/korap/authentication/APIAuthentication.java
index 8c41ab0..7b7da01 100644
--- a/full/src/main/java/de/ids_mannheim/korap/authentication/APIAuthentication.java
+++ b/full/src/main/java/de/ids_mannheim/korap/authentication/APIAuthentication.java
@@ -22,7 +22,7 @@
*
* Created by hanl on 5/23/14.
*/
-public abstract class APIAuthentication implements AuthenticationIface {
+public class APIAuthentication implements AuthenticationIface {
private JWTSigner signedToken;
private Cache invalided =
@@ -34,6 +34,13 @@
this.signedToken = new JWTSigner(config.getSharedSecret(),
config.getIssuer(), config.getTokenTTL());
}
+
+ /** EM: for testing
+ * @param signedToken
+ */
+ public APIAuthentication (JWTSigner signedToken) {
+ this.signedToken = signedToken;
+ }
@Override
public TokenContext getTokenContext (String authToken)
diff --git a/full/src/main/java/de/ids_mannheim/korap/authentication/KustvaktAuthenticationManager.java b/full/src/main/java/de/ids_mannheim/korap/authentication/KustvaktAuthenticationManager.java
index 0b98f76..528b8a1 100644
--- a/full/src/main/java/de/ids_mannheim/korap/authentication/KustvaktAuthenticationManager.java
+++ b/full/src/main/java/de/ids_mannheim/korap/authentication/KustvaktAuthenticationManager.java
@@ -98,7 +98,7 @@
* @throws KustvaktException
*/
@Override
- public TokenContext getTokenStatus(TokenType type, String token,
+ public TokenContext getTokenContext(TokenType type, String token,
String host, String useragent) throws KustvaktException {
AuthenticationIface provider = getProvider(type , null);
@@ -109,11 +109,6 @@
"token type not defined or found", "token_type");
TokenContext context = provider.getTokenContext(token);
- if (context != null && TimeUtils.isExpired(context.getExpirationTime()))
- throw new KustvaktException(StatusCodes.EXPIRED);
- else if (context == null)
- throw new KustvaktException(StatusCodes.NO_RESULT_FOUND);
-
// if (!matchStatus(host, useragent, context))
// provider.removeUserSession(token);
return context;