Remove Token.userid from the Python code

This paves the way for removing it from existing DBs with a migration.

h/models/token.py

@@ -23,8 +23,6 @@ class Token(Base, mixins.Timestamps):
 
     id = sqlalchemy.Column(sqlalchemy.Integer, autoincrement=True, primary_key=True)
 
-    userid = sqlalchemy.Column(sqlalchemy.UnicodeText(), nullable=False)
-
     value = sqlalchemy.Column(sqlalchemy.UnicodeText(), nullable=False, unique=True)
 
     #: A timestamp after which this token will no longer be considered valid.

h/services/developer_token.py

@@ -41,9 +41,7 @@ def create(self, userid):
         :rtype: h.models.Token
         """
         user = self.user_svc.fetch(userid)
-        token = models.Token(
-            user=user, userid=user.userid, value=self._generate_token()
-        )
+        token = models.Token(user=user, value=self._generate_token())
         self.session.add(token)
         return token
 

h/services/oauth/_validator.py

@@ -223,7 +223,6 @@ def save_bearer_token(self, token, request, *args, **kwargs):
 
         oauth_token = models.Token(
             user=request.user,
-            userid=request.user.userid,
             value=token["access_token"],
             refresh_token=token["refresh_token"],
             expires=expires,

h/services/user_rename.py

@@ -51,10 +51,6 @@ def rename(self, user, new_username):
         # https://michael.merickel.org/projects/pyramid_auth_demo/auth_vs_auth.html
         self._purge_auth_tickets(user)
 
-        # For OAuth tokens, only the token's value is stored by clients, so we
-        # can just update the userid.
-        self._update_tokens(old_userid, new_userid)
-
         self._change_annotations(old_userid, new_userid)
         tasks.job_queue.add_annotations_from_user.delay(
             "sync_annotation",
@@ -68,11 +64,6 @@ def _purge_auth_tickets(self, user):
             models.AuthTicket.user_id == user.id
         ).delete()
 
-    def _update_tokens(self, old_userid, new_userid):
-        self.session.query(models.Token).filter(
-            models.Token.userid == old_userid
-        ).update({"userid": new_userid}, synchronize_session="fetch")
-
     def _change_annotations(self, old_userid, new_userid):
         annotations = self._fetch_annotations(old_userid)
 

tests/common/factories/token.py

@@ -17,7 +17,6 @@ class Meta:
         sqlalchemy_session_persistence = "flush"
 
     user = factory.SubFactory(User)
-    userid = factory.LazyAttribute(lambda developer_token: developer_token.user.userid)
     value = factory.LazyAttribute(
         lambda _: (DEVELOPER_TOKEN_PREFIX + security.token_urlsafe())
     )
@@ -29,7 +28,6 @@ class Meta:
         sqlalchemy_session_persistence = "flush"
 
     user = factory.SubFactory(User)
-    userid = factory.LazyAttribute(lambda developer_token: developer_token.user.userid)
     value = factory.LazyAttribute(
         lambda _: (ACCESS_TOKEN_PREFIX + security.token_urlsafe())
     )

tests/unit/h/services/developer_token_test.py

@@ -40,9 +40,7 @@ def test_create_creates_new_developer_token_for_userid(
 
         user_service.fetch.assert_called_once_with(user.userid)
         assert db_session.query(models.Token).all() == [
-            Any.instance_of(models.Token).with_attrs(
-                {"userid": user.userid, "user": user}
-            )
+            Any.instance_of(models.Token).with_attrs({"user": user})
         ]
 
     def test_create_returns_new_developer_token_for_userid(
@@ -54,7 +52,6 @@ def test_create_returns_new_developer_token_for_userid(
 
         token = svc.create(user.userid)
 
-        assert token.userid == user.userid
         assert token.user == user
         assert token.value == "6879-secure-token"
         assert token.expires is None

tests/unit/h/services/user_rename_test.py

@@ -75,7 +75,6 @@ def test_rename_updates_tokens(self, service, user, db_session, factories):
         updated_token = (
             db_session.query(models.Token).filter(models.Token.id == token.id).one()
         )
-        assert updated_token.userid == user.userid
         assert updated_token.user == user
 
     @pytest.mark.usefixtures("annotations")