Merge pull request #2767 from AzureAD/ameyapat/add-bart-support-toggle-button

Refresh release/2.6.0 with MSAL test app changes for toggling BART support

Author: ameyapat

MSAL/IdentityCore

@@ -62,6 +62,7 @@
 #import "MSIDMetadataCache.h"
 #import "MSIDAccountMetadataCacheItem.h"
 #import "MSIDAccountMetadataCacheKey.h"
+#import "MSIDBoundRefreshToken.h"
 
 #define BAD_REFRESH_TOKEN @"bad-refresh-token"
 #define APP_METADATA @"App-Metadata"
@@ -166,6 +167,7 @@ - (void)deleteToken:(MSIDBaseToken *)token
         {
             case MSIDFamilyRefreshTokenType:
             case MSIDRefreshTokenType:
+            case MSIDBoundRefreshTokenType:
             {
                 if ([token isKindOfClass:[MSIDLegacyRefreshToken class]])
                 {
@@ -485,6 +487,20 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
                 }
                 break;
             }
+            case MSIDBoundRefreshTokenType:
+            {
+                MSIDBoundRefreshToken *bart = (MSIDBoundRefreshToken *) token;
+                
+                cell.textLabel.text = [NSString stringWithFormat:@"BoundRefreshToken : %@, FamilyId : %@", bart.clientId, bart.familyId ? bart.familyId : @"0"];
+                cell.detailTextLabel.text = [NSString stringWithFormat:@"Client_Id: %@", bart.clientId];
+                
+                if ([bart.refreshToken isEqualToString:BAD_REFRESH_TOKEN])
+                {
+                    cell.textLabel.textColor = [UIColor orangeColor];
+                    cell.detailTextLabel.text = [NSString stringWithFormat:@"Client_Id : %@", bart.clientId];
+                }
+                break;
+            }
             case MSIDAccessTokenType:
             {
                 MSIDAccessToken *accessToken = (MSIDAccessToken *) token;
@@ -589,6 +605,7 @@ - (UISwipeActionsConfiguration *)tableView:(__unused UITableView *)tableView tra
         {
             case MSIDFamilyRefreshTokenType:
             case MSIDRefreshTokenType:
+            case MSIDBoundRefreshTokenType:
             {
                 if ([token isKindOfClass:[MSIDLegacyRefreshToken class]])
                 {

MSAL/test/app/ios/MSALTestAppCacheViewController.m

@@ -34,6 +34,7 @@
 #import "MSIDWorkPlaceJoinUtil.h"
 #import "MSALPublicClientApplicationConfig.h"
 #import "MSALCacheConfig.h"
+#import "MSIDBartFeatureUtil.h"
 
 static NSArray* s_profileRows = nil;
 static NSArray* s_deviceRows = nil;
@@ -82,6 +83,7 @@ @implementation MSALTestAppSettingsViewController
 
     NSArray* _profileRows;
     NSArray* _deviceRows;
+    NSArray* _bartSettingsRows;
 }
 
 - (id)init
@@ -171,6 +173,27 @@ - (void)viewWillAppear:(BOOL)animated
                      [MSALTestAppSettingsRow rowWithTitle:@"Device_Info - Device Id" value:^NSString *{ return aadDeviceIdentifier; }],
                      [MSALTestAppSettingsRow rowWithTitle:@"Device_Info - Tenant Id" value:^NSString *{ return tenantIdentifier; }]];
 
+    MSALTestAppSettingsRow* toggleRow = [MSALTestAppSettingsRow rowWithTitle:@"Request bound app refresh tokens?"];
+    toggleRow.valueBlock = ^NSString *{
+        // You can replace this with actual toggle state logic
+        BOOL isEnabled = [[MSIDBartFeatureUtil sharedInstance] isBartFeatureEnabled];
+        return isEnabled ? @"YES" : @"NO";
+    };
+    __weak typeof(self) weakSelf = self;
+    toggleRow.action = ^{
+        typeof(self) strongSelf = weakSelf;
+        if (!strongSelf) return;
+        
+        // Toggle the setting
+        BOOL currentState = [[MSIDBartFeatureUtil sharedInstance] isBartFeatureEnabled];
+        [[MSIDBartFeatureUtil sharedInstance] setBartSupportInAppCache:!currentState];
+        [strongSelf->_tableView reloadData];
+    };
+    
+    _bartSettingsRows = @[
+        toggleRow
+    ];
+    
     self.navigationController.navigationBarHidden = YES;
 
     [_tableView reloadData];
@@ -184,14 +207,16 @@ - (NSInteger)tableView:(UITableView *)tableView numberOfRowsInSection:(NSInteger
         return _profileRows.count;
     if (section == 1)
         return _deviceRows.count;
+    if (section == 2)
+        return _bartSettingsRows.count;
 
     return 0;
 }
 
 - (NSInteger)numberOfSectionsInTableView:(UITableView *)tableView
 {
     (void)tableView;
-    return 2;
+    return 3;
 }
 
 - (nullable NSString *)tableView:(UITableView *)tableView titleForHeaderInSection:(NSInteger)section
@@ -201,6 +226,8 @@ - (nullable NSString *)tableView:(UITableView *)tableView titleForHeaderInSectio
         return @"Authentication Settings";
     if (section == 1)
         return @"Device State";
+    if (section == 2)
+        return @"Bound App Refresh Token Settings";
 
     return nil;
 }
@@ -221,6 +248,11 @@ - (MSALTestAppSettingsRow*)rowForIndexPath:(NSIndexPath *)indexPath
         return _deviceRows[row];
     }
 
+    if (section == 2)
+    {
+        return _bartSettingsRows[row];
+    }
+    
     return nil;
 }
 

MSAL/test/app/ios/MSALTestAppSettingsViewController.m

@@ -49,6 +49,7 @@
 #import "MSIDCacheConfig.h"
 #import "MSIDAssymetricKeyPair.h"
 #import "MSIDAuthScheme.h"
+#import "MSIDBoundRefreshToken.h"
 
 static NSString *s_appMetadata = @"App-Metadata";
 static NSString *s_badRefreshToken = @"Bad-Refresh-Token";
@@ -237,6 +238,7 @@ - (void)deleteToken:(MSIDBaseToken *)token
         {
             case MSIDFamilyRefreshTokenType:
             case MSIDRefreshTokenType:
+            case MSIDBoundRefreshTokenType:
             {
                 [self.defaultAccessor validateAndRemoveRefreshToken:(MSIDRefreshToken *)token
                                                             context:nil
@@ -367,6 +369,20 @@ - (NSView *)outlineView:(NSOutlineView *)outlineView viewForTableColumn:(NSTable
             MSIDBaseToken *token = (MSIDBaseToken *)item;
             switch (token.credentialType)
             {
+                case MSIDBoundRefreshTokenType:
+                {
+                    MSIDBoundRefreshToken *bart = (MSIDBoundRefreshToken *)token;
+                    textValue = [NSString stringWithFormat:@"Bound Refresh Token: ClientId - %@, Realm - %@, FamilyId - %@", bart.clientId, bart.realm, bart.familyId];
+                    
+                    if ([bart.refreshToken isEqualToString:s_badRefreshToken])
+                    {
+                        cellView.textField.textColor = [NSColor redColor];
+                        [cellView.textField setStringValue:textValue];
+                        return cellView;
+                    }
+                    
+                    break;
+                }
                 case MSIDFamilyRefreshTokenType:
                 {
                     MSIDFamilyRefreshToken *familyRefreshToken = (MSIDFamilyRefreshToken *)token;