From 7d17f160617b4ca9f357a3b27e3f119c26d8bee9 Mon Sep 17 00:00:00 2001
From: Tomas Stary <staryto5@fit.cvut.cz>
Date: Sun, 29 Apr 2018 22:21:28 +0200
Subject: [PATCH] Minor changes - package - stats api method

---
 evodoc/api/miscapi.py    | 7 +++----
 evodoc/entity/package.py | 4 ++--
 evodoc/login.py          | 5 +++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/evodoc/api/miscapi.py b/evodoc/api/miscapi.py
index bda3c89..1d7456f 100644
--- a/evodoc/api/miscapi.py
+++ b/evodoc/api/miscapi.py
@@ -61,12 +61,11 @@ def registration_action():
     except DbException as err:
         return response_err(err)
 
-@app.route('/stats')
+@app.route('/stats', methods=['GET'])
 def stats():
     try:
-        data = request.get_json()
-        validate_data(data, {'token'})
-        validate_token(data['token'])
+        token = request.args.get('token')
+        validate_token(token)
         user_count = User.query.count()
         module_count = Module.query.count()
         project_count = Project.query.count()
diff --git a/evodoc/entity/package.py b/evodoc/entity/package.py
index 205ffa5..f37e90a 100644
--- a/evodoc/entity/package.py
+++ b/evodoc/entity/package.py
@@ -2,7 +2,7 @@
 from sqlalchemy import Column, Integer, String, DateTime, Boolean
 from evodoc.app import db, git_path
 from evodoc.exception import DbException
-import git
+from git import Git
 
 class Package(db.Model):
     __tablename__ = "package"
@@ -62,7 +62,7 @@ def save_or_create(cls, data):
 
     @classmethod
     def clone_repository(cls):
-        git.Git(git_path).clone(cls.url + '.git')
+        Git(git_path).clone(cls.url + '.git')
         return True
 
     def serialize(self):
diff --git a/evodoc/login.py b/evodoc/login.py
index 06ba2ef..464ebec 100644
--- a/evodoc/login.py
+++ b/evodoc/login.py
@@ -44,8 +44,9 @@ def authenticate(token):
 	"""
 	if token == None:
 		return None
-	userTokenEntity = UserToken.query.filter_by(token=token).filter(UserToken.created > datetime.utcnow() + timedelta(hours=-24)).filter(UserToken.update > datetime.utcnow() + timedelta(hours=-2)).first()
-	if userTokenEntity == None:
+	userTokenEntity = UserToken.query.filter_by(token=token).first()
+	if userTokenEntity == None or (userTokenEntity.created + timedelta(hours=24) < datetime.utcnow() \
+        and userTokenEntity.update + timedelta(hours=2) < datetime.utcnow()):
 		return None
 	if userTokenEntity.user.active != 1:
 		return None