Switch logging on/off, better overriding capabilities of auth framework

SoltauFintel · Jan 8, 2018 · c906f37 · c906f37
1 parent 9d2b969
commit c906f37
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 8 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,5 +1,5 @@
 allprojects {
-	version = "0.2.2"
+	version = "0.2.3"
 	group = 'de.mwvb.maja'
 }
 

diff --git a/maja-auth/src/main/java/de/mwvb/maja/auth/AuthPlugin.java b/maja-auth/src/main/java/de/mwvb/maja/auth/AuthPlugin.java
@@ -126,7 +126,7 @@ public static String getUserId(Session session) {
 		return session.attribute(USERID_ATTR);
 	}
 
-	static void setLoginData(boolean loggedIn, String name, String id, Session session) {
+	public static void setLoginData(boolean loggedIn, String name, String id, Session session) {
 		session.attribute(LOGGED_IN, loggedIn ? LOGGED_IN_YES : null);
 		session.attribute(USER_ATTR, name);
 		session.attribute(USERID_ATTR, id);
@@ -172,7 +172,9 @@ public String login(Request req, Response res, String name, String foreignId, St
 		String longId = service + "#" + foreignId;
 		setLoginData(true, name, longId, req.session());
 		rememberMe.rememberMe(rememberMeWanted, res, name, longId);
-		logLogin(name, longId);
+		if (isDebugLogging()) {
+			logLogin(name, longId);
+		}
 
 		// Redirect zur ursprünglich angewählten Seite
 		String uri = req.session().attribute("uri");
@@ -184,10 +186,8 @@ public String login(Request req, Response res, String name, String foreignId, St
 		return "";
 	}
 
-	protected void logLogin(String name, String longId) {
-		if (isDebugLogging()) {
-			Logger.debug("Login: " + name + " (" + longId + ")");
-		}
+	protected void logLogin(String name, String userId) {
+		Logger.debug("Login: " + name + " (" + userId + ")");
 	}
 
 	public boolean isDebugLogging() {

diff --git a/maja-auth/src/main/java/de/mwvb/maja/auth/LogoutAction.java b/maja-auth/src/main/java/de/mwvb/maja/auth/LogoutAction.java
@@ -20,12 +20,16 @@ public String run() {
 		Session session = req.session();
 		String userId = AuthPlugin.getUserId(session);
 		if (userId != null && isDebugLogging) {
-			Logger.debug("Logout: " + AuthPlugin.getUser(session) + " (" + userId + ")");
+			logLogout(AuthPlugin.getUser(session), userId);
 		}
 		rememberMe.forget(res, userId);
 		AuthPlugin.setLoginData(false, null, null, session);
 
 		res.redirect("/");
 		return "";
 	}
+
+	protected void logLogout(String user, String userId) {
+		Logger.debug("Logout: " + user + " (" + userId + ")");
+	}
 }