Skip to content

Commit

Permalink
fix: Updated KC dependency to 22.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
desaintmartin committed Nov 29, 2023
1 parent 8b7dc82 commit 7e356ae
Show file tree
Hide file tree
Showing 4 changed files with 32 additions and 29 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/release.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ on:
push:
tags:
- '*'
branches:
- "0.0.8"

jobs:
build:
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM maven:3.8.5-jdk-11-slim AS build
FROM maven:3.9.5-eclipse-temurin-17 AS build

WORKDIR /home/app/src

Expand Down
24 changes: 12 additions & 12 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,17 @@
<modelVersion>4.0.0</modelVersion>

<artifactId>actions-token</artifactId>
<groupId>org.jboss.aerogear</groupId>
<groupId>io.wiremind.keycloak.actionstoken</groupId>
<packaging>jar</packaging>
<version>0.0.7</version>
<version>0.0.8</version>

<properties>
<java.version>11</java.version>
<keycloak.version>15.0.2</keycloak.version>
<version.compiler.maven.plugin>3.5.1</version.compiler.maven.plugin>
<maven.compiler.source>11</maven.compiler.source>
<maven.compiler.target>11</maven.compiler.target>
<gson.version>2.9.0</gson.version>
<java.version>17</java.version>
<keycloak.version>22.0.5</keycloak.version>
<version.compiler.maven.plugin>3.8.1</version.compiler.maven.plugin>
<maven.compiler.source>17</maven.compiler.source>
<maven.compiler.target>17</maven.compiler.target>
<gson.version>2.10.1</gson.version>
</properties>

<dependencies>
Expand Down Expand Up @@ -56,7 +56,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>properties-maven-plugin</artifactId>
<version>1.0.0</version>
<version>1.2.1</version>
<executions>
<execution>
<phase>generate-resources</phase>
Expand All @@ -72,7 +72,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.2.1</version>
<version>3.5.1</version>
<executions>
<execution>
<phase>package</phase>
Expand All @@ -85,7 +85,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>3.2.0</version>
<version>3.3.0</version>
<configuration>
<archive>
<manifestEntries>
Expand All @@ -96,4 +96,4 @@
</plugin>
</plugins>
</build>
</project>
</project>
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,20 @@
import java.util.LinkedList;
import java.util.List;

import javax.ws.rs.Consumes;
import javax.ws.rs.ForbiddenException;
import javax.ws.rs.NotAuthorizedException;
import javax.ws.rs.NotFoundException;
import javax.ws.rs.POST;
import javax.ws.rs.Path;
import javax.ws.rs.Produces;
import javax.ws.rs.WebApplicationException;
import javax.ws.rs.core.Context;
import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.Response.Status;
import javax.ws.rs.core.UriInfo;
import jakarta.ws.rs.Consumes;
import jakarta.ws.rs.ForbiddenException;
import jakarta.ws.rs.NotAuthorizedException;
import jakarta.ws.rs.NotFoundException;
import jakarta.ws.rs.POST;
import jakarta.ws.rs.Path;
import jakarta.ws.rs.Produces;
import jakarta.ws.rs.WebApplicationException;
import jakarta.ws.rs.core.Context;
import jakarta.ws.rs.core.HttpHeaders;
import jakarta.ws.rs.core.MediaType;
import jakarta.ws.rs.core.Response;
import jakarta.ws.rs.core.Response.Status;
import jakarta.ws.rs.core.UriInfo;

import org.jboss.logging.Logger;
import org.jboss.resteasy.annotations.cache.NoCache;
Expand Down Expand Up @@ -86,7 +86,7 @@ public Response getActionToken(
ActionTokenRequest actionTokenRequest = null;
try {
Gson gson = new Gson();
actionTokenRequest = gson.fromJson(jsonString, ActionTokenRequest.class);
actionTokenRequest = gson.fromJson(jsonString, ActionTokenRequest.class);
} catch (IllegalArgumentException cause) {
throw new WebApplicationException(
ErrorResponse.error("Invalid json input.", Status.BAD_REQUEST));
Expand Down Expand Up @@ -119,7 +119,8 @@ public Response getActionToken(

if (requiredActions.contains(RequiredAction.VERIFY_EMAIL.name()) && user.getEmail() == null)
{
return ErrorResponse.error("User email missing", Status.BAD_REQUEST);
throw new WebApplicationException(
ErrorResponse.error("User email missing", Status.BAD_REQUEST));
}

if (!user.isEnabled()) {
Expand Down

0 comments on commit 7e356ae

Please sign in to comment.