added personal token validity period selection box on settings page

Author: albogdano

src/main/java/com/erudika/scoold/ScooldConfig.java

@@ -512,7 +512,8 @@ public int jwtExpiresAfterSec() {
 			value = "604800",
 			type = Integer.class,
 			category = "Security",
-			description = "The validity period of personal API keys (Bearer tokens) for use with API/MCP. Default is 168h.")
+			description = "The validity period of personal API keys (Bearer tokens) for use with API/MCP. "
+					+ "Setting this to 0 will show a select combobox in the UI. Default is 168h.")
 	public int personalTokenExpiresAfterSec() {
 		return getConfigInt("personal_token_expires_after", 168 * 60 * 60);
 	}

src/main/java/com/erudika/scoold/controllers/AdminController.java

@@ -504,6 +504,11 @@ public String setTheme(@RequestParam String theme, @RequestParam String css, Htt
 	public ResponseEntity<Map<String, Object>> generateAPIKey(@RequestParam Integer validityHours,
 			HttpServletRequest req, Model model) throws ParseException {
 		Profile authUser = utils.getAuthUser(req);
+		if (validityHours < 0) {
+			validityHours = 0;
+		} else if (validityHours > 2200) {
+			validityHours = 2200;
+		}
 		Map<String, Object> data = utils.generateApiKey(authUser, validityHours, false);
 		if (!data.isEmpty()) {
 			return ResponseEntity.ok().body(data);

src/main/java/com/erudika/scoold/controllers/SettingsController.java

@@ -232,7 +232,16 @@ public ResponseEntity<Map<String, Object>> generateAPIKey(@RequestParam Integer
 		Profile authUser = utils.getAuthUser(req);
 		if (StringUtils.isBlank(authUser.getPersonalApiToken())) {
 			Long personalTokenValidityHours = TimeUnit.SECONDS.toHours(CONF.personalTokenExpiresAfterSec());
-			Map<String, Object> data = utils.generateApiKey(authUser, personalTokenValidityHours.intValue(), true);
+			if (validityHours < 0) {
+				validityHours = 0;
+			} else if (validityHours > 2200) {
+				validityHours = 2200;
+			}
+			// allow users to select validity period from the web UI
+			if (personalTokenValidityHours != 0) {
+				validityHours = personalTokenValidityHours.intValue();
+			}
+			Map<String, Object> data = utils.generateApiKey(authUser, validityHours, true);
 			if (!data.isEmpty()) {
 				return ResponseEntity.ok().body(data);
 			}

src/main/resources/static/scripts/scoold.js

@@ -414,6 +414,9 @@ $(function () {
 		});
 		table.append(row).removeClass("hide");
 		row.find(".api-key-show").click();
+		if (window.location.pathname.match("/settings$")) {
+			$(form).find("button").attr("disabled", "disabled").prev("div").addClass("hide");
+		}
 	});
 
 	$(document).on("click", ".api-key-revoke", function () {

src/main/resources/templates/macro.vm

@@ -308,7 +308,8 @@
 		</div>
 		<div class="row mvm">
 			<div class="col s6 offset-s3 m3 offset-m4 center-align">
-				<div class="input-field #if($formActionBase != $adminlink)hide#end">
+				#set($disabled = $formActionBase != $adminlink && $apiKeys.size() >= 1)
+				<div class="input-field #if($scooldUtils.config.personalTokenExpiresAfterSec != 0 || $disabled)hide#end">
 					<select id="validity-period" name="validityHours" required>
 						<option value="1">1 hour</option>
 						<option value="12" selected="selected">12 hours</option>
@@ -321,7 +322,6 @@
 					</select>
 					<label for="validity-period">$!lang.get('admin.validity')</label>
 				</div>
-				#set($disabled = $formActionBase != $adminlink && $apiKeys.size() >= 1)
 				<button type="submit" class="btn waves-effect waves-light" #if($disabled)disabled="disabled"#end>$!lang.get('admin.generate')</button>
 			</div>
 			<div class="col s6 m9">