finished outstanding 401.2.x changes

docker · Sep 20, 2018 · 39392fd · 39392fd
1 parent 0b1ff87
commit 39392fd
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 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
@@ -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");
+//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);
diff --git 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");