Merge branch 'jarias/use-single-frt-2' into jarias/test-fix-msalcpp-pipeline

Author: juan-arias

IdentityCore/src/cache/accessor/MSIDDefaultTokenCacheAccessor.m

@@ -141,12 +141,14 @@ - (MSIDRefreshToken *)getRefreshTokenWithAccount:(MSIDAccountIdentifier *)accoun
         MSID_LOG_WITH_CTX(MSIDLogLevelError, context, @"Error checking FRT enabled status, not using new FRT. Error: %@", frtError);
     }
 
+#if !EXCLUDE_FROM_MSALCPP
     MSIDAADTokenRequestServerTelemetry *serverTelemetry = [MSIDAADTokenRequestServerTelemetry new];
     NSString *telemetryMessage = [NSString stringWithFormat:@"sfrt(%ld)", frtStatus];
 
     [serverTelemetry handleError:[[NSError alloc] initWithDomain:telemetryMessage code:0 userInfo:nil]
                      errorString:telemetryMessage
                          context:context];
+#endif
 
     MSIDCredentialType credentialType = frtEnabled ? MSIDFamilyRefreshTokenType : MSIDRefreshTokenType;
 

IdentityCore/src/requests/MSIDInteractiveTokenRequest.m

@@ -149,16 +149,19 @@ - (void)updateCustomHeadersForFRTSupportIfNeeded
         {
             NSError *error = nil;
             MSIDIsFRTEnabledStatus frtEnabledStatus = [credentialCache checkFRTEnabled:self.requestParameters error:&error];
+            enableFRT = (frtEnabledStatus == MSIDIsFRTEnabledStatusEnabled);
 
-            if (!error)
+            if (error)
             {
                 MSID_LOG_WITH_CTX(MSIDLogLevelError, self.requestParameters, @"Error when checking if FRT is enabled: error code: %@", error);
-                enableFRT = (frtEnabledStatus == MSIDIsFRTEnabledStatusEnabled);
             }
         }
     }
 
-    if (self.requestParameters.promptType != MSIDPromptTypeLogin && enableFRT)
+    if (enableFRT &&
+        self.requestParameters.promptType != MSIDPromptTypeLogin &&
+        self.requestParameters.promptType != MSIDPromptTypeSelectAccount &&
+        self.requestParameters.promptType != MSIDPromptTypeCreate)
     {
         NSMutableDictionary *customHeaders = nil;
         if (self.requestParameters.customWebviewHeaders)