SRSoftware/Umbrella
1
0
Fork 0
Code Issues Pull Requests Actions Projects Releases Wiki Activity

Merge branch 'main' into module/wiki

Browse Source
This commit is contained in:
Stephan Richter
2025-09-12 00:41:58 +02:00
parent 41eb4ca9dd d7869d320f
commit 667052e3c4
31 changed files with 180 additions and 215 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
user/src/main/java/de/srsoftware/umbrella/user/Constants.java
View File

@@ -35,8 +35,8 @@ public class Constants {
public static final String SCOPE = "scope";
public static final String SERVICE_ID = "service_id";
public static final String TABLE_LOGIN_SERVICES = "user_login_services";
public static final String TABLE_SERVICE_IDS_USERS = "user_service_ids_users";
public static final String TABLE_LOGIN_SERVICES = "login_services";
public static final String TABLE_SERVICE_IDS_USERS = "service_ids_users";
public static final String TABLE_TOKENS = "tokens";
public static final String TABLE_TOKEN_USES = "token_uses";
public static final String TABLE_USERS = "users";

6
user/src/main/java/de/srsoftware/umbrella/user/UserModule.java
View File

@@ -8,6 +8,7 @@ import static de.srsoftware.umbrella.core.ConnectionProvider.connect;
import static de.srsoftware.umbrella.core.Constants.*;
import static de.srsoftware.umbrella.core.Constants.CODE;
import static de.srsoftware.umbrella.core.Constants.TOKEN;
import static de.srsoftware.umbrella.core.ModuleRegistry.postBox;
import static de.srsoftware.umbrella.core.Paths.*;
import static de.srsoftware.umbrella.core.ResponseCode.*;
import static de.srsoftware.umbrella.core.ResponseCode.HTTP_SERVER_ERROR;
@@ -80,12 +81,13 @@ public class UserModule extends BaseHandler implements UserService {
}
}
public UserModule(ModuleRegistry registry, Configuration config) throws UmbrellaException {
super(registry);
public UserModule(Configuration config) throws UmbrellaException {
super();
var dbFile = config.get(CONFIG_DATABASE).orElseThrow(() -> missingConfigException(CONFIG_DATABASE));
// may be splitted in separate db files later
logins = new SqliteDB(connect(dbFile));
users = new SqliteDB(connect(dbFile));
ModuleRegistry.add(this);
}
private boolean deleteOIDC(HttpExchange ex, UmbrellaUser user, Path path) throws IOException {