From f57e8475b5c9d58dd9cedc7f0d866d9cdb09965c Mon Sep 17 00:00:00 2001
From: ulrich
Date: Sat, 16 May 2020 12:00:02 +0000
Subject: [PATCH] Funktion und Dialog 'Neue Rolle' erstellt, Vorlagen.js entfernt und in app.js ueberfuehrt
---
src/java/de/uhilger/um/pub/SessionManager.java | 31 +++++++++++++++++++++++++++++--
1 files changed, 29 insertions(+), 2 deletions(-)
diff --git a/src/java/de/uhilger/um/pub/SessionManager.java b/src/java/de/uhilger/um/pub/SessionManager.java
index a1a3af6..3eb6de3 100644
--- a/src/java/de/uhilger/um/pub/SessionManager.java
+++ b/src/java/de/uhilger/um/pub/SessionManager.java
@@ -1,6 +1,23 @@
+/*
+ * Nutzerverwaltung - User and role management in your browser
+ * Copyright (C) 2011-2017 Ulrich Hilger, http://uhilger.de
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/
+ */
+
package de.uhilger.um.pub;
-import de.uhilger.baselink.PersistenceManager;
import de.uhilger.um.api.Api;
import static de.uhilger.um.api.UserMgr.MP_USER_DATA;
import static de.uhilger.um.api.UserMgr.SQL_GET_USER_DATA;
@@ -8,11 +25,14 @@
import de.uhilger.um.daten.UserData;
import java.security.Principal;
import java.util.List;
+import java.util.logging.Logger;
/**
*
*/
public class SessionManager extends Api {
+
+ private static final Logger logger = Logger.getLogger(SessionManager.class.getName());
// /um/pub?c=de.uhilger.um.pub.SessionManager&m=getSessionUser
public UserData getSessionUser() {
@@ -24,7 +44,7 @@
Object p = getRequest().getUserPrincipal();
if(p instanceof Principal) {
String id = ((Principal) p).getName();
- PersistenceManager pm = getDb();
+ logger.finer("User-ID: " + id);
List userDataList = getDb().select(getSql(SQL_GET_USER_DATA), getMapper(MP_USER_DATA), WITHOUT_BLOBS, id);
if(userDataList != null && userDataList.size() > 0) {
Object o = userDataList.get(0);
@@ -32,9 +52,16 @@
userData = (UserData) o;
}
}
+ } else {
+ logger.finer("getUserPrincipal returned null or no Principal");
}
return userData;
}
+ public String expireSession() {
+ getRequest().getSession().invalidate();
+ return "Die aktuelle Sitzung ist nicht mehr gueltig.";
+ }
+
}
--
Gitblit v1.9.3