09 12 25

В черновую переделал авторификацию

shine-server-db/src/main/java/shine/db/entities/ActiveSession.java

@@ -1,12 +1,27 @@
 package shine.db.entities;
 
+/**
+ * ActiveSession — запись об активной сессии пользователя.
+ *
+ * Поля:
+ *  - sessionId      – строка (base64 от 32 байт)
+ *  - loginId        – long
+ *  - sessionPwd     – строка (секрет шага 1)
+ *  - storagePwd     – строка (секрет клиента для хранения данных)
+ *  - sessionCreatedAtMs      – long (время создания)
+ *  - lastAuthirificatedAtMs  – long (последнее подтверждение/refresh)
+ *  - pushEndpoint   – строка (WebPush, пока null/пусто)
+ *  - pushP256dhKey  – строка (WebPush, пока null/пусто)
+ *  - pushAuthKey    – строка (WebPush, пока null/пусто)
+ */
 public class ActiveSession {
 
-    private long sessionId;
-    private String sessionPwd;
+    private String sessionId;
     private long loginId;
-    private long timeMs;       // время в мс
-    private short pubkeyNum;
+    private String sessionPwd;
+    private String storagePwd;
+    private long sessionCreatedAtMs;
+    private long lastAuthirificatedAtMs;
     private String pushEndpoint;
     private String pushP256dhKey;
     private String pushAuthKey;
@@ -14,68 +29,71 @@ public class ActiveSession {
     public ActiveSession() {
     }
 
-    public ActiveSession(long sessionId,
-                         String sessionPwd,
+    public ActiveSession(String sessionId,
                          long loginId,
-                         long timeMs,
-                         short pubkeyNum,
+                         String sessionPwd,
+                         String storagePwd,
+                         long sessionCreatedAtMs,
+                         long lastAuthirificatedAtMs,
                          String pushEndpoint,
                          String pushP256dhKey,
                          String pushAuthKey) {
         this.sessionId = sessionId;
-        this.sessionPwd = sessionPwd;
         this.loginId = loginId;
-        this.timeMs = timeMs;
-        this.pubkeyNum = pubkeyNum;
+        this.sessionPwd = sessionPwd;
+        this.storagePwd = storagePwd;
+        this.sessionCreatedAtMs = sessionCreatedAtMs;
+        this.lastAuthirificatedAtMs = lastAuthirificatedAtMs;
         this.pushEndpoint = pushEndpoint;
         this.pushP256dhKey = pushP256dhKey;
         this.pushAuthKey = pushAuthKey;
     }
 
-    public long getSessionId() {
+    public String getSessionId() {
         return sessionId;
     }
-
-    public void setSessionId(long sessionId) {
+    public void setSessionId(String sessionId) {
         this.sessionId = sessionId;
     }
 
-    public String getSessionPwd() {
-        return sessionPwd;
-    }
-
-    public void setSessionPwd(String sessionPwd) {
-        this.sessionPwd = sessionPwd;
-    }
-
     public long getLoginId() {
         return loginId;
     }
-
     public void setLoginId(long loginId) {
         this.loginId = loginId;
     }
 
-    public long getTimeMs() {
-        return timeMs;
+    public String getSessionPwd() {
+        return sessionPwd;
+    }
+    public void setSessionPwd(String sessionPwd) {
+        this.sessionPwd = sessionPwd;
     }
 
-    public void setTimeMs(long timeMs) {
-        this.timeMs = timeMs;
+    public String getStoragePwd() {
+        return storagePwd;
+    }
+    public void setStoragePwd(String storagePwd) {
+        this.storagePwd = storagePwd;
     }
 
-    public short getPubkeyNum() {
-        return pubkeyNum;
+    public long getSessionCreatedAtMs() {
+        return sessionCreatedAtMs;
+    }
+    public void setSessionCreatedAtMs(long sessionCreatedAtMs) {
+        this.sessionCreatedAtMs = sessionCreatedAtMs;
     }
 
-    public void setPubkeyNum(short pubkeyNum) {
-        this.pubkeyNum = pubkeyNum;
+    public long getLastAuthirificatedAtMs() {
+        return lastAuthirificatedAtMs;
+    }
+    public void setLastAuthirificatedAtMs(long lastAuthirificatedAtMs) {
+        this.lastAuthirificatedAtMs = lastAuthirificatedAtMs;
     }
 
     public String getPushEndpoint() {
         return pushEndpoint;
     }
-
     public void setPushEndpoint(String pushEndpoint) {
         this.pushEndpoint = pushEndpoint;
     }
@@ -83,7 +101,6 @@ public class ActiveSession {
     public String getPushP256dhKey() {
         return pushP256dhKey;
     }
-
     public void setPushP256dhKey(String pushP256dhKey) {
         this.pushP256dhKey = pushP256dhKey;
     }
@@ -91,7 +108,6 @@ public class ActiveSession {
     public String getPushAuthKey() {
         return pushAuthKey;
     }
-
     public void setPushAuthKey(String pushAuthKey) {
         this.pushAuthKey = pushAuthKey;
     }