diff options
| -rw-r--r-- | .gitignore | 6 | ||||
| -rw-r--r-- | src/account/forms.py | 2 | ||||
| -rw-r--r-- | src/account/models.py | 1 | ||||
| -rw-r--r-- | src/account/views.py | 2 |
4 files changed, 6 insertions, 5 deletions
@@ -1,5 +1,3 @@ -# Byte-compiled / optimized / DLL files -__pycache__/ *.py[cod] # C extensions @@ -42,5 +40,5 @@ bower_components/ config.env # rsa key files -rsa.pem -rsa.pub +src/account/rsa.pem +src/account/rsa.pub diff --git a/src/account/forms.py b/src/account/forms.py index 7653e2b..3b9c627 100644 --- a/src/account/forms.py +++ b/src/account/forms.py @@ -17,6 +17,6 @@ from account.models import UserProfile class AccountSettingsForm(forms.ModelForm): class Meta: model = UserProfile - fields = ['company', 'ssh_public_key', 'pgp_public_key', 'timezone'] + fields = ['company', 'email_addr', 'ssh_public_key', 'pgp_public_key', 'timezone'] timezone = forms.ChoiceField(choices=[(x, x) for x in pytz.common_timezones], initial='UTC') diff --git a/src/account/models.py b/src/account/models.py index c2e9902..bfc0bbe 100644 --- a/src/account/models.py +++ b/src/account/models.py @@ -20,6 +20,7 @@ class UserProfile(models.Model): timezone = models.CharField(max_length=100, blank=False, default='UTC') ssh_public_key = models.FileField(upload_to=upload_to, null=True, blank=True) pgp_public_key = models.FileField(upload_to=upload_to, null=True, blank=True) + email_addr = models.CharField(max_length=300, blank=false, default='email@mail.com') company = models.CharField(max_length=200, blank=False) oauth_token = models.CharField(max_length=1024, blank=False) diff --git a/src/account/views.py b/src/account/views.py index 17fbdc3..e6a0e5d 100644 --- a/src/account/views.py +++ b/src/account/views.py @@ -119,6 +119,7 @@ class JiraAuthenticatedView(RedirectView): jira = JIRA(server=settings.JIRA_URL, oauth=oauth_dict) username = jira.current_user() + email = jira.user(username).emailAddress url = '/' # Step 3. Lookup the user or create them if they don't exist. try: @@ -130,6 +131,7 @@ class JiraAuthenticatedView(RedirectView): profile = UserProfile() profile.user = user profile.save() + user.userprofile.email_addr = email url = reverse('account:settings') user.userprofile.oauth_token = access_token['oauth_token'] user.userprofile.oauth_secret = access_token['oauth_token_secret'] |