Integration working

Author: vinscom

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

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

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

@@ -2,7 +2,7 @@
 $class=in.erail.route.OIDCCallbackRouteBuilder
 
 queryParamAuthCode=code
-authProvider=/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/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

@@ -1,6 +1,7 @@
 package in.erail.route;
 
 import in.erail.common.FrameworkConstants;
+import io.vertx.reactivex.ext.auth.AuthProvider;
 import io.vertx.reactivex.ext.auth.User;
 import io.vertx.reactivex.ext.web.Router;
 import io.vertx.reactivex.ext.web.RoutingContext;
@@ -12,6 +13,8 @@
  */
 public class LoadUserFromSessionRouteBuillder extends AbstractRouterBuilderImpl {
 
+	private AuthProvider mAuthProvider;
+	
   @Override
   public Router getRouter(Router pRouter) {
     pRouter.route().handler(this::handle);
@@ -23,15 +26,23 @@ public void handle(RoutingContext pRoutingContext) {
 
     if (session != null) {
       io.vertx.ext.auth.User user = session.get(FrameworkConstants.Session.PRINCIPAL);
-
       if (user == null) {
         getLog().debug("User not found");
       } else {
+        user.setAuthProvider(getAuthProvider().getDelegate());
         pRoutingContext.setUser(new User(user));
       }
     }
 
     pRoutingContext.next();
   }
 
+  public AuthProvider getAuthProvider() {
+    return mAuthProvider;
+  }
+
+  public void setAuthProvider(AuthProvider pAuthProvider) {
+    this.mAuthProvider = pAuthProvider;
+  }
+
 }

src/main/java/in/erail/route/LoadUserFromSessionRouteBuillder.java

@@ -21,12 +21,34 @@ public class OIDCCallbackRouteBuilder extends AbstractRouterBuilderImpl {
   private String mFailPath;
 
   public void handle(RoutingContext pRoutingCoutext) {
+
+    if (getAuthProvider() == null) {
+      getLog().warn("Auth provider not set");
+      return;
+    }
+
     JsonObject tokenConfig = getTokenConfig(pRoutingCoutext);
 
     getAuthProvider()
             .rxAuthenticate(tokenConfig)
             .doOnSuccess((u) -> {
-              Session session = pRoutingCoutext.session().regenerateId();
+              Session session = pRoutingCoutext.session();
+
+              if (session == null) {
+
+                getLog().error(() -> "Session not found");
+
+                pRoutingCoutext
+                        .response()
+                        .putHeader(HttpHeaders.LOCATION, getFailURL(pRoutingCoutext))
+                        .setStatusCode(302)
+                        .end();
+                return;
+              }
+
+              session = session.regenerateId();
+
+              //Session session = pRoutingCoutext.session().regenerateId();
               session.put(FrameworkConstants.Session.PRINCIPAL, u.getDelegate());
               getLog().debug(() -> "Success URL:" + getSuccessURL(pRoutingCoutext));
 
@@ -46,7 +68,7 @@ public void handle(RoutingContext pRoutingCoutext) {
                       .setStatusCode(302)
                       .end();
             })
-            .blockingGet();
+            .subscribe();
   }
 
   private String baseURL(RoutingContext pRoutingContext) {
@@ -98,9 +120,14 @@ private JsonObject getTokenConfig(RoutingContext pRoutingContext) {
 
     String authCode = pRoutingContext.request().params().get(getQueryParamAuthCode());
 
-    return new JsonObject()
+    JsonObject config = new JsonObject()
             .put("code", authCode)
             .put("redirect_uri", baseURL(pRoutingContext) + getCallbackURI());
+
+    getLog().debug(() -> "Auth Config:" + config);
+
+    return config;
+
   }
 
   public String getQueryParamAuthCode() {

src/main/java/in/erail/route/OIDCCallbackRouteBuilder.java

@@ -31,6 +31,7 @@ public Router getRouter(Router pRouter) {
     route.handler(CookieHandler.create());
     if (isEnableSession()) {
       route.handler(SessionHandler.create(getSessionStore()));
+      getLog().info("Session Store Enabled");
     }
     return pRouter;
   }