Resolve merge conflicts

Author: Swasti Gupta

CHANGELOG.md

@@ -1,4 +1,5 @@
 ## [TBD]
+* Use a single family refresh token (#2550)
 * Removed deprecated APIs, including legacy initializers, account management methods, token acquisition methods, and the MSALTelemetry interface (#2577)
 * Enforced requirement for a valid ParentViewController (with a window) in interactive token requests (#2590)
 * Removed deprecated methods from native auth public interface (#2588)

MSAL/test/app/ios/MSALTestAppCacheViewController.m

@@ -33,6 +33,7 @@
 #import "MSALAccount+Internal.h"
 #import "MSIDBaseToken.h"
 #import "MSIDRefreshToken.h"
+#import "MSIDFamilyRefreshToken.h"
 #import "MSIDAccessToken.h"
 #import "MSIDIdToken.h"
 #import "MSIDLegacyTokenCacheAccessor.h"
@@ -163,6 +164,7 @@ - (void)deleteToken:(MSIDBaseToken *)token
     {
         switch (token.credentialType)
         {
+            case MSIDFamilyRefreshTokenType:
             case MSIDRefreshTokenType:
             {
                 if ([token isKindOfClass:[MSIDLegacyRefreshToken class]])
@@ -469,6 +471,20 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
                 }
                 break;
             }
+            case MSIDFamilyRefreshTokenType:
+            {
+                MSIDFamilyRefreshToken *familyRefreshToken = (MSIDFamilyRefreshToken *) token;
+                
+                cell.textLabel.text = [NSString stringWithFormat:@"FamilyRefreshToken : %@, FamilyId : %@", familyRefreshToken.clientId, familyRefreshToken.familyId ? familyRefreshToken.familyId : @"0"];
+                cell.detailTextLabel.text = [NSString stringWithFormat:@"Client_Id: %@", familyRefreshToken.clientId];
+                
+                if ([familyRefreshToken.refreshToken isEqualToString:BAD_REFRESH_TOKEN])
+                {
+                    cell.textLabel.textColor = [UIColor orangeColor];
+                    cell.detailTextLabel.text = [NSString stringWithFormat:@"Client_Id : %@", familyRefreshToken.clientId];
+                }
+                break;
+            }
             case MSIDAccessTokenType:
             {
                 MSIDAccessToken *accessToken = (MSIDAccessToken *) token;
@@ -571,6 +587,7 @@ - (UISwipeActionsConfiguration *)tableView:(__unused UITableView *)tableView tra
 
         switch (token.credentialType)
         {
+            case MSIDFamilyRefreshTokenType:
             case MSIDRefreshTokenType:
             {
                 if ([token isKindOfClass:[MSIDLegacyRefreshToken class]])

MSAL/test/app/mac/MSALCacheViewController.m

@@ -36,6 +36,7 @@
 #import "MSIDAccountIdentifier.h"
 #import "MSIDBaseToken.h"
 #import "MSIDRefreshToken.h"
+#import "MSIDFamilyRefreshToken.h"
 #import "MSIDAccessToken.h"
 #import "MSIDIdToken.h"
 #import "MSIDKeychainTokenCache.h"
@@ -234,6 +235,7 @@ - (void)deleteToken:(MSIDBaseToken *)token
     {
         switch (token.credentialType)
         {
+            case MSIDFamilyRefreshTokenType:
             case MSIDRefreshTokenType:
             {
                 [self.defaultAccessor validateAndRemoveRefreshToken:(MSIDRefreshToken *)token
@@ -365,6 +367,20 @@ - (NSView *)outlineView:(NSOutlineView *)outlineView viewForTableColumn:(NSTable
             MSIDBaseToken *token = (MSIDBaseToken *)item;
             switch (token.credentialType)
             {
+                case MSIDFamilyRefreshTokenType:
+                {
+                    MSIDFamilyRefreshToken *familyRefreshToken = (MSIDFamilyRefreshToken *)token;
+                    textValue = [NSString stringWithFormat:@"Family Refresh Token: ClientId - %@, Realm - %@, FamilyId - %@", familyRefreshToken.clientId, familyRefreshToken.realm, familyRefreshToken.familyId];
+                    
+                    if ([familyRefreshToken.refreshToken isEqualToString:s_badRefreshToken])
+                    {
+                        cellView.textField.textColor = [NSColor redColor];
+                        [cellView.textField setStringValue:textValue];
+                        return cellView;
+                    }
+                    
+                    break;
+                }
                 case MSIDRefreshTokenType:
                 {
                     MSIDRefreshToken *refreshToken = (MSIDRefreshToken *) token;