felixfoertsch/bundesmessenger-ios
1
0
Fork 0
mirror of https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git synced 2026-05-03 06:36:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

Authentication: support SSO by using the fallback URL

Browse Source 
#2306
This commit is contained in:
manuroe
2019-03-04 16:52:22 +01:00
parent 50137eaf77
commit 909bf66f19
6 changed files with 118 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Riot/Modules/Authentication/Views/AuthInputsView.m
+48 -22
View File
@@ -67,6 +67,7 @@
_thirdPartyIdentifiersHidden = YES;
_isThirdPartyIdentifierPending = NO;
_isSingleSignOnRequired = NO;
self.userLoginTextField.placeholder = NSLocalizedStringFromTable(@"auth_user_id_placeholder", @"Vector", nil);
self.repeatPasswordTextField.placeholder = NSLocalizedStringFromTable(@"auth_repeat_password_placeholder", @"Vector", nil);
@@ -119,6 +120,12 @@
self.passwordSeparator.backgroundColor = ThemeService.shared.theme.lineBreakColor;
self.repeatPasswordSeparator.backgroundColor = ThemeService.shared.theme.lineBreakColor;
[self.ssoButton.layer setCornerRadius:5];
self.ssoButton.clipsToBounds = YES;
[self.ssoButton setTitle:NSLocalizedStringFromTable(@"auth_login_single_sign_on", @"Vector", nil) forState:UIControlStateNormal];
[self.ssoButton setTitle:NSLocalizedStringFromTable(@"auth_login_single_sign_on", @"Vector", nil) forState:UIControlStateHighlighted];
self.ssoButton.backgroundColor = ThemeService.shared.theme.tintColor;
if (self.userLoginTextField.placeholder)
{
self.userLoginTextField.attributedPlaceholder = [[NSAttributedString alloc]
@@ -189,30 +196,44 @@
{
if (authType == MXKAuthenticationTypeLogin)
{
self.passWordTextField.returnKeyType = UIReturnKeyDone;
self.phoneTextField.returnKeyType = UIReturnKeyNext;
self.userLoginTextField.placeholder = NSLocalizedStringFromTable(@"auth_user_id_placeholder", @"Vector", nil);
self.messageLabel.text = NSLocalizedStringFromTable(@"or", @"Vector", nil);
self.phoneTextField.placeholder = NSLocalizedStringFromTable(@"auth_phone_placeholder", @"Vector", nil);
_isSingleSignOnRequired = NO;
self.userLoginTextField.attributedPlaceholder = [[NSAttributedString alloc]
initWithString:self.userLoginTextField.placeholder
if ([self isFlowSupported:kMXLoginFlowTypePassword])
{
self.passWordTextField.returnKeyType = UIReturnKeyDone;
self.phoneTextField.returnKeyType = UIReturnKeyNext;
self.userLoginTextField.placeholder = NSLocalizedStringFromTable(@"auth_user_id_placeholder", @"Vector", nil);
self.messageLabel.text = NSLocalizedStringFromTable(@"or", @"Vector", nil);
self.phoneTextField.placeholder = NSLocalizedStringFromTable(@"auth_phone_placeholder", @"Vector", nil);
self.userLoginTextField.attributedPlaceholder = [[NSAttributedString alloc]
initWithString:self.userLoginTextField.placeholder
attributes:@{NSForegroundColorAttributeName: ThemeService.shared.theme.placeholderTextColor}];
self.phoneTextField.attributedPlaceholder = [[NSAttributedString alloc]
initWithString:self.phoneTextField.placeholder
attributes:@{NSForegroundColorAttributeName: ThemeService.shared.theme.placeholderTextColor}];
self.phoneTextField.attributedPlaceholder = [[NSAttributedString alloc]
initWithString:self.phoneTextField.placeholder
attributes:@{NSForegroundColorAttributeName: ThemeService.shared.theme.placeholderTextColor}];
self.userLoginContainer.hidden = NO;
self.messageLabel.hidden = NO;
self.phoneContainer.hidden = NO;
self.passwordContainer.hidden = NO;
self.messageLabelTopConstraint.constant = 59;
self.phoneContainerTopConstraint.constant = 70;
self.passwordContainerTopConstraint.constant = 150;
self.currentLastContainer = self.passwordContainer;
self.userLoginContainer.hidden = NO;
self.messageLabel.hidden = NO;
self.phoneContainer.hidden = NO;
self.passwordContainer.hidden = NO;
self.messageLabelTopConstraint.constant = 59;
self.phoneContainerTopConstraint.constant = 70;
self.passwordContainerTopConstraint.constant = 150;
self.currentLastContainer = self.passwordContainer;
}
else if ([self isFlowSupported:kMXLoginFlowTypeCAS]
|| [self isFlowSupported:kMXLoginFlowTypeSSO])
{
self.ssoButtonContainer.hidden = NO;
self.currentLastContainer = self.ssoButtonContainer;
_isSingleSignOnRequired = YES;
}
}
else
{
@@ -1242,6 +1263,7 @@
self.messageLabel.hidden = YES;
self.recaptchaContainer.hidden = YES;
self.termsView.hidden = YES;
self.ssoButtonContainer.hidden = YES;
_currentLastContainer = nil;
}
@@ -1362,6 +1384,10 @@
{
return YES;
}
else if ([flowType isEqualToString:kMXLoginFlowTypeCAS] || [flowType isEqualToString:kMXLoginFlowTypeSSO])
{
return YES;
}
return NO;
}