You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ma...@apache.org on 2017/06/16 20:36:53 UTC
[50/50] [abbrv] airavata-php-gateway git commit: Merge branch
'keycloak-integration' into develop
Merge branch 'keycloak-integration' into develop
Project: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/commit/b591279a
Tree: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/tree/b591279a
Diff: http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/diff/b591279a
Branch: refs/heads/develop
Commit: b591279a47b3af3f9be38e5175a48730721e5551
Parents: a2366ef d980e75
Author: Marcus Christie <ma...@iu.edu>
Authored: Fri Jun 16 16:35:51 2017 -0400
Committer: Marcus Christie <ma...@iu.edu>
Committed: Fri Jun 16 16:35:51 2017 -0400
----------------------------------------------------------------------
app/config/app.php | 7 +-
app/config/email_templates.json | 59 +
app/config/email_templates.json.template | 41 +
app/config/pga_config.php.template | 23 +-
app/controllers/AccountController.php | 239 +-
app/controllers/AdminController.php | 46 +-
app/controllers/UserSettingsController.php | 90 +
app/filters.php | 4 +-
app/libraries/AdminUtilities.php | 3 +-
.../Airavata/Facades/IamAdminServices.php | 16 +
.../Airavata/Facades/UserProfileServices.php | 16 +
.../Airavata/IamAdminServiceProvider.php | 84 +
.../Airavata/Model/Workspace/Types.php | 133 +-
.../Iam/Admin/Services/CPI/Error/Types.php | 95 +
.../Iam/Admin/Services/CPI/IamAdminServices.php | 2341 +++++++++++++++++
.../Service/Iam/Admin/Services/CPI/Types.php | 33 +
.../Service/Profile/Tenant/CPI/Error/Types.php | 95 +
.../Profile/Tenant/CPI/TenantProfileService.php | 2435 ++++++++++++++++++
.../Service/Profile/Tenant/CPI/Types.php | 33 +
.../Airavata/Service/Profile/Types.php | 20 +
.../Service/Profile/User/CPI/Error/Types.php | 95 +
.../Airavata/Service/Profile/User/CPI/Types.php | 33 +
.../Profile/User/CPI/UserProfileService.php | 2025 +++++++++++++++
.../Airavata/UserProfileServiceProvider.php | 83 +
app/libraries/EmailUtilities.php | 124 +
app/libraries/GrouperUtilities.php | 37 +-
.../Keycloak/API/BaseKeycloakAPIEndpoint.php | 29 +
app/libraries/Keycloak/API/RoleMapper.php | 113 +
app/libraries/Keycloak/API/Roles.php | 37 +
app/libraries/Keycloak/API/Users.php | 102 +
app/libraries/Keycloak/Facades/Keycloak.php | 16 +
app/libraries/Keycloak/Keycloak.php | 446 ++++
.../Keycloak/KeycloakServiceProvider.php | 71 +
app/libraries/Keycloak/KeycloakUtil.php | 38 +
app/libraries/SharingUtilities.php | 8 +-
app/libraries/UserProfileUtilities.php | 48 +
.../security/incommon_rsa_server_ca.pem | 34 +
app/routes.php | 6 +
app/views/account/create.blade.php | 42 -
app/views/account/forgot-password.blade.php | 15 +
app/views/account/login.blade.php | 13 +-
app/views/account/reset-password.blade.php | 25 +-
app/views/account/settings.blade.php | 16 +
.../account/user-profile-update-email.blade.php | 60 +
app/views/account/user-profile.blade.php | 73 +
app/views/layout/basic.blade.php | 4 +-
app/views/layout/fixed-scripts.blade.php | 8 +-
public/css/bootstrap.min.css | 2 +-
48 files changed, 9111 insertions(+), 305 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/b591279a/app/config/app.php
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/b591279a/app/controllers/AdminController.php
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/b591279a/app/libraries/SharingUtilities.php
----------------------------------------------------------------------
diff --cc app/libraries/SharingUtilities.php
index f069e55,5822a04..6cf7e7e
--- a/app/libraries/SharingUtilities.php
+++ b/app/libraries/SharingUtilities.php
@@@ -74,10 -64,9 +74,10 @@@ class SharingUtilities
$read = GrouperUtilities::getAllAccessibleUsers($resourceId, $dataResourceType, ResourcePermissionType::READ);
$write = GrouperUtilities::getAllAccessibleUsers($resourceId, $dataResourceType, ResourcePermissionType::WRITE);
+ $owner = GrouperUtilities::getAllAccessibleUsers($resourceId, $dataResourceType, ResourcePermissionType::OWNER);
foreach($read as $uid) {
- if ($uid !== Session::get('username') && WSIS::usernameExists($uid)) {
+ if ($uid !== Session::get('username') && Keycloak::usernameExists($uid)) {
$users[$uid] = array('read' => true, 'write' => false);
}
}
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/b591279a/app/routes.php
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata-php-gateway/blob/b591279a/app/views/layout/basic.blade.php
----------------------------------------------------------------------