From 39392fd42365719de4dd94ba79220e921a3c5959 Mon Sep 17 00:00:00 2001 From: John Gasper Date: Thu, 20 Sep 2018 14:17:55 -0700 Subject: [PATCH] finished outstanding 401.2.x changes --- .../ex401.2.6/container_files/seed-data/bootstrap.gsh | 9 ++++++++- .../ex401.2.9/container_files/seed-data/bootstrap.gsh | 11 ++++++++--- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/ex401/ex401.2.6/container_files/seed-data/bootstrap.gsh b/ex401/ex401.2.6/container_files/seed-data/bootstrap.gsh index 7343c7c..0b1394b 100644 --- a/ex401/ex401.2.6/container_files/seed-data/bootstrap.gsh +++ b/ex401/ex401.2.6/container_files/seed-data/bootstrap.gsh @@ -37,4 +37,11 @@ addMember("app:mfa:ref:NonFacultyBannerINB","lbutler643"); addMember("app:mfa:ref:NonFacultyBannerINB","dmartinez657"); -addMember("app:mfa:mfa_enabled_allow", "app:mfa:ref:NonFacultyBannerINB"); \ No newline at end of file +//Set expiration out 30 days +java.util.Calendar cal = Calendar.getInstance(); +cal.setTime(new Date()); +cal.add(Calendar.DAY_OF_YEAR, 30); + +group = GroupFinder.findByName(gs, "app:mfa:mfa_enabled_allow", true); +subject = GroupFinder.findByName(gs, "app:mfa:ref:NonFacultyBannerINB", true).toSubject(); +group.addOrEditMember(subject, false, true, cal.getTime(), null, true); \ No newline at end of file diff --git a/ex401/ex401.2.9/container_files/seed-data/bootstrap.gsh b/ex401/ex401.2.9/container_files/seed-data/bootstrap.gsh index 45fe101..e5d090b 100644 --- a/ex401/ex401.2.9/container_files/seed-data/bootstrap.gsh +++ b/ex401/ex401.2.9/container_files/seed-data/bootstrap.gsh @@ -1,8 +1,13 @@ gs = GrouperSession.startRootSession(); addStem("app:mfa", "basis", "basis"); -addGroup("app:mfa:basis", "bypass", "bypass"); + +group = GroupFinder.findByName(gs, "app:mfa:ref:mfa_bypass", true); +stem = StemFinder.findByName(gs, "app:mfa:basis", true); +group.move(stem); + addGroup("app:mfa:ref", "bypass-not-opt-in", "bypass-not-opt-in"); -addComposite("app:mfa:ref:bypass-not-opt-in", CompositeType.COMPLEMENT, "app:mfa:basis:bypass", "app:mfa:ref:mfa_opt_in"); +addComposite("app:mfa:ref:bypass-not-opt-in", CompositeType.COMPLEMENT, "app:mfa:basis:mfa_bypass", "app:mfa:ref:mfa_opt_in"); + +addMember("app:mfa:mfa_enabled_deny", "app:mfa:ref:bypass-not-opt-in"); -addMember("app:mfa:mfa_enabled_deny", "app:mfa:ref:bypass-not-opt-in"); \ No newline at end of file