Merge branch 'feature/5-add-token-management' into 'develop/0.1.0'

Resolve "Add token management"

Closes #5

See merge request tpeetz/kontor!3

LICENSE

@@ -0,0 +1,9 @@
+MIT License
+
+Copyright (c) 2024 Kontor
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

qt/gui/main_window.py

@@ -3,11 +3,10 @@ from PySide6.QtWidgets import QWidget, QVBoxLayout, QMenu, QMessageBox, QTabWidg
 from PySide6.QtWidgets import QLabel, QMainWindow
 
 from database import KontorDB
-from database.media import MediaFile
-from database.comic import Comic
-from gui.dialogs import ExportKontorDialog, ImportKontorDialog
-from gui.model_config import KontorModelConfig
-from gui.table_model import KontorTableModel
+from dialogs import ExportKontorDialog, ImportKontorDialog
+from model_config import KontorModelConfig
+from table_model import KontorTableModel
+from media_file_model import MediaFileTableModel
 
 
 class MainWindow(QMainWindow):

springboot/src/main/java/de/thpeetz/kontor/admin/data/Token.java

@@ -0,0 +1,35 @@
+package de.thpeetz.kontor.admin.data;
+
+import de.thpeetz.kontor.common.data.AbstractEntity;
+import jakarta.persistence.Entity;
+import jakarta.persistence.Index;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.Table;
+import jakarta.persistence.UniqueConstraint;
+import jakarta.validation.constraints.NotNull;
+import lombok.Getter;
+import lombok.Setter;
+import lombok.ToString;
+import lombok.extern.slf4j.Slf4j;
+import java.util.Date;
+
+@Slf4j
+@Getter
+@Setter
+@ToString
+@Entity
+@Table(indexes = @Index(columnList = "token"), uniqueConstraints = @UniqueConstraint(columnNames = {"token"}))
+public class Token extends AbstractEntity {
+
+    private String token;
+
+    private Date lastUsedDate;
+
+    private boolean enabled;
+
+    @ManyToOne
+    @JoinColumn(name="user_id")
+    @NotNull
+    private User user;
+}

springboot/src/main/java/de/thpeetz/kontor/admin/data/User.java

@@ -38,14 +38,14 @@ public class User extends AbstractEntity {
 
     private boolean enabled;
 
-    private boolean tokenExpired;
-
-    private String token;
-
     @OneToMany(fetch = FetchType.EAGER, mappedBy = "user")
     @Nullable
     private List<AuthorizationMatrix> matrix = new LinkedList<>();
 
+    @OneToMany(fetch = FetchType.EAGER, mappedBy = "user")
+    @Nullable
+    private List<Token> tokens = new LinkedList<>();
+
     public String getFullName() {
         StringBuilder fullNamBuilder = new StringBuilder();
         if (firstName != null) {