Merge branch 'develop'

danielbarela · danielbarela · commit 0cfec4587b22 · 2022-08-11T06:14:55.000-06:00
diff --git a/Mage/AuthenticationCoordinator.m b/Mage/AuthenticationCoordinator.m
@@ -366,7 +366,7 @@ - (void) returnToLogin: (void (^) (AuthenticationStatus authenticationStatus, NS
 
 - (void) authenticationWasSuccessfulWithModule: (id<AuthenticationProtocol>) module {
     
-    [module finishLogin:^(AuthenticationStatus authenticationStatus, NSString *errorString) {
+    [module finishLogin:^(AuthenticationStatus authenticationStatus, NSString *errorString, NSString *errorDetail) {
         if (authenticationStatus == AUTHENTICATION_SUCCESS) {
             NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
             
@@ -384,7 +384,7 @@ - (void) authenticationWasSuccessfulWithModule: (id<AuthenticationProtocol>) mod
                 [self.navigationController pushViewController:viewController animated:NO];
             }
         } else {
-            ContactInfo *info = [[ContactInfo alloc] initWithTitle:@"Login Failed" andMessage: errorString];
+            ContactInfo *info = [[ContactInfo alloc] initWithTitle:@"Login Failed" andMessage: errorString andDetailedInfo: errorDetail];
 //            info.username = username;
             [self.loginView setContactInfo:info];
         }
diff --git a/Mage/ContactInfo.h b/Mage/ContactInfo.h
@@ -32,7 +32,10 @@ NS_ASSUME_NONNULL_BEGIN
  */
 @property (nonatomic, strong) NSString *strategy;
 
+@property (nonatomic, strong) NSString *detailedInfo;
+
 - (instancetype) initWithTitle: (nullable NSString *)title andMessage: (NSString *) message;
+- (instancetype) initWithTitle: (nullable NSString *)title andMessage: (NSString *) message andDetailedInfo: (NSString *) detailedInfo;
 
 - (NSAttributedString *) messageWithContactInfo;
 
diff --git a/Mage/ContactInfo.m b/Mage/ContactInfo.m
@@ -23,6 +23,16 @@ - (instancetype) initWithTitle: (nullable NSString *)title andMessage: (NSString
     return self;
 }
 
+- (instancetype) initWithTitle: (nullable NSString *)title andMessage: (NSString *) message andDetailedInfo:(nonnull NSString *)detailedInfo {
+    
+    self = [self initWithTitle:title andMessage:message];
+    if (!self) return nil;
+    
+    [self setDetailedInfo:detailedInfo];
+    
+    return self;
+}
+
 - (NSAttributedString *) messageWithContactInfo {
     NSString * htmlString = [self constructMessage];
     NSAttributedString *attributedString = [[NSAttributedString alloc]
diff --git a/Mage/LoginViewController.m b/Mage/LoginViewController.m
@@ -14,6 +14,7 @@
 #import "LocalLoginView.h"
 #import "LdapLoginView.h"
 #import "OrView.h"
+#import <PureLayout.h>
 
 @interface LoginViewController () <UITextFieldDelegate, UIGestureRecognizerDelegate>
 
@@ -32,7 +33,10 @@ @interface LoginViewController () <UITextFieldDelegate, UIGestureRecognizerDeleg
 @property (strong, nonatomic) id<MDCContainerScheming> scheme;
 @property (weak, nonatomic) IBOutlet UIStackView *loginsStackView;
 @property (strong, nonatomic) IBOutlet UITextView *messageView;
+@property (strong, nonatomic) MDCButton *messageDetailButton;
+@property (strong, nonatomic) NSString *errorMessageDetail;
 @property (strong, nonatomic) OrView *orView;
+@property (strong, nonatomic) UITapGestureRecognizer *gestureRecognizer;
 
 @end
 
@@ -169,9 +173,26 @@ - (void) setupAuthentication {
     self.messageView.editable = NO;
     [self.loginsStackView addArrangedSubview:self.messageView];
     
+    UIView *messageDetailButtonContainer = [UIView newAutoLayoutView];
+    self.messageDetailButton = [[MDCButton alloc] init];
+    [self.messageDetailButton applyTextThemeWithScheme:_scheme];
+    [self.messageDetailButton setTitle:@"Copy Error Message Detail" forState:UIControlStateNormal];
+    [self.messageDetailButton addTarget:self action:@selector(copyDetail) forControlEvents:UIControlEventTouchUpInside];
+    self.messageDetailButton.hidden = YES;
+    
+    [messageDetailButtonContainer addSubview:self.messageDetailButton];
+    [self.messageDetailButton autoPinEdgesToSuperviewEdgesWithInsets:UIEdgeInsetsMake(0, 16, 0, 16)];
+    
+    [self.loginsStackView addArrangedSubview:messageDetailButtonContainer];
+    
     self.statusView.hidden = !self.loginFailure;
 }
 
+- (void) copyDetail {
+    UIPasteboard.generalPasteboard.string = self.errorMessageDetail;
+    [MDCSnackbarManager.defaultManager showMessage:[MDCSnackbarMessage messageWithText: @"Error detail copied to clipboard"]];
+}
+
 - (void) setContactInfo:(ContactInfo *) contactInfo {
     self.messageView.attributedText = contactInfo.messageWithContactInfo;
     self.messageView.accessibilityLabel = contactInfo.title;
@@ -183,6 +204,14 @@ - (void) setContactInfo:(ContactInfo *) contactInfo {
     [self.messageView sizeToFit];
     self.messageView.hidden = NO;
     
+    if (contactInfo.detailedInfo) {
+        self.messageDetailButton.hidden = NO;
+        self.errorMessageDetail = contactInfo.detailedInfo;
+    } else {
+        self.messageDetailButton.hidden = YES;
+        self.errorMessageDetail = nil;
+    }
+    
     if([self.loginsStackView.superview isMemberOfClass:[UIScrollView class]]) {
         [self.loginsStackView.superview layoutIfNeeded];
         dispatch_async(dispatch_get_main_queue(), ^{
diff --git a/sdk/Authentication.h b/sdk/Authentication.h
@@ -18,7 +18,7 @@ typedef NS_ENUM(NSInteger, AuthenticationStatus) {
 - (NSDictionary *) parameters;
 - (BOOL) canHandleLoginToURL: (NSString *) url;
 - (void) loginWithParameters: (NSDictionary *) loginParameters complete:(void (^) (AuthenticationStatus authenticationStatus, NSString *errorString)) complete;
-- (void) finishLogin:(void (^) (AuthenticationStatus authenticationStatus, NSString *errorString)) complete;
+- (void) finishLogin:(void (^) (AuthenticationStatus authenticationStatus, NSString *errorString, NSString *errorDetail)) complete;
 @end
 
 @interface Authentication : NSObject
diff --git a/sdk/IdpAuthentication.m b/sdk/IdpAuthentication.m
@@ -56,7 +56,7 @@ - (void) signupWithParameters: (NSDictionary *) parameters complete:(void (^) (A
     }
 }
 
-- (void) finishLogin:(void (^) (AuthenticationStatus authenticationStatus, NSString *errorString)) complete {
+- (void) finishLogin:(void (^) (AuthenticationStatus authenticationStatus, NSString *errorString, NSString *errorDetail)) complete {
     NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
     NSDictionary *api = [self.response objectForKey:@"api"];
     
@@ -109,7 +109,7 @@ - (void) finishLogin:(void (^) (AuthenticationStatus authenticationStatus, NSStr
         [defaults synchronize];
         [StoredPassword persistTokenToKeyChain:token];
         
-        complete(AUTHENTICATION_SUCCESS, nil);
+        complete(AUTHENTICATION_SUCCESS, nil, nil);
     }];
 }
 
diff --git a/sdk/LdapAuthentication.m b/sdk/LdapAuthentication.m
@@ -81,7 +81,7 @@ - (void) loginWithParameters: (NSDictionary *) parameters complete:(void (^) (Au
     [manager addTask:task];
 }
 
-- (void) finishLogin:(void (^) (AuthenticationStatus authenticationStatus, NSString *errorString)) complete {
+- (void) finishLogin:(void (^) (AuthenticationStatus authenticationStatus, NSString *errorString, NSString *errorDetail)) complete {
     NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
     NSDictionary *api = [self.response objectForKey:@"api"];
     
@@ -135,7 +135,7 @@ - (void) finishLogin:(void (^) (AuthenticationStatus authenticationStatus, NSStr
         [defaults synchronize];
         [StoredPassword persistTokenToKeyChain:token];
         
-        complete(AUTHENTICATION_SUCCESS, nil);
+        complete(AUTHENTICATION_SUCCESS, nil, nil);
     }];
 }
 
diff --git a/sdk/LocalAuthentication.m b/sdk/LocalAuthentication.m
@@ -59,7 +59,7 @@ - (void) loginWithParameters: (NSDictionary *) loginParameters complete:(void (^
     complete(AUTHENTICATION_ERROR, @"Error logging in");
 }
 
-- (void) finishLogin:(void (^) (AuthenticationStatus authenticationStatus, NSString *errorString)) complete {
+- (void) finishLogin:(void (^) (AuthenticationStatus authenticationStatus, NSString *errorString, NSString *errorDetail)) complete {
     NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
     NSDictionary *oldLoginParameters = [defaults objectForKey:@"loginParameters"];
     
@@ -73,7 +73,7 @@ - (void) finishLogin:(void (^) (AuthenticationStatus authenticationStatus, NSStr
     [[UserUtility singleton] resetExpiration];
     
     [MageSessionManager sharedManager].token = [oldLoginParameters objectForKey:@"token"];
-    complete(AUTHENTICATION_SUCCESS, nil);
+    complete(AUTHENTICATION_SUCCESS, nil, nil);
 }
 
 @end
diff --git a/sdk/ServerAuthentication.m b/sdk/ServerAuthentication.m
@@ -97,8 +97,9 @@ - (void) authorize:(NSDictionary *) parameters complete:(void (^) (Authenticatio
     NSMutableURLRequest *request = [manager.requestSerializer requestWithMethod:@"POST" URLString:url parameters:authorizeParameters error:nil];
     [request setValue:[NSString stringWithFormat:@"Bearer %@", token] forHTTPHeaderField:@"Authorization"];
     NSURLSessionDataTask *task = [manager dataTaskWithRequest:request uploadProgress:nil downloadProgress:nil completionHandler:^(NSURLResponse * _Nonnull response, id  _Nullable responseObject, NSError * _Nullable error) {
+        NSHTTPURLResponse *httpResponse = (NSHTTPURLResponse *) response;
+
         if (error) {
-            NSHTTPURLResponse *httpResponse = (NSHTTPURLResponse *) response;
 
             // if the error was a network error try to login with the local auth module
             if ([error.domain isEqualToString:NSURLErrorDomain]&& (error.code == NSURLErrorCannotConnectToHost|| error.code == NSURLErrorNotConnectedToInternet)) {
@@ -125,23 +126,27 @@ - (void) authorize:(NSDictionary *) parameters complete:(void (^) (Authenticatio
             return complete(AUTHENTICATION_ERROR, error.localizedDescription);
         }
         self.loginParameters = parameters;
-        self.response = responseObject;
+        
+        NSMutableDictionary *responseDictionary = [[NSMutableDictionary alloc] initWithDictionary:responseObject];
+        responseDictionary[@"headers"] = [httpResponse allHeaderFields];
+        
+        self.response = responseDictionary;
         
         complete(AUTHENTICATION_SUCCESS, nil);
     }];
     
     [manager addTask:task];
 }
 
-- (void) finishLogin:(void (^) (AuthenticationStatus authenticationStatus, NSString *errorString)) complete {
+- (void) finishLogin:(void (^) (AuthenticationStatus authenticationStatus, NSString *errorString, NSString *errorDetail)) complete {
     NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
     NSDictionary *api = [self.response objectForKey:@"api"];
     
     if (self.response == nil) {
-        complete(AUTHENTICATION_ERROR, @"Invalid server response");
+        complete(AUTHENTICATION_ERROR, @"Invalid server response", nil);
         return;
     } else if (self.loginParameters == nil) {
-        complete(AUTHENTICATION_ERROR, @"Server login error");
+        complete(AUTHENTICATION_ERROR, @"Server login error", nil);
         return;
     }
     
@@ -165,7 +170,8 @@ - (void) finishLogin:(void (^) (AuthenticationStatus authenticationStatus, NSStr
         if (tokenExpirationDate == nil) {
             failureMessage = [NSString stringWithFormat: @"%@Invalid Token Expiration Date<br>", failureMessage];
         }
-        complete(AUTHENTICATION_ERROR, failureMessage);
+        
+        complete(AUTHENTICATION_ERROR, failureMessage, [NSString stringWithFormat:@"Response Details %@", self.response]);
         return;
     }
     
@@ -215,7 +221,7 @@ - (void) finishLogin:(void (^) (AuthenticationStatus authenticationStatus, NSStr
         [StoredPassword persistPasswordToKeyChain:password];
         [StoredPassword persistTokenToKeyChain:token];
         
-        complete(AUTHENTICATION_SUCCESS, nil);
+        complete(AUTHENTICATION_SUCCESS, nil, nil);
     }];
 }
 

Original file line number	Diff line number	Diff line change
`@@ -366,7 +366,7 @@ - (void) returnToLogin: (void (^) (AuthenticationStatus authenticationStatus, NS`
`366`	`366`
`367`	`367`	`- (void) authenticationWasSuccessfulWithModule: (id<AuthenticationProtocol>) module {`
`368`	`368`
`369`		`- [module finishLogin:^(AuthenticationStatus authenticationStatus, NSString *errorString) {`
	`369`	`+ [module finishLogin:^(AuthenticationStatus authenticationStatus, NSString errorString, NSString errorDetail) {`
`370`	`370`	`if (authenticationStatus == AUTHENTICATION_SUCCESS) {`
`371`	`371`	`NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];`
`372`	`372`
`@@ -384,7 +384,7 @@ - (void) authenticationWasSuccessfulWithModule: (id<AuthenticationProtocol>) mod`
`384`	`384`	`[self.navigationController pushViewController:viewController animated:NO];`
`385`	`385`	`}`
`386`	`386`	`} else {`
`387`		`- ContactInfo *info = [[ContactInfo alloc] initWithTitle:@"Login Failed" andMessage: errorString];`
	`387`	`+ ContactInfo *info = [[ContactInfo alloc] initWithTitle:@"Login Failed" andMessage: errorString andDetailedInfo: errorDetail];`
`388`	`388`	`// info.username = username;`
`389`	`389`	`[self.loginView setContactInfo:info];`
`390`	`390`	`}`
Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ - (void) signupWithParameters: (NSDictionary *) parameters complete:(void (^) (A`
`56`	`56`	`}`
`57`	`57`	`}`
`58`	`58`
`59`		`-- (void) finishLogin:(void (^) (AuthenticationStatus authenticationStatus, NSString *errorString)) complete {`
	`59`	`+- (void) finishLogin:(void (^) (AuthenticationStatus authenticationStatus, NSString errorString, NSString errorDetail)) complete {`
`60`	`60`	`NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];`
`61`	`61`	`NSDictionary *api = [self.response objectForKey:@"api"];`
`62`	`62`
`@@ -109,7 +109,7 @@ - (void) finishLogin:(void (^) (AuthenticationStatus authenticationStatus, NSStr`
`109`	`109`	`[defaults synchronize];`
`110`	`110`	`[StoredPassword persistTokenToKeyChain:token];`
`111`	`111`
`112`		`- complete(AUTHENTICATION_SUCCESS, nil);`
	`112`	`+ complete(AUTHENTICATION_SUCCESS, nil, nil);`
`113`	`113`	`}];`
`114`	`114`	`}`
`115`	`115`
Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ - (void) loginWithParameters: (NSDictionary *) parameters complete:(void (^) (Au`
`81`	`81`	`[manager addTask:task];`
`82`	`82`	`}`
`83`	`83`
`84`		`-- (void) finishLogin:(void (^) (AuthenticationStatus authenticationStatus, NSString *errorString)) complete {`
	`84`	`+- (void) finishLogin:(void (^) (AuthenticationStatus authenticationStatus, NSString errorString, NSString errorDetail)) complete {`
`85`	`85`	`NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];`
`86`	`86`	`NSDictionary *api = [self.response objectForKey:@"api"];`
`87`	`87`
`@@ -135,7 +135,7 @@ - (void) finishLogin:(void (^) (AuthenticationStatus authenticationStatus, NSStr`
`135`	`135`	`[defaults synchronize];`
`136`	`136`	`[StoredPassword persistTokenToKeyChain:token];`
`137`	`137`
`138`		`- complete(AUTHENTICATION_SUCCESS, nil);`
	`138`	`+ complete(AUTHENTICATION_SUCCESS, nil, nil);`
`139`	`139`	`}];`
`140`	`140`	`}`
`141`	`141`
Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,7 @@ - (void) loginWithParameters: (NSDictionary *) loginParameters complete:(void (^`
`59`	`59`	`complete(AUTHENTICATION_ERROR, @"Error logging in");`
`60`	`60`	`}`
`61`	`61`
`62`		`-- (void) finishLogin:(void (^) (AuthenticationStatus authenticationStatus, NSString *errorString)) complete {`
	`62`	`+- (void) finishLogin:(void (^) (AuthenticationStatus authenticationStatus, NSString errorString, NSString errorDetail)) complete {`
`63`	`63`	`NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];`
`64`	`64`	`NSDictionary *oldLoginParameters = [defaults objectForKey:@"loginParameters"];`
`65`	`65`
`@@ -73,7 +73,7 @@ - (void) finishLogin:(void (^) (AuthenticationStatus authenticationStatus, NSStr`
`73`	`73`	`[[UserUtility singleton] resetExpiration];`
`74`	`74`
`75`	`75`	`[MageSessionManager sharedManager].token = [oldLoginParameters objectForKey:@"token"];`
`76`		`- complete(AUTHENTICATION_SUCCESS, nil);`
	`76`	`+ complete(AUTHENTICATION_SUCCESS, nil, nil);`
`77`	`77`	`}`
`78`	`78`
`79`	`79`	`@end`