Merge branch 'sam' into development
This commit is contained in:
@@ -17,8 +17,10 @@ class AccountActivationTokenGenerator(PasswordResetTokenGenerator):
|
||||
def _make_hash_value(self, user, timestamp):
|
||||
return f"{user.pk}{timestamp}{user.full_name}"
|
||||
|
||||
|
||||
account_activation_token = AccountActivationTokenGenerator()
|
||||
|
||||
|
||||
def get_tokens_for_user(user):
|
||||
refresh = RefreshToken.for_user(user)
|
||||
|
||||
@@ -39,12 +41,14 @@ def get_auth_token(client, email, password):
|
||||
# logging.error(f"User {email} was refused a token: {response.content}")
|
||||
return None
|
||||
|
||||
|
||||
def create_active_user(email, password):
|
||||
user = User.objects.create_user(email=email, password=password)
|
||||
user.is_active = True
|
||||
user.save()
|
||||
return user
|
||||
|
||||
|
||||
def create_admin_user(email, password):
|
||||
user = User.objects.create_user(email=email, password=password)
|
||||
user.is_staff = True
|
||||
@@ -52,6 +56,7 @@ def create_admin_user(email, password):
|
||||
user.save()
|
||||
return user
|
||||
|
||||
|
||||
def send_verification_email(request, user):
|
||||
try:
|
||||
current_site = get_current_site(request)
|
||||
|
||||
Reference in New Issue
Block a user