Release datarouter 0.0.127

Author: pranavbheda

.gitignore

@@ -10,4 +10,7 @@ target/
 **/src/main/webapp/META-INF/
 .DS_Store
 *.factorypath
-.profiler/
+.profiler/
+.vscode/
+.cursor/
+.windsurfrules

datarouter-auth-web/README.md

@@ -8,7 +8,7 @@ datarouter-auth-web is a framework that brings in users and apikey accounts to d
 <dependency>
 	<groupId>io.datarouter</groupId>
 	<artifactId>datarouter-auth-web</artifactId>
-	<version>0.0.126</version>
+	<version>0.0.127</version>
 </dependency>
 ```
 

datarouter-auth-web/pom.xml

@@ -22,7 +22,7 @@
 	<parent>
 		<groupId>io.datarouter</groupId>
 		<artifactId>datarouter-parent</artifactId>
-		<version>0.0.126</version>
+		<version>0.0.127</version>
 		<relativePath>../datarouter-parent</relativePath>
 	</parent>
 
@@ -40,13 +40,13 @@
 		</dependency>
 		<dependency>
 			<groupId>io.datarouter</groupId>
-			<artifactId>datarouter-secret-web</artifactId>
+			<artifactId>datarouter-auto-config</artifactId>
 			<version>${datarouter-version}</version>
 		</dependency>
 		<dependency>
-			<groupId>com.github.ben-manes.caffeine</groupId>
-			<artifactId>caffeine</artifactId>
-			<version>${ben-manes-caffeine-version}</version>
+			<groupId>io.datarouter</groupId>
+			<artifactId>datarouter-secret-web</artifactId>
+			<version>${datarouter-version}</version>
 		</dependency>
 		<dependency>
 			<groupId>io.datarouter</groupId>

datarouter-auth-web/src/main/java/io/datarouter/auth/web/config/ApiDocsSchemaNavBarItem.java

@@ -0,0 +1,50 @@
+/*
+ * Copyright © 2009 HotPads (admin@hotpads.com)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.datarouter.auth.web.config;
+
+import io.datarouter.auth.config.DatarouterAuthPaths;
+import io.datarouter.scanner.Scanner;
+import io.datarouter.web.config.RouteSetRegistry;
+import io.datarouter.web.handler.documentation.DocumentationRouteSet;
+import io.datarouter.web.navigation.AppNavBarCategory;
+import io.datarouter.web.navigation.DynamicNavBarItem;
+import io.datarouter.web.navigation.NavBarCategory.NavBarItemType;
+import io.datarouter.web.navigation.NavBarItem;
+import jakarta.inject.Inject;
+
+public class ApiDocsSchemaNavBarItem implements DynamicNavBarItem{
+
+	@Inject
+	private DatarouterAuthPaths paths;
+	@Inject
+	private RouteSetRegistry routeSetRegistry;
+
+	@Override
+	public NavBarItem getNavBarItem(){
+		return new NavBarItem(AppNavBarCategory.DOCS, paths.schema.toSlashedString(), "Api Schemas");
+	}
+
+	@Override
+	public Boolean shouldDisplay(){
+		return Scanner.of(routeSetRegistry.get())
+				.anyMatch(clazz -> clazz instanceof DocumentationRouteSet);
+	}
+
+	@Override
+	public NavBarItemType getType(){
+		return NavBarItemType.APP;
+	}
+}

datarouter-auth-web/src/main/java/io/datarouter/auth/web/config/DatarouterAccountConfigAppListener.java

@@ -15,20 +15,26 @@
  */
 package io.datarouter.auth.web.config;
 
-import io.datarouter.auth.web.service.DatarouterAccountConfigAppListenerService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import io.datarouter.auth.web.service.DatarouterAccountConfigService;
+import io.datarouter.scanner.Scanner;
 import io.datarouter.web.listener.DatarouterAppListener;
 import jakarta.inject.Inject;
 import jakarta.inject.Singleton;
 
 @Singleton
 public class DatarouterAccountConfigAppListener implements DatarouterAppListener{
+	private static final Logger logger = LoggerFactory.getLogger(DatarouterAccountConfigAppListener.class);
 
 	@Inject
-	private DatarouterAccountConfigAppListenerService service;
+	private DatarouterAccountConfigService service;
 
 	@Override
 	public void onStartUp(){
-		service.createDefaultAccountRecords();
+		Scanner.of(service.createDefaultAccountRecords())
+				.forEach(logger::warn);
 	}
 
 }

datarouter-auth-web/src/main/java/io/datarouter/auth/web/config/DatarouterAuthFiles.java

@@ -26,7 +26,6 @@ public class DatarouterAuthFiles extends FilesRoot{
 
 	public static class JsFiles extends PathNode{
 		public final PathNode accountManagerJsx = leaf("accountManager.jsx");
-		public final PathNode deprovisionedUsersJsx = leaf("DeprovisionedUsers.jsx");
 		public final PathNode viewUsersJsx = leaf("viewUsers.jsx");
 	}
 

datarouter-auth-web/src/main/java/io/datarouter/auth/web/config/DatarouterAuthPlugin.java

@@ -22,7 +22,9 @@
 
 import io.datarouter.auth.config.DatarouterAuthPaths;
 import io.datarouter.auth.service.DatarouterUserService;
+import io.datarouter.auth.service.PermissionRequestUserInfo;
 import io.datarouter.auth.service.UserInfo;
+import io.datarouter.auth.service.deprovisioning.DatarouterUserDeprovisioningStrategy;
 import io.datarouter.auth.service.deprovisioning.UserDeprovisioningStrategy;
 import io.datarouter.auth.storage.account.DatarouterAccountDao;
 import io.datarouter.auth.storage.account.DatarouterAccountDao.DatarouterAccountDaoParams;
@@ -34,8 +36,9 @@
 import io.datarouter.auth.storage.account.permission.DatarouterAccountPermissionDao.DatarouterAccountPermissionDaoParams;
 import io.datarouter.auth.storage.user.datarouteruser.DatarouterUserDao;
 import io.datarouter.auth.storage.user.datarouteruser.DatarouterUserDao.DatarouterUserDaoParams;
-import io.datarouter.auth.storage.user.deprovisioneduser.DeprovisionedUserDao;
-import io.datarouter.auth.storage.user.deprovisioneduser.DeprovisionedUserDao.DeprovisionedUserDaoParams;
+import io.datarouter.auth.storage.user.datarouteruser.cache.DatarouterUserByIdCache;
+import io.datarouter.auth.storage.user.datarouteruser.cache.DatarouterUserByUserTokenCache;
+import io.datarouter.auth.storage.user.datarouteruser.cache.DatarouterUserByUsernameCache;
 import io.datarouter.auth.storage.user.permissionrequest.DatarouterPermissionRequestDao;
 import io.datarouter.auth.storage.user.permissionrequest.DatarouterPermissionRequestDao.DatarouterPermissionRequestDaoParams;
 import io.datarouter.auth.storage.user.roleapprovals.DatarouterUserRoleApprovalDao;
@@ -55,27 +58,24 @@
 import io.datarouter.auth.web.config.routeset.DatarouterAuthRouteSet;
 import io.datarouter.auth.web.config.routeset.DatarouterDocumentationRouteSet;
 import io.datarouter.auth.web.config.routeset.DatarouterRoleRequirementsRouteSet;
-import io.datarouter.auth.web.config.routeset.UserDeprovisioningRouteSet;
 import io.datarouter.auth.web.service.AccountCallerTypeRegistry2;
-import io.datarouter.auth.web.service.CopyUserListener;
-import io.datarouter.auth.web.service.CopyUserListener.DefaultCopyUserListener;
 import io.datarouter.auth.web.service.DatarouterAccountDailyDigest;
 import io.datarouter.auth.web.service.DatarouterDefaultAccountKeysDailyDigest;
 import io.datarouter.auth.web.service.DatarouterDefaultStaleAccountsDailyDigest;
 import io.datarouter.auth.web.service.DatarouterDefaultUserDailyDigest;
 import io.datarouter.auth.web.service.DatarouterPermissionRequestUserInfo;
-import io.datarouter.auth.web.service.DatarouterUserDeprovisioningStrategy;
 import io.datarouter.auth.web.service.DefaultDatarouterAccountKeys;
 import io.datarouter.auth.web.service.DefaultDatarouterAccountKeysSupplier;
 import io.datarouter.auth.web.service.DefaultDatarouterUserPassword;
 import io.datarouter.auth.web.service.DefaultDatarouterUserPasswordSupplier;
 import io.datarouter.auth.web.service.PermissionRequestDailyDigest;
-import io.datarouter.auth.web.service.PermissionRequestUserInfo;
+import io.datarouter.autoconfig.service.AutoConfigGroup;
 import io.datarouter.httpclient.endpoint.caller.CallerType;
 import io.datarouter.job.BaseTriggerGroup;
 import io.datarouter.job.config.DatarouterJobRouteSet;
 import io.datarouter.plugin.PluginConfigKey;
 import io.datarouter.plugin.PluginConfigValue;
+import io.datarouter.storage.cache.Cache;
 import io.datarouter.storage.client.ClientId;
 import io.datarouter.storage.dao.Dao;
 import io.datarouter.storage.dao.DaosModuleBuilder;
@@ -88,7 +88,6 @@ public class DatarouterAuthPlugin extends BaseWebPlugin{
 	private static final DatarouterAuthPaths PATHS = new DatarouterAuthPaths();
 
 	private final Class<? extends UserDeprovisioningStrategy> userDeprovisioningStrategyClass;
-	private final Class<? extends CopyUserListener> copyUserListenerClass;
 	private final String defaultDatarouterUserPassword;
 	private final String defaultApiKey;
 	private final String defaultSecretKey;
@@ -98,14 +97,12 @@ private DatarouterAuthPlugin(
 			boolean enableUserAuth,
 			DatarouterAuthDaoModule daosModuleBuilder,
 			Class<? extends UserDeprovisioningStrategy> userDeprovisioningStrategyClass,
-			Class<? extends CopyUserListener> copyUserListenerClass,
 			String defaultDatarouterUserPassword,
 			String defaultApiKey,
 			String defaultSecretKey,
 			List<Class<? extends CallerType>> callerTypes2,
 			Map<PluginConfigKey<?>,Class<? extends PluginConfigValue<?>>> configs){
 		this.userDeprovisioningStrategyClass = userDeprovisioningStrategyClass;
-		this.copyUserListenerClass = copyUserListenerClass;
 		this.defaultDatarouterUserPassword = defaultDatarouterUserPassword;
 		this.defaultApiKey = defaultApiKey;
 		this.defaultSecretKey = defaultSecretKey;
@@ -126,15 +123,18 @@ private DatarouterAuthPlugin(
 				PATHS.datarouter.accountManager,
 				"Accounts");
 
-		addAppNavBarItem(AppNavBarCategory.USER, PATHS.userDeprovisioning, "User Deprovisioning");
 		addDynamicNavBarItem(ApiDocsNavBarItem.class);
+		addDynamicNavBarItem(ApiDocsSchemaNavBarItem.class);
 		addRouteSet(DatarouterAccountApiRouteSet.class);
 		addRouteSet(DatarouterAccountRouteSet.class);
 		addRouteSet(DatarouterDocumentationRouteSet.class);
-		addRouteSet(UserDeprovisioningRouteSet.class);
 		addRouteSet(DatarouterRoleRequirementsRouteSet.class);
 		addSettingRoot(DatarouterAuthSettingRoot.class);
+		addPluginEntry(AutoConfigGroup.KEY, DatarouterDefaultAccountAutoConfig.class);
 		addPluginEntry(BaseTriggerGroup.KEY, DatarouterAuthTriggerGroup.class);
+		addPluginEntry(Cache.KEY, DatarouterUserByIdCache.class);
+		addPluginEntry(Cache.KEY, DatarouterUserByUsernameCache.class);
+		addPluginEntry(Cache.KEY, DatarouterUserByUserTokenCache.class);
 		setDaosModule(daosModuleBuilder);
 		addDatarouterGithubDocLink("datarouter-auth-web");
 		addDailyDigest(PermissionRequestDailyDigest.class);
@@ -152,7 +152,6 @@ protected void configure(){
 		bindActual(BaseDatarouterSamlDao.class, DatarouterSamlDao.class);
 
 		bind(UserDeprovisioningStrategy.class).to(userDeprovisioningStrategyClass);
-		bindActual(CopyUserListener.class, copyUserListenerClass);
 		bindActualInstance(DefaultDatarouterUserPasswordSupplier.class,
 				new DefaultDatarouterUserPassword(defaultDatarouterUserPassword));
 		bindActualInstance(DefaultDatarouterAccountKeysSupplier.class,
@@ -169,7 +168,6 @@ public static class DatarouterAuthPluginBuilder{
 
 		private Class<? extends UserDeprovisioningStrategy> userDeprovisioningStrategyClass =
 				DatarouterUserDeprovisioningStrategy.class;
-		private Class<? extends CopyUserListener> copyUserListenerClass = DefaultCopyUserListener.class;
 		private String defaultDatarouterUserPassword = "";
 		private String defaultApiKey = "";
 		private String defaultSecretKey = "";
@@ -203,12 +201,6 @@ public DatarouterAuthPluginBuilder setUserDeprovisioningStrategyClass(
 			return this;
 		}
 
-		public DatarouterAuthPluginBuilder setCopyUserListenerClass(
-				Class<? extends CopyUserListener> copyUserListenerClass){
-			this.copyUserListenerClass = copyUserListenerClass;
-			return this;
-		}
-
 		public DatarouterAuthPluginBuilder setPermissionRequestUserInfo(
 				Class<? extends PermissionRequestUserInfo> permissionRequestUserInfo){
 			configs.put(PermissionRequestUserInfo.KEY, permissionRequestUserInfo);
@@ -233,10 +225,8 @@ public DatarouterAuthPlugin build(){
 							defaultClientId,
 							defaultClientId,
 							defaultClientId,
-							defaultClientId,
 							defaultClientId),
 					userDeprovisioningStrategyClass,
-					copyUserListenerClass,
 					defaultDatarouterUserPassword,
 					defaultApiKey,
 					defaultSecretKey,
@@ -257,7 +247,6 @@ public static class DatarouterAuthDaoModule extends DaosModuleBuilder{
 		private final List<ClientId> datarouterUserAccountMapClientIds;
 		private final List<ClientId> datarouterUserClientIds;
 		private final List<ClientId> datarouterUserHistoryClientIds;
-		private final List<ClientId> deprovisionedUserClientIds;
 		private final List<ClientId> datarouterUserRoleApprovalClientIds;
 
 		public DatarouterAuthDaoModule(
@@ -270,7 +259,6 @@ public DatarouterAuthDaoModule(
 				List<ClientId> datarouterUserAccountMapClientIds,
 				List<ClientId> datarouterUserClientIds,
 				List<ClientId> datarouterUserHistoryClientIds,
-				List<ClientId> deprovisionedUserClientIds,
 				List<ClientId> datarouterUserRoleApprovalClientIds){
 			this.datarouterAccountClientIds = datarouterAccountClientIds;
 			this.datarouterAccountCredentialClientIds = datarouterAccountCredentialClientIds;
@@ -281,7 +269,6 @@ public DatarouterAuthDaoModule(
 			this.datarouterUserAccountMapClientIds = datarouterUserAccountMapClientIds;
 			this.datarouterUserClientIds = datarouterUserClientIds;
 			this.datarouterUserHistoryClientIds = datarouterUserHistoryClientIds;
-			this.deprovisionedUserClientIds = deprovisionedUserClientIds;
 			this.datarouterUserRoleApprovalClientIds = datarouterUserRoleApprovalClientIds;
 		}
 
@@ -297,7 +284,6 @@ public List<Class<? extends Dao>> getDaoClasses(){
 					DatarouterUserDao.class,
 					DatarouterUserHistoryDao.class,
 					DatarouterSamlDao.class,
-					DeprovisionedUserDao.class,
 					DatarouterUserRoleApprovalDao.class);
 		}
 
@@ -322,8 +308,6 @@ public void configure(){
 					.toInstance(new DatarouterUserAccountMapDaoParams(datarouterUserAccountMapClientIds));
 			bind(DatarouterSamlDaoParams.class)
 					.toInstance(new DatarouterSamlDaoParams(datarouterSamlClientIds));
-			bind(DeprovisionedUserDaoParams.class)
-					.toInstance(new DeprovisionedUserDaoParams(deprovisionedUserClientIds));
 			bind(DatarouterUserRoleApprovalDaoParams.class)
 					.toInstance(new DatarouterUserRoleApprovalDaoParams(datarouterUserRoleApprovalClientIds));
 		}

datarouter-auth-web/src/main/java/io/datarouter/auth/web/config/DatarouterAuthSettingRoot.java

@@ -15,6 +15,7 @@
  */
 package io.datarouter.auth.web.config;
 
+import java.time.Duration;
 import java.util.concurrent.TimeUnit;
 
 import io.datarouter.storage.setting.DatarouterSettingCategory;
@@ -33,10 +34,11 @@ public class DatarouterAuthSettingRoot extends SettingRoot{
 	public final CachedSetting<Boolean> runDeletedRoleCleanupJob;
 	public final CachedSetting<Boolean> runUserSessionVacuumJob;
 	public final CachedSetting<Boolean> runPermissionRequestVacuumJob;
-	public final CachedSetting<Boolean> shouldUseDatarouterAccountCredentialInsteadOfDatarouterAccount;
-	public final CachedSetting<Boolean> enableHandlerAccountCallerValidator;
+	public final CachedSetting<Boolean> runInactivityRoleResetJob;
+	public final CachedSetting<DatarouterDuration> inactivityRoleResetDuration;
 	public final CachedSetting<DatarouterDuration> accountRefreshFrequencyDuration;
 	public final CachedSetting<Boolean> enableAccountDailyDigest;
+	public final CachedSetting<Boolean> allowRequestingRolesHasFromSamlGroup;
 
 	@Inject
 	public DatarouterAuthSettingRoot(SettingFinder finder){
@@ -47,12 +49,13 @@ public DatarouterAuthSettingRoot(SettingFinder finder){
 		runDeletedRoleCleanupJob = registerBoolean("runDeletedRoleCleanupJob", true);
 		runUserSessionVacuumJob = registerBoolean("runUserSessionVacuum", false);
 		runPermissionRequestVacuumJob = registerBoolean("runPermissionRequestVacuumJob", false);
-		shouldUseDatarouterAccountCredentialInsteadOfDatarouterAccount = registerBoolean(
-				"shouldUseDatarouterAccountCredentialInsteadOfDatarouterAccount", true);
-		enableHandlerAccountCallerValidator = registerBoolean("enableHandlerAccountCallerValidator", false);
+		runInactivityRoleResetJob = registerBoolean("runInactivityRoleResetJob", false);
+		inactivityRoleResetDuration = registerDuration("inactivityRoleResetDuration",
+				new DatarouterDuration(Duration.ofDays(180)));
 		accountRefreshFrequencyDuration = registerDuration("accountRefreshFrequencyDuration",
 				new DatarouterDuration(15, TimeUnit.SECONDS));
 		enableAccountDailyDigest = registerBoolean("enableAccountDailyDigest", false);
+		allowRequestingRolesHasFromSamlGroup = registerBoolean("allowRequestingRolesHasFromSamlGroup", false);
 	}
 
 }