diff --git a/src/authentic2_auth_fc/migrations/0001_initial.py b/src/authentic2_auth_fc/migrations/0001_initial.py index 5db0738da..095691798 100644 --- a/src/authentic2_auth_fc/migrations/0001_initial.py +++ b/src/authentic2_auth_fc/migrations/0001_initial.py @@ -20,8 +20,8 @@ class Migration(migrations.Migration): models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True), ), ('sub', models.TextField(verbose_name='sub', db_index=True)), - ('token', models.TextField(verbose_name='access token')), - ('user_info', models.TextField(null=True, verbose_name='access token', blank=True)), + ('token', models.TextField(verbose_name='access token', default='{}')), + ('user_info', models.TextField(null=True, verbose_name='access token', default='{}')), ( 'user', models.ForeignKey( diff --git a/src/authentic2_auth_fc/models.py b/src/authentic2_auth_fc/models.py index 3516ee10c..6976732ff 100644 --- a/src/authentic2_auth_fc/models.py +++ b/src/authentic2_auth_fc/models.py @@ -91,18 +91,24 @@ class FcAccount(models.Model): ) sub = models.TextField(verbose_name=_('sub'), db_index=True) order = models.PositiveIntegerField(verbose_name=_('order'), default=0) - token = models.TextField(verbose_name=_('access token')) - user_info = models.TextField(verbose_name=_('access token'), blank=True, null=True) + token = models.TextField(verbose_name=_('access token'), default='{}') + user_info = models.TextField(verbose_name=_('access token'), null=True, default='{}') @property def id_token(self): return parse_id_token(self.get_token()['id_token']) def get_token(self): - return json.loads(self.token) + if self.token: + return json.loads(self.token) + else: + return {} def get_user_info(self): - return json.loads(self.user_info) + if self.user_info: + return json.loads(self.user_info) + else: + return {} def __str__(self): user_info = self.get_user_info()