Merge pull request #370 from AzureAD/oldalton/schema_compliance

Updated common core and optimized silent requests

MSAL/src/MSALAccount+Internal.h

@@ -67,8 +67,7 @@
          homeAccountId:(NSString *)homeAccountId
         localAccountId:(NSString *)localAccountId
            environment:(NSString *)environment
-              tenantId:(NSString *)tenantId
-            clientInfo:(MSIDClientInfo *)clientInfo;
+              tenantId:(NSString *)tenantId;
 
 /*!
  Initialize an MSALAccount with MSIDAccount

MSAL/src/MSALAccount.m

@@ -53,7 +53,6 @@ - (id)initWithUsername:(NSString *)username
         localAccountId:(NSString *)localAccountId
            environment:(NSString *)environment
               tenantId:(NSString *)tenantId
-            clientInfo:(MSIDClientInfo *)clientInfo
 {
     self = [super init];
 
@@ -63,18 +62,15 @@ - (id)initWithUsername:(NSString *)username
         _name = name;
         _environment = environment;
 
-        NSString *uid = clientInfo.uid;
-        NSString *utid = clientInfo.utid;
+        NSArray *accountIdComponents = [homeAccountId componentsSeparatedByString:@"."];
 
-        if (!uid && !utid)
-        {
-            NSArray *accountIdComponents = [homeAccountId componentsSeparatedByString:@"."];
+        NSString *uid = nil;
+        NSString *utid = nil;
 
-            if ([accountIdComponents count] == 2)
-            {
-                uid = accountIdComponents[0];
-                utid = accountIdComponents[1];
-            }
+        if ([accountIdComponents count] == 2)
+        {
+            uid = accountIdComponents[0];
+            utid = accountIdComponents[1];
         }
 
         _homeAccountId = [[MSALAccountId alloc] initWithHomeAccountIdentifier:homeAccountId
@@ -94,12 +90,11 @@ - (id)initWithUsername:(NSString *)username
 - (id)initWithMSIDAccount:(MSIDAccount *)account
 {
     return [self initWithUsername:account.username
-                                  name:account.name
-                         homeAccountId:account.accountIdentifier.homeAccountId
-                        localAccountId:account.localAccountId
-                           environment:account.authority.environment
-                              tenantId:account.authority.url.msidTenant
-                            clientInfo:account.clientInfo];
+                             name:account.name
+                    homeAccountId:account.accountIdentifier.homeAccountId
+                   localAccountId:account.localAccountId
+                      environment:account.authority.environment
+                         tenantId:account.authority.url.msidTenant];
 }
 
 #pragma mark - NSCopying

MSAL/src/MSALResult+Internal.h

@@ -29,6 +29,7 @@
 
 @class MSIDAccessToken;
 @class MSIDIdToken;
+@class MSIDClientInfo;
 
 @interface MSALResult (Internal)
 

MSAL/src/MSALResult.m

@@ -84,12 +84,11 @@ + (MSALResult *)resultWithAccessToken:(MSIDAccessToken *)accessToken
     }
 
     MSALAccount *account = [[MSALAccount alloc] initWithUsername:idTokenClaims.preferredUsername
-                                                                 name:idTokenClaims.name
-                                                        homeAccountId:accessToken.accountIdentifier.homeAccountId
-                                                       localAccountId:idTokenClaims.objectId
-                                                          environment:accessToken.authority.environment
-                                                             tenantId:idTokenClaims.tenantId
-                                                           clientInfo:accessToken.clientInfo];
+                                                            name:idTokenClaims.name
+                                                   homeAccountId:accessToken.accountIdentifier.homeAccountId
+                                                  localAccountId:idTokenClaims.objectId
+                                                     environment:accessToken.authority.environment
+                                                        tenantId:idTokenClaims.tenantId];
 
     NSError *authorityError = nil;
     MSALAuthority *authority = [[MSALAuthorityFactory new] authorityFromUrl:accessToken.authority.url

MSAL/src/requests/MSALBaseRequest.m

@@ -164,21 +164,16 @@ - (void)resolveEndpoints:(MSALAuthorityCompletion)completionBlock
                                                  context:_parameters
                                          completionBlock:^(NSURL *openIdConfigurationEndpoint, BOOL validated, NSError *error)
      {
-         [_parameters.unvalidatedAuthority loadOpenIdMetadataWithContext:_parameters
-                                                         completionBlock:^(MSIDOpenIdProviderMetadata *metadata, NSError *error)
-          {
-              if (error)
-              {
-                  MSALTelemetryAPIEvent *event = [self getTelemetryAPIEvent];
-                  [self stopTelemetryEvent:event error:error];
-
-                  completionBlock(NO, error);
-                  return;
-              }
-
-              _authority = _parameters.unvalidatedAuthority;
-              completionBlock(YES, nil);
-          }];
+         if (error)
+         {
+             MSALTelemetryAPIEvent *event = [self getTelemetryAPIEvent];
+             [self stopTelemetryEvent:event error:error];
+
+             completionBlock(NO, error);
+             return;
+         }
+
+         completionBlock(YES, nil);
      }];
 }
 
@@ -321,7 +316,10 @@ - (MSALResult *)resultFromTokenResponse:(MSIDAADV2TokenResponse *)tokenResponse
         if (error) *error = resultError;
     }
 
-    MSALResult *result = [MSALResult resultWithAccessToken:accessToken idToken:idToken isExtendedLifetimeToken:NO error:error];
+    MSALResult *result = [MSALResult resultWithAccessToken:accessToken
+                                                   idToken:idToken
+                                   isExtendedLifetimeToken:NO
+                                                     error:error];
     return result;
 }
 

MSAL/src/requests/MSALInteractiveRequest.m

@@ -113,7 +113,21 @@ - (void)acquireToken:(MSALCompletionBlock)completionBlock
             return;
         }
 
-        [self acquireTokenImpl:completionBlock];
+        [_parameters.unvalidatedAuthority loadOpenIdMetadataWithContext:_parameters
+                                                        completionBlock:^(MSIDOpenIdProviderMetadata *metadata, NSError *error)
+         {
+             if (error)
+             {
+                 MSALTelemetryAPIEvent *event = [self getTelemetryAPIEvent];
+                 [self stopTelemetryEvent:event error:error];
+
+                 completionBlock(nil, error);
+                 return;
+             }
+
+             _authority = _parameters.unvalidatedAuthority;
+             [self acquireTokenImpl:completionBlock];
+         }];
     }];
 }
 

MSAL/src/requests/MSALSilentRequest.m

@@ -82,6 +82,7 @@ - (void)acquireToken:(MSALCompletionBlock)completionBlock
             return;
         }
 
+        _authority = _parameters.unvalidatedAuthority;
         [self acquireTokenImpl:completionBlock];
     }];
 }
@@ -159,26 +160,50 @@ - (void)acquireTokenImpl:(MSALCompletionBlock)completionBlock
     MSID_LOG_INFO(_parameters, @"Refreshing access token");
     MSID_LOG_INFO_PII(_parameters, @"Refreshing access token");
 
-    [super acquireToken:^(MSALResult *result, NSError *error)
-    {
-         // Logic for returning extended lifetime token
-         if (_parameters.extendedLifetimeEnabled && _extendedLifetimeAccessToken && [self isServerUnavailable:error])
+    [self acquireTokenWithRefreshToken:self.refreshToken
+                         configuration:msidConfiguration
+                       completionBlock:completionBlock];
+}
+
+- (void)acquireTokenWithRefreshToken:(MSIDRefreshToken *)refreshToken
+                       configuration:(MSIDConfiguration *)configuration
+                     completionBlock:(MSALCompletionBlock)completionBlock
+{
+    [_parameters.unvalidatedAuthority loadOpenIdMetadataWithContext:_parameters
+                                                    completionBlock:^(MSIDOpenIdProviderMetadata *metadata, NSError *error)
+     {
+         if (error)
          {
-             MSIDIdToken *idToken = [self.tokenCache getIDTokenForAccount:_parameters.account.lookupAccountIdentifier
-                                                            configuration:msidConfiguration
-                                                                  context:_parameters
-                                                                    error:&error];
-
-             NSError *resultError = nil;
-
-             result = [MSALResult resultWithAccessToken:_extendedLifetimeAccessToken
-                                                idToken:idToken
-                                isExtendedLifetimeToken:YES
-                                                  error:&resultError];
-             error = resultError;
+             MSALTelemetryAPIEvent *event = [self getTelemetryAPIEvent];
+             [self stopTelemetryEvent:event error:error];
+
+             completionBlock(nil, error);
+             return;
          }
 
-         completionBlock(result, error);
+         _authority = _parameters.unvalidatedAuthority;
+
+         [super acquireToken:^(MSALResult *result, NSError *error)
+          {
+              // Logic for returning extended lifetime token
+              if (_parameters.extendedLifetimeEnabled && _extendedLifetimeAccessToken && [self isServerUnavailable:error])
+              {
+                  MSIDIdToken *idToken = [self.tokenCache getIDTokenForAccount:_parameters.account.lookupAccountIdentifier
+                                                                 configuration:configuration
+                                                                       context:_parameters
+                                                                         error:&error];
+
+                  NSError *resultError = nil;
+
+                  result = [MSALResult resultWithAccessToken:_extendedLifetimeAccessToken
+                                                     idToken:idToken
+                                     isExtendedLifetimeToken:YES
+                                                       error:&resultError];
+                  error = resultError;
+              }
+
+              completionBlock(result, error);
+          }];
      }];
 }
 

MSAL/test/automation/tests/interactive/MSALAADBasicInteractiveTests.m

@@ -105,7 +105,7 @@ - (void)testInteractiveAADLogin_withConvergedApp_andMicrosoftGraphScopes_andComm
     [self closeResultView];
 
     // 5. Run silent with not consented scopes
-    request.scopes = @"Calendars.Read";
+    request.scopes = @"Contacts.Read";
     config = [self configWithTestRequest:request];
     [self acquireTokenSilent:config];
     [self assertErrorCode:@"MSALErrorInteractionRequired"];