From aa7eeca376f3d56709c36fd9f8baae8b56768428 Mon Sep 17 00:00:00 2001 From: Eduardo Silva Date: Sat, 1 Mar 2025 09:45:22 -0300 Subject: [PATCH] fix: correct token parameter formatting in invite URL --- wgwadmlibrary/tools.py | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/wgwadmlibrary/tools.py b/wgwadmlibrary/tools.py index 11faff8..24ebf1c 100644 --- a/wgwadmlibrary/tools.py +++ b/wgwadmlibrary/tools.py @@ -1,12 +1,15 @@ -import ipaddress, re +import ipaddress +import random +import re import subprocess -from django.utils import timezone from datetime import timedelta + +from django.db.models import Max +from django.utils import timezone + +from user_manager.models import UserAcl from vpn_invite.models import PeerInvite, InviteSettings from wireguard.models import Peer, WireGuardInstance -from user_manager.models import UserAcl -from django.db.models import Max -import random def user_has_access_to_instance(user_acl: UserAcl, instance: WireGuardInstance): @@ -136,7 +139,7 @@ def create_random_password(length, complexity): def replace_message_variables(message: str, peer_invite: PeerInvite, invite_settings: InviteSettings): # The & at the end is to prevent the token from being concatenated with any other template text. - message = message.replace('{invite_url}', f'{invite_settings.invite_url}?token{peer_invite.uuid}&') + message = message.replace('{invite_url}', f'{invite_settings.invite_url}?token={peer_invite.uuid}&') message = message.replace('{expire_minutes}', f'{invite_settings.invite_expiration}') return message