darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-08-23 15:57:23 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1598 from gov-cjwaszczuk/master

Browse Source 
Email auth for inviting members and editing permissions
This commit is contained in:
Chris Waszczuk
2017-11-06 10:00:15 +00:00
committed by GitHub
parent 8985f3978e c6ea90a7d8
commit 98c8ddca38
11 changed files with 325 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
tests/conftest.py
View File

@@ -1063,7 +1063,8 @@ def platform_admin_user(fake_uuid):
'manage_settings',
'manage_api_keys',
'view_activity']},
'platform_admin': True
'platform_admin': True,
'auth_type': 'sms_auth'
}
user = User(user_data)
return user
@@ -1081,6 +1082,7 @@ def api_user_active(fake_uuid, email_address='test@user.gov.uk'):
'failed_login_count': 0,
'permissions': {},
'platform_admin': False,
'auth_type': 'sms_auth',
'password_changed_at': str(datetime.utcnow())
}
user = User(user_data)
@@ -1099,6 +1101,7 @@ def api_nongov_user_active(fake_uuid):
'failed_login_count': 0,
'permissions': {},
'platform_admin': False,
'auth_type': 'sms_auth',
'password_changed_at': str(datetime.utcnow())
}
user = User(user_data)
@@ -1125,7 +1128,35 @@ def active_user_with_permissions(fake_uuid):
'manage_settings',
'manage_api_keys',
'view_activity']},
'platform_admin': False
'platform_admin': False,
'auth_type': 'sms_auth'
}
user = User(user_data)
return user
@pytest.fixture(scope='function')
def active_user_no_mobile(fake_uuid):
from app.notify_client.user_api_client import User
user_data = {'id': fake_uuid,
'name': 'Test User',
'password': 'somepassword',
'password_changed_at': str(datetime.utcnow()),
'email_address': 'test@user.gov.uk',
'mobile_number': None,
'state': 'active',
'failed_login_count': 0,
'permissions': {SERVICE_ONE_ID: ['send_texts',
'send_emails',
'send_letters',
'manage_users',
'manage_templates',
'manage_settings',
'manage_api_keys',
'view_activity']},
'platform_admin': False,
'auth_type': 'email_auth'
}
user = User(user_data)
return user
@@ -1144,7 +1175,8 @@ def active_user_view_permissions(fake_uuid):
'state': 'active',
'failed_login_count': 0,
'permissions': {SERVICE_ONE_ID: ['view_activity']},
'platform_admin': False
'platform_admin': False,
'auth_type': 'sms_auth'
}
user = User(user_data)
return user
@@ -1167,7 +1199,8 @@ def active_user_manage_template_permission(fake_uuid):
'manage_templates',
'view_activity',
]},
'platform_admin': False
'platform_admin': False,
'auth_type': 'sms_auth'
}
user = User(user_data)
return user
@@ -1183,7 +1216,8 @@ def api_user_locked(fake_uuid):
'mobile_number': '07700 900762',
'state': 'active',
'failed_login_count': 5,
'permissions': {}
'permissions': {},
'auth_type': 'sms_auth'
}
user = User(user_data)
return user
@@ -1200,7 +1234,8 @@ def api_user_request_password_reset(fake_uuid):
'state': 'active',
'failed_login_count': 5,
'permissions': {},
'password_changed_at': None
'password_changed_at': None,
'auth_type': 'sms_auth'
}
user = User(user_data)
return user
@@ -1217,6 +1252,7 @@ def api_user_changed_password(fake_uuid):
'state': 'active',
'failed_login_count': 5,
'permissions': {},
'auth_type': 'sms_auth',
'password_changed_at': str(datetime.utcnow() + timedelta(minutes=1))
}
user = User(user_data)
@@ -1813,6 +1849,7 @@ def mock_get_users_by_service(mocker):
'password_changed_at': None,
'name': 'Test User',
'email_address': 'notify@digital.cabinet-office.gov.uk',
'auth_type': 'sms_auth',
'failed_login_count': 0}]
return [User(data[0])]