Merge branch 'voximplant-sdk-2.38.0'

voximplant · Apr 27, 2021 · 484c1b1 · 484c1b1
2 parents 3a70c35 + 299bc64
commit 484c1b1
Show file tree

Hide file tree

Showing 18 changed files with 162 additions and 837 deletions.
diff --git a/AudioCall/ACAuthService.m b/AudioCall/ACAuthService.m
@@ -86,29 +86,31 @@ - (void)loginWithUser:(NSString *)user
             __strong ACAuthService *strongSelf = weakSelf;
             [strongSelf.client loginWithUser:user
                                     password:password
-                                     success:^(NSString * _Nonnull userDisplayName, VIAuthParams * _Nonnull authParams) {
-                                         NSTimeInterval refreshExpire = authParams.refreshExpire;
-                                         NSString *refreshToken = authParams.refreshToken;
-                                         NSTimeInterval accessExpire = authParams.accessExpire;
-                                         NSString *accessToken = authParams.accessToken;
-
-                                         __strong ACAuthService *strongSelf = weakSelf;
-
-                                         VoxToken *validAccessToken = [VoxToken createToken:accessToken
-                                                                               expireDate:[NSDate dateWithTimeIntervalSinceNow:accessExpire]];
-
-                                         VoxToken *validRefreshToken = [VoxToken createToken:refreshToken
-                                                                                expireDate:[NSDate dateWithTimeIntervalSinceNow:refreshExpire]];
-                                         VoxKeys *keys = [VoxKeys keyholderWithAccess:validAccessToken refresh:validRefreshToken];
-                                         [strongSelf.tokenManager setKeys:keys];
-                                         strongSelf.loggedInUser = user;
-                                         strongSelf.loggedInUserDisplayName = userDisplayName;
-
-                                         completion(userDisplayName, nil);
-                                     }
+                                     success:^(NSString *_Nonnull userDisplayName, VIAuthParams *_Nullable authParams) {
+                __strong ACAuthService *strongSelf = weakSelf;
+                if (authParams) {
+                    NSTimeInterval refreshExpire = authParams.refreshExpire;
+                    NSString *refreshToken = authParams.refreshToken;
+                    NSTimeInterval accessExpire = authParams.accessExpire;
+                    NSString *accessToken = authParams.accessToken;
+
+
+                    VoxToken *validAccessToken = [VoxToken createToken:accessToken
+                                                            expireDate:[NSDate dateWithTimeIntervalSinceNow:accessExpire]];
+
+                    VoxToken *validRefreshToken = [VoxToken createToken:refreshToken
+                                                             expireDate:[NSDate dateWithTimeIntervalSinceNow:refreshExpire]];
+                    VoxKeys *keys = [VoxKeys keyholderWithAccess:validAccessToken refresh:validRefreshToken];
+                    [strongSelf.tokenManager setKeys:keys];
+                }
+                strongSelf.loggedInUser = user;
+                strongSelf.loggedInUserDisplayName = userDisplayName;
+
+                completion(userDisplayName, nil);
+            }
                                      failure:^(NSError * _Nonnull error) {
-                                         completion(nil, error);
-                                     }];
+                completion(nil, error);
+            }];
         }];
     }];
 }
@@ -152,27 +154,27 @@ - (void)loginUsingTokenWithCompletion:(VoxResult)completion {
                 __strong ACAuthService *strongSelf = weakSelf;
                 [strongSelf.client loginWithUser:user
                                            token:accessToken.token
-                                         success:^(NSString * _Nonnull userDisplayName, VIAuthParams * _Nonnull authParams) {
-                                             NSTimeInterval refreshExpire = authParams.refreshExpire;
-                                             NSString *refreshToken = authParams.refreshToken;
-                                             NSTimeInterval accessExpire = authParams.accessExpire;
-                                             NSString *accessToken = authParams.accessToken;
-                                             
-                                             if (refreshExpire && refreshToken && accessExpire && accessToken) {
-                                                 VoxToken *validAccessToken = [VoxToken createToken:accessToken
-                                                                                       expireDate:[NSDate dateWithTimeIntervalSinceNow:accessExpire]];
-                                                 VoxToken *validRefreshToken = [VoxToken createToken:refreshToken
-                                                                                        expireDate:[NSDate dateWithTimeIntervalSinceNow:refreshExpire]];
-                                                 VoxKeys *keys = [VoxKeys keyholderWithAccess:validAccessToken refresh:validRefreshToken];
-                                                 [strongSelf.tokenManager setKeys:keys];
-                                                 strongSelf.loggedInUser = user;
-                                                 strongSelf.loggedInUserDisplayName = userDisplayName;
-                                             }
-                                             completion(userDisplayName, nil);
-                                             
-                                         } failure:^(NSError * _Nonnull error) {
-                                             completion(nil, error);
-                                         }];
+                                         success:^(NSString * _Nonnull userDisplayName, VIAuthParams *_Nullable authParams) {
+                    __strong ACAuthService *strongSelf = weakSelf;
+                    if (authParams) {
+                        NSTimeInterval refreshExpire = authParams.refreshExpire;
+                        NSString *refreshToken = authParams.refreshToken;
+                        NSTimeInterval accessExpire = authParams.accessExpire;
+                        NSString *accessToken = authParams.accessToken;
+                        VoxToken *validAccessToken = [VoxToken createToken:accessToken
+                                                                expireDate:[NSDate dateWithTimeIntervalSinceNow:accessExpire]];
+                        VoxToken *validRefreshToken = [VoxToken createToken:refreshToken
+                                                                 expireDate:[NSDate dateWithTimeIntervalSinceNow:refreshExpire]];
+                        VoxKeys *keys = [VoxKeys keyholderWithAccess:validAccessToken refresh:validRefreshToken];
+                        [strongSelf.tokenManager setKeys:keys];
+                    }
+                    strongSelf.loggedInUser = user;
+                    strongSelf.loggedInUserDisplayName = userDisplayName;
+                    completion(userDisplayName, nil);
+
+                } failure:^(NSError * _Nonnull error) {
+                    completion(nil, error);
+                }];
             }];
         }];
     }];