paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-11 17:36:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Stop using initial password for newly activated users.

Browse Source 
Previously we needed to use a specified password when activating a
formerly mirror dummy user, in order for that user to be able to
(re)set their password and login.  Now that we have our own password
reset form, this is no longer required.
This commit is contained in:
Tim Abbott
2016-04-28 14:26:11 -07:00
parent 89d9060aab
commit af4203b41b
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
zerver/lib/actions.py
View File

@@ -37,7 +37,6 @@ from six.moves import range
session_engine = import_module(settings.SESSION_ENGINE) session_engine = import_module(settings.SESSION_ENGINE)
from zerver.lib.create_user import random_api_key from zerver.lib.create_user import random_api_key
from zerver.lib.initial_password import initial_password
from zerver.lib.timestamp import timestamp_to_datetime, datetime_to_timestamp from zerver.lib.timestamp import timestamp_to_datetime, datetime_to_timestamp
from zerver.lib.cache_helpers import cache_save_message from zerver.lib.cache_helpers import cache_save_message
from zerver.lib.queue import queue_json_publish from zerver.lib.queue import queue_json_publish
@@ -496,7 +495,7 @@ def create_mirror_user_if_needed(realm, email, email_to_fullname):
except UserProfile.DoesNotExist: except UserProfile.DoesNotExist:
try: try:
# Forge a user for this person # Forge a user for this person
return create_user(email, initial_password(email), realm, return create_user(email, None, realm,
email_to_fullname(email), email_to_username(email), email_to_fullname(email), email_to_username(email),
active=False, is_mirror_dummy=True) active=False, is_mirror_dummy=True)
except IntegrityError: except IntegrityError:
@@ -1434,7 +1433,7 @@ def do_change_subscription_property(user_profile, sub, stream_name,
def do_activate_user(user_profile, log=True, join_date=timezone.now()): def do_activate_user(user_profile, log=True, join_date=timezone.now()):
user_profile.is_active = True user_profile.is_active = True
user_profile.is_mirror_dummy = False user_profile.is_mirror_dummy = False
user_profile.set_password(initial_password(user_profile.email)) user_profile.set_unusable_password()
user_profile.date_joined = join_date user_profile.date_joined = join_date
user_profile.save(update_fields=["is_active", "date_joined", "password", user_profile.save(update_fields=["is_active", "date_joined", "password",
"is_mirror_dummy"]) "is_mirror_dummy"])