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

gui/builtinPreferenceViews/pyfaEsiPreferences.py

@@ -48,9 +48,30 @@ class PFEsiPref(PreferenceView):
 
         self.rbMode.Bind(wx.EVT_RADIOBOX, self.OnModeChange)
 
-        mainSizer.Add(rbSizer, 1, wx.ALL | wx.EXPAND, 0)
+        mainSizer.Add(rbSizer, 0, wx.ALL | wx.EXPAND, 0)
+
+        esiSizer = wx.BoxSizer(wx.HORIZONTAL)
+
+        self.esiServer = wx.StaticText(panel, wx.ID_ANY, _t("Default SSO Server:"), wx.DefaultPosition,wx.DefaultSize, 0)
+
+        self.esiServer.Wrap(-1)
+
+        esiSizer.Add(self.esiServer, 0, wx.ALL | wx.ALIGN_CENTER_VERTICAL, 5)
+
+        self.esiServer.SetToolTip(wx.ToolTip(_t('The source you choose will be used on connection.')))
+
+        self.chESIserver = wx.Choice(panel, choices=list(self.settings.keys()))
+
+        self.chESIserver.SetStringSelection(self.settings.get("server"))
+
+        esiSizer.Add(self.chESIserver, 0, wx.ALL | wx.ALIGN_CENTER_VERTICAL, 10)
+
+        mainSizer.Add(esiSizer, 0, wx.TOP | wx.RIGHT , 10)
+
+        self.chESIserver.Bind(wx.EVT_CHOICE, self.OnServerChange)
 
         panel.SetSizer(mainSizer)
+
         panel.Layout()
 
     def OnTimeoutChange(self, event):
@@ -59,8 +80,12 @@ class PFEsiPref(PreferenceView):
     def OnModeChange(self, event):
         self.settings.set('loginMode', event.GetInt())
 
+    def OnServerChange(self, event):
+        source = self.chESIserver.GetString(self.chESIserver.GetSelection())
+        self.settings.set("server",source)
+
     def getImage(self):
         return BitmapLoader.getBitmap("eve", "gui")
 
 
-PFEsiPref.register()
+PFEsiPref.register()

gui/ssoLogin.py

@@ -26,6 +26,18 @@ class SsoLogin(wx.Dialog):
 
         bSizer1.Add(self.ssoInfoCtrl, 1, wx.LEFT | wx.RIGHT | wx.EXPAND, 10)
 
+        from service.settings import EsiSettings
+        import config
+        import time
+        self.Esisettings = EsiSettings.getInstance()
+        if (self.Esisettings.get("server") == "Serenity"):
+            bSizer4 = wx.BoxSizer(wx.VERTICAL)
+            text = wx.StaticText(self, wx.ID_ANY, _t("Please copy the url when your authorization is completed"))
+            bSizer4.Add(text, 0, wx.ALL | wx.EXPAND, 10)
+            bSizer1.Add(bSizer4, 0, wx.ALL | wx.EXPAND, 10)
+            webbrowser.open(config.SSO_LOGOFF_SERENITY)
+            time.sleep(1)
+
         bSizer3 = wx.BoxSizer(wx.VERTICAL)
         bSizer3.Add(wx.StaticLine(self, wx.ID_ANY), 0, wx.BOTTOM | wx.EXPAND, 10)
 
@@ -39,6 +51,7 @@ class SsoLogin(wx.Dialog):
 
         self.sEsi = Esi.getInstance()
         uri = self.sEsi.get_login_uri(None)
+
         webbrowser.open(uri)