Add support to the new FRT in test apps

juan-arias · juan-arias · commit 96e97017cabd · 2025-03-11T21:30:46.000-07:00
diff --git a/MSAL/IdentityCore b/MSAL/IdentityCore
@@ -1 +1 @@
-Subproject commit 357ac4791217381c69946624fe341380d1990c7b
+Subproject commit cee6ee51793685ee14b544d691470d0542cce333
diff --git a/MSAL/test/app/ios/MSALTestAppCacheViewController.m b/MSAL/test/app/ios/MSALTestAppCacheViewController.m
@@ -163,6 +163,7 @@ - (void)deleteToken:(MSIDBaseToken *)token
     {
         switch (token.credentialType)
         {
+            case MSIDFamilyRefreshTokenType:
             case MSIDRefreshTokenType:
             {
                 if ([token isKindOfClass:[MSIDLegacyRefreshToken class]])
@@ -469,6 +470,20 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
                 }
                 break;
             }
+            case MSIDFamilyRefreshTokenType:
+            {
+                MSIDRefreshToken *refreshToken = (MSIDRefreshToken *) token;
+                
+                cell.textLabel.text = [NSString stringWithFormat:@"FamilyRefreshToken : %@, FamilyId : %@", refreshToken.clientId, refreshToken.familyId ? refreshToken.familyId : @"0"];
+                cell.detailTextLabel.text = [NSString stringWithFormat:@"Client_Id: %@", refreshToken.clientId];
+                
+                if ([refreshToken.refreshToken isEqualToString:BAD_REFRESH_TOKEN])
+                {
+                    cell.textLabel.textColor = [UIColor orangeColor];
+                    cell.detailTextLabel.text = [NSString stringWithFormat:@"Client_Id : %@", refreshToken.clientId];
+                }
+                break;
+            }
             case MSIDAccessTokenType:
             {
                 MSIDAccessToken *accessToken = (MSIDAccessToken *) token;
@@ -571,6 +586,7 @@ - (UISwipeActionsConfiguration *)tableView:(__unused UITableView *)tableView tra
         
         switch (token.credentialType)
         {
+            case MSIDFamilyRefreshTokenType:
             case MSIDRefreshTokenType:
             {
                 if ([token isKindOfClass:[MSIDLegacyRefreshToken class]])
diff --git a/MSAL/test/app/mac/MSALCacheViewController.m b/MSAL/test/app/mac/MSALCacheViewController.m
@@ -234,6 +234,7 @@ - (void)deleteToken:(MSIDBaseToken *)token
     {
         switch (token.credentialType)
         {
+            case MSIDFamilyRefreshTokenType:
             case MSIDRefreshTokenType:
             {
                 [self.defaultAccessor validateAndRemoveRefreshToken:(MSIDRefreshToken *)token
@@ -365,6 +366,20 @@ - (NSView *)outlineView:(NSOutlineView *)outlineView viewForTableColumn:(NSTable
             MSIDBaseToken *token = (MSIDBaseToken *)item;
             switch (token.credentialType)
             {
+                case MSIDFamilyRefreshTokenType:
+                {
+                    MSIDRefreshToken *refreshToken = (MSIDRefreshToken *) token;
+                    textValue = [NSString stringWithFormat:@"Family Refresh Token: ClientId - %@, Realm - %@, FamilyId - %@", refreshToken.clientId, refreshToken.realm, refreshToken.familyId];
+                    
+                    if ([refreshToken.refreshToken isEqualToString:s_badRefreshToken])
+                    {
+                        cellView.textField.textColor = [NSColor redColor];
+                        [cellView.textField setStringValue:textValue];
+                        return cellView;
+                    }
+                    
+                    break;
+                }
                 case MSIDRefreshTokenType:
                 {
                     MSIDRefreshToken *refreshToken = (MSIDRefreshToken *) token;

Original file line number	Diff line number	Diff line change
`@@ -163,6 +163,7 @@ - (void)deleteToken:(MSIDBaseToken *)token`
`163`	`163`	`{`
`164`	`164`	`switch (token.credentialType)`
`165`	`165`	`{`
	`166`	`+ case MSIDFamilyRefreshTokenType:`
`166`	`167`	`case MSIDRefreshTokenType:`
`167`	`168`	`{`
`168`	`169`	`if ([token isKindOfClass:[MSIDLegacyRefreshToken class]])`
`@@ -469,6 +470,20 @@ - (UITableViewCell )tableView:(UITableView )tableView cellForRowAtIndexPath:(N`
`469`	`470`	`}`
`470`	`471`	`break;`
`471`	`472`	`}`
	`473`	`+ case MSIDFamilyRefreshTokenType:`
	`474`	`+ {`
	`475`	`+ MSIDRefreshToken refreshToken = (MSIDRefreshToken ) token;`
	`476`	`+`
	`477`	`+ cell.textLabel.text = [NSString stringWithFormat:@"FamilyRefreshToken : %@, FamilyId : %@", refreshToken.clientId, refreshToken.familyId ? refreshToken.familyId : @"0"];`
	`478`	`+ cell.detailTextLabel.text = [NSString stringWithFormat:@"Client_Id: %@", refreshToken.clientId];`
	`479`	`+`
	`480`	`+ if ([refreshToken.refreshToken isEqualToString:BAD_REFRESH_TOKEN])`
	`481`	`+ {`
	`482`	`+ cell.textLabel.textColor = [UIColor orangeColor];`
	`483`	`+ cell.detailTextLabel.text = [NSString stringWithFormat:@"Client_Id : %@", refreshToken.clientId];`
	`484`	`+ }`
	`485`	`+ break;`
	`486`	`+ }`
`472`	`487`	`case MSIDAccessTokenType:`
`473`	`488`	`{`
`474`	`489`	`MSIDAccessToken accessToken = (MSIDAccessToken ) token;`
`@@ -571,6 +586,7 @@ - (UISwipeActionsConfiguration )tableView:(__unused UITableView )tableView tra`
`571`	`586`
`572`	`587`	`switch (token.credentialType)`
`573`	`588`	`{`
	`589`	`+ case MSIDFamilyRefreshTokenType:`
`574`	`590`	`case MSIDRefreshTokenType:`
`575`	`591`	`{`
`576`	`592`	`if ([token isKindOfClass:[MSIDLegacyRefreshToken class]])`
Original file line number	Diff line number	Diff line change
`@@ -234,6 +234,7 @@ - (void)deleteToken:(MSIDBaseToken *)token`
`234`	`234`	`{`
`235`	`235`	`switch (token.credentialType)`
`236`	`236`	`{`
	`237`	`+ case MSIDFamilyRefreshTokenType:`
`237`	`238`	`case MSIDRefreshTokenType:`
`238`	`239`	`{`
`239`	`240`	`[self.defaultAccessor validateAndRemoveRefreshToken:(MSIDRefreshToken *)token`
`@@ -365,6 +366,20 @@ - (NSView )outlineView:(NSOutlineView )outlineView viewForTableColumn:(NSTable`
`365`	`366`	`MSIDBaseToken token = (MSIDBaseToken )item;`
`366`	`367`	`switch (token.credentialType)`
`367`	`368`	`{`
	`369`	`+ case MSIDFamilyRefreshTokenType:`
	`370`	`+ {`
	`371`	`+ MSIDRefreshToken refreshToken = (MSIDRefreshToken ) token;`
	`372`	`+ textValue = [NSString stringWithFormat:@"Family Refresh Token: ClientId - %@, Realm - %@, FamilyId - %@", refreshToken.clientId, refreshToken.realm, refreshToken.familyId];`
	`373`	`+`
	`374`	`+ if ([refreshToken.refreshToken isEqualToString:s_badRefreshToken])`
	`375`	`+ {`
	`376`	`+ cellView.textField.textColor = [NSColor redColor];`
	`377`	`+ [cellView.textField setStringValue:textValue];`
	`378`	`+ return cellView;`
	`379`	`+ }`
	`380`	`+`
	`381`	`+ break;`
	`382`	`+ }`
`368`	`383`	`case MSIDRefreshTokenType:`
`369`	`384`	`{`
`370`	`385`	`MSIDRefreshToken refreshToken = (MSIDRefreshToken ) token;`