Merge branch 'master' into split-sms-and-retry

app/dao/permissions_dao.py

@@ -68,6 +68,8 @@ class PermissionDAO(DAOClass):
             query = self.get_query(filter_by_dict={'user': user.id, 'service': service.id})
             query.delete()
             for p in permissions:
+                p.user = user
+                p.service = service
                 self.create_instance(p, _commit=False)
         except Exception as e:
             if _commit:

app/dao/templates_dao.py

@@ -45,7 +45,7 @@ def dao_get_all_templates_for_service(service_id):
         service_id=service_id,
         archived=False
     ).order_by(
-        asc(Template.updated_at), asc(Template.created_at)
+        desc(Template.created_at)
     ).all()
 
 

app/permissions_utils.py

@@ -1,28 +0,0 @@
-from app.models import (
-    MANAGE_USERS,
-    MANAGE_TEMPLATES,
-    MANAGE_SETTINGS,
-    SEND_TEXTS,
-    SEND_EMAILS,
-    SEND_LETTERS,
-    MANAGE_API_KEYS,
-    VIEW_ACTIVITY
-)
-
-from app.schemas import permission_schema
-
-
-permissions_groups = {'send_messages': [SEND_TEXTS, SEND_EMAILS, SEND_LETTERS],
-                      'manage_service': [MANAGE_USERS, MANAGE_SETTINGS, MANAGE_TEMPLATES],
-                      'manage_api_keys': [MANAGE_API_KEYS],
-                      VIEW_ACTIVITY: [VIEW_ACTIVITY]}
-
-
-def get_permissions_by_group(permission_groups):
-    requested_permissions = []
-    for group in permission_groups:
-        permissions = permissions_groups[group]
-        for permission in permissions:
-            requested_permissions.append({'permission': permission})
-    permissions, errors = permission_schema.load(requested_permissions, many=True)
-    return permissions

app/service/rest.py

@@ -26,12 +26,13 @@ from app.dao.services_dao import (
 from app.dao.provider_statistics_dao import get_fragment_count
 
 from app.dao.users_dao import get_model_users
-from app.models import ApiKey
+
 from app.schemas import (
     service_schema,
     api_key_schema,
     user_schema,
-    from_to_date_schema
+    from_to_date_schema,
+    permission_schema
 )
 
 from app.errors import register_errors
@@ -150,10 +151,9 @@ def add_user_to_service(service_id, user_id):
         return jsonify(result='error',
                        message='User id: {} already part of service id: {}'.format(user_id, service_id)), 400
 
-    permissions_json = request.get_json().get('permissions', [])
-    permissions = _process_permissions(user, service, permissions_json)
-    dao_add_user_to_service(service, user, permissions)
+    permissions, errors = permission_schema.load(request.get_json(), many=True)
 
+    dao_add_user_to_service(service, user, permissions)
     data, errors = service_schema.dump(service)
     return jsonify(data=data), 201
 

app/user/rest.py

@@ -1,8 +1,8 @@
 import json
+import uuid
 from datetime import datetime
 from flask import (jsonify, request, abort, Blueprint, current_app)
-from app import encryption
-
+from app import encryption, DATETIME_FORMAT
 from app.dao.users_dao import (
     get_model_users,
     save_model_user,
@@ -11,12 +11,12 @@ from app.dao.users_dao import (
     use_user_code,
     increment_failed_login_count,
     reset_failed_login_count,
-    get_user_by_email
+    get_user_by_email,
+    create_secret_code
 )
-
 from app.dao.permissions_dao import permission_dao
 from app.dao.services_dao import dao_fetch_service_by_id
-
+from app.dao.templates_dao import dao_get_template_by_id
 from app.schemas import (
     email_data_request_schema,
     user_schema,
@@ -26,7 +26,7 @@ from app.schemas import (
 )
 
 from app.celery.tasks import (
-    send_sms_code,
+    send_sms,
     email_reset_password,
     email_registration_verification
 )
@@ -123,14 +123,26 @@ def send_user_sms_code(user_id):
     if errors:
         return jsonify(result="error", message=errors), 400
 
-    from app.dao.users_dao import create_secret_code
     secret_code = create_secret_code()
     create_user_code(user_to_send_to, secret_code, 'sms')
 
     mobile = user_to_send_to.mobile_number if verify_code.get('to', None) is None else verify_code.get('to')
-    verification_message = {'to': mobile, 'secret_code': secret_code}
+    sms_code_template_id = current_app.config['SMS_CODE_TEMPLATE_ID']
+    sms_code_template = dao_get_template_by_id(sms_code_template_id)
+    verification_message = encryption.encrypt({
+        'template': sms_code_template_id,
+        'template_version': sms_code_template.version,
+        'to': mobile,
+        'personalisation': {
+            'verify_code': secret_code
+        }
 
-    send_sms_code.apply_async([encryption.encrypt(verification_message)], queue='sms-code')
+    })
+    send_sms.apply_async([current_app.config['NOTIFY_SERVICE_ID'],
+                          str(uuid.uuid4()),
+                          verification_message,
+                          datetime.utcnow().strftime(DATETIME_FORMAT)
+                          ], queue='sms-code')
 
     return jsonify({}), 204
 
@@ -142,7 +154,6 @@ def send_user_email_verification(user_id):
     if errors:
         return jsonify(result="error", message=errors), 400
 
-    from app.dao.users_dao import create_secret_code
     secret_code = create_secret_code()
     create_user_code(user_to_send_to, secret_code, 'email')