Payara-1554 Basic MP-JWT 1.0 implementation passing TCK basic and full #2226
Conversation
|
jenkins test please |
|
Quick build and test failed! |
|
jenkins test please |
|
Quick build and test passed! |
appserver/pom.xml
Outdated
| @@ -114,6 +114,12 @@ | |||
|
|
|||
| <jsftemplating.version>2.1.2</jsftemplating.version> | |||
| <uc-pkg-client.version>1.122-57.2889</uc-pkg-client.version> | |||
|
|
|||
| <nimbus-jose-jwt.version>5.1</nimbus-jose-jwt.version> | |||
| <asm.version>5.0.4</asm.version> | |||
There was a problem hiding this comment.
This property is already defined in nucleus
| <dependency> | ||
| <groupId>org.eclipse.microprofile.jwt</groupId> | ||
| <artifactId>microprofile-jwt-auth-api</artifactId> | ||
| <version>1.0</version> |
There was a problem hiding this comment.
Hmmm, that's a merge or commit going wrong as the properties were being put there. I'll fix it.
| <dependency> | ||
| <groupId>com.nimbusds</groupId> | ||
| <artifactId>nimbus-jose-jwt</artifactId> | ||
| <version>5.1</version> |
|
|
||
| Bean<?> bean = injectionPoint.getBean(); | ||
|
|
||
| Class<?> scope = bean != null? injectionPoint.getBean().getScope() : null; |
There was a problem hiding this comment.
Ternary? (╯°□°）╯︵ ┻━┻
Ternary with no space before the question mark? ┻━┻ ︵ヽ(`Д´)ﾉ︵ ┻━┻
There was a problem hiding this comment.
Omg... how then?
| * | ||
| * @author Arjan Tijms | ||
| */ | ||
| public class CdiExtension2 { |
There was a problem hiding this comment.
There's no words indeed to describe that. It's absolutely maddening, spend 2 days on it including debugging deep into the bowels of the sun.* classes. For some reason the @Observers annotations can't be processed, unless the code of the event observers is moved elsewhere.
| converter = e -> ((JsonString) e).getString(); | ||
| } else if (coreClass.equals(Set.class)) { | ||
| converter = e -> e instanceof JsonArray | ||
| ? new HashSet<>(((JsonArray) e).getValuesAs(JsonString.class)).stream().map(t -> t.getString()).collect(toSet()) |
There was a problem hiding this comment.
This is a very "busy" statement - probably easier to read as a proper if/else
There was a problem hiding this comment.
True, it's busyness comes from I developed against the Java EE 8 API first where it's much less code, then had to convert to EE 7 which Payara 4 is still using of course. Probably an entire separate method, which then can use the if/else is even better here.
| return (T) singleton( ((JsonString) claimValue).getString()); | ||
| } else { | ||
| return (T) new HashSet<>(((JsonArray) claimValue).getValuesAs(JsonString.class)).stream().map(t -> | ||
| t.getString()).collect(toSet()); |
There was a problem hiding this comment.
Holy awful indenting batman!
There was a problem hiding this comment.
Same as above, used to be small single line on Java EE 8, looks like mess with EE 7 API.
| Map<String, JsonValue> rawClaims = | ||
| new HashMap<>( | ||
| Json.createReader(new StringReader(signedJWT.getPayload().toString())) | ||
| .readObject()); |
There was a problem hiding this comment.
Where? lines 96 and 97 have double indents, and on line 98 .readObject() is aligned with .createReader.
|
|
||
| private boolean checkNotExpired(Map<String, JsonValue> presentedClaims) { | ||
| int currentTime = (int) (System.currentTimeMillis() / 1000); | ||
| long expiredTime = ((JsonNumber) presentedClaims.get(exp.name())).intValue(); |
There was a problem hiding this comment.
Why long? You've just done .intValue()
| } | ||
| } | ||
| } catch (Exception e) { | ||
| // Ignore |
There was a problem hiding this comment.
Better to log at finer/finest
|
jenkins test please |
|
Quick build and test passed! |
|
jenkins test please |
|
Quick build and test passed! |
payara#2226) * PAYARA-1554 Initial MP-JWT implementation. WIP! * PAYARA-1554 Basic MP-JWT 1.0 implementation passing TCK basic and full. * PAYARA-1554 Versions via placeholder and new deps added to license text * PAYARA-1554 Added JCIP to ext modules * Payara-1554 Addressing Andy's feedback * PAYARA-1554 Renaming CdiExtension2 to a more semantic name
PAYARA-1554 Basic MP-JWT 1.0 implementation passing TCK basic and full.