Skip to content

Commit

Permalink
Merge pull request openedx#482 from yangzhenweiq/HH_register
Browse files Browse the repository at this point in the history
HH register
  • Loading branch information
xavierchan authored Aug 14, 2019
2 parents a6ae807 + 9194b90 commit 02ed54c
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 0 deletions.
2 changes: 2 additions & 0 deletions lms/envs/production.py
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,8 @@
EMAIL_FILE_PATH = ENV_TOKENS.get('EMAIL_FILE_PATH', None)
EMAIL_HOST = ENV_TOKENS.get('EMAIL_HOST', 'localhost') # django default is localhost
EMAIL_PORT = ENV_TOKENS.get('EMAIL_PORT', 25) # django default is 25
EMAIL_ACCESS_LIST = ENV_TOKENS.get('EMAIL_ACCESS_LIST', ["hh.global"])
EMAIL_ACCESS_DATE = ENV_TOKENS.get('EMAIL_ACCESS_DATE', 365)
EMAIL_USE_TLS = ENV_TOKENS.get('EMAIL_USE_TLS', False) # django default is False
SITE_NAME = ENV_TOKENS['SITE_NAME']
HTTPS = ENV_TOKENS.get('HTTPS', HTTPS)
Expand Down
11 changes: 11 additions & 0 deletions openedx/core/djangoapps/user_api/views.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
"""HTTP end-points for the User API. """

import pytz
from datetime import datetime
from dateutil.relativedelta import relativedelta

from django.contrib.auth.models import User
from django.conf import settings
from django.core.exceptions import NON_FIELD_ERRORS, PermissionDenied, ValidationError
from django.db import transaction
from django.http import HttpResponse, HttpResponseForbidden
Expand Down Expand Up @@ -152,6 +157,12 @@ def post(self, request):

try:
user = create_account_with_params(request, data)
if email.split('@')[-1] in settings.EMAIL_ACCESS_LIST:
from membership.models import VIPInfo
expired_at = datetime.now(pytz.utc) + \
relativedelta(days=+int(settings.EMAIL_ACCESS_DATE))
VIPInfo.objects.create(user=user, expired_at=expired_at)

except AccountValidationError as err:
errors = {
err.field: [{"user_message": text_type(err)}]
Expand Down

0 comments on commit 02ed54c

Please sign in to comment.