Merge pull request #65 from vinscom/develop

Release

Author: vinscom

config-layers/common/in/erail/route/LoadUserFromSessionRouteBuillder.properties

@@ -4,4 +4,4 @@ $class=in.erail.route.LoadUserFromSessionRouteBuillder
 vertx=/io/vertx/core/Vertx
 log=true
 enable^=/in/erail/route/SessionRouteBuillder.enable
-oAuth2Auth=/io/vertx/ext/auth/oauth2/OAuth2Auth
+#authProvider=

config-layers/common/in/erail/route/OIDCCallbackRouteBuilder.properties

@@ -2,7 +2,7 @@
 $class=in.erail.route.OIDCCallbackRouteBuilder
 
 queryParamAuthCode=code
-oAuth2Auth=/io/vertx/ext/auth/oauth2/OAuth2Auth
+authProvider=
 vertx=/io/vertx/core/Vertx
 log=true
 callbackURI=/callback

config-layers/common/in/erail/route/SessionRouteBuillder.properties

@@ -4,4 +4,4 @@ $class=in.erail.route.SessionRouteBuillder
 vertx=/io/vertx/core/Vertx
 log=true
 enable=true
-sessionStore=/io/vertx/ext/web/sstore/SessionStore
+sessionStore=/io/vertx/ext/web/sstore/SessionStore

config-layers/common/in/erail/server/Server.properties

@@ -7,8 +7,8 @@ log=true
 routerBuilder=\
     /v1/=/in/erail/route/CORSRouteBuilder,\
     /=/in/erail/route/SessionRouteBuillder,\
-    /=/in/erail/route/LoadUserFromSessionRouteBuillder,\
     /=/in/erail/route/OIDCCallbackRouteBuilder,\
+    /=/in/erail/route/LoadUserFromSessionRouteBuillder,\
     /v1/=/in/erail/route/LoadUserFromAccessTokenRouteBuilder,\
     /v1/=/in/erail/route/OpenAPI3RouteBuilder
 

config-layers/common/io/vertx/ext/auth/oauth2/OAuth2Auth.properties

@@ -1,8 +1,6 @@
 #/io/vertx/ext/auth/oauth2/OAuth2Auth
 $class=io.vertx.reactivex.ext.auth.oauth2.OAuth2Auth
 $instanceFactory=/in/erail/factory/MethodInstanceFactory
-$factory.class=io.vertx.reactivex.ext.auth.oauth2.providers.KeycloakAuth
+$factory.instance=/io/vertx/ext/auth/oauth2/OpenIDConnectAuthFactory
 $factory.method.name=create
-$factory.param.values=/io/vertx/core/Vertx,AUTH_CODE,keyCloakConfig.json
-$factory.param.type=io.vertx.reactivex.core.Vertx,io.vertx.ext.auth.oauth2.OAuth2FlowType,io.vertx.core.json.JsonObject
-$factory.enable=false
+$factory.enable=true

config-layers/common/io/vertx/ext/auth/oauth2/OAuth2ClientOptions.properties

@@ -0,0 +1,6 @@
+#/io/vertx/ext/auth/oauth2/OAuth2ClientOptions
+$class=io.vertx.ext.auth.oauth2.OAuth2ClientOptions
+site=
+clientID=
+clientSecret=
+flow=

config-layers/common/io/vertx/ext/auth/oauth2/OpenIDConnectAuthFactory.properties

@@ -0,0 +1,6 @@
+#/io/vertx/ext/auth/oauth2/OpenIDConnectAuthFactory
+$class=io.vertx.reactivex.ext.auth.oauth2.providers.OpenIDConnectAuthFactory
+vertx=/io/vertx/core/Vertx
+log=true
+oAuth2ClientOptions=/io/vertx/ext/auth/oauth2/OAuth2ClientOptions
+openIDConnectAuthClass=

config-layers/common/io/vertx/ext/auth/oauth2/keyCloakConfig.json

@@ -0,0 +1,2 @@
+#/in/erail/route/SessionRouteBuillder
+enableSession=true

config-layers/test/in/erail/route/SessionRouteBuillder.properties

@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>in.erail</groupId>
     <artifactId>api-framework</artifactId>
-    <version>2.4.6</version>
+    <version>2.4.7</version>
     <packaging>jar</packaging>
     <developers>
         <developer>
@@ -102,7 +102,7 @@
         </profile>
     </profiles>
     <properties>
-        <vertx.version>3.6.2</vertx.version>
+        <vertx.version>3.7.0</vertx.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <maven.compiler.source>1.8</maven.compiler.source>
         <maven.compiler.target>1.8</maven.compiler.target>
@@ -183,24 +183,36 @@
         <dependency>
             <groupId>in.erail</groupId>
             <artifactId>glue</artifactId>
-            <version>2.4.6</version>
+            <version>2.4.7</version>
         </dependency>
         <dependency>
-            <groupId>org.mockito</groupId>
-            <artifactId>mockito-core</artifactId>
-            <version>2.23.4</version>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-api</artifactId>
+            <version>5.4.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.12</version>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-engine</artifactId>
+            <version>5.4.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest-core</artifactId>
-            <version>2.1</version>
+            <groupId>io.vertx</groupId>
+            <artifactId>vertx-junit5</artifactId>
+            <version>${vertx.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-junit-jupiter</artifactId>
+            <version>2.23.4</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>org.junit.jupiter</groupId>
+                    <artifactId>junit-jupiter-api</artifactId>
+                </exclusion>
+            </exclusions>
             <scope>test</scope>
         </dependency>
     </dependencies>