Merge branch 'master' into refresh-token

Clinical-Genomics · Mar 11, 2024 · 3d40af6 · 3d40af6
2 parents 3423a6d + 737bb5a
commit 3d40af6
Show file tree

Hide file tree

Showing 8 changed files with 5 additions and 5 deletions.
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 21.0.8
+current_version = 21.1.0
 commit = True
 tag = True
 tag_name = {new_version}

diff --git a/alembic/versions/2024_03_08_febdb4e78bb5_add_refresh_token_column.py b/alembic/versions/2024_03_08_febdb4e78bb5_add_refresh_token_column.py
@@ -17,7 +17,7 @@
 
 
 def upgrade():
-    op.add_column("user", sa.Column("refresh_token", sa.String(length=128), nullable=True))
+    op.add_column("user", sa.Column("refresh_token", sa.Text, nullable=True))
 
 
 def downgrade():

diff --git a/setup.py b/setup.py
@@ -52,7 +52,7 @@ def parse_reqs(req_path="./requirements.txt"):
 
 setup(
     name=NAME,
-    version="21.0.8",
+    version="21.1.0",
     description=DESCRIPTION,
     long_description=LONG_DESCRIPTION,
     long_description_content_type="text/markdown",

diff --git a/trailblazer/clients/authentication_client/google_oauth_client.py b/trailblazer/clients/authentication_client/google_oauth_client.py
@@ -24,7 +24,7 @@ def get_tokens(self, authorization_code: str) -> TokensResponse:
             code=authorization_code,
             redirect_uri=self.redirect_uri,
         )
-        data: str = request.model_dump_json()
+        data: dict = request.model_dump()
 
         response = requests.post(self.token_uri, data=data)
 

diff --git a/trailblazer/clients/google_api_client/__init__.py b/trailblazer/clients/google_api_client/__init__.py
diff --git a/trailblazer/services/authentication_service/__init__.py b/trailblazer/services/authentication_service/__init__.py
diff --git a/trailblazer/services/encryption_service/__init__.py b/trailblazer/services/encryption_service/__init__.py
diff --git a/trailblazer/store/models.py b/trailblazer/store/models.py
@@ -40,7 +40,7 @@ class User(Model):
     id = Column(types.Integer, primary_key=True)
     is_archived = Column(types.Boolean, default=False)
     name = Column(types.String(128))
-    refresh_token = Column(types.String(128))
+    refresh_token = Column(types.Text)
 
     runs = orm.relationship("Analysis", backref="user")