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

[FIX] Capitalization of Jabber service name

Browse Source
This commit is contained in:
Peter Pfeufer 2023-10-31 10:03:06 +01:00
parent df003c8ec5
commit 257fbdef36
No known key found for this signature in database
GPG Key ID: 6051D2C6AD4EBC27
1 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
allianceauth/services/modules/openfire/views.py
View File

@ -24,23 +24,23 @@ ACCESS_PERM = 'openfire.access_openfire'
def activate_jabber(request): def activate_jabber(request):
logger.debug("activate_jabber called by user %s" % request.user) logger.debug("activate_jabber called by user %s" % request.user)
character = request.user.profile.main_character character = request.user.profile.main_character
logger.debug(f"Adding jabber user for user {request.user} with main character {character}") logger.debug(f"Adding Jabber user for user {request.user} with main character {character}")
info = OpenfireManager.add_user(OpenfireTasks.get_username(request.user)) info = OpenfireManager.add_user(OpenfireTasks.get_username(request.user))
# If our username is blank means we already had a user # If our username is blank means we already had a user
if info[0] != "": if info[0] != "":
OpenfireUser.objects.update_or_create(user=request.user, defaults={'username': info[0]}) OpenfireUser.objects.update_or_create(user=request.user, defaults={'username': info[0]})
logger.debug("Updated authserviceinfo for user %s with jabber credentials. Updating groups." % request.user) logger.debug("Updated authserviceinfo for user %s with Jabber credentials. Updating groups." % request.user)
OpenfireTasks.update_groups.delay(request.user.pk) OpenfireTasks.update_groups.delay(request.user.pk)
logger.info("Successfully activated jabber for user %s" % request.user) logger.info("Successfully activated Jabber for user %s" % request.user)
messages.success(request, _('Activated jabber account.')) messages.success(request, _('Activated Jabber account.'))
credentials = { credentials = {
'username': info[0], 'username': info[0],
'password': info[1], 'password': info[1],
} }
return render(request, 'services/service_credentials.html', context={'credentials': credentials, 'service': 'Jabber'}) return render(request, 'services/service_credentials.html', context={'credentials': credentials, 'service': 'Jabber'})
else: else:
logger.error("Unsuccessful attempt to activate jabber for user %s" % request.user) logger.error("Unsuccessful attempt to activate Jabber for user %s" % request.user)
messages.error(request, _('An error occurred while processing your jabber account.')) messages.error(request, _('An error occurred while processing your Jabber account.'))
return redirect("services:services") return redirect("services:services")
@ -49,11 +49,11 @@ def activate_jabber(request):
def deactivate_jabber(request): def deactivate_jabber(request):
logger.debug("deactivate_jabber called by user %s" % request.user) logger.debug("deactivate_jabber called by user %s" % request.user)
if OpenfireTasks.has_account(request.user) and OpenfireTasks.delete_user(request.user): if OpenfireTasks.has_account(request.user) and OpenfireTasks.delete_user(request.user):
logger.info("Successfully deactivated jabber for user %s" % request.user) logger.info("Successfully deactivated Jabber for user %s" % request.user)
messages.success(request, 'Deactivated jabber account.') messages.success(request, 'Deactivated Jabber account.')
else: else:
logger.error("Unsuccessful attempt to deactivate jabber for user %s" % request.user) logger.error("Unsuccessful attempt to deactivate Jabber for user %s" % request.user)
messages.error(request, _('An error occurred while processing your jabber account.')) messages.error(request, _('An error occurred while processing your Jabber account.'))
return redirect("services:services") return redirect("services:services")
@ -65,15 +65,15 @@ def reset_jabber_password(request):
result = OpenfireManager.update_user_pass(request.user.openfire.username) result = OpenfireManager.update_user_pass(request.user.openfire.username)
# If our username is blank means we failed # If our username is blank means we failed
if result != "": if result != "":
logger.info("Successfully reset jabber password for user %s" % request.user) logger.info("Successfully reset Jabber password for user %s" % request.user)
messages.success(request, _('Reset jabber password.')) messages.success(request, _('Reset Jabber password.'))
credentials = { credentials = {
'username': request.user.openfire.username, 'username': request.user.openfire.username,
'password': result, 'password': result,
} }
return render(request, 'services/service_credentials.html', context={'credentials': credentials, 'service': 'Jabber'}) return render(request, 'services/service_credentials.html', context={'credentials': credentials, 'service': 'Jabber'})
logger.error("Unsuccessful attempt to reset jabber for user %s" % request.user) logger.error("Unsuccessful attempt to reset Jabber for user %s" % request.user)
messages.error(request, _('An error occurred while processing your jabber account.')) messages.error(request, _('An error occurred while processing your Jabber account.'))
return redirect("services:services") return redirect("services:services")
@ -95,7 +95,7 @@ def jabber_broadcast_view(request):
logger.debug("Received POST request containing form, valid: %s" % form.is_valid()) logger.debug("Received POST request containing form, valid: %s" % form.is_valid())
if form.is_valid(): if form.is_valid():
main_char = request.user.profile.main_character main_char = request.user.profile.main_character
logger.debug(f"Processing jabber broadcast for user {request.user} with main character {main_char}") logger.debug(f"Processing Jabber broadcast for user {request.user} with main character {main_char}")
try: try:
if main_char is not None: if main_char is not None:
message_to_send = form.cleaned_data['message'] + "\n##### SENT BY: " + "[" + main_char.corporation_ticker + "]" + \ message_to_send = form.cleaned_data['message'] + "\n##### SENT BY: " + "[" + main_char.corporation_ticker + "]" + \
@ -112,8 +112,8 @@ def jabber_broadcast_view(request):
OpenfireManager.send_broadcast_message(group_to_send, message_to_send) OpenfireManager.send_broadcast_message(group_to_send, message_to_send)
messages.success(request, _('Sent jabber broadcast to %s' % group_to_send)) messages.success(request, _('Sent Jabber broadcast to %s' % group_to_send))
logger.info("Sent jabber broadcast on behalf of user %s" % request.user) logger.info("Sent Jabber broadcast on behalf of user %s" % request.user)
except PingBotException as e: except PingBotException as e:
messages.error(request, e) messages.error(request, e)
@ -140,11 +140,11 @@ def set_jabber_password(request):
logger.debug("Form contains password of length %s" % len(password)) logger.debug("Form contains password of length %s" % len(password))
result = OpenfireManager.update_user_pass(request.user.openfire.username, password=password) result = OpenfireManager.update_user_pass(request.user.openfire.username, password=password)
if result != "": if result != "":
logger.info("Successfully set jabber password for user %s" % request.user) logger.info("Successfully set Jabber password for user %s" % request.user)
messages.success(request, _('Set jabber password.')) messages.success(request, _('Set jabber password.'))
else: else:
logger.error("Failed to install custom jabber password for user %s" % request.user) logger.error("Failed to install custom Jabber password for user %s" % request.user)
messages.error(request, _('An error occurred while processing your jabber account.')) messages.error(request, _('An error occurred while processing your Jabber account.'))
return redirect("services:services") return redirect("services:services")
else: else:
logger.debug("Request is not type POST - providing empty form.") logger.debug("Request is not type POST - providing empty form.")