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

[FIX] Normalization of IPSuite4 service name

Browse Source
This commit is contained in:
Peter Pfeufer 2023-10-31 10:09:43 +01:00
parent 15042f5e77
commit a04e6ae3d0
No known key found for this signature in database
GPG Key ID: 6051D2C6AD4EBC27
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
allianceauth/services/modules/ips4/views.py
View File

@ -25,9 +25,9 @@ def activate_ips4(request):
# if empty we failed # if empty we failed
if result[0] != "" and not Ips4Tasks.has_account(request.user): if result[0] != "" and not Ips4Tasks.has_account(request.user):
ips_user = Ips4User.objects.create(user=request.user, id=result[2], username=result[0]) ips_user = Ips4User.objects.create(user=request.user, id=result[2], username=result[0])
logger.debug("Updated authserviceinfo for user %s with IPS4 credentials." % request.user) logger.debug("Updated authserviceinfo for user %s with IPSuite4 credentials." % request.user)
# update_ips4_groups.delay(request.user.pk) # update_ips4_groups.delay(request.user.pk)
logger.info("Successfully activated IPS4 for user %s" % request.user) logger.info("Successfully activated IPSuite4 for user %s" % request.user)
messages.success(request, _('Activated IPSuite4 account.')) messages.success(request, _('Activated IPSuite4 account.'))
credentials = { credentials = {
'username': result[0], 'username': result[0],
@ -35,7 +35,7 @@ def activate_ips4(request):
} }
return render(request, 'services/service_credentials.html', context={'credentials': credentials, 'service': 'IPSuite4'}) return render(request, 'services/service_credentials.html', context={'credentials': credentials, 'service': 'IPSuite4'})
else: else:
logger.error("Unsuccessful attempt to activate IPS4 for user %s" % request.user) logger.error("Unsuccessful attempt to activate IPSuite4 for user %s" % request.user)
messages.error(request, _('An error occurred while processing your IPSuite4 account.')) messages.error(request, _('An error occurred while processing your IPSuite4 account.'))
return redirect("services:services") return redirect("services:services")
@ -48,7 +48,7 @@ def reset_ips4_password(request):
result = Ips4Manager.update_user_password(request.user.ips4.username) result = Ips4Manager.update_user_password(request.user.ips4.username)
# false we failed # false we failed
if result != "": if result != "":
logger.info("Successfully reset IPS4 password for user %s" % request.user) logger.info("Successfully reset IPSuite4 password for user %s" % request.user)
messages.success(request, _('Reset IPSuite4 password.')) messages.success(request, _('Reset IPSuite4 password.'))
credentials = { credentials = {
'username': request.user.ips4.username, 'username': request.user.ips4.username,
@ -56,7 +56,7 @@ def reset_ips4_password(request):
} }
return render(request, 'services/service_credentials.html', context={'credentials': credentials, 'service': 'IPSuite4'}) return render(request, 'services/service_credentials.html', context={'credentials': credentials, 'service': 'IPSuite4'})
logger.error("Unsuccessful attempt to reset IPS4 password for user %s" % request.user) logger.error("Unsuccessful attempt to reset IPSuite4 password for user %s" % request.user)
messages.error(request, _('An error occurred while processing your IPSuite4 account.')) messages.error(request, _('An error occurred while processing your IPSuite4 account.'))
return redirect("services:services") return redirect("services:services")
@ -74,10 +74,10 @@ 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))
result = Ips4Manager.update_custom_password(request.user.ips4.username, plain_password=password) result = Ips4Manager.update_custom_password(request.user.ips4.username, plain_password=password)
if result != "": if result != "":
logger.info("Successfully set IPS4 password for user %s" % request.user) logger.info("Successfully set IPSuite4 password for user %s" % request.user)
messages.success(request, _('Set IPSuite4 password.')) messages.success(request, _('Set IPSuite4 password.'))
else: else:
logger.error("Failed to install custom IPS4 password for user %s" % request.user) logger.error("Failed to install custom IPSuite4 password for user %s" % request.user)
messages.error(request, _('An error occurred while processing your IPSuite4 account.')) messages.error(request, _('An error occurred while processing your IPSuite4 account.'))
return redirect('services:services') return redirect('services:services')
else: else:
@ -94,9 +94,9 @@ def set_ips4_password(request):
def deactivate_ips4(request): def deactivate_ips4(request):
logger.debug("deactivate_ips4 called by user %s" % request.user) logger.debug("deactivate_ips4 called by user %s" % request.user)
if Ips4Tasks.delete_user(request.user): if Ips4Tasks.delete_user(request.user):
logger.info("Successfully deactivated IPS4 for user %s" % request.user) logger.info("Successfully deactivated IPSuite4 for user %s" % request.user)
messages.success(request, _('Deactivated IPSuite4 account.')) messages.success(request, _('Deactivated IPSuite4 account.'))
else: else:
logger.error("Unsuccessful attempt to deactivate IPS4 for user %s" % request.user) logger.error("Unsuccessful attempt to deactivate IPSuite4 for user %s" % request.user)
messages.error(request, _('An error occurred while processing your IPSuite4 account.')) messages.error(request, _('An error occurred while processing your IPSuite4 account.'))
return redirect("services:services") return redirect("services:services")