Merge branch 'dev' of https://github.com/AzureAD/microsoft-authentication-library-common-for-objc into jak/error-coding

Author: unpluggedk

IdentityCore/src/oauth2/aad_base/MSIDAADTokenResponse.m

@@ -43,6 +43,7 @@ @implementation MSIDAADTokenResponse
 MSID_JSON_ACCESSOR(MSID_OAUTH2_RESOURCE, resource)
 MSID_JSON_RW(MSID_OAUTH2_CLIENT_INFO, rawClientInfo, setRawClientInfo)
 MSID_JSON_ACCESSOR(MSID_FAMILY_ID, familyId)
+MSID_JSON_RW(MSID_OAUTH2_REFRESH_TOKEN, refreshToken, setRefreshToken)
 MSID_JSON_ACCESSOR(MSID_TELEMETRY_KEY_SPE_INFO, speInfo)
 
 - (instancetype)initWithJSONDictionary:(NSDictionary *)json
@@ -58,6 +59,11 @@ - (instancetype)initWithJSONDictionary:(NSDictionary *)json
             self.rawClientInfo = token.clientInfo.rawClientInfo;
             _clientInfo = token.clientInfo;
         }
+
+        if (token && [NSString msidIsStringNilOrBlank:self.refreshToken])
+        {
+            self.refreshToken = token.refreshToken;
+        }
 
         [self initDerivedProperties];
     }

IdentityCore/tests/MSIDAADTokenResponseTests.m

@@ -173,7 +173,7 @@ - (void)testExtendedExpiryDate_whenExtendedExpiresInNotAvailable_shouldReturnNil
 
 #pragma mark - Refresh token
 
-- (void)testInitWithJson_andRefreshToken_shouldTakeFieldsFromRefreshToken
+- (void)testInitWithJson_andRefreshToken_andNilClientInfoInResponse_shouldTakeClientInfoFromRefreshToken
 {
     NSDictionary *jsonInput = @{@"access_token": @"at",
                                 @"token_type": @"Bearer",
@@ -198,6 +198,26 @@ - (void)testInitWithJson_andRefreshToken_shouldTakeFieldsFromRefreshToken
     XCTAssertEqualObjects(response.clientInfo, clientInfo);
 }
 
+- (void)testInitWithJson_andRefreshToken_andNilRefreshTokenInResponse_shouldTakeRefreshTokenFromInput
+{
+    NSDictionary *jsonInput = @{@"access_token": @"at",
+                                @"token_type": @"Bearer",
+                                @"expires_in": @"3600"};
+
+    MSIDRefreshToken *refreshToken = [MSIDRefreshToken new];
+    refreshToken.refreshToken = @"rt from refresh token";
+
+    NSError *error = nil;
+    MSIDAADTokenResponse *response = [[MSIDAADTokenResponse alloc] initWithJSONDictionary:jsonInput
+                                                                             refreshToken:refreshToken
+                                                                                    error:&error];
+
+    XCTAssertNotNil(response);
+    XCTAssertNil(error);
+
+    XCTAssertEqualObjects(response.refreshToken, @"rt from refresh token");
+}
+
 - (void)testInitWithJson_andNilRefreshToken_shouldNotTakeFieldsFromRefreshToken
 {
     NSDictionary *jsonInput = @{@"access_token": @"at",
@@ -227,6 +247,7 @@ - (void)testInitWithJson_andRefreshToken_shouldNotTakeFieldsFromRefreshTokenAndU
                                 };
 
     MSIDRefreshToken *refreshToken = [MSIDRefreshToken new];
+    refreshToken.refreshToken = @"rt2";
 
     MSIDClientInfo *clientInfo = [MSIDClientInfo new];
     [clientInfo setValue:@"clientinfo" forKey:@"rawClientInfo"];
@@ -242,6 +263,7 @@ - (void)testInitWithJson_andRefreshToken_shouldNotTakeFieldsFromRefreshTokenAndU
     XCTAssertNil(error);
 
     XCTAssertEqualObjects(response.clientInfo.rawClientInfo, clientInfoString);
+    XCTAssertEqualObjects(response.refreshToken, @"rt");
 }
 
 @end

IdentityCore/tests/automation/MSIDTestAccountsProvider.h

@@ -29,9 +29,30 @@
 
 - (instancetype)init NS_UNAVAILABLE;
 
+/*
+This information would normally come from a configuration file.
+@param certificate Base64 encoded client certificate to authenticate with keyvault
+@param password Certificate password in case it's password protected
+@param additionalConfigurations Additional local configurations that should override server configurations
+@param appInstallLinks Information necessary to install additional apps to run multi-app tests, e.g.
+
+ "msal": {
+    "install_url": "https://...",
+    "app_bundle_id": "com.microsoft.MSALTestApp",
+    "app_name": "MSAL Test App"
+ },
+ "broker": {
+    "install_url": "https://...",
+    "app_bundle_id": "com.microsoft.broker",
+    "app_name": "Broker"
+ }
+@param apiPath Lab API path
+ */
+
 - (instancetype)initWithClientCertificateContents:(NSString *)certificate
                               certificatePassword:(NSString *)password
                          additionalConfigurations:(NSDictionary *)additionalConfigurations
+                                  appInstallLinks:(NSDictionary *)appInstallLinks
                                           apiPath:(NSString *)apiPath;
 
 - (instancetype)initWithConfigurationPath:(NSString *)configurationPath;
@@ -42,4 +63,6 @@
 - (void)passwordForAccount:(MSIDTestAccount *)account
          completionHandler:(void (^)(NSString *password))completionHandler;
 
+- (NSDictionary *)appInstallForConfiguration:(NSString *)appId;
+
 @end

IdentityCore/tests/automation/MSIDTestAccountsProvider.m

@@ -27,6 +27,7 @@
 @interface MSIDTestAccountsProvider()
 
 @property (nonatomic, strong) NSMutableDictionary *cachedConfigurations;
+@property (nonatomic, strong) NSDictionary *appInstallLinks;
 @property (nonatomic, strong) KeyvaultAuthentication *keyvaultAuthentication;
 @property (nonatomic, strong) NSString *apiPath;
 
@@ -37,6 +38,7 @@ @implementation MSIDTestAccountsProvider
 - (instancetype)initWithClientCertificateContents:(NSString *)certificate
                               certificatePassword:(NSString *)password
                          additionalConfigurations:(NSDictionary *)additionalConfigurations
+                                  appInstallLinks:(NSDictionary *)appInstallLinks
                                           apiPath:(NSString *)apiPath
 {
     self = [super init];
@@ -47,6 +49,7 @@ - (instancetype)initWithClientCertificateContents:(NSString *)certificate
         _keyvaultAuthentication = [[KeyvaultAuthentication alloc] initWithCertContents:certificate certPassword:password];
         _apiPath = apiPath;
         [_cachedConfigurations addEntriesFromDictionary:additionalConfigurations];
+        _appInstallLinks = appInstallLinks;
     }
 
     return self;
@@ -90,10 +93,16 @@ - (instancetype)initWithConfigurationPath:(NSString *)configurationPath
     return [self initWithClientCertificateContents:encodedCertificate
                                certificatePassword:certificatePassword
                           additionalConfigurations:additionalConfsDictionary
+                                   appInstallLinks:configurationDictionary[@"app_install_urls"]
                                            apiPath:apiPath];
 
 }
 
+- (NSDictionary *)appInstallForConfiguration:(NSString *)appId
+{
+    return _appInstallLinks[appId];
+}
+
 - (void)configurationWithRequest:(MSIDTestAutomationConfigurationRequest *)request
                completionHandler:(void (^)(MSIDTestAutomationConfiguration *configuration))completionHandler
 {