Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

confirmation: Add url_pattern_name to simplify subclassing Confirmation.

This commit is contained in:
Rishi Gupta 2017-07-07 00:08:53 -07:00 committed by Tim Abbott
parent 8fed9eeb75
commit 7cef3d95ee
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
confirmation/models.py
View File

@ -27,6 +27,8 @@ def generate_key():
return generate_random_token(40) return generate_random_token(40)
class ConfirmationManager(models.Manager): class ConfirmationManager(models.Manager):
url_pattern_name = 'confirmation.views.confirm'
def confirm(self, confirmation_key): def confirm(self, confirmation_key):
# type: (str) -> Union[bool, PreregistrationUser, EmailChangeStatus] # type: (str) -> Union[bool, PreregistrationUser, EmailChangeStatus]
if B16_RE.search(confirmation_key): if B16_RE.search(confirmation_key):
@ -56,16 +58,11 @@ class ConfirmationManager(models.Manager):
# type: (Text, str) -> Text # type: (Text, str) -> Text
return u'%s%s%s' % (settings.EXTERNAL_URI_SCHEME, return u'%s%s%s' % (settings.EXTERNAL_URI_SCHEME,
host, host,
reverse('confirmation.views.confirm', reverse(self.url_pattern_name,
kwargs={'confirmation_key': confirmation_key})) kwargs={'confirmation_key': confirmation_key}))
class EmailChangeConfirmationManager(ConfirmationManager): class EmailChangeConfirmationManager(ConfirmationManager):
def get_activation_url(self, key, host): url_pattern_name = 'zerver.views.user_settings.confirm_email_change'
# type: (Text, str) -> Text
return u'%s%s%s' % (settings.EXTERNAL_URI_SCHEME,
host,
reverse('zerver.views.user_settings.confirm_email_change',
kwargs={'confirmation_key': key}))
class Confirmation(models.Model): class Confirmation(models.Model):
content_type = models.ForeignKey(ContentType) content_type = models.ForeignKey(ContentType)