From e30eed4fbc053e4f79918c040db15c91282e9f9e Mon Sep 17 00:00:00 2001 From: Aditya Bharadwaj Date: Sat, 3 Mar 2018 20:36:51 -0500 Subject: [PATCH 01/31] Create PULL_REQUEST_TEMPLATE.md Adding a pull request template to standardize the description of the proposed changes from contributors. Project contributors will automatically see the template's contents in the pull request body. More details can be found [here](https://help.github.com/articles/creating-a-pull-request-template-for-your-repository/). --- PULL_REQUEST_TEMPLATE.md | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 PULL_REQUEST_TEMPLATE.md diff --git a/PULL_REQUEST_TEMPLATE.md b/PULL_REQUEST_TEMPLATE.md new file mode 100644 index 00000000..9de17e17 --- /dev/null +++ b/PULL_REQUEST_TEMPLATE.md @@ -0,0 +1,20 @@ +## Purpose +_Describe the problem or feature in addition to a link to the issues._ + +Example: +Fixes # . + +## Approach +_How does this change address the problem?_ + +#### Open Questions and Pre-Merge TODOs +- [ ] Use github checklists. When solved, check the box and explain the answer. + +## Learning +_Describe the research stage_ + +_Links to blog posts, patterns, libraries or addons used to solve this problem_ + +#### Blog Posts +- [How to Pull Request](https://github.com/flexyford/pull-request) Github Repo with Learning focused Pull Request Template. + From 52ddf6e08de3e99d35b67f532d22b4d886967b47 Mon Sep 17 00:00:00 2001 From: jing Date: Tue, 14 Aug 2018 08:09:06 -0400 Subject: [PATCH 02/31] Changes for controllers.py --- applications/users/controllers.py | 51 ++++++++++++++++++++++++++----- 1 file changed, 44 insertions(+), 7 deletions(-) diff --git a/applications/users/controllers.py b/applications/users/controllers.py index be2fe623..95b9c8da 100644 --- a/applications/users/controllers.py +++ b/applications/users/controllers.py @@ -8,6 +8,13 @@ from graphspace.exceptions import BadRequest, ErrorCodes from graphspace.utils import generate_uid +# The mailmanclient library provides official Python bindings for the GNU Mailman 3 REST API. +from mailmanclient import Client + +# In order to talk to Mailman, the engine's REST server must be running. +# Begin by instantiating a client object to access the root of the REST hierarchy, providing it the base URL, user name and password (for Basic Auth) +client = Client('http://localhost:8001/3.1', 'restadmin', 'restpass') + # import the logging library import logging @@ -30,13 +37,16 @@ def authenticate_user(request, username=None, password=None): 'id': user.id, 'user_id': user.email, 'password': user.password, - 'admin': user.is_admin + 'admin': user.is_admin, + 'user_account_status':user.user_account_status, + 'email_list_announcement': user.email_list_announcement, + 'email_list_user': user.email_list_user } else: return None -def update_user(request, user_id, email=None, password=None, is_admin=None): +def update_user(request, user_id, email=None, password=None, is_admin=None, user_account_status=None, email_list_announcement=None, email_list_user=None): user = {} if email is not None: user['email'] = email @@ -44,7 +54,18 @@ def update_user(request, user_id, email=None, password=None, is_admin=None): user['password'] = bcrypt.hashpw(password, bcrypt.gensalt()) if is_admin is not None: user['is_admin'] = is_admin - + if user_account_status is not None: + user['user_account_status'] = user_account_status + if email_list_announcement is not None: + user['email_list_announcement'] = email_list_announcement + if email_list_announcement == '1': + client_list_announcement = client.get_list(settings.ANNOUNCEMENTS_LIST) + client_list_announcement.subscribe(email, pre_verified=True, pre_confirmed=True) + if email_list_user is not None: + user['email_list_user'] = email_list_user + if email_list_user == '1': + client_list_user = client.get_list(settings.USERS_LIST) + client_list_user.subscribe(email, pre_verified=True, pre_confirmed=True) return db.update_user(request.db_session, id=user_id, updated_user=user) @@ -126,14 +147,16 @@ def search_users(request, email=None, limit=20, offset=0, order='desc', sort='na return total, users -def register(request, username=None, password=None): +def register(request, username=None, password=None, user_account_status=None, email_confirmation_code=None, email_list_announcement=None, email_list_user=None): if db.get_user(request.db_session, username): raise BadRequest(request, error_code=ErrorCodes.Validation.UserAlreadyExists, args=username) - return add_user(request, email=username, password=password) + return add_user(request, email=username, password=password, user_account_status=user_account_status, + email_confirmation_code=email_confirmation_code, email_list_announcement=email_list_announcement, + email_list_user=email_list_user) -def add_user(request, email=None, password="graphspace_public_user", is_admin=0): +def add_user(request, email=None, password="graphspace_public_user", is_admin=0, user_account_status=None, email_confirmation_code=None, email_list_announcement=None, email_list_user=None): """ Add a new user. If email and password is not passed, it will create a user with default values. By default a user has no admin access. @@ -146,7 +169,9 @@ def add_user(request, email=None, password="graphspace_public_user", is_admin=0) """ email = "public_user_%s@graphspace.com" % generate_uid(size=10) if email is None else email - return db.add_user(request.db_session, email=email, password=bcrypt.hashpw(password, bcrypt.gensalt()), is_admin=is_admin) + return db.add_user(request.db_session, email=email, password=bcrypt.hashpw(password, bcrypt.gensalt()), is_admin=is_admin, + user_account_status=user_account_status, email_confirmation_code=email_confirmation_code, email_list_announcement=email_list_announcement, + email_list_user=email_list_user) def is_member_of_group(request, username, group_id): @@ -290,6 +315,9 @@ def delete_group_graph(request, group_id, graph_id): def get_password_reset_by_code(request, code): return db.get_password_reset_by_code(request.db_session, code) +def get_email_confirmation_code(request, code): + return db.get_email_confirmation_code(request.db_session, code) + def delete_password_reset_code(request, id): return db.delete_password_reset(request.db_session, id) @@ -312,3 +340,12 @@ def send_password_reset_email(request, password_reset_code): email_from = "GraphSpace Admin" return send_mail(mail_title, message, email_from, [password_reset_code.email], fail_silently=False) + +def send_confirmation_email(request, email, token, email_list_announcement, email_list_user): + # Construct email message + mail_title = 'Activate your account for GraphSpace!' + message = 'Please confirm your email address to complete the registration ' + settings.URL_PATH + 'activate_account/?activation_code=' + token + email_from = "GraphSpace Admin" + + return send_mail(mail_title, message, email_from, [email], fail_silently=False) + From a0bf6a76591b3d2310bc8fc26e38fefb304d46ed Mon Sep 17 00:00:00 2001 From: jing Date: Tue, 14 Aug 2018 08:25:34 -0400 Subject: [PATCH 03/31] Changes in model for email lists features --- applications/users/models.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/applications/users/models.py b/applications/users/models.py index 053fc6f1..9f3fff00 100644 --- a/applications/users/models.py +++ b/applications/users/models.py @@ -23,6 +23,10 @@ class User(IDMixin, TimeStampMixin, Base): email = Column(String, nullable=False, unique=True, index=True) password = Column(String, nullable=False) is_admin = Column(Integer, nullable=False, default=0) + user_account_status = Column(Integer, nullable=False, default=0) + email_confirmation_code = Column(String, nullable=False, default=0) + email_list_announcement = Column(String, nullable=False, default=0) + email_list_user = Column(String, nullable=False, default=0) password_reset_codes = relationship("PasswordResetCode", back_populates="user", cascade="all, delete-orphan") owned_groups = relationship("Group", back_populates="owner", cascade="all, delete-orphan") From 462358e7ac6caff462818a4428bb9c1ba8b97860 Mon Sep 17 00:00:00 2001 From: jing Date: Tue, 14 Aug 2018 08:32:47 -0400 Subject: [PATCH 04/31] Update activate account page --- applications/home/views.py | 64 +++++++++++++++++++++++++++++++------- 1 file changed, 52 insertions(+), 12 deletions(-) diff --git a/applications/home/views.py b/applications/home/views.py index d9ddf1a0..ac1a3672 100644 --- a/applications/home/views.py +++ b/applications/home/views.py @@ -6,7 +6,8 @@ from django.template import RequestContext from graphspace.utils import * from graphspace.exceptions import * - +from graphspace.utils import generate_uid +from django.conf import settings def home_page(request): """ @@ -26,7 +27,7 @@ def home_page(request): Raises ------ MethodNotAllowed: If a user tries to send requests other than GET i.e., POST, PUT or UPDATE. - +: Notes ------ @@ -225,12 +226,14 @@ def login(request): request_body = json.loads(request.body) user = users.authenticate_user(request, username=request_body['user_id'], password=request_body['pw']) - if user is not None: + if user is not None and user['user_account_status'] == 1: request.session['uid'] = user['user_id'] request.session['admin'] = user['admin'] return HttpResponse( - json.dumps(json_success_response(200, message='%s, Welcome to GraphSpace!' % user['user_id'])), + json.dumps(json_success_response(200, message='%s, welcome to GraphSpace!' % user['user_id'])), content_type="application/json") + elif user is not None and user['user_account_status'] is not 1: + raise ValidationError(request, ErrorCodes.Validation.UserUnVerified) else: raise ValidationError(request, ErrorCodes.Validation.UserPasswordMisMatch) else: @@ -248,24 +251,61 @@ def register(request): if 'POST' == request.method: request_body = json.loads(request.body) + #test_form = request_body if 'user_id' in request_body and 'password' in request_body: # RegisterForm is bound to POST data register_form = RegisterForm(request_body) + if register_form.is_valid(): + token = generate_uid() + email_list_announcement = request_body['email_list_announcement'] + email_list_user = request_body['email_list_user'] + #test_form = email_list_user user = users.register(request, username=register_form.cleaned_data['user_id'], - password=register_form.cleaned_data['password']) - if user is not None: - request.session['uid'] = user.email - request.session['admin'] = user.is_admin - - return HttpResponse(json.dumps(json_success_response(200, message='Registered!')), - content_type="application/json") + password=register_form.cleaned_data['password'], user_account_status=0, email_confirmation_code=token, + email_list_announcement=email_list_announcement, email_list_user=email_list_user) + + users.send_confirmation_email(request, request_body['user_id'], token, email_list_announcement, email_list_user) + #return HttpResponse('register click link', content_type="application/json") #pop green undefined + return HttpResponse(json.dumps(json_success_response(200, message='A verification link has been sent to your email account. '+ + 'Please click on the link to verify your email and continue '+ + 'the registration process.')), + content_type="application/json") else: raise BadRequest(request) else: raise MethodNotAllowed(request) # Handle other type of request methods like GET, PUT, UPDATE. +def activate_account_page(request): + """ + Activate a user account + + :param request: HTTP GET Request containing: + + {"activation_code": } + """ + + context = RequestContext(request) # Checkout base.py file to see what context processors are being applied here. + + if 'GET' == request.method: + user = users.get_email_confirmation_code(request, request.GET.get('activation_code', None)) + users.update_user(request, user.id, user_account_status=1, email=user.email, email_list_announcement=user.email_list_announcement, email_list_user=user.email_list_user) + if user is not None: + request.session['uid'] = user.email + request.session['admin'] = user.is_admin + request.session['email_list_announcement'] = user.email_list_announcement + request.session['email_list_user'] = user.email_list_user + announcement_list_message = 'announcements email list for GraphSpace ' + '(' + settings.ANNOUNCEMENTS_LIST + ')' if user.email_list_announcement == '1' else '' + user_list_message = 'users email list for GraphSpace ' + '(' + settings.USERS_LIST + ')' if user.email_list_user == '1' else '' + comma = ', ' if user.email_list_announcement == '1' and user.email_list_user == '1' else '' + context["success_message"] = 'Thank you! Your account has been activated successfully. You will also receive email confirmation(s) for the following email list(s): ' + announcement_list_message + comma + user_list_message +'.' + + return render(request, 'home/index.html', context) + else: + raise MethodNotAllowed(request) # Handle other type of request methods like GET, PUT, UPDATE. + + def logout(request): """ Log the user out and display logout page. @@ -290,4 +330,4 @@ def images(request, query): :param request: HTTP GET Request """ - return redirect('/static' + request.path) \ No newline at end of file + return redirect('/static' + request.path) From ff7dafec98b8a800839e3e5e8597151cb831ec85 Mon Sep 17 00:00:00 2001 From: jing Date: Tue, 14 Aug 2018 08:38:54 -0400 Subject: [PATCH 05/31] Update templates --- templates/home/index.html | 26 +++++++++++++++++++++++--- templates/partials/signup_modal.html | 13 +++++++++++-- 2 files changed, 34 insertions(+), 5 deletions(-) diff --git a/templates/home/index.html b/templates/home/index.html index 31f07b67..75b9dc3c 100644 --- a/templates/home/index.html +++ b/templates/home/index.html @@ -1,6 +1,26 @@ {% extends 'base.html' %} {% load staticfiles %} {% block content %} +{% if success_message != None %} + +{% endif %} +
@@ -10,6 +30,7 @@
\ No newline at end of file +
From 6198a53b79dbd9a75c9351950173e97ddfcad411 Mon Sep 17 00:00:00 2001 From: jing Date: Tue, 14 Aug 2018 08:48:25 -0400 Subject: [PATCH 06/31] Update log in js file --- static/js/main.js | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/static/js/main.js b/static/js/main.js index aefeaf82..a1fb939e 100644 --- a/static/js/main.js +++ b/static/js/main.js @@ -61,6 +61,19 @@ var header = { var user_id = $("#user_id").val(); var password = $("#password").val(); var verify_password = $("#verify_password").val(); + var email_list_announcement = '0'; + var email_list_user = '0'; + var announcement_checked = document.getElementById("email_list_announcement"); + var user_checked = document.getElementById("email_list_user"); + + + if (announcement_checked.checked == true) { + email_list_announcement = '1'; + } + + if (user_checked.checked == true) { + email_list_user = '1'; + } if (!$("#user_id") || user_id.length == 0) { $.notify({ @@ -102,10 +115,17 @@ var header = { //POST Request to log in user jsonRequest('POST', "/register/", { "user_id": user_id, - "password": password + "password": password, + "email_list_announcement": email_list_announcement, + "email_list_user": email_list_user }, successCallback = function (response) { - window.location.reload(); + $('#signupModal').modal('hide'); + $.notify({ + message: response.Message + }, { + type: 'success' + }); }, errorCallback = function (response) { $.notify({ @@ -115,4 +135,4 @@ var header = { }); }); } -}; \ No newline at end of file +}; From 052c249f9dec023dfcd0dc48ec1e0ee5bca290ef Mon Sep 17 00:00:00 2001 From: jing Date: Tue, 14 Aug 2018 08:50:13 -0400 Subject: [PATCH 07/31] Add mailmanclient to requirements --- requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/requirements.txt b/requirements.txt index b75a2132..24be9cff 100644 --- a/requirements.txt +++ b/requirements.txt @@ -28,3 +28,4 @@ elasticsearch-dsl>=5.0.0,<6.0.0 sphinx-rtd-theme sphinx recommonmark +mailmanclient From 670cd4452c4a05196f3f4ce40ebf053b5608afc4 Mon Sep 17 00:00:00 2001 From: jing Date: Tue, 14 Aug 2018 08:52:02 -0400 Subject: [PATCH 08/31] Add email lists docs --- docs/Email_Lists_for_GraphSpace.md | 39 ++++++++++++++++++++++++++++++ docs/index.rst | 1 + 2 files changed, 40 insertions(+) create mode 100644 docs/Email_Lists_for_GraphSpace.md diff --git a/docs/Email_Lists_for_GraphSpace.md b/docs/Email_Lists_for_GraphSpace.md new file mode 100644 index 00000000..7bbbf58e --- /dev/null +++ b/docs/Email_Lists_for_GraphSpace.md @@ -0,0 +1,39 @@ + +# Email Lists for GraphSpace + +[GraphSpace](http://graphspace.org) built announcements and users email lists to post important announcements and allow users to communicate with each other. + +## Users Email List for GraphSpace +The users list is meant for all users of GraphSpace to communicate with each other and with the GraphSpace administrators. Please use this list to pose questions about GraphSpace, discuss any problems you may have, give us feedback, request features etc. + +### Subscribe +To subscribe you can choose "Please add me to the users email list for GraphSpace" when create account, + +![Users Email List for GraphSpace](_static/images/email-list/gs-Screenshot-register-users-email-list.png.png) + +or send an email with 'subscribe' in the subject to [graphspace-users-join@graphspace.org](mailto:graphspace-users-join@graphspace.org). + +### Unsubscribe +To unsubscribe from users list, send an email with 'unsubscribe' in the subject to [graphspace-users-leave@graphspace.org](mailto:graphspace-users-leave@graphspace.org). + +### Post +To post to users list, send your email to [graphspace-users@graphspace.org](mailto:graphspace-users@graphspace.org). + +### Archives +You can access the [archives](http://email.graphspace.org/hyperkitty/list/graphspace-users@graphspace.org/) of the users list. + +## Announcements Email List for GraphSpace +The GraphSpace administrators will use this list to post important announcements about GraphSpace. Note that you will not be able to post to this mailing list. If you have a question about GraphSpace, please join the graphspace-users mailing list and post there. + +### Subscribe +To subscribe you can choose "Please add me to the announcements email list for GraphSpace" when create account, + +![Announcements Email List for GraphSpace](_static/images/email-list/gs-Screenshot-register-announcements-email-list.png) + +or send an email with 'subscribe' in the subject to [graphspace-announcements-join@graphspace.org](mailto:graphspace-announcements-join@graphspace.org). + +### Unsubscribe +To unsubscribe from announcements list, send an email with 'unsubscribe' in the subject to [graphspace-announcements-leave@graphspace.org](mailto:graphspace-announcements-leave@graphspace.org). + +### Archives +You can access the [archives](http://email.graphspace.org/hyperkitty/list/graphspace-announcements@graphspace.org/) of the announcements list. diff --git a/docs/index.rst b/docs/index.rst index 3d08fe4f..f661d7cb 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -23,5 +23,6 @@ GraphSpace 2.0 User Manual Sharing_Graphs Editing_Layouts Organizing_Graphs_Using_Tags + Email_Lists_for_GraphSpace Programmers_Guide Release_Notes From d1328668b697cf5eff0117678f253b5b4ddbbc4b Mon Sep 17 00:00:00 2001 From: jing Date: Tue, 14 Aug 2018 09:25:57 -0400 Subject: [PATCH 09/31] Add email lists settings --- graphspace/settings/local.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/graphspace/settings/local.py b/graphspace/settings/local.py index 9b2fa36d..93e20953 100644 --- a/graphspace/settings/local.py +++ b/graphspace/settings/local.py @@ -12,6 +12,10 @@ # URL through which to access graphspace URL_PATH = "http://localhost:8000/" +# Email lists of graphspace +ANNOUNCEMENTS_LIST = 'graphspace-announcements@graphspace.org' +USERS_LIST = 'graphspace-users@graphspace.org' + # If tracking is enabled for GraphSpace in Google Analytics GOOGLE_ANALYTICS_PROPERTY_ID = 'UA-00000000-0' @@ -39,10 +43,10 @@ DATABASES = { 'default': { 'ENGINE': 'django.db.backends.postgresql_psycopg2', - 'NAME': 'test_database', - 'USER': 'adb', - 'PASSWORD': '', + 'NAME': 'postgres', + 'USER': 'postgres', + 'PASSWORD': 'Cjing_1185426', 'HOST': 'localhost', 'PORT': '5432' } -} \ No newline at end of file +} From 4e179b52dc3695abffc089b0bd488df6f550e7ad Mon Sep 17 00:00:00 2001 From: JingVT <33851894+JingVT@users.noreply.github.com> Date: Tue, 14 Aug 2018 09:30:52 -0400 Subject: [PATCH 10/31] Update local.py --- graphspace/settings/local.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/graphspace/settings/local.py b/graphspace/settings/local.py index 93e20953..9f7bfff9 100644 --- a/graphspace/settings/local.py +++ b/graphspace/settings/local.py @@ -39,13 +39,12 @@ # http://stackoverflow.com/questions/4642011/test-sending-email-without-email-server EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend' - DATABASES = { 'default': { 'ENGINE': 'django.db.backends.postgresql_psycopg2', - 'NAME': 'postgres', - 'USER': 'postgres', - 'PASSWORD': 'Cjing_1185426', + 'NAME': 'test_database', + 'USER': 'adb', + 'PASSWORD': '', 'HOST': 'localhost', 'PORT': '5432' } From 9cc957282d450150700c141372ae1620275548fe Mon Sep 17 00:00:00 2001 From: JingVT <33851894+JingVT@users.noreply.github.com> Date: Tue, 14 Aug 2018 09:33:07 -0400 Subject: [PATCH 11/31] Update local.py --- graphspace/settings/local.py | 1 + 1 file changed, 1 insertion(+) diff --git a/graphspace/settings/local.py b/graphspace/settings/local.py index 9f7bfff9..0cd8e34f 100644 --- a/graphspace/settings/local.py +++ b/graphspace/settings/local.py @@ -39,6 +39,7 @@ # http://stackoverflow.com/questions/4642011/test-sending-email-without-email-server EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend' + DATABASES = { 'default': { 'ENGINE': 'django.db.backends.postgresql_psycopg2', From 9d7321c0e4e023fe09d6f04436eea84290cdcf22 Mon Sep 17 00:00:00 2001 From: JingVT <33851894+JingVT@users.noreply.github.com> Date: Tue, 14 Aug 2018 09:52:10 -0400 Subject: [PATCH 12/31] Update views.py --- applications/home/views.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/applications/home/views.py b/applications/home/views.py index ac1a3672..e343839b 100644 --- a/applications/home/views.py +++ b/applications/home/views.py @@ -27,7 +27,7 @@ def home_page(request): Raises ------ MethodNotAllowed: If a user tries to send requests other than GET i.e., POST, PUT or UPDATE. -: + Notes ------ @@ -251,7 +251,6 @@ def register(request): if 'POST' == request.method: request_body = json.loads(request.body) - #test_form = request_body if 'user_id' in request_body and 'password' in request_body: # RegisterForm is bound to POST data register_form = RegisterForm(request_body) @@ -260,13 +259,11 @@ def register(request): token = generate_uid() email_list_announcement = request_body['email_list_announcement'] email_list_user = request_body['email_list_user'] - #test_form = email_list_user user = users.register(request, username=register_form.cleaned_data['user_id'], password=register_form.cleaned_data['password'], user_account_status=0, email_confirmation_code=token, email_list_announcement=email_list_announcement, email_list_user=email_list_user) users.send_confirmation_email(request, request_body['user_id'], token, email_list_announcement, email_list_user) - #return HttpResponse('register click link', content_type="application/json") #pop green undefined return HttpResponse(json.dumps(json_success_response(200, message='A verification link has been sent to your email account. '+ 'Please click on the link to verify your email and continue '+ 'the registration process.')), From 499d9cf51166f7dc5b9157e380177dbd86c60d94 Mon Sep 17 00:00:00 2001 From: JingVT <33851894+JingVT@users.noreply.github.com> Date: Tue, 14 Aug 2018 09:53:37 -0400 Subject: [PATCH 13/31] Update templates --- templates/partials/signup_modal.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/partials/signup_modal.html b/templates/partials/signup_modal.html index a0434e87..6b3b4c24 100644 --- a/templates/partials/signup_modal.html +++ b/templates/partials/signup_modal.html @@ -7,7 +7,7 @@
- + {% csrf_token %}
{% for field in register_form %}
From 5328d0ff13219187c4d8ded0a79e61c0c5908955 Mon Sep 17 00:00:00 2001 From: JingVT <33851894+JingVT@users.noreply.github.com> Date: Tue, 14 Aug 2018 09:57:05 -0400 Subject: [PATCH 14/31] Update views.py --- applications/home/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/applications/home/views.py b/applications/home/views.py index e343839b..f72bc792 100644 --- a/applications/home/views.py +++ b/applications/home/views.py @@ -230,7 +230,7 @@ def login(request): request.session['uid'] = user['user_id'] request.session['admin'] = user['admin'] return HttpResponse( - json.dumps(json_success_response(200, message='%s, welcome to GraphSpace!' % user['user_id'])), + json.dumps(json_success_response(200, message='%s, Welcome to GraphSpace!' % user['user_id'])), content_type="application/json") elif user is not None and user['user_account_status'] is not 1: raise ValidationError(request, ErrorCodes.Validation.UserUnVerified) From 382ca363bef61bec4f6254a5b2f29f7598238b12 Mon Sep 17 00:00:00 2001 From: JingVT <33851894+JingVT@users.noreply.github.com> Date: Tue, 14 Aug 2018 10:32:22 -0400 Subject: [PATCH 15/31] Update PULL_REQUEST_TEMPLATE.md --- PULL_REQUEST_TEMPLATE.md | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/PULL_REQUEST_TEMPLATE.md b/PULL_REQUEST_TEMPLATE.md index 9de17e17..a693ad04 100644 --- a/PULL_REQUEST_TEMPLATE.md +++ b/PULL_REQUEST_TEMPLATE.md @@ -1,20 +1,20 @@ ## Purpose -_Describe the problem or feature in addition to a link to the issues._ - -Example: -Fixes # . +Built announcements and users email lists to post important announcements and allow users to communicate with each other. ## Approach -_How does this change address the problem?_ +Invoke GNU Mailman3 REST API. #### Open Questions and Pre-Merge TODOs -- [ ] Use github checklists. When solved, check the box and explain the answer. +- [ ] Merge [validates email address by sending a confirmation email to users](https://github.com/Murali-group/GraphSpace/pull/368) +- [ ] [Install and Configure Mailman3 Suite for GraphSpace](https://github.com/Murali-group/GraphSpace/wiki/Install-and-Configure-Mailman3-Suite-for-GraphSpace-(Ubuntu-16.04,-PostgreSQL,-Apache2,-Postfix)) +- [ ] Create the email lists of GraphSpace and add them to settings file +- [ ] Update the database. ## Learning -_Describe the research stage_ +[Mailman 3 suite documents](http://docs.mailman3.org/en/latest/) + +[Install and Configure Mailman3 Suite for GraphSpace](https://github.com/Murali-group/GraphSpace/wiki/Install-and-Configure-Mailman3-Suite-for-GraphSpace-(Ubuntu-16.04,-PostgreSQL,-Apache2,-Postfix)) -_Links to blog posts, patterns, libraries or addons used to solve this problem_ #### Blog Posts - [How to Pull Request](https://github.com/flexyford/pull-request) Github Repo with Learning focused Pull Request Template. - From 40aeb5bc7a142b6bb09ae1c5ef2f2f81a0d5200e Mon Sep 17 00:00:00 2001 From: JingVT <33851894+JingVT@users.noreply.github.com> Date: Tue, 14 Aug 2018 10:33:45 -0400 Subject: [PATCH 16/31] Update PULL_REQUEST_TEMPLATE.md --- PULL_REQUEST_TEMPLATE.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/PULL_REQUEST_TEMPLATE.md b/PULL_REQUEST_TEMPLATE.md index a693ad04..542978af 100644 --- a/PULL_REQUEST_TEMPLATE.md +++ b/PULL_REQUEST_TEMPLATE.md @@ -11,9 +11,9 @@ Invoke GNU Mailman3 REST API. - [ ] Update the database. ## Learning -[Mailman 3 suite documents](http://docs.mailman3.org/en/latest/) +- [Mailman 3 suite documents](http://docs.mailman3.org/en/latest/) -[Install and Configure Mailman3 Suite for GraphSpace](https://github.com/Murali-group/GraphSpace/wiki/Install-and-Configure-Mailman3-Suite-for-GraphSpace-(Ubuntu-16.04,-PostgreSQL,-Apache2,-Postfix)) +- [Install and Configure Mailman3 Suite for GraphSpace](https://github.com/Murali-group/GraphSpace/wiki/Install-and-Configure-Mailman3-Suite-for-GraphSpace-(Ubuntu-16.04,-PostgreSQL,-Apache2,-Postfix)) #### Blog Posts From d3201f4f9797eb53ed2379bb7198b0f444d11d19 Mon Sep 17 00:00:00 2001 From: jing Date: Tue, 14 Aug 2018 10:59:12 -0400 Subject: [PATCH 17/31] Add email lists docs images --- ...enshot-register-announcements-email-list.png | Bin 0 -> 25516 bytes .../gs-Screenshot-register-users-email-list.png | Bin 0 -> 22854 bytes 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 docs/_static/images/email-list/gs-Screenshot-register-announcements-email-list.png create mode 100644 docs/_static/images/email-list/gs-Screenshot-register-users-email-list.png diff --git a/docs/_static/images/email-list/gs-Screenshot-register-announcements-email-list.png b/docs/_static/images/email-list/gs-Screenshot-register-announcements-email-list.png new file mode 100644 index 0000000000000000000000000000000000000000..bd8d1ce851d44cc8aefc1b471e15dc09573e65f7 GIT binary patch literal 25516 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 literal 0 HcmV?d00001 From d921ae7c39d389f461041a4acf9a63a4524e2ee6 Mon Sep 17 00:00:00 2001 From: JingVT <33851894+JingVT@users.noreply.github.com> Date: Mon, 26 Nov 2018 20:52:21 -0500 Subject: [PATCH 18/31] Change data type Change data type of email_list_announcement/user to integer --- applications/users/models.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/applications/users/models.py b/applications/users/models.py index 9f3fff00..62b5bb18 100644 --- a/applications/users/models.py +++ b/applications/users/models.py @@ -17,6 +17,10 @@ class User(IDMixin, TimeStampMixin, Base): :param email: Email ID of the user. :param password: Password of the user. :param admin: 1 if the user has admin access else 0. + :param user_account_status: 1 if the user has created account successfully else 0. + :param email_confirmation_code: confirmation code sent to email when the user creates account + :param email_list_announcement: 1 if the user has chosen to join GraphSpace announcement email list else 0 + :param email_list_user: 1 if the user has chosen to join GraphSpace users email list else 0 """ __tablename__ = "user" @@ -25,8 +29,8 @@ class User(IDMixin, TimeStampMixin, Base): is_admin = Column(Integer, nullable=False, default=0) user_account_status = Column(Integer, nullable=False, default=0) email_confirmation_code = Column(String, nullable=False, default=0) - email_list_announcement = Column(String, nullable=False, default=0) - email_list_user = Column(String, nullable=False, default=0) + email_list_announcement = Column(Integer, nullable=False, default=0) + email_list_user = Column(Integer, nullable=False, default=0) password_reset_codes = relationship("PasswordResetCode", back_populates="user", cascade="all, delete-orphan") owned_groups = relationship("Group", back_populates="owner", cascade="all, delete-orphan") From 5196423dc8f11b664778233d011112b5acd85b97 Mon Sep 17 00:00:00 2001 From: JingVT <33851894+JingVT@users.noreply.github.com> Date: Mon, 26 Nov 2018 20:55:15 -0500 Subject: [PATCH 19/31] Change data type Change data type of email_list_announcemnt/user to integer --- static/js/main.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/static/js/main.js b/static/js/main.js index a1fb939e..d7e3efab 100644 --- a/static/js/main.js +++ b/static/js/main.js @@ -61,18 +61,18 @@ var header = { var user_id = $("#user_id").val(); var password = $("#password").val(); var verify_password = $("#verify_password").val(); - var email_list_announcement = '0'; - var email_list_user = '0'; + var email_list_announcement = 0; + var email_list_user = 0; var announcement_checked = document.getElementById("email_list_announcement"); var user_checked = document.getElementById("email_list_user"); if (announcement_checked.checked == true) { - email_list_announcement = '1'; + email_list_announcement = 1; } if (user_checked.checked == true) { - email_list_user = '1'; + email_list_user = 1; } if (!$("#user_id") || user_id.length == 0) { From 12e361a8c1d284cc0d7669aa37c407ee735aaea5 Mon Sep 17 00:00:00 2001 From: JingVT <33851894+JingVT@users.noreply.github.com> Date: Mon, 26 Nov 2018 21:01:15 -0500 Subject: [PATCH 20/31] change '1' to 1 --- applications/home/views.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/applications/home/views.py b/applications/home/views.py index f72bc792..02a378a9 100644 --- a/applications/home/views.py +++ b/applications/home/views.py @@ -293,9 +293,9 @@ def activate_account_page(request): request.session['admin'] = user.is_admin request.session['email_list_announcement'] = user.email_list_announcement request.session['email_list_user'] = user.email_list_user - announcement_list_message = 'announcements email list for GraphSpace ' + '(' + settings.ANNOUNCEMENTS_LIST + ')' if user.email_list_announcement == '1' else '' - user_list_message = 'users email list for GraphSpace ' + '(' + settings.USERS_LIST + ')' if user.email_list_user == '1' else '' - comma = ', ' if user.email_list_announcement == '1' and user.email_list_user == '1' else '' + announcement_list_message = 'announcements email list for GraphSpace ' + '(' + settings.ANNOUNCEMENTS_LIST + ')' if user.email_list_announcement == 1 else '' + user_list_message = 'users email list for GraphSpace ' + '(' + settings.USERS_LIST + ')' if user.email_list_user == 1 else '' + comma = ', ' if user.email_list_announcement == 1 and user.email_list_user == 1 else '' context["success_message"] = 'Thank you! Your account has been activated successfully. You will also receive email confirmation(s) for the following email list(s): ' + announcement_list_message + comma + user_list_message +'.' return render(request, 'home/index.html', context) From f5a6d6df4203aec858ac79df05ee171a479131bf Mon Sep 17 00:00:00 2001 From: JingVT <33851894+JingVT@users.noreply.github.com> Date: Mon, 26 Nov 2018 21:05:23 -0500 Subject: [PATCH 21/31] Change '1' to 1 --- applications/users/controllers.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/applications/users/controllers.py b/applications/users/controllers.py index 95b9c8da..926f6ba1 100644 --- a/applications/users/controllers.py +++ b/applications/users/controllers.py @@ -58,12 +58,12 @@ def update_user(request, user_id, email=None, password=None, is_admin=None, user user['user_account_status'] = user_account_status if email_list_announcement is not None: user['email_list_announcement'] = email_list_announcement - if email_list_announcement == '1': + if email_list_announcement == 1: client_list_announcement = client.get_list(settings.ANNOUNCEMENTS_LIST) client_list_announcement.subscribe(email, pre_verified=True, pre_confirmed=True) if email_list_user is not None: user['email_list_user'] = email_list_user - if email_list_user == '1': + if email_list_user == 1: client_list_user = client.get_list(settings.USERS_LIST) client_list_user.subscribe(email, pre_verified=True, pre_confirmed=True) return db.update_user(request.db_session, id=user_id, updated_user=user) From 3c28afccfb0ec3f798216f858a1f339dab2a96e8 Mon Sep 17 00:00:00 2001 From: JingVT <33851894+JingVT@users.noreply.github.com> Date: Tue, 27 Nov 2018 13:51:53 -0500 Subject: [PATCH 22/31] Update local.py --- graphspace/settings/local.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/graphspace/settings/local.py b/graphspace/settings/local.py index 0cd8e34f..2b404b36 100644 --- a/graphspace/settings/local.py +++ b/graphspace/settings/local.py @@ -12,10 +12,6 @@ # URL through which to access graphspace URL_PATH = "http://localhost:8000/" -# Email lists of graphspace -ANNOUNCEMENTS_LIST = 'graphspace-announcements@graphspace.org' -USERS_LIST = 'graphspace-users@graphspace.org' - # If tracking is enabled for GraphSpace in Google Analytics GOOGLE_ANALYTICS_PROPERTY_ID = 'UA-00000000-0' From 5909b496e1b867cdb3beaabaae050ea1170006ba Mon Sep 17 00:00:00 2001 From: JingVT <33851894+JingVT@users.noreply.github.com> Date: Tue, 27 Nov 2018 13:57:59 -0500 Subject: [PATCH 23/31] Update local.py --- graphspace/settings/local.py | 1 + 1 file changed, 1 insertion(+) diff --git a/graphspace/settings/local.py b/graphspace/settings/local.py index 2b404b36..03e62620 100644 --- a/graphspace/settings/local.py +++ b/graphspace/settings/local.py @@ -46,3 +46,4 @@ 'PORT': '5432' } } + From 43e0f70f42ef38328bb4bef977c0bca3d6eb0296 Mon Sep 17 00:00:00 2001 From: JingVT <33851894+JingVT@users.noreply.github.com> Date: Tue, 27 Nov 2018 13:59:12 -0500 Subject: [PATCH 24/31] Update local.py --- graphspace/settings/local.py | 1 - 1 file changed, 1 deletion(-) diff --git a/graphspace/settings/local.py b/graphspace/settings/local.py index 03e62620..2b404b36 100644 --- a/graphspace/settings/local.py +++ b/graphspace/settings/local.py @@ -46,4 +46,3 @@ 'PORT': '5432' } } - From 63d8c6fc0bb333cb34100a2b9a957be2a9441f03 Mon Sep 17 00:00:00 2001 From: JingVT <33851894+JingVT@users.noreply.github.com> Date: Tue, 27 Nov 2018 14:00:22 -0500 Subject: [PATCH 25/31] Update local.py From 752c508bcf62328b51f554e9a680a180f9871b41 Mon Sep 17 00:00:00 2001 From: JingVT <33851894+JingVT@users.noreply.github.com> Date: Tue, 27 Nov 2018 16:17:52 -0500 Subject: [PATCH 26/31] Update local.py From 9a33289639b58c826312b931aecb88fedd8132ed Mon Sep 17 00:00:00 2001 From: JingVT <33851894+JingVT@users.noreply.github.com> Date: Tue, 27 Nov 2018 16:38:19 -0500 Subject: [PATCH 27/31] Update local.py --- graphspace/settings/local.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/graphspace/settings/local.py b/graphspace/settings/local.py index 2b404b36..63ee42d1 100644 --- a/graphspace/settings/local.py +++ b/graphspace/settings/local.py @@ -22,6 +22,10 @@ # Path to GraphSPace PATH = "/Path_to_GraphSpace" +# Email lists of graphspace +ANNOUNCEMENTS_LIST = 'graphspace-announcements@graphspace.org' +USERS_LIST = 'graphspace-users@graphspace.org' + # SHOULD NEVER CHANGE THIS VALUE SECRET_KEY = 'this-is-a-secret-key-for-local-settings-only' From 45c5b02557af50405117574160730fe42962ad1f Mon Sep 17 00:00:00 2001 From: JingVT <33851894+JingVT@users.noreply.github.com> Date: Wed, 28 Nov 2018 19:03:38 -0500 Subject: [PATCH 28/31] Update models.py --- applications/users/models.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/applications/users/models.py b/applications/users/models.py index 62b5bb18..ae3b82a1 100644 --- a/applications/users/models.py +++ b/applications/users/models.py @@ -31,7 +31,7 @@ class User(IDMixin, TimeStampMixin, Base): email_confirmation_code = Column(String, nullable=False, default=0) email_list_announcement = Column(Integer, nullable=False, default=0) email_list_user = Column(Integer, nullable=False, default=0) - + password_reset_codes = relationship("PasswordResetCode", back_populates="user", cascade="all, delete-orphan") owned_groups = relationship("Group", back_populates="owner", cascade="all, delete-orphan") owned_graphs = relationship("Graph", back_populates="owner", cascade="all, delete-orphan") From 0f443ec2399a0fafd31a7cf495e33b189e6aa26e Mon Sep 17 00:00:00 2001 From: JingVT <33851894+JingVT@users.noreply.github.com> Date: Wed, 28 Nov 2018 19:53:29 -0500 Subject: [PATCH 29/31] Update requirements.txt --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 24be9cff..b952e136 100644 --- a/requirements.txt +++ b/requirements.txt @@ -28,4 +28,4 @@ elasticsearch-dsl>=5.0.0,<6.0.0 sphinx-rtd-theme sphinx recommonmark -mailmanclient +mailmanclient==3.1.1 From 235b064b128a5b5454ffe8248c0a7b0eefedb39f Mon Sep 17 00:00:00 2001 From: JingVT <33851894+JingVT@users.noreply.github.com> Date: Wed, 28 Nov 2018 22:42:58 -0500 Subject: [PATCH 30/31] Update controllers.py --- applications/users/controllers.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/applications/users/controllers.py b/applications/users/controllers.py index 926f6ba1..2595be4b 100644 --- a/applications/users/controllers.py +++ b/applications/users/controllers.py @@ -165,6 +165,10 @@ def add_user(request, email=None, password="graphspace_public_user", is_admin=0, :param email: User ID of the user. Default value is dynamically generated user id. :param password: Password of the user. Default value is "public". :param admin: 1 if user has admin access else 0. Default value is 0. + :param user_account_status: 1 if the user has created account successfully else 0. + :param email_confirmation_code: confirmation code sent to email when the user creates account + :param email_list_announcement: 1 if the user has chosen to join GraphSpace announcement email list else 0 + :param email_list_user: 1 if the user has chosen to join GraphSpace users email list else 0 :return: User """ email = "public_user_%s@graphspace.com" % generate_uid(size=10) if email is None else email From 43ec81e097b72440903561b32df7d2f82204428a Mon Sep 17 00:00:00 2001 From: JingVT <33851894+JingVT@users.noreply.github.com> Date: Wed, 28 Nov 2018 22:46:51 -0500 Subject: [PATCH 31/31] Update dal.py --- applications/users/dal.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/applications/users/dal.py b/applications/users/dal.py index 66b19861..86140588 100644 --- a/applications/users/dal.py +++ b/applications/users/dal.py @@ -12,7 +12,7 @@ @with_session -def add_user(db_session, email, password, is_admin): +def add_user(db_session, email, password, is_admin, user_account_status, email_confirmation_code, email_list_announcement, email_list_user): """ Add a new user. @@ -20,9 +20,13 @@ def add_user(db_session, email, password, is_admin): :param email: User ID of the user. :param password: Password of the user. :param admin: 1 if user has admin access else 0. + :param user_account_status: 1 if the user has created account successfully else 0. + :param email_confirmation_code: confirmation code sent to email when the user creates account + :param email_list_announcement: 1 if the user has chosen to join GraphSpace announcement email list else 0 + :param email_list_user: 1 if the user has chosen to join GraphSpace users email list else 0 :return: User """ - user = User(email=email, password=password, is_admin = is_admin) + user = User(email=email, password=password, is_admin = is_admin, user_account_status=user_account_status, email_confirmation_code=email_confirmation_code, email_list_announcement=email_list_announcement, email_list_user=email_list_user) db_session.add(user) return user