Update user token model

Author: Dusko Bogdanovski

ckanext/oauth2/db.py

@@ -39,7 +39,7 @@ def by_user_name(cls, user_name):
             sa.Column('user_name', sa.types.UnicodeText, primary_key=True),
             sa.Column('access_token', sa.types.UnicodeText),
             sa.Column('token_type', sa.types.UnicodeText),
-            sa.Column('refresh_token', sa.types.UnicodeText),
+            sa.Column('expires_at', sa.types.UnicodeText),
             sa.Column('expires_in', sa.types.UnicodeText)
         )
 

ckanext/oauth2/oauth2.py

@@ -159,7 +159,7 @@ def get_stored_token(self, user_name):
         if user_token:
             return {
                 'access_token': user_token.access_token,
-                'refresh_token': user_token.refresh_token,
+                'expires_at': user_token.expires_at,
                 'expires_in': user_token.expires_in,
                 'token_type': user_token.token_type
             }
@@ -173,7 +173,7 @@ def update_token(self, user_name, token):
         # Save the new token
         user_token.access_token = token['access_token']
         user_token.token_type = token['token_type']
-        user_token.refresh_token = token['refresh_token']
+        user_token.expires_at = token['expires_at']
         user_token.expires_in = token['expires_in']
         model.Session.add(user_token)
         model.Session.commit()