Refactor and add unit tests

Author: npalaska

lib/pbench/server/api/__init__.py

@@ -35,21 +35,29 @@ def register_endpoints(api, app):
     to make the APIs active."""
 
     api.add_resource(
-        Upload, f"{app.config['REST_URI']}/upload/ctrl/<string:controller>", resource_class_args=(app, api)
+        Upload,
+        f"{app.config['REST_URI']}/upload/ctrl/<string:controller>",
+        resource_class_args=(app, api),
+    )
+    api.add_resource(
+        HostInfo, f"{app.config['REST_URI']}/host_info", resource_class_args=(app, api)
+    )
+    api.add_resource(
+        Elasticsearch,
+        f"{app.config['REST_URI']}/elasticsearch",
+        resource_class_args=(app, api),
+    )
+    api.add_resource(
+        GraphQL, f"{app.config['REST_URI']}/graphql", resource_class_args=(app, api)
     )
-    api.add_resource(HostInfo, f"{app.config['REST_URI']}/host_info",  resource_class_args=(app, api))
-    api.add_resource(Elasticsearch, f"{app.config['REST_URI']}/elasticsearch", resource_class_args=(app, api))
-    api.add_resource(GraphQL, f"{app.config['REST_URI']}/graphql", resource_class_args=(app, api))
     api.add_resource(
         RegisterUser, f"{app.config['REST_URI']}/user", resource_class_args=(app, api)
     )
     api.add_resource(
         LoginAPI, f"{app.config['REST_URI']}/session", resource_class_args=(app, api)
     )
     api.add_resource(
-        LogoutAPI,
-        f"{app.config['REST_URI']}/session",
-        resource_class_args=(app, api),
+        LogoutAPI, f"{app.config['REST_URI']}/session", resource_class_args=(app, api),
     )
     api.add_resource(
         GetUser,

lib/pbench/server/api/resources/database.py

@@ -1,4 +1,3 @@
-
 import os
 import sys
 from sqlalchemy import create_engine
@@ -17,8 +16,7 @@ def get_engine_uri():
         psql = config.conf["Postgres"]
     except NoSectionError as e:
         logger.error(
-            "Failed to find an [Postgres] section"
-            " in {} configuration file.",
+            "Failed to find an [Postgres] section" " in {} configuration file.",
             " ".join(config.files),
         )
         sys.exit(1)
@@ -42,15 +40,14 @@ def get_engine_uri():
         sys.exit(1)
 
 
-db_session = scoped_session(sessionmaker(autocommit=False,
-                                         autoflush=False))
+db_session = scoped_session(sessionmaker(autocommit=False, autoflush=False))
 
 Base = declarative_base()
 Base.query = db_session.query_property()
 
 
 def init_engine():
-    return create_engine(get_engine_uri(), convert_unicode=True)
+    return create_engine(get_engine_uri())
 
 
 def init_db():
@@ -59,6 +56,7 @@ def init_db():
     # you will have to import them first before calling init_db()
 
     import pbench.server.api.resources.models
+
     engine = init_engine()
     Base.metadata.create_all(bind=engine)
     db_session.configure(bind=engine)

lib/pbench/server/api/resources/models.py

@@ -16,7 +16,7 @@ class UserModel(Base):
     lastName = Column(String(255), unique=False, nullable=False)
     password = Column(String(255), nullable=False)
     registered_on = Column(DateTime, nullable=False)
-    email = Column(String(255), unique=False, nullable=False)
+    email = Column(String(255), unique=True, nullable=False)
 
     def __init__(self, app, **kwargs):
         super().__init__(**kwargs)
@@ -43,10 +43,12 @@ def encode_auth_token(self, app, user_id):
                 "exp": datetime.datetime.utcnow() + datetime.timedelta(minutes=5),
                 "sub": user_id,
             }
-            return jwt.encode(payload, app.config.get("JWT_SECRET_KEY"), algorithm="HS256")
+            return jwt.encode(
+                payload, app.config.get("JWT_SECRET_KEY"), algorithm="HS256"
+            )
         except Exception as e:
             app.logger.info(
-                f"Some exception occurred while encoding the auth token for user_id {user_id}"
+                f"Exception occurred while encoding the auth token for user_id {user_id}, exception: {e}"
             )
             return None
 
@@ -59,7 +61,9 @@ def decode_auth_token(auth_token, app):
         :return: integer|string
         """
         try:
-            payload = jwt.decode(auth_token, app.config.get("SECRET_KEY"))
+            payload = jwt.decode(
+                auth_token, app.config.get("JWT_SECRET_KEY"), algorithms="HS256"
+            )
             if auth_token in app.blacklist:
                 return "Token blacklisted. Please log in again."
             return payload["sub"]
@@ -73,6 +77,7 @@ def decode_auth_token(auth_token, app):
 
 class URLModel(Base):
     """ URL Model for storing URL related details """
+
     # TODO: Think about the better name
     __tablename__ = "urls"