Merge pull request #159 from AzureAD/oldalton/adfsv3_fix

Use refresh token from input if none is returned in response (ADFSv3 …

Author: oldalton

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