[airavata-php-gateway] branch custos-integration-latest updated: Automatic creation of admin user under supertenant

[isjarana]

This is an automated email from the ASF dual-hosted git repository.

isjarana pushed a commit to branch custos-integration-latest
in repository https://gitbox.apache.org/repos/asf/airavata-php-gateway.git


The following commit(s) were added to refs/heads/custos-integration-latest by 
this push:
     new c559d7e  Automatic creation of admin user under supertenant
c559d7e is described below

commit c559d7e5f9a33d4a2164b050331faecb11f9f265
Author: Isuru Ranawaka <irjan...@gmail.com>
AuthorDate: Wed May 5 11:19:43 2021 -0400

    Automatic creation of admin user under supertenant
---
 app/libraries/AdminUtilities.php            | 22 ++++++++++++++++++++++
 app/libraries/IamAdminServicesUtilities.php |  6 ++++++
 2 files changed, 28 insertions(+)

diff --git a/app/libraries/AdminUtilities.php b/app/libraries/AdminUtilities.php
index 1a3807b..a932c82 100644
--- a/app/libraries/AdminUtilities.php
+++ b/app/libraries/AdminUtilities.php
@@ -7,6 +7,7 @@ use Airavata\Model\Workspace\NotificationPriority;
 use Airavata\Model\Credential\Store\SummaryType;
 use Illuminate\Support\Facades\Log;
 
+
 class AdminUtilities
 {
 
@@ -28,6 +29,11 @@ class AdminUtilities
         $gateway->gatewayAdminEmail = $inputs["admin-email"];
         $gateway->gatewayAdminLastName = $inputs["admin-lastname"];
         $gateway->identityServerUserName = $inputs["admin-username"];
+        if 
(!(IamAdminServicesUtilities::isUserExist($gateway->identityServerUserName))){
+            
IamAdminServicesUtilities::registerUser($gateway->identityServerUserName,$gateway->gatewayAdminEmail,
+                
$gateway->gatewayAdminFirstName,$gateway->gatewayAdminLastName,$inputs["admin-password"]);
+            
IamAdminServicesUtilities::enableUser($gateway->identityServerUserName);
+        }
         $token = AdminUtilities::create_pwd_token([
             "username" => $inputs["admin-username"],
             "password" => $inputs["admin-password"],
@@ -103,6 +109,11 @@ class AdminUtilities
         $gateway->gatewayAdminFirstName = $inputs["admin-firstname"];
         $gateway->gatewayAdminLastName = $inputs["admin-lastname"];
         $gateway->identityServerUserName = $inputs["admin-username"];
+        if 
(!(IamAdminServicesUtilities::isUserExist($gateway->identityServerUserName))){
+            
IamAdminServicesUtilities::registerUser($gateway->identityServerUserName,$gateway->gatewayAdminEmail,
+                
$gateway->gatewayAdminFirstName,$gateway->gatewayAdminLastName,$inputs["admin-password"]);
+            
IamAdminServicesUtilities::enableUser($gateway->identityServerUserName);
+        }
         $token = AdminUtilities::create_pwd_token([
             "username" => $inputs["admin-username"],
             "password" => $inputs["admin-password"],
@@ -218,6 +229,12 @@ class AdminUtilities
             $gateway->gatewayAdminEmail = $gatewayData["gatewayAdminEmail"];
             $gateway->identityServerUserName = 
$gatewayData["identityServerUserName"];
             if (!empty($gatewayData["gatewayAdminPassword"])) {
+                if 
(!(IamAdminServicesUtilities::isUserExist($gateway->identityServerUserName))){
+                    
IamAdminServicesUtilities::registerUser($gateway->identityServerUserName,$gateway->gatewayAdminEmail,
+                        
$gateway->gatewayAdminFirstName,$gateway->gatewayAdminLastName,$gatewayData["gatewayAdminPassword"]);
+                    
IamAdminServicesUtilities::enableUser($gateway->identityServerUserName);
+                }
+
 
                 $token = AdminUtilities::create_pwd_token([
                     "username" => $gatewayData["identityServerUserName"],
@@ -250,6 +267,11 @@ class AdminUtilities
             $gateway->gatewayAdminEmail = $gatewayData["gatewayAdminEmail"];
             $gateway->identityServerUserName = 
$gatewayData["identityServerUserName"];
             if (!empty($gatewayData["gatewayAdminPassword"])) {
+                if 
(!(IamAdminServicesUtilities::isUserExist($gateway->identityServerUserName))){
+                    
IamAdminServicesUtilities::registerUser($gateway->identityServerUserName,$gateway->gatewayAdminEmail,
+                        
$gateway->gatewayAdminFirstName,$gateway->gatewayAdminLastName,$gatewayData["gatewayAdminPassword"]);
+                    
IamAdminServicesUtilities::enableUser($gateway->identityServerUserName);
+                }
                 $token = AdminUtilities::create_pwd_token([
                     "username" => $gatewayData["identityServerUserName"],
                     "password" => $gatewayData["gatewayAdminPassword"],
diff --git a/app/libraries/IamAdminServicesUtilities.php 
b/app/libraries/IamAdminServicesUtilities.php
index 5a32736..2c6c066 100644
--- a/app/libraries/IamAdminServicesUtilities.php
+++ b/app/libraries/IamAdminServicesUtilities.php
@@ -33,6 +33,12 @@ class IamAdminServicesUtilities {
         return IamAdminServices::resetUserPassword($admin_authz_token, 
$username, $new_password);
     }
 
+    public static function isUserExist($username) {
+
+        $admin_authz_token = IamAdminServicesUtilities::getAdminAuthzToken();
+        return IamAdminServices::isUserExist($admin_authz_token, $username);
+    }
+
     public static function getUsersWithRole($role_name) {
 
         $authz_token = Session::get('authz-token');