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/12/13 20:24:03 UTC
[airavata] branch develop updated (edf1783 -> 41d371b)
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata.git.
from edf1783 Merge branch 'google-analytics-ansible' into develop
add d802360 Added SIU big dog email and jetstream email in to the production config
add 0e35b48 changing ultrascan gateway to point to production stack
add 236455f temporarly adding dev ultrascan to point to gw153 airavata, this will soon be removed.
add 6cee9a2 Merge branch 'google-analytics-ansible'
add b5d2d37 Remove local state from SCPDataStageTask
new dedbfc9 AIRAVATA-2571 Set emailVerified=true when user is enabled
new 7a9164f AIRAVATA-2571 Use `state` field to indicate if Keycloak user is enabled
new 41d371b Merge branch 'AIRAVATA-2571-email-verified' into develop
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../core/impl/TenantManagementKeycloakImpl.java | 9 +++-
.../production/pga_config/newUltrascan/vars.yml | 51 ++++++++++++----------
.../production/pga_config/newUltrascan/vault.yml | 34 +++++++--------
.../production/pga_config/ultrascan/vars.yml | 34 ++++++---------
.../production/pga_config/ultrascan/vault.yml | 34 +++++++--------
.../roles/gfac/templates/gfac-config.yaml.j2 | 4 ++
.../airavata/gfac/impl/task/SCPDataStageTask.java | 5 +--
7 files changed, 91 insertions(+), 80 deletions(-)
--
To stop receiving notification emails like this one, please contact
['"commits@airavata.apache.org" <co...@airavata.apache.org>'].
[airavata] 03/03: Merge branch 'AIRAVATA-2571-email-verified' into
develop
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata.git
commit 41d371bd7b4ee949b8d62db8791c2beab5e49ede
Merge: edf1783 7a9164f
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Wed Dec 13 15:17:06 2017 -0500
Merge branch 'AIRAVATA-2571-email-verified' into develop
.../core/impl/TenantManagementKeycloakImpl.java | 9 +++-
.../production/pga_config/newUltrascan/vars.yml | 51 ++++++++++++----------
.../production/pga_config/newUltrascan/vault.yml | 34 +++++++--------
.../production/pga_config/ultrascan/vars.yml | 34 ++++++---------
.../production/pga_config/ultrascan/vault.yml | 34 +++++++--------
.../roles/gfac/templates/gfac-config.yaml.j2 | 4 ++
.../airavata/gfac/impl/task/SCPDataStageTask.java | 5 +--
7 files changed, 91 insertions(+), 80 deletions(-)
--
To stop receiving notification emails like this one, please contact
"commits@airavata.apache.org" <co...@airavata.apache.org>.
[airavata] 01/03: AIRAVATA-2571 Set emailVerified=true when user is
enabled
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata.git
commit dedbfc9e24075b55ac04cea49054e7794da54d46
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Wed Dec 13 15:02:33 2017 -0500
AIRAVATA-2571 Set emailVerified=true when user is enabled
---
.../iam/admin/services/core/impl/TenantManagementKeycloakImpl.java | 2 ++
1 file changed, 2 insertions(+)
diff --git a/airavata-services/profile-service/iam-admin-services-core/src/main/java/org/apache/airavata/service/profile/iam/admin/services/core/impl/TenantManagementKeycloakImpl.java b/airavata-services/profile-service/iam-admin-services-core/src/main/java/org/apache/airavata/service/profile/iam/admin/services/core/impl/TenantManagementKeycloakImpl.java
index 8b8c42f..cdb254e 100644
--- a/airavata-services/profile-service/iam-admin-services-core/src/main/java/org/apache/airavata/service/profile/iam/admin/services/core/impl/TenantManagementKeycloakImpl.java
+++ b/airavata-services/profile-service/iam-admin-services-core/src/main/java/org/apache/airavata/service/profile/iam/admin/services/core/impl/TenantManagementKeycloakImpl.java
@@ -329,6 +329,8 @@ public class TenantManagementKeycloakImpl implements TenantManagementInterface {
UserResource userResource = client.realm(tenantId).users().get(userResourceList.get(0).getId());
UserRepresentation profile = userResource.toRepresentation();
profile.setEnabled(true);
+ // We require that a user verify their email before enabling the account
+ profile.setEmailVerified(true);
userResource.update(profile);
return true;
} catch (ApplicationSettingsException ex) {
--
To stop receiving notification emails like this one, please contact
"commits@airavata.apache.org" <co...@airavata.apache.org>.
[airavata] 02/03: AIRAVATA-2571 Use `state` field to indicate if
Keycloak user is enabled
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata.git
commit 7a9164fde6bf7434b5c957a6201a0123ead1ebd1
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Wed Dec 13 15:03:05 2017 -0500
AIRAVATA-2571 Use `state` field to indicate if Keycloak user is enabled
---
.../iam/admin/services/core/impl/TenantManagementKeycloakImpl.java | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/airavata-services/profile-service/iam-admin-services-core/src/main/java/org/apache/airavata/service/profile/iam/admin/services/core/impl/TenantManagementKeycloakImpl.java b/airavata-services/profile-service/iam-admin-services-core/src/main/java/org/apache/airavata/service/profile/iam/admin/services/core/impl/TenantManagementKeycloakImpl.java
index cdb254e..4296bca 100644
--- a/airavata-services/profile-service/iam-admin-services-core/src/main/java/org/apache/airavata/service/profile/iam/admin/services/core/impl/TenantManagementKeycloakImpl.java
+++ b/airavata-services/profile-service/iam-admin-services-core/src/main/java/org/apache/airavata/service/profile/iam/admin/services/core/impl/TenantManagementKeycloakImpl.java
@@ -597,7 +597,12 @@ public class TenantManagementKeycloakImpl implements TenantManagementInterface {
profile.setLastAccessTime(0);
profile.setCreationTime(0);
profile.setValidUntil(0);
- profile.setState(Status.ACTIVE);
+ // Use state field to indicate whether user has been enabled in Keycloak
+ if (userRepresentation.isEnabled()) {
+ profile.setState(Status.CONFIRMED);
+ } else {
+ profile.setState(Status.PENDING_CONFIRMATION);
+ }
return profile;
}
--
To stop receiving notification emails like this one, please contact
"commits@airavata.apache.org" <co...@airavata.apache.org>.