extended social_auth_usersocialauth table.

galaxyproject · Dec 7, 2017 · 55c0b4b · 55c0b4b
1 parent 4829f2d
commit 55c0b4b
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/lib/galaxy/model/mapping.py b/lib/galaxy/model/mapping.py
@@ -142,9 +142,13 @@
 model.UserAuthnAssociation.table = Table(
     "social_auth_usersocialauth", metadata,
     Column('id', Integer, primary_key=True),
-    Column('provider', VARCHAR(32)),
-    Column('uid', VARCHAR(255)),
     Column('user_id', Integer, ForeignKey("galaxy_user.id"), index=True),
+    Column('uid', VARCHAR(255)),
+    Column('provider', VARCHAR(32)),
+    Column("state_token", TEXT, nullable=False, index=True),
+    Column("access_token", TEXT),
+    Column("id_token", TEXT),
+    Column("refresh_token", TEXT),
     Column('extra_data', TEXT),
     Column('lifetime', Integer),
     Column('assoc_type', VARCHAR(64)))

diff --git a/lib/galaxy/model/migrate/versions/0137_psa_tables.py b/lib/galaxy/model/migrate/versions/0137_psa_tables.py
@@ -48,9 +48,13 @@
 social_auth_usersocialauth = Table(
     "social_auth_usersocialauth", metadata,
     Column('id', Integer, primary_key=True),
-    Column('provider', VARCHAR(32)),
-    Column('uid', VARCHAR(255)),
     Column('user_id', Integer, ForeignKey("galaxy_user.id"), index=True),
+    Column('uid', VARCHAR(255)),
+    Column('provider', VARCHAR(32)),
+    Column("state_token", TEXT, nullable=False, index=True),
+    Column("access_token", TEXT),
+    Column("id_token", TEXT),
+    Column("refresh_token", TEXT),
     Column('extra_data', TEXT),
     Column('lifetime', Integer),
     Column('assoc_type', VARCHAR(64)))