Hi {{name}} ,
Congrats! Your {{app}} account has been created successfully.
Click on the button below to activate your account.
Best regards,
The {{app}} team
"
+ subs = {
+ '{{name}}': username,
+ '{{app}}': app_info['APP_NAME'],
+ '{{link}}': '{}activate/{}>'.format(get_config(key='API_LINK'), objectId)
+ }
+
+ return send_email(
+ email_to=email_to,
+ email_from=None,
+ subject=subject,
+ subs=subs,
+ content=content)
+
+
+def send_reset_password_email(email, password, username=None):
+ if username is None:
+ username = '{}<{}>'.format(email.split("@", 1)[0], email)
+
+ email_to = '{}<{}>'.format(username, email)
+ subject = 'Reset for password for {}'.format(get_config(key='APP_NAME'))
+ content = " Hi {{name}},
We have received a request to set a new password for your {{app}} account.
Your new password is shown in the bow below.
Please login to {{app}} and change your password
Best regards,
The {{app}} team
"
+ subs = {
+ '{{name}}': username,
+ '{{app}}': get_config(key='APP_NAME'),
+ '{{link}}': get_config(key='APP_LINK'),
+ '{{password}}': password
+ }
+ return send_email(
+ email_to=email_to,
+ email_from=None,
+ subject=subject,
+ subs=subs,
+ content=content)
diff --git a/src/models/sms_model.py b/src/models/sms_model.py
new file mode 100644
index 0000000..50a929b
--- /dev/null
+++ b/src/models/sms_model.py
@@ -0,0 +1,30 @@
+# @name <%= app_name %>
+# @description
+# Utility functions for sending emails
+
+from src.utils import get_config
+import twilio
+import twilio.rest
+
+def init():
+ twillio_info = get_config(key='TWILLIO_INFO')
+
+ client = twilio.rest.TwilioRestClient(
+ twillio_info['TWILLIO_ACCOUNT'],
+ twillio_info['TWILLIO_AUTH_TOKEN']
+ )
+ return client
+
+def send_sms(to_number, body, media_url=None):
+ try:
+ twillio_info = get_config(key='TWILLIO_INFO')
+ client = init()
+ message = client.messages.create(
+ to=to_number,
+ from_=twillio_info['TWILLIO_NUMBER'],
+ body=body,
+ media_url=media_url
+ )
+ return message.error_code
+ except twilio.TwilioRestException as e:
+ return e
\ No newline at end of file
diff --git a/src/models/user_model.py b/src/models/user_model.py
index 8214c37..dca9856 100644
--- a/src/models/user_model.py
+++ b/src/models/user_model.py
@@ -1,27 +1,34 @@
+# @name <%= app_name %>
+# @description
+# Models for UserControler.
+
import json
from src.models.authentication_model import \
generate_auth_token
from src.models import BaseModel
-from src.utils import \
+from src.utils import random_string
+from src.models.email_model import\
send_activation_email,\
- random_string, \
send_reset_password_email
+
class UserModel(BaseModel):
_parse_class_name = '_User'
+
+
def user_update(self, payload, object_id):
- # Params for checking user's credentials and payload for updating
+ # params for checking user's credentials and payload for updating
params = payload.copy()
- remove = ('username','password','old_password','re_old_password')
- for object in remove:
- payload.pop(object, None)
+ remove = ('username', 'password', 'old_password', 're_old_password')
+ for key in remove:
+ payload.pop(key, None)
if 'old_password' in params:
payload['password'] = params['password']
params['password'] = params['old_password']
# Login to check user's credentials first
- res = self.login(params = params)
+ res = self.login(params=params)
if 'error' in res:
return res
@@ -33,31 +40,36 @@ def user_update(self, payload, object_id):
master_key=True)
return res
+
def user_login(self, params):
- res = self.login(params = params)
+ res = self.login(params=params)
# Generate user's token
if 'error' not in res:
- res['token'] = generate_auth_token(res);
+ res['token'] = generate_auth_token(res)
return res
+
def user_signup(self, payload):
- res = self.signup(payload = payload)
+ res = self.signup(payload=payload)
# Generate user's token
if 'error' not in res:
res['token'] = generate_auth_token(res);
- status, msg = send_activation_email(email=payload['email'], objectId=res['objectId'])
+ status, msg = send_activation_email(
+ email=payload['email'],
+ objectId=res['objectId'])
if status is not 200:
return {'code': status, 'error': msg}
return res
+
def user_reset_password(self, where):
# Get user's infomation for sending email
where.pop('objectId', 0)
params = {
- 'where':json.dumps(where),
- 'keys':'name,email,username'
+ 'where': json.dumps(where),
+ 'keys': 'name,email,username'
}
user = self.get(
@@ -66,10 +78,15 @@ def user_reset_password(self, where):
if 'error' in user:
return user
+ elif len(user['results']) != 1:
+ return {
+ 'error': 404,
+ 'message': 'Invalid email'
+ }
# Reset user's password
payload = {
- 'objectId':user['results'][0]['objectId'],
+ 'objectId': user['results'][0]['objectId'],
'password': random_string(15)
}
diff --git a/src/utils/__init__.py b/src/utils/__init__.py
index b0e400d..9b18522 100644
--- a/src/utils/__init__.py
+++ b/src/utils/__init__.py
@@ -1,5 +1,8 @@
+# @name <%= app_name %>
+# @description
+# Utility functions for reading config files
+
import json
-import sendgrid
import os
import random
import string
@@ -27,76 +30,5 @@ def get_config(
return CONFIG
-
-def sendgrid_init(email_to, subject, subs, email_from):
- sg = sendgrid.SendGridClient(get_config(key="SENDGRID_API_KEY"))
- message = sendgrid.Mail()
- message.add_to(email_to)
- message.set_subject(subject)
- if email_from is None:
- email_from = '{}<{}>'.format(get_config(key='EMAIL_FROM_NAME'),
- get_config(key='EMAIL_FROM'))
- message.set_from(email_from)
- for key in subs:
- message.add_substitution(key, subs[key])
-
- return sg, message
-
-def send_email_template(email_to, subject, template_id, subs, email_from):
- sg, message = sendgrid_init(email_to, subject, subs, email_from)
- message.set_html(' ')
- message.add_filter('templates', 'enable', '1')
- message.add_filter('templates', 'template_id', template_id)
-
- return sg.send(message)
-
-def send_email(email_to, subject, content, subs, email_from=None):
- if get_config(key="SENDGRID") == 0:
- return 200, "Not send"
-
- sg, message = sendgrid_init(email_to,subject, subs, email_from)
- message.set_html(content)
-
- return sg.send(message)
-
-def send_activation_email(email, objectId, username=None):
- if username is None:
- username = '{}<{}>'.format(email.split("@",1)[0], email)
-
- email_to = '{}<{}>'.format(username, email)
- subject = 'Activation'
- content = " Hi {{name}} ,
Congrats! Your {{app}} account has been created successfully.
Click on the button below to activate your account.
Best regards,
The {{app}} team
"
- subs = {
- '{{name}}': username,
- '{{app}}': get_config(key='APP_NAME'),
- '{{link}}':'{}activate/{}>'.format(get_config(key='API_LINK'), objectId)
- }
- return send_email(
- email_to=email_to,
- email_from=None,
- subject=subject,
- subs=subs,
- content=content)
-
-def send_reset_password_email(email, password, username=None):
- if username is None:
- username = '{}<{}>'.format(email.split("@",1)[0], email)
-
- email_to = '{}<{}>'.format(username, email)
- subject = 'Reset for password for {}'.format(get_config(key='APP_NAME'))
- content = " Hi {{name}},
We have received a request to set a new password for your {{app}} account.
Your new password is shown in the bow below.
Please login to {{app}} and change your password
Best regards,
The {{app}} team
"
- subs = {
- '{{name}}': username,
- '{{app}}': get_config(key='APP_NAME'),
- '{{link}}': get_config(key='APP_LINK'),
- '{{password}}': password
- }
- return send_email(
- email_to=email_to,
- email_from=None,
- subject=subject,
- subs=subs,
- content=content)
-
def random_string(length = 20, chars=string.ascii_uppercase + string.digits):
- return ''.join(random.choice(chars) for _ in range(length))
\ No newline at end of file
+ return ''.join(random.choice(chars) for _ in range(length))
\ No newline at end of file
diff --git a/test/__init__.py b/test/__init__.py
index 4c66361..096e8d2 100644
--- a/test/__init__.py
+++ b/test/__init__.py
@@ -1,3 +1,7 @@
+# @name <%= app_name %>
+# @description
+# Utility functions for setting up testing enviroment
+
import json
import string
import random
diff --git a/test/live/integration/__init__.py b/test/live/integration/__init__.py
index e69de29..da6012d 100644
--- a/test/live/integration/__init__.py
+++ b/test/live/integration/__init__.py
@@ -0,0 +1 @@
+# This file is left blank intentionally. Do not remove it
\ No newline at end of file
diff --git a/test/live/integration/test_user.py b/test/live/integration/test_user.py
index 547e745..e325fde 100644
--- a/test/live/integration/test_user.py
+++ b/test/live/integration/test_user.py
@@ -1,4 +1,7 @@
-import json
+# @name <%= app_name %>
+# @description
+# Tests for UserController
+
from test import BaseTestCase
from src.utils import\
get_config
@@ -134,8 +137,8 @@ def test_reset_password(self):
'password': get_config(key="TEST_PASSWORD"),
'email': "%s@email.com" % string
}
- user = self.post_data(url='signup', data=payload)
+ user = self.post_data(url='signup', data=payload)
res = self.post_data(url='resetpassword', data=payload)
assert 'updatedAt' in res