From d225831557e04c85a5d971fd2677191d0d7066f5 Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: May 17 2017 13:57:09 +0000
Subject: Drop making the token required at the database level


We can't enforce this since pagure-ci flags pull-requests but does not
act with an API token.

Signed-off-by: Pierre-Yves Chibon <pingou@pingoured.fr>

---

diff --git a/pagure/lib/lib_ci.py b/pagure/lib/lib_ci.py
index 624adee..cd9cc7e 100644
--- a/pagure/lib/lib_ci.py
+++ b/pagure/lib/lib_ci.py
@@ -74,6 +74,7 @@ def process_jenkins_build(session, project, build_id, requestfolder):
         url=url,
         uid=None,
         user=project.user.username,
+        token=None,
         requestfolder=requestfolder,
     )
     session.commit()
diff --git a/pagure/lib/model.py b/pagure/lib/model.py
index 2c13357..ba2cef3 100644
--- a/pagure/lib/model.py
+++ b/pagure/lib/model.py
@@ -27,7 +27,6 @@ from sqlalchemy.orm import backref
 from sqlalchemy.orm import sessionmaker
 from sqlalchemy.orm import scoped_session
 from sqlalchemy.orm import relation
-from sqlalchemy.orm import validates
 
 import pagure.exceptions
 
@@ -1888,12 +1887,6 @@ class PullRequestFlag(BASE):
         foreign_keys=[pull_request_uid],
         remote_side=[PullRequest.uid])
 
-    @validates('token_id')
-    def validate_token_id(self, _, token_id):
-        if token_id is None:
-            raise ValueError('token_id may not be None.')
-        return token_id
-
     def to_json(self, public=False):
         ''' Returns a dictionnary representation of the pull-request.
 
diff --git a/tests/test_pagure_lib.py b/tests/test_pagure_lib.py
index d7ec772..d49b038 100644
--- a/tests/test_pagure_lib.py
+++ b/tests/test_pagure_lib.py
@@ -2445,35 +2445,6 @@ class PagureLibtests(tests.Modeltests):
         self.assertEqual(len(request.flags), 1)
         self.assertEqual(request.flags[0].token_id, 'aaabbbcccddd')
 
-    @patch('pagure.lib.notify.send_email')
-    def test_add_pull_request_flag_no_token(self, mockemail):
-        """ Test add_pull_request_flag of pagure.lib. """
-        mockemail.return_value = True
-
-        self.test_new_pull_request()
-        tests.create_tokens(self.session)
-
-        request = pagure.lib.search_pull_requests(self.session, requestid=1)
-        self.assertEqual(len(request.flags), 0)
-
-        self.assertRaises(
-            ValueError,
-            pagure.lib.add_pull_request_flag,
-            session=self.session,
-            request=request,
-            username="jenkins",
-            percent=100,
-            comment="Build passes",
-            url="http://jenkins.cloud.fedoraproject.org",
-            uid="jenkins_build_pagure_34",
-            user='foo',
-            token=None,
-            requestfolder=None,
-        )
-
-        request = pagure.lib.search_pull_requests(self.session, requestid=1)
-        self.assertEqual(len(request.flags), 0)
-
     @patch('pagure.lib.notify.send_email', MagicMock(return_value=True))
     def test_search_pull_requests(self):
         """ Test search_pull_requests of pagure.lib. """