Mathis/allianceauth
1
0
Fork 0
mirror of https://gitlab.com/allianceauth/allianceauth.git synced 2025-07-12 05:50:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed IPS4 User deletion

Browse Source
This commit is contained in:
orbitroom 2016-03-30 05:11:43 -05:00
parent 4666dd748b
commit fb6fb61d61
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
services/views.py
View File

@ -630,9 +630,10 @@ def reset_ips4_password(request):
logger.debug("reset_ips4_password called by user %s" % request.user) logger.debug("reset_ips4_password called by user %s" % request.user)
authinfo = AuthServicesInfoManager.get_auth_service_info(request.user) authinfo = AuthServicesInfoManager.get_auth_service_info(request.user)
result = Ips4Manager.update_user_password(authinfo.ips4_username) result = Ips4Manager.update_user_password(authinfo.ips4_username)
member_id = Ips4Manager.get_user_id(authinfo.ips4_username)
# false we failed # false we failed
if result != "": if result != "":
AuthServicesInfoManager.update_user_ips4_info(authinfo.ips4_username, result, id, request.user) AuthServicesInfoManager.update_user_ips4_info(authinfo.ips4_username, result, member_id, request.user)
logger.info("Succesfully reset IPS4 password for user %s" % request.user) logger.info("Succesfully reset IPS4 password for user %s" % request.user)
return HttpResponseRedirect("/services/") return HttpResponseRedirect("/services/")
logger.error("Unsuccessful attempt to reset IPS4 password for user %s" % request.user) logger.error("Unsuccessful attempt to reset IPS4 password for user %s" % request.user)
@ -652,8 +653,9 @@ def set_ips4_password(request):
logger.debug("Form contains password of length %s" % len(password)) logger.debug("Form contains password of length %s" % len(password))
authinfo = AuthServicesInfoManager.get_auth_service_info(request.user) authinfo = AuthServicesInfoManager.get_auth_service_info(request.user)
result = Ips4Manager.update_custom_password(authinfo.ips4_username, plain_password=password) result = Ips4Manager.update_custom_password(authinfo.ips4_username, plain_password=password)
member_id = Ips4Manager.get_user_id(authinfo.ips4_username)
if result != "": if result != "":
AuthServicesInfoManager.update_user_ips4_info(authinfo.ips4_username, result, authinfo.ips4_id, request.user) AuthServicesInfoManager.update_user_ips4_info(authinfo.ips4_username, result, member_id, request.user)
logger.info("Succesfully reset IPS4 password for user %s" % request.user) logger.info("Succesfully reset IPS4 password for user %s" % request.user)
return HttpResponseRedirect("/services/") return HttpResponseRedirect("/services/")
else: else:

3
util/context_processors.py
View File

@ -37,15 +37,18 @@ def domain_url(request):
'ENABLE_AUTH_IPBOARD': settings.ENABLE_AUTH_IPBOARD, 'ENABLE_AUTH_IPBOARD': settings.ENABLE_AUTH_IPBOARD,
'ENABLE_AUTH_TEAMSPEAK3': settings.ENABLE_AUTH_TEAMSPEAK3, 'ENABLE_AUTH_TEAMSPEAK3': settings.ENABLE_AUTH_TEAMSPEAK3,
'ENABLE_AUTH_DISCORD': settings.ENABLE_AUTH_DISCORD, 'ENABLE_AUTH_DISCORD': settings.ENABLE_AUTH_DISCORD,
'ENABLE_AUTH_IPS4': settings.ENABLE_AUTH_IPS4,
'ENABLE_BLUE_JABBER': settings.ENABLE_BLUE_JABBER, 'ENABLE_BLUE_JABBER': settings.ENABLE_BLUE_JABBER,
'ENABLE_BLUE_FORUM': settings.ENABLE_BLUE_FORUM, 'ENABLE_BLUE_FORUM': settings.ENABLE_BLUE_FORUM,
'ENABLE_BLUE_MUMBLE': settings.ENABLE_BLUE_MUMBLE, 'ENABLE_BLUE_MUMBLE': settings.ENABLE_BLUE_MUMBLE,
'ENABLE_BLUE_IPBOARD': settings.ENABLE_BLUE_IPBOARD, 'ENABLE_BLUE_IPBOARD': settings.ENABLE_BLUE_IPBOARD,
'ENABLE_BLUE_TEAMSPEAK3': settings.ENABLE_BLUE_TEAMSPEAK3, 'ENABLE_BLUE_TEAMSPEAK3': settings.ENABLE_BLUE_TEAMSPEAK3,
'ENABLE_BLUE_DISCORD': settings.ENABLE_BLUE_DISCORD, 'ENABLE_BLUE_DISCORD': settings.ENABLE_BLUE_DISCORD,
'ENABLE_BLUE_IPS4': settings.ENABLE_BLUE_IPS4,
'TEAMSPEAK3_PUBLIC_URL': settings.TEAMSPEAK3_PUBLIC_URL, 'TEAMSPEAK3_PUBLIC_URL': settings.TEAMSPEAK3_PUBLIC_URL,
'JACK_KNIFE_URL': settings.JACK_KNIFE_URL, 'JACK_KNIFE_URL': settings.JACK_KNIFE_URL,
'DISCORD_SERVER_ID': settings.DISCORD_SERVER_ID, 'DISCORD_SERVER_ID': settings.DISCORD_SERVER_ID,
'KILLBOARD_URL': settings.KILLBOARD_URL, 'KILLBOARD_URL': settings.KILLBOARD_URL,
'IPS4_URL': settings.IPS4_URL,
'EXTERNAL_MEDIA_URL': settings.EXTERNAL_MEDIA_URL, 'EXTERNAL_MEDIA_URL': settings.EXTERNAL_MEDIA_URL,
'CURRENT_UTC_TIME': timezone.now()} 'CURRENT_UTC_TIME': timezone.now()}