bugfixes in token handling, added session duration property to user

Signed-off-by: Stephan Richter <s.richter@srsoftware.de>

de.srsoftware.oidc.web/src/main/resources/en/scripts/settings.js

@@ -1,3 +1,5 @@
+var session_duration_minutes = 10;
+
 function fillForm(){
     if (user == null){
         setTimeout(fillForm,100);
@@ -7,6 +9,9 @@ function fillForm(){
         setValue('email',user.email);
         setValue('uuid', user.uuid);
         setValue('realname', user.realname);
+        session_duration_minutes = user.session_duration | 10;
+        displayDuration();
+
     }
 }
 
@@ -64,6 +69,7 @@ async function handleSettings(response){
     console.log('handleSettings(…)',response);
     if (response.ok){
         var json = await response.json();
+        console.log("json: ",json);
         for (var key in json){
             setValue(key,json[key]);
         }
@@ -125,7 +131,8 @@ function update(){
         username : getValue('username'),
         email : getValue('email'),
         realname : getValue('realname'),
-        uuid : getValue('uuid')
+        uuid : getValue('uuid'),
+        session_duration : session_duration_minutes
     }
     fetch(user_controller+'/update',{
         method : 'POST',
@@ -137,5 +144,37 @@ function update(){
     setText('updateBtn','sent…');
 }
 
+function displayDuration(){
+    var mins = session_duration_minutes;
+    hrs = Math.floor(mins/60);
+    mins-=60*hrs;
+    days = Math.floor(hrs/24);
+    hrs-=24*days;
+    setText('days',days);
+    setText('hours',hrs);
+    setText('minutes',mins);
+}
+
+function durationUpdate(){
+    var raw = getValue('session_duration');
+    console.log(raw);
+    var mins = 0;
+    var hrs = 0;
+    var days = 0;
+    if (raw<30){
+        mins = raw;
+    } else if(raw<37) {
+        mins=5*(raw-24);
+    } else if(raw<57){
+        mins=15*(raw-32);
+    } else if(raw<75){
+        mins=60*(raw-50);
+    } else {
+        mins=60*24*(raw-73);
+    }
+    session_duration_minutes = mins;
+    displayDuration();
+}
+
 setTimeout(fillForm,100);
 fetch("/api/email/settings").then(handleSettings);

de.srsoftware.oidc.web/src/main/resources/en/settings.html

@@ -30,12 +30,12 @@
                             <td><input id="email" type="email"></td>
                         </tr>
                         <tr>
-                            <th>ID</th>
-                            <td><input id="uuid" type="text" disabled="true"></td>
-                        </tr>
-                        <tr id="update_error" style="display: none">
-                            <th>Error</th>
-                            <td class="warning">Failed to update settings!</td>
+                            <th>Session duration</th>
+                            <td>
+                                <input id="session_duration" type="range" value="50" min="1" max="103" oninput="durationUpdate()"/>
+                                <br/>
+                                <span id="days"></span> days, <span id="hours"></span> hours, <span id="minutes"></span> minutes
+                            </td>
                         </tr>
                         <tr>
                             <td></td>
@@ -53,8 +53,12 @@
                             <td><input id="oldpass" type="password"></td>
                         </tr>
                         <tr>
-                            <th></th>
-                            <td><input type="text" style="visibility: hidden"></td>
+                            <th>ID</th>
+                            <td><input id="uuid" type="text" disabled="true"></td>
+                        </tr>
+                        <tr id="update_error" style="display: none">
+                            <th>Error</th>
+                            <td class="warning">Failed to update settings!</td>
                         </tr>
                         <tr>
                             <th>New Password</th>

de.srsoftware.oidc.web/src/main/resources/en/todo.html

@@ -12,6 +12,7 @@
         <div id="content">
             <h1>to do…</h1>
             <ul>
+                <li>Separates Email-Konto</li>
                 <li><a href="login.html">Login: "remember me" option</a></li>
                 <li>at_hash in ID Token</li>
                 <li>drop outdated sessions</li>