diff --git a/src/dev/peerat/framework/Client.java b/src/dev/peerat/framework/Client.java index a3cf77a..354bda8 100644 --- a/src/dev/peerat/framework/Client.java +++ b/src/dev/peerat/framework/Client.java @@ -24,7 +24,6 @@ public class Client extends Thread{ Context context = null; try{ String[] headers = reader.readLine().split("\\s"); - System.out.println(Arrays.toString(headers)); reader.readHeaders(); RequestType type = RequestType.valueOf(headers[0]); @@ -33,7 +32,7 @@ public class Client extends Thread{ writer.flush(); writer.close(); }catch(InvalidJwtException e){ - e.printStackTrace(); +// e.printStackTrace(); }catch(Exception e){ e.printStackTrace(); if(context != null && context.getResponseCode() == 0){ @@ -47,17 +46,19 @@ public class Client extends Thread{ if(context != null) logger.setValue(context); } - private User isLogin(Router router, RequestType type, HttpReader reader) throws Exception{ + private User isLogin(Router router, RequestType type, HttpReader reader) throws InvalidJwtException{ String auth = reader.getHeader("Authorization"); if(auth == null) return null; auth = auth.substring(7); try{ return this.router.getUser(auth); - }catch(Exception e){ + }catch(InvalidJwtException e){ e.printStackTrace(); - writer.response(401, router.getDefaultHeaders(type)); - writer.flush(); - writer.close(); + try{ + writer.response(401, router.getDefaultHeaders(type)); + writer.flush(); + writer.close(); + }catch(Exception ex){} throw e; } } diff --git a/src/dev/peerat/framework/Router.java b/src/dev/peerat/framework/Router.java index d4c9a8d..b631155 100644 --- a/src/dev/peerat/framework/Router.java +++ b/src/dev/peerat/framework/Router.java @@ -16,6 +16,7 @@ import org.jose4j.jwk.RsaJwkGenerator; import org.jose4j.jws.AlgorithmIdentifiers; import org.jose4j.jws.JsonWebSignature; import org.jose4j.jwt.JwtClaims; +import org.jose4j.jwt.consumer.InvalidJwtException; import org.jose4j.jwt.consumer.JwtConsumer; import org.jose4j.jwt.consumer.JwtConsumerBuilder; import org.jose4j.lang.JoseException; @@ -107,7 +108,7 @@ public class Router{ return this; } - public U getUser(String token) throws Exception{ + public U getUser(String token) throws InvalidJwtException{ return this.userCreator.apply(this.jwtConsumer.processToClaims(token)); }