Compare commits
5 Commits
7abbf93f73
...
990b7c08da
Author | SHA1 | Date | |
---|---|---|---|
990b7c08da | |||
7f393a9e44 | |||
c91291dbce | |||
d684b5eaa9 | |||
85b27c0b31 |
2
pom.xml
2
pom.xml
@ -3,7 +3,7 @@
|
|||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<groupId>kangaroo-and-rabbit</groupId>
|
<groupId>kangaroo-and-rabbit</groupId>
|
||||||
<artifactId>archidata</artifactId>
|
<artifactId>archidata</artifactId>
|
||||||
<version>0.20.5-SNAPSHOT</version>
|
<version>0.21.1-SNAPSHOT</version>
|
||||||
<properties>
|
<properties>
|
||||||
<java.version>21</java.version>
|
<java.version>21</java.version>
|
||||||
<maven.compiler.version>3.1</maven.compiler.version>
|
<maven.compiler.version>3.1</maven.compiler.version>
|
||||||
|
@ -119,7 +119,7 @@ public class AuthenticationFilter implements ContainerRequestFilter {
|
|||||||
final boolean isApplicationToken = apikeyHeader != null;
|
final boolean isApplicationToken = apikeyHeader != null;
|
||||||
final boolean isJwtToken = isTokenBasedAuthentication(authorizationHeader);
|
final boolean isJwtToken = isTokenBasedAuthentication(authorizationHeader);
|
||||||
if (!isApplicationToken && !isJwtToken) {
|
if (!isApplicationToken && !isJwtToken) {
|
||||||
LOGGER.warn("REJECTED unauthorized: {}", requestContext.getUriInfo().getPath());
|
LOGGER.warn("REJECTED unauthorized: /{}", requestContext.getUriInfo().getPath());
|
||||||
abortWithUnauthorized(requestContext, "REJECTED unauthorized: " + requestContext.getUriInfo().getPath());
|
abortWithUnauthorized(requestContext, "REJECTED unauthorized: " + requestContext.getUriInfo().getPath());
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
@ -48,7 +48,8 @@ public class User extends GenericDataSoftDelete {
|
|||||||
|
|
||||||
@DefaultValue("'0'")
|
@DefaultValue("'0'")
|
||||||
@Column(nullable = false)
|
@Column(nullable = false)
|
||||||
public boolean blocked = false;
|
@Nullable
|
||||||
|
public Boolean blocked = false;
|
||||||
@Column(length = 512)
|
@Column(length = 512)
|
||||||
public String blockedReason;
|
public String blockedReason;
|
||||||
|
|
||||||
|
@ -198,7 +198,7 @@ public class JWTWrapper {
|
|||||||
.claim("login", userLogin).claim("application", application).issuer(isuer).issueTime(now)
|
.claim("login", userLogin).claim("application", application).issuer(isuer).issueTime(now)
|
||||||
.expirationTime(expiration); // Do not ask why we need a "-" here ... this have no meaning
|
.expirationTime(expiration); // Do not ask why we need a "-" here ... this have no meaning
|
||||||
// add right if needed:
|
// add right if needed:
|
||||||
if (rights != null && !rights.isEmpty()) {
|
if (rights != null) {
|
||||||
builder.claim("right", rights);
|
builder.claim("right", rights);
|
||||||
}
|
}
|
||||||
// Prepare JWT with claims set
|
// Prepare JWT with claims set
|
||||||
|
@ -1 +1 @@
|
|||||||
0.20.5-dev
|
0.21.1-dev
|
||||||
|
Loading…
x
Reference in New Issue
Block a user