Update the SSO Login for Serenity and Singularity server's player

This commit is contained in:
hz2016
2022-04-28 15:58:33 +08:00
parent ebd7a1a4ad
commit 216dd2a787
6 changed files with 82 additions and 16 deletions

View File

@@ -108,7 +108,16 @@ class Esi(EsiAccess):
else:
with gui.ssoLogin.SsoLogin() as dlg:
if dlg.ShowModal() == wx.ID_OK:
message = json.loads(base64.b64decode(dlg.ssoInfoCtrl.Value.strip()))
message = {}
if (self.server_name == "Serenity"):
import re
s=re.search(r'(?<=code=)[a-zA-Z0-9\-_]*',dlg.ssoInfoCtrl.Value.strip())
if s:
message['code']=s.group()
else:
message['code']=None
else:
message = json.loads(base64.b64decode(dlg.ssoInfoCtrl.Value.strip()))
self.handleLogin(message)
def stopServer(self):