@@ -1585,12 +1585,17 @@ - (void)textFieldDidEndEditing:(UITextField *)textField {
15851585 NSString *urlWithoutUserPassword = [self stripUsernameAndPassword: self .urlTextField.text];
15861586 self.auxUrlForReloadTable = [self stripIndexPhpOrAppsFilesFromUrl: urlWithoutUserPassword];
15871587 } else {
1588- // This is when we deleted the last account and go to the login screen
1588+ // This is when we deleted the last account and go to the login screen and when edit credentials in settings view
15891589 self.urlTextField = [[UITextField alloc ]initWithFrame:self .urlFrame];
15901590 self.urlTextField .text = self.auxUrlForReloadTable ;
15911591 textField = self.urlTextField ;
15921592 }
15931593
1594+ if (self.usernameTextField .text == nil ) {
1595+ self.usernameTextField = [[UITextField alloc ]initWithFrame:self .userAndPasswordFrame];
1596+ self.usernameTextField .text = self.auxUsernameForReloadTable ;
1597+ }
1598+
15941599 self.auxUsernameForReloadTable = self.usernameTextField .text ;
15951600 self.auxPasswordForReloadTable = self.passwordTextField .text ;
15961601
@@ -1672,6 +1677,10 @@ -(void) isConnectionToTheServerByUrlInOtherThread {
16721677 isCheckingTheServerRightNow = YES ;
16731678 isConnectionToServer = NO ;
16741679
1680+ // Reset the url of redirected server at this point
1681+ AppDelegate *app = (AppDelegate*)[[UIApplication sharedApplication ] delegate ];
1682+ app.urlServerRedirected = nil ;
1683+
16751684 [[CheckAccessToServer sharedManager ] isConnectionToTheServerByUrl: [self getUrlToCheck ]];
16761685}
16771686
@@ -1980,39 +1989,42 @@ - (void) checkIfServerAutentificationIsNormalFromURL {
19801989 });
19811990 } failureRequest: ^(NSHTTPURLResponse *response, NSError *error, NSString *redirectedServer) {
19821991
1983- BOOL isInvalid = NO ;
1992+ BOOL isInvalid = YES ;
1993+
1994+ NSString *authenticationHeader = @" Www-Authenticate"
1995+ NSString *outhAuthentication = @" bearer"
1996+ NSString *basicAuthentication = @" basic"
19841997
19851998 if (!k_is_sso_active) {
1986- // Get header related with autentication type
1987- NSString *autenticationType = [[response allHeaderFields ] valueForKey: @" Www-Authenticate"
1988-
1989- if (autenticationType) {
1990- // Autentication type basic
1991- if ([autenticationType hasPrefix: @" Basic"
1992- isInvalid = NO ;
1993- } else if ([autenticationType hasPrefix: @" Bearer"
1999+ if (response.statusCode == kOCErrorServerUnauthorized ) {
2000+ // Get header related with autentication type
2001+ NSString *autenticationType = [[response allHeaderFields ] valueForKey: authenticationHeader];
2002+
2003+ if ((autenticationType) && ([autenticationType.lowercaseString hasPrefix: outhAuthentication])) {
19942004 // Autentication type oauth
19952005 if (k_is_oauth_active) {
19962006 // Check if is activate oauth
19972007 isInvalid = NO ;
19982008 } else {
19992009 isInvalid = YES ;
20002010 }
2011+ } else if ((autenticationType) && ([autenticationType.lowercaseString hasPrefix: basicAuthentication])) {
2012+ isInvalid = NO ;
20012013 } else {
2002- // Unknown autentication type
2003- isInvalid = YES ;
2014+ // For the moment we have to mantain this value as valid because when we work with
2015+ // some Redirected Server our library lost the Wwww-Authenticate header
2016+ isInvalid = NO ;
20042017 }
2005- } else {
2006- // The server not return a Www-Authenticate header
2007- isInvalid = YES ;
20082018 }
2019+
20092020 } else {
20102021 // If sso_active the check does not fail
20112022 // As we are receiving a SAML error from SAML server, we forced the flag to accept this connection
20122023 isInvalid = NO ;
20132024 isLoginButtonEnabled = YES ;
20142025 }
20152026
2027+
20162028 // Update the interface depend of if isInvalid or not
20172029 if (isInvalid) {
20182030 hasInvalidAuth = YES ;
@@ -2208,6 +2220,8 @@ -(void)createUserAndDataInTheSystemWithRequest:(NSArray *)items andCode:(NSInteg
22082220 userDto.password = passwordUTF8;
22092221 userDto.ssl = isHttps;
22102222 userDto.activeaccount = YES ;
2223+ // Take into account that this global property can be stored bab value
2224+ // For that we reset this property when the system check the server in LoginViewController class
22112225 userDto.urlRedirected = app.urlServerRedirected ;
22122226
22132227 [ManageUsersDB insertUser: userDto];
0 commit comments