diff --git a/.gitignore b/.gitignore index 75d9974..a91cd9e 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ dist/ *.py[cod] *.egg-info .ropeproject +src/ \ No newline at end of file diff --git a/DOC.md b/DOC.md index 6a3cb31..e6d8783 100644 --- a/DOC.md +++ b/DOC.md @@ -46,6 +46,8 @@ Install the package using pip. pip install django-oidc-provider # Or latest code from repo. pip install git+https://github.com/juanifioren/django-oidc-provider.git#egg=oidc_provider +# Or if working from a local repo +pip install git+./#egg=oidc_provider ``` Add it to your apps. diff --git a/oidc_provider/models.py b/oidc_provider/models.py index 3b204e3..e467b47 100644 --- a/oidc_provider/models.py +++ b/oidc_provider/models.py @@ -21,6 +21,12 @@ class Client(models.Model): _redirect_uris = models.TextField(default='') + def __str__(self): + return self.name + + def __unicode__(self): + return self.__str__() + def redirect_uris(): def fget(self): return self._redirect_uris.splitlines() @@ -40,6 +46,7 @@ class BaseCodeTokenModel(models.Model): client = models.ForeignKey(Client) expires_at = models.DateTimeField() _scope = models.TextField(default='') + def scope(): def fget(self): return self._scope.split() @@ -51,6 +58,12 @@ class BaseCodeTokenModel(models.Model): def has_expired(self): return timezone.now() >= self.expires_at + def __str__(self): + return "%s - %s (%s)" % (self.client, self.user, self.expires_at) + + def __unicode__(self): + return self.__str__() + class Meta: abstract = True @@ -127,4 +140,4 @@ class UserInfo(models.Model): if formatted.startswith(', '): formatted = formatted[2:] if formatted.endswith(', '): - formatted = formatted[:-2] \ No newline at end of file + formatted = formatted[:-2]