rebasing and some fixes

Author: npalaska

lib/pbench/server/api/__init__.py

@@ -86,10 +86,10 @@ def register_endpoints(api, app, config):
     )
 
     api.add_resource(
-        UserMetadata, f"{base_uri}/user/metadata", resource_class_args=(config, logger),
+        UserMetadata, f"{base_uri}/metadata", resource_class_args=(config, logger, token_auth),
     )
     api.add_resource(
-        QueryMetadata, f"{base_uri}/user/metadata/<string:id>", resource_class_args=(config, logger),
+        QueryMetadata, f"{base_uri}/metadata/<string:id>", resource_class_args=(config, logger),
     )
 
 
@@ -129,11 +129,6 @@ def create_app(server_config):
         app.logger.exception("Exception while initializing sqlalchemy database")
         sys.exit(1)
 
-    @app.before_request
-    def before_request():
-        print(request.path)
-        print(request.remote_addr)
-
     @app.teardown_appcontext
     def shutdown_session(exception=None):
         Database.db_session.remove()

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

@@ -3,21 +3,22 @@
 import json
 from flask_restful import Resource, abort
 from flask import request, make_response, jsonify
-from pbench.server.api.resources.auth import auth
-from pbench.server.api.resources.models import MetadataModel
-from pbench.server.api.resources.database import Database
+from pbench.server.database.models.metadata import MetadataModel
+from pbench.server.database.database import Database
+from pbench.server.api.auth import Auth
 
 
 class UserMetadata(Resource):
     """
     Abstracted pbench API for handling user metadata by using graphql schema
     """
 
-    def __init__(self, config, logger):
+    def __init__(self, config, logger, auth):
         self.server_config = config
         self.logger = logger
+        self.auth = auth
 
-    @auth.login_required()
+    @Auth.token_auth.login_required(f=Auth().verify_auth())
     def post(self):
         """
         Post request for creating metadata instance for a user.
@@ -56,7 +57,7 @@ def post(self):
         if not description:
             self.logger.warning("Description not provided during metadata creation")
             abort(400, message="Please provide a description string")
-        current_user_id = auth.current_user().id
+        current_user_id = self.auth.token_auth.current_user().id
 
         try:
             # Create a new metadata session
@@ -84,7 +85,7 @@ def post(self):
             }
             return make_response(jsonify(response_object), 201)
 
-    @auth.login_required()
+    @Auth.token_auth.login_required(f=Auth().verify_auth())
     def get(self):
         """
         Get request for querying all the metadata sessions for a user.
@@ -105,7 +106,7 @@ def get(self):
                         }
                 }
         """
-        current_user_id = auth.current_user().id
+        current_user_id = self.auth.token_auth.current_user().id
         try:
             # Fetch the metadata session
             sessions = (
@@ -138,7 +139,7 @@ def __init__(self, config, logger):
         self.server_config = config
         self.logger = logger
 
-    @auth.login_required()
+    @Auth.token_auth.login_required(f=Auth().verify_auth())
     def get(self, id=None):
         """
         Get request for querying a metadata session for a user given a metadata id.
@@ -189,7 +190,7 @@ def get(self, id=None):
             }
             return make_response(jsonify(response_object), 200)
 
-    @auth.login_required()
+    @Auth.token_auth.login_required(f=Auth().verify_auth())
     def put(self, id=None):
         """
         Put request for updating a metadata session for a user given a metadata id.

lib/pbench/server/database/models/metadata.py

@@ -0,0 +1,31 @@
+import datetime
+from dateutil import parser
+from pbench.server.database.database import Database
+from sqlalchemy import Column, Integer, String, DateTime, ForeignKey
+
+
+class MetadataModel(Database.Base):
+    """ Metadata Model for storing user metadata details """
+
+    # TODO: Think about the better name
+    __tablename__ = "metadata"
+
+    id = Column(Integer, primary_key=True, autoincrement=True)
+    created = Column(DateTime, nullable=False)
+    updated = Column(DateTime, nullable=False)
+    config = Column(String(255), unique=False, nullable=False)
+    description = Column(String(255), nullable=False)
+    user_id = Column(Integer, ForeignKey('users.id'))
+
+    def __init__(self, created, config, description, user_id):
+        self.created = parser.parse(created)
+        self.updated = datetime.datetime.now()
+        self.config = config
+        self.description = description
+        self.user_id = user_id
+
+    def __str__(self):
+        return f"Url id: {self.id}, created on: {self.created}, description: {self.description}"
+
+    def as_dict(self):
+        return {c.name: str(getattr(self, c.name)) for c in self.__table__.columns}

lib/pbench/test/unit/server/test_user_auth.py

@@ -428,8 +428,7 @@ def test_delete_user(client, server_config):
 
 class TestMetadataSession:
     @staticmethod
-    def test_registration(client, server_config, pytestconfig):
-        client.config["SESSION_FILE_DIR"] = pytestconfig.cache.get("TMP", None)
+    def test_registration(client, server_config):
         """ Test for user registration """
         with client:
             response = register_user(
@@ -447,25 +446,26 @@ def test_registration(client, server_config, pytestconfig):
             response = login_user(client, server_config, "user", "12345")
             data_login = response.json
             assert data_login["status"] == "success"
+            assert data_login["auth_token"]
 
             response = client.post(
-                f"{server_config.rest_uri}/user/metadata",
+                f"{server_config.rest_uri}/metadata",
                 json={"config": "config1", "description": "description1"},
                 headers=dict(Authorization="Bearer " + data_login["auth_token"])
             )
             data = response.json
             assert data["status"] == "success"
 
             response = client.post(
-                f"{server_config.rest_uri}/user/metadata",
+                f"{server_config.rest_uri}/metadata",
                 json={"config": "config2", "description": "description2"},
                 headers=dict(Authorization="Bearer " + data_login["auth_token"])
             )
             data = response.json
             assert data["status"] == "success"
 
             response = client.get(
-                f"{server_config.rest_uri}/user/metadata",
+                f"{server_config.rest_uri}/metadata",
                 headers=dict(Authorization="Bearer " + data_login["auth_token"])
             )
             data = response.json