Merge pull request #1114 from vector-im/fix_registration_with_email

Bug Fix - Registration with email failed when the user validated the …
element-hq · Mar 21, 2017 · 7372213 · 7372213
2 parents a6939d3 + d0bedbe
commit 7372213
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/Riot/ViewController/AuthenticationViewController.m b/Riot/ViewController/AuthenticationViewController.m
@@ -327,7 +327,8 @@ - (IBAction)onButtonPressed:(id)sender
     else if (sender == self.submitButton)
     {
         // Handle here the second screen used to manage the 3rd party ids during the registration.
-        if (self.authType == MXKAuthenticationTypeRegister)
+        // Except if there is an external set of parameters defined to perform a registration.
+        if (self.authType == MXKAuthenticationTypeRegister && !self.externalRegistrationParameters)
         {
             // Sanity check
             if ([self.authInputsView isKindOfClass:AuthInputsView.class])

diff --git a/Riot/Views/Authentication/AuthInputsView.m b/Riot/Views/Authentication/AuthInputsView.m
@@ -303,6 +303,8 @@ - (void)prepareParameters:(void (^)(NSDictionary *parameters))callback
             callback(externalRegistrationParameters);
 
             // CAUTION: Do not reset this dictionary here, it is used later to handle this registration until the end (see [updateAuthSessionWithCompletedStages:didUpdateParameters:])
+
+            return;
         }
 
         // Prepare here parameters dict by checking each required fields.
-Original file line number
+Diff line change
@@ Expand Up @@
                 callback(externalRegistrationParameters);
                 // CAUTION: Do not reset this dictionary here, it is used later to handle this registration until the end (see [updateAuthSessionWithCompletedStages:didUpdateParameters:])
+                return;
             }
             // Prepare here parameters dict by checking each required fields.
@@ Expand Down @@