improved API key handling

account-dao/pom.xml

@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <parent>
+        <groupId>de.muehlencord</groupId>
+        <artifactId>shared</artifactId>
+        <version>1.1-SNAPSHOT</version>
+    </parent>
+    
+    <groupId>de.muehlencord.shared</groupId>
+    <artifactId>shared-account-dao</artifactId>
+    <packaging>jar</packaging>
+
+    <name>shared-account-dao</name>    
+       
+    <dependencies>
+        <dependency>
+            <groupId>com.google.code.gson</groupId>
+            <artifactId>gson</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-annotations</artifactId>
+            <version>2.9.8</version>
+        </dependency>
+        <dependency>
+            <groupId>de.muehlencord.shared</groupId>
+            <artifactId>shared-util</artifactId>
+        </dependency>
+    </dependencies>
+</project>

account-dao/src/main/java/de/muehlencord/shared/account/dao/ApiKeyObject.java

@@ -0,0 +1,71 @@
+/* 
+ * Copyright 2018 joern.muehlencord.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package de.muehlencord.shared.account.dao;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.google.gson.annotations.Expose;
+import java.util.Date;
+
+/**
+ *
+ * @author Joern Muehlencord <joern at muehlencord.de>
+ */
+public class ApiKeyObject  {
+
+    @Expose
+    private String userName;
+    @Expose
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd'T'HH:mm'Z'")
+    private Date issuedOn;
+    @Expose
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd'T'HH:mm'Z'")
+    private Date expiresOn;
+    @Expose
+    private String authToken;
+
+    public String getUserName() {
+        return userName;
+    }
+
+    public void setUserName(String userName) {
+        this.userName = userName;
+    }
+
+    public Date getIssuedOn() {
+        return issuedOn;
+    }
+
+    public void setIssuedOn(Date issuedOn) {
+        this.issuedOn = issuedOn;
+    }
+
+    public Date getExpiresOn() {
+        return expiresOn;
+    }
+
+    public void setExpiresOn(Date expiresOn) {
+        this.expiresOn = expiresOn;
+    }
+
+    public String getAuthToken() {
+        return authToken;
+    }
+
+    public void setAuthToken(String authToken) {
+        this.authToken = authToken;
+    }
+
+}

account-dao/src/main/java/de/muehlencord/shared/account/dao/ApiKeyUtil.java

@@ -0,0 +1,43 @@
+/*
+ * Copyright 2019 Joern Muehlencord <joern at muehlencord.de>.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package de.muehlencord.shared.account.dao;
+
+import de.muehlencord.shared.util.DateUtil;
+import java.util.Date;
+
+/**
+ *
+ * @author Joern Muehlencord <joern at muehlencord.de>
+ */
+public abstract class ApiKeyUtil {
+
+    private ApiKeyUtil() {
+        // hide constructor for abstract class - only static methods are used
+    }
+
+    public static boolean isValid(ApiKeyObject apiKeyObject) {
+        if (apiKeyObject == null) {
+            return false;
+        }
+        Date validToDate = apiKeyObject.getExpiresOn();
+        if (validToDate == null) {
+            return false;
+        }
+        Date now = DateUtil.getCurrentTimeInUTC();
+        return validToDate.after(now);
+    }
+
+}