commit 1dcb50ee487d93b6b7e9540b1ef6a355fb0b7f4f
author Isuru Ranawaka <irjanith@gmail.com> Mon Aug 17 15:10:57 2020 -0400
committer Isuru Ranawaka <irjanith@gmail.com> Mon Aug 17 15:10:57 2020 -0400
tree c0a7ce2a3199d6ccef69aaf4975ccafa6f5a5da4
parent b47c2099852cd9e38faab328c0a9dccda03b0896

Adding logs

app/libraries/AdminUtilities.php

diff --git a/app/libraries/AdminUtilities.php b/app/libraries/AdminUtilities.php
index 3c11266..c9a4e2a 100644
--- a/app/libraries/AdminUtilities.php
+++ b/app/libraries/AdminUtilities.php
@@ -39,8 +39,16 @@
         $gateway->requesterUsername = Session::get('username');
         $gateway->gatewayApprovalStatus = GatewayApprovalStatus::APPROVED;
 
+
+
+         $logoutURI = $gateway->gatewayURL;
+         $redirectURI = $logoutURI."auth/callback*";
+         $gateway->redirectURLs = array($logoutURI,$redirectURI);
+         $gateway->scope = "openid profile email org.cilogon.userinfo" ;
+
         try {
-            TenantProfileService::addGateway(Session::get('authz-token'), $gateway);
+            Log::info("Gateway #####".$gateway);
+           // TenantProfileService::addGateway(Session::get('authz-token'), $gateway);
             return 1;
         }
         catch (Exception $ex) {
@@ -71,13 +79,15 @@
         $gateway->gatewayPublicAbstract = $inputs["public-project-description"];
         $gateway->requesterUsername = Session::get('username');
 
-        try {
-            TenantProfileService::addGateway(Session::get('authz-token'), $gateway);
+
+        Log::info("Check request #####".$gateway);
+       // try {
+         //   TenantProfileService::addGateway(Session::get('authz-token'), $gateway);
             return 1;
-        }
-        catch (Exception $ex) {
-            return -1;
-        }
+       // }
+       // catch (Exception $ex) {
+        //    return -1;
+       // }
     }
 
     public static function request_gateway( $inputs)
@@ -105,7 +115,18 @@
         $gateway->gatewayPublicAbstract = $inputs["public-project-description"];
         $gateway->requesterUsername = Session::get('username');
 
-        return TenantProfileService::addGateway(Session::get('authz-token'), $gateway);
+
+        $logoutURI = $gateway->gatewayURL;
+        $redirectURI = $logoutURI."auth/callback*";
+        $gateway->redirectURLs = array($logoutURI,$redirectURI);
+        $gateway->scope = "openid profile email org.cilogon.userinfo" ;
+
+
+        Log::info ("Request_Gateway ".$gateway);
+
+        return 1;
+
+        // return TenantProfileService::addGateway(Session::get('authz-token'), $gateway);
     }
 
     public static function get_gateway_approval_statuses()
@@ -129,14 +150,17 @@
         $gateway->gatewayURL = $gatewayData["gateway-url"];
         $gateway->reviewProposalDescription = $gatewayData["project-details"];
         $gateway->gatewayPublicAbstract = $gatewayData["public-project-description"];
-        if( TenantProfileService::updateGateway( Session::get('authz-token'), $gateway) ){
+
+        Log::info("user_update_gateway ".$gateway);
+
+      //  if( TenantProfileService::updateGateway( Session::get('authz-token'), $gateway) ){
             return 1;
-        }
-        else{
+     //   }
+      //  else{
             //Need to find a better way for this.
             // retun echo "Tenant Name is already in use";
-            return -1;
-        }
+       //     return -1;
+     //   }
     }
 
     public static function update_gateway( $gatewayId, $gatewayData){
@@ -166,7 +190,7 @@
                     return -1;
                 }
             }
-            $gateway = IamAdminServices::setUpGateway( Session::get('authz-token'), $gateway);
+          //  $gateway = IamAdminServices::setUpGateway( Session::get('authz-token'), $gateway);
             $gateway->gatewayApprovalStatus = GatewayApprovalStatus::CREATED;
         }
         elseif( isset( $gatewayData["approveRequest"])){
@@ -217,14 +241,15 @@
             $gateway->gatewayApprovalStatus = GatewayApprovalStatus::DEACTIVATED;
         }
 
-        if( TenantProfileService::updateGateway( Session::get('authz-token'), $gateway) ){
+        Log.info("Calling update gateway".$gateway);
+       // if( TenantProfileService::updateGateway( Session::get('authz-token'), $gateway) ){
             return 1;
-        }
-        else{
-            //Need to find a better way for this.
-           // retun echo "Tenant Name is already in use";
-            return -1;
-        }
+//        }
+//        else{
+//            //Need to find a better way for this.
+//           // retun echo "Tenant Name is already in use";
+//            return -1;
+//        }
     }
 
     public static function add_tenant( $gateway){