From c30e0622107649d932db3478600ce2ea60fc1049 Mon Sep 17 00:00:00 2001
From: Inex Code <inex.code@selfprivacy.org>
Date: Tue, 31 May 2022 11:46:58 +0300
Subject: [PATCH] Fix date formats

---
 selfprivacy_api/app.py              |  2 +-
 selfprivacy_api/resources/common.py |  2 +-
 selfprivacy_api/utils/auth.py       | 14 ++++++++++----
 setup.py                            |  2 +-
 4 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/selfprivacy_api/app.py b/selfprivacy_api/app.py
index 5c64121..49e5bae 100644
--- a/selfprivacy_api/app.py
+++ b/selfprivacy_api/app.py
@@ -68,7 +68,7 @@ def create_app(test_config=None):
     def spec():
         if app.config["ENABLE_SWAGGER"] == "1":
             swag = swagger(app)
-            swag["info"]["version"] = "1.2.6"
+            swag["info"]["version"] = "1.2.7"
             swag["info"]["title"] = "SelfPrivacy API"
             swag["info"]["description"] = "SelfPrivacy API"
             swag["securityDefinitions"] = {
diff --git a/selfprivacy_api/resources/common.py b/selfprivacy_api/resources/common.py
index 9a35179..ce0dedf 100644
--- a/selfprivacy_api/resources/common.py
+++ b/selfprivacy_api/resources/common.py
@@ -23,4 +23,4 @@ class ApiVersion(Resource):
             401:
                 description: Unauthorized
         """
-        return {"version": "1.2.6"}
+        return {"version": "1.2.7"}
diff --git a/selfprivacy_api/utils/auth.py b/selfprivacy_api/utils/auth.py
index 1aa7e22..8e5a5b2 100644
--- a/selfprivacy_api/utils/auth.py
+++ b/selfprivacy_api/utils/auth.py
@@ -120,7 +120,7 @@ def create_token(name):
             {
                 "token": token,
                 "name": name,
-                "date": str(datetime.now()),
+                "date": str(datetime.now().strftime("%Y-%m-%dT%H:%M:%S.%fZ")),
             }
         )
     return token
@@ -282,9 +282,15 @@ def _get_new_device_auth_token():
         new_device = tokens["new_device"]
         if "expiration" not in new_device:
             return None
-        if datetime.now() > datetime.strptime(
-            new_device["expiration"], "%Y-%m-%d %H:%M:%S.%f"
-        ):
+        if new_device["expiration"].endswith("Z"):
+            expiration = datetime.strptime(
+                new_device["expiration"], "%Y-%m-%dT%H:%M:%S.%fZ"
+            )
+        else:
+            expiration = datetime.strptime(
+                new_device["expiration"], "%Y-%m-%d %H:%M:%S.%f"
+            )
+        if datetime.now() > expiration:
             return None
         return new_device["token"]
 
diff --git a/setup.py b/setup.py
index 72ffd76..5619621 100755
--- a/setup.py
+++ b/setup.py
@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="selfprivacy_api",
-    version="1.2.6",
+    version="1.2.7",
     packages=find_packages(),
     scripts=[
         "selfprivacy_api/app.py",