cameleer/cameleer-saas
2
0
Fork 0
Code Issues 22 Pull Requests Actions Packages Projects Releases Wiki Activity

fix: read M2M credentials from bootstrap JSON when env vars empty
All checks were successful
CI / build (push) Successful in 39s
Details
CI / docker (push) Successful in 31s
Details

Browse Source 
The bootstrap dynamically creates the M2M app and writes credentials
to the JSON file. LogtoConfig now falls back to the bootstrap file
when LOGTO_M2M_CLIENT_ID/SECRET env vars are not set.

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
hsiegeln
2026-04-05 10:23:02 +02:00
parent 34aadd1e25
commit 51c73d64a4
1 changed files with 35 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/main/java/net/siegeln/cameleer/saas/identity/LogtoConfig.java
View File

@@ -1,11 +1,21 @@
package net.siegeln.cameleer.saas.identity;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import jakarta.annotation.PostConstruct;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Configuration;
import java.io.File;
@Configuration
public class LogtoConfig {
private static final Logger log = LoggerFactory.getLogger(LogtoConfig.class);
private static final String BOOTSTRAP_FILE = "/data/bootstrap/logto-bootstrap.json";
@Value("${cameleer.identity.logto-endpoint:}")
private String logtoEndpoint;
@@ -15,11 +25,35 @@ public class LogtoConfig {
@Value("${cameleer.identity.m2m-client-secret:}")
private String m2mClientSecret;
@PostConstruct
public void init() {
if (isConfigured()) return;
// Fall back to bootstrap file for M2M credentials
try {
File file = new File(BOOTSTRAP_FILE);
if (file.exists()) {
JsonNode node = new ObjectMapper().readTree(file);
if ((m2mClientId == null || m2mClientId.isEmpty()) && node.has("m2mClientId")) {
m2mClientId = node.get("m2mClientId").asText();
}
if ((m2mClientSecret == null || m2mClientSecret.isEmpty()) && node.has("m2mClientSecret")) {
m2mClientSecret = node.get("m2mClientSecret").asText();
}
log.info("Loaded M2M credentials from bootstrap file");
}
} catch (Exception e) {
log.warn("Failed to read bootstrap config for M2M credentials: {}", e.getMessage());
}
}
public String getLogtoEndpoint() { return logtoEndpoint; }
public String getM2mClientId() { return m2mClientId; }
public String getM2mClientSecret() { return m2mClientSecret; }
public boolean isConfigured() {
return !logtoEndpoint.isEmpty() && !m2mClientId.isEmpty() && !m2mClientSecret.isEmpty();
return logtoEndpoint != null && !logtoEndpoint.isEmpty()
&& m2mClientId != null && !m2mClientId.isEmpty()
&& m2mClientSecret != null && !m2mClientSecret.isEmpty();
}
}