darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-06-26 02:11:49 -04:00
Code Issues Packages Projects Releases Wiki Activity

Save api_key.key_type from radio buttons

Browse Source
This commit is contained in:
Leo Hemsted
2016-07-06 15:10:36 +01:00
parent c0c516ba7a
commit 630b5df552
3 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/main/forms.py
View File

@@ -19,6 +19,7 @@ from wtforms.fields.html5 import EmailField, TelField
from wtforms.validators import (DataRequired, Email, Length, Regexp)
from app.main.validators import (Blacklist, CsvFileValidator, ValidEmailDomainRegex, NoCommasInPlaceHolders)
from app.notify_client.api_key_api_client import KEY_TYPE_NORMAL, KEY_TYPE_TEST, KEY_TYPE_TEAM
def email_address(label='Email address'):
@@ -295,9 +296,9 @@ class CreateKeyForm(Form):
key_type = RadioField(
'What should Notify do when you use this key?',
choices=[
('normal', 'Send messages to anyone'),
('test', 'Simulate sending messages to anyone'),
('team', 'Only send messages to members of your team')
(KEY_TYPE_NORMAL, 'Send messages to anyone'),
(KEY_TYPE_TEST, 'Simulate sending messages to anyone'),
(KEY_TYPE_TEAM, 'Only send messages to members of your team')
],
validators=[
DataRequired()

6
app/main/views/api_keys.py
View File

@@ -25,7 +25,11 @@ def create_api_key(service_id):
]
form = CreateKeyForm(key_names)
if form.validate_on_submit():
secret = api_key_api_client.create_api_key(service_id=service_id, key_name=form.key_name.data)
secret = api_key_api_client.create_api_key(
service_id=service_id,
key_name=form.key_name.data,
key_type=form.key_type.data
)
return render_template('views/api-keys/show.html', secret=secret,
key_name=form.key_name.data)
return render_template(

5
app/notify_client/api_key_api_client.py
View File

@@ -5,6 +5,7 @@ from app.notify_client import _attach_current_user
# must match key types in notifications-api/app/models.py
KEY_TYPE_NORMAL = 'normal'
KEY_TYPE_TEAM = 'team'
KEY_TYPE_TEST = 'test'
class ApiKeyApiClient(BaseAPIClient):
@@ -24,10 +25,10 @@ class ApiKeyApiClient(BaseAPIClient):
else:
return self.get(url='/service/{}/api-keys'.format(service_id))
def create_api_key(self, service_id, key_name):
def create_api_key(self, service_id, key_name, key_type):
data = {
'name': key_name,
'key_type': KEY_TYPE_NORMAL
'key_type': key_type
}
_attach_current_user(data)
key = self.post(url='/service/{}/api-key'.format(service_id), data=data)