mirror of
https://gitlab.com/allianceauth/allianceauth.git
synced 2026-02-09 16:46:20 +01:00
Included Discord in disable_services from common_task.
Changed how user accounts in discord are handled: endpoint accepts password and email. Accounts are created with a password(random) and their user email. Need to activate account through link in email.
This commit is contained in:
@@ -2,6 +2,7 @@ import requests
|
||||
import json
|
||||
from django.conf import settings
|
||||
import re
|
||||
import os
|
||||
|
||||
DISCORD_URL = "https://discordapp.com/api"
|
||||
|
||||
@@ -153,12 +154,14 @@ class DiscordAPIManager:
|
||||
r.raise_for_status()
|
||||
|
||||
@staticmethod
|
||||
def register_user(server_id, username, invite_code):
|
||||
def register_user(server_id, username, invite_code, password, email):
|
||||
custom_headers = {'content-type': 'application/json'}
|
||||
data = {
|
||||
'fingerprint': None,
|
||||
'username': username,
|
||||
'invite': invite_code,
|
||||
'passowrd': password,
|
||||
'email': email,
|
||||
}
|
||||
path = DISCORD_URL + "/auth/register"
|
||||
r = requests.post(path, headers=custom_headers, data=json.dumps(data))
|
||||
@@ -213,14 +216,19 @@ class DiscordManager:
|
||||
return clean
|
||||
|
||||
@staticmethod
|
||||
def add_user(username):
|
||||
def __generate_random_pass():
|
||||
return os.urandom(8).encode('hex')
|
||||
|
||||
@staticmethod
|
||||
def add_user(username, email):
|
||||
try:
|
||||
username_clean = DiscordManager.__sanatize_username(username)
|
||||
invite_code = DiscordAPIManager.create_invite(settings.DISCORD_SERVER_ID)['code']
|
||||
DiscordAPIManager.register_user(settings.DISCORD_SERVER_ID, username_clean, invite_code)
|
||||
password = DiscordManager.__generate_random_pass()
|
||||
DiscordAPIManager.register_user(server_id=settings.DISCORD_SERVER_ID, username=username_clean, invite=invite_code, password=password, email=email)
|
||||
user_id = DiscordAPIManager.get_user_id(settings.DISCORD_SERVER_ID, username_clean)
|
||||
DiscordAPIManager.delete_invite(invite_code)
|
||||
return username_clean, user_id
|
||||
return username_clean, password
|
||||
except:
|
||||
return "", ""
|
||||
|
||||
|
||||
@@ -325,7 +325,7 @@ context_instance=RequestContext(request))
|
||||
def activate_discord(request):
|
||||
authinfo = AuthServicesInfoManager.get_auth_service_info(request.user)
|
||||
character = EveManager.get_character_by_id(authinfo.main_char_id)
|
||||
info = DiscordManager.add_user(character.character_name)
|
||||
info = DiscordManager.add_user(character.character_name, request.user.email)
|
||||
# If our username is blank means we already had a user
|
||||
if info[0] is not "":
|
||||
AuthServicesInfoManager.update_user_discord_info(info[0], info[1], request.user)
|
||||
@@ -352,7 +352,7 @@ def reset_discord(request):
|
||||
if result:
|
||||
# ensures succesful deletion
|
||||
AuthServicesInfoManager.update_user_discord_info("", "", request.user)
|
||||
new_result = DiscordManager.add_user(authinfo.discord_username)
|
||||
new_result = DiscordManager.add_user(authinfo.discord_username, request.user.email)
|
||||
if new_result:
|
||||
# ensures succesful creation
|
||||
AuthServicesInfoManager.update_user_discord_info(new_result[0], new_result[1], request.user)
|
||||
|
||||
Reference in New Issue
Block a user