Extract credentials from header and cookie; Fixed gitlab namespaces

portal/facade/gitlab_facade.py

@@ -20,12 +20,20 @@ class GitlabFacade(GeneralFacade):
 
     @property
     def user_gl_cred(self):
-        return dict(token=self._get_cookie('token'),
-                    token_type=self._get_cookie('token_type'))
+        return dict(token=self._get_credential('token'),
+                    token_type=self._get_credential('token_type'))
 
     def _get_cookie(self, name, prefix='gitlab'):
         return self._request.cookies.get(f'{prefix}_{name}')
 
+    def _get_header(self, name, prefix='gitlab'):
+        full_name = f'{prefix}_{name}'.upper()
+        return self._request.headers.get(full_name)
+
+    def _get_credential(self, name, prefix='gitlab'):
+        return self._get_cookie(name, prefix=prefix) or self._get_header(name, prefix=prefix)
+
+
     def check_gl_enabled(self):
         if not self.is_enabled():
             raise errors.GitlabIsNotEnabledError()

portal/rest/gitlab.py

@@ -8,6 +8,7 @@ from gitlab.v4 import objects
 from portal import logger, oauth
 from portal.rest import rest_api
 from portal.rest.custom_resource import CustomResource
+from portal.service import errors
 
 log = logger.get_logger(__name__)
 
@@ -79,24 +80,31 @@ class GitlabProjects(CustomResource):
         return jsonify([proj.attributes for proj in projects])
 
 
-@gitlab_namespace.route('/projects/<string:pname>')
-@gitlab_namespace.param('pname', 'Project name')
+def _get_project_name() -> str:
+    pname = request.args.get('project')
+    if not pname:
+        raise errors.PortalAPIError(code=400, message="Gitlab project name is missing.")
+    return pname
+
+
+@gitlab_namespace.route('/project')
 class GitlabProjects(CustomResource):
     @jwt_required
     # @courses_namespace.response(200, 'Course found', model=course_schema)
-    def get(self, pname: str):
+    def get(self):
         self.facades.gitlab.check_gl_enabled()
+        pname = _get_project_name()
         project: objects.Project = self.facades.gitlab.get_project(project_name=pname)
         return project.attributes
 
 
-@gitlab_namespace.route('/projects/<string:pname>/members')
-@gitlab_namespace.param('pname', 'Project name')
+@gitlab_namespace.route('/project/members')
 class GitlabProjectMembers(CustomResource):
     @jwt_required
     # @courses_namespace.response(200, 'Course found', model=course_schema)
-    def get(self, pname: str):
+    def get(self):
         self.facades.gitlab.check_gl_enabled()
+        pname = _get_project_name()
         return self.facades.gitlab.list_members(project_name=pname)
 
     @jwt_required

portal/service/gitlab.py

@@ -93,9 +93,8 @@ class GitlabService(GeneralService):
     def get_project(self, project_name, gl_client=None, **kwargs) -> objects.Project:
         gl_client = gl_client or self.gl_client
         projects: objects.ProjectManager = gl_client.projects
-        full_project_name = gl_client.user.username + '/' + project_name
-        log.debug(f"[GL_PROJ] Getting gitlab project: {full_project_name}")
-        project: objects.Project = projects.get(full_project_name, **kwargs)
+        log.debug(f"[GL_PROJ] Getting gitlab project: {project_name}")
+        project: objects.Project = projects.get(project_name, **kwargs)
         return project
 
     def tag_submission(self, submission: Submission, **kwargs) -> objects.ProjectTag:

tests/rest/test_gitlab.py

 import logging
+from urllib.parse import urlencode
 
 import gitlab
 import pytest
@@ -192,13 +193,13 @@ def test_list_gitlab_projects(client, gl_api_url, data_gl_projects, gl_cookies,
 @responses.activate
 def test_get_gitlab_project(client, gl_api_url, data_gl_projects, gl_cookies, gl_user):
     project = data_gl_projects[0]
-    pname = project['name']
-    namespace = f"{gl_user['username']}%2F{pname}"
+    pname: str = project['path_with_namespace']
+    namespace = pname.replace('/', '%2F')
     responses.add(responses.GET, f"{gl_api_url}/user", json=gl_user, status=200)
     responses.add(responses.GET, f"{gl_api_url}/projects/{namespace}",
                   json=project, status=200)
     # 'https://gitlab.local/api/v4/user'
-    response = rest_tools.make_request(client, f'/gitlab/projects/{pname}',
+    response = rest_tools.make_request(client, f'/gitlab/project?project={pname}',
                                        cookies=gl_cookies)
     assert_response(response)