Changeset 771:76aae72ccaba

Timestamp:

05/06/16 18:10:55 (8 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

Phase:

public

Message:

Fixed the handling of the login information after registering (re #285)

Location:

src/mlx

Files:

• gui/flight.py (modified) (1 diff)
• web.py (modified) (3 diffs)

src/mlx/gui/flight.py

@@ -1364 +1364 @@
         if registrationOK:
             if result.loggedIn:
+                self._wizard._loginResult = result
                 self._wizard.nextPage()
             else:

src/mlx/web.py

@@ -678 +678 @@
 
             self._client.setCredentials(pilotID, registrationData.password)
-            loginResult = self._client.login()
-            result.loggedIn = loginResult is not None
+            LoginRPC.setupLoginResult(result, self._client, pilotID,
+                                      registrationData.password)
 
         result.invalidData = \
@@ -750 +750 @@
 class LoginRPC(RPCRequest):
     """An RPC-based login request."""
-    def __init__(self, client, callback, pilotID, password):
-        """Construct the login request with the given pilot ID and
+    @staticmethod
+    def setupLoginResult(result, client, pilotID, password):
+        """Setup the login result with the given client, pilot ID and
         password."""
-        super(LoginRPC, self).__init__(client, callback)
-
-        self._pilotID = pilotID
-        self._password = password
-
-    def run(self):
-        """Perform the login request."""
-        result = Result()
-
-        self._client.setCredentials(self._pilotID, self._password)
-        loginResult = self._client.login()
+        loginResult = client.login()
         result.loggedIn = loginResult is not None
         if result.loggedIn:
-            result.pilotID = self._pilotID
+            result.pilotID = pilotID
             result.pilotName = loginResult[0]
             result.rank = loginResult[1]
-            result.password = self._password
-            result.flights = self._client.getFlights()
+            result.password = password
+            result.flights = client.getFlights()
             if result.rank=="STU":
-                reply = self._client.getEntryExamStatus()
+                reply = client.getEntryExamStatus()
                 result.entryExamPassed = reply[0]
                 result.entryExamLink = reply[1]
@@ -778 +769 @@
                 if reply[3]:
                     result.rank = "FO"
+
+    def __init__(self, client, callback, pilotID, password):
+        """Construct the login request with the given pilot ID and
+        password."""
+        super(LoginRPC, self).__init__(client, callback)
+
+        self._pilotID = pilotID
+        self._password = password
+
+    def run(self):
+        """Perform the login request."""
+        result = Result()
+
+        self._client.setCredentials(self._pilotID, self._password)
+        LoginRPC.setupLoginResult(result, self._client,
+                                  self._pilotID, self._password)
 
         return result