Use single FRT [MSAL] #2550

juan-arias · 2025-03-12T18:19:52Z

Proposed changes

Add support to the new FRT in test apps.

Type of change

Risk

High – Errors could cause MAJOR regression of many scenarios. (Example: new large features or high level infrastructure changes)
Medium – Errors could cause regression of 1 or more scenarios. (Example: somewhat complex bug fixes, small new features)
Small – No issues are expected. (Example: Very small bug fixes, string changes, or configuration settings changes)

Additional information

# Conflicts: # MSAL/IdentityCore

ameyapat · 2025-03-13T16:51:51Z

Cloned PR for jarias/use-single-frt

AI description (iteration 1)

PR Classification

New feature

PR Summary

This pull request introduces functionality to check and update the status of Family Refresh Tokens (FRT) in the cache.

MSIDAccountCredentialsCacheTests.m: Added multiple test cases to verify the behavior of the checkFRTEnabled method under various conditions.
MSIDAccountCredentialCache.m: Implemented the checkFRTEnabled method to determine the FRT status and update settings based on feature flags.
Added a new file MSIDFamilyRefreshToken.m to handle the creation and management of family refresh tokens.

ameyapat · 2025-03-13T16:51:52Z

"Added 1 Inline Code Review comment(s) at the following location(s):

/msal-from-github/MSAL/IdentityCore/IdentityCore/src/MSIDRequestContext.h at Lines 33-35

AI-generated content may be incorrect

"

ameyapat · 2025-03-13T16:51:53Z

"AI code review (iteration 1)
There is a minor spelling mistake in the comment. The word 'disablle' should be corrected to 'disable'.
Here is the suggested code:

/**
 Temporal property to disable Family Refresh Token. This will be removed in future, added to allow 1P apps to disable this feature themselves.
 Enabled by default, also configured to be enabled/disabled remotely by Microsoft.
 */

This comment refers to line 33 to 35 in the new file.
AI-generated content may be incorrect

ameyapat · 2025-03-20T21:28:53Z

Cloned PR for jarias/use-single-frt

AI description (iteration 1)

PR Classification

New feature implementation.

PR Summary

This pull request introduces the functionality to check and update the Family Refresh Token (FRT) settings based on feature flags.

MSIDAccountCredentialsCacheTests.m: Added multiple tests to verify the behavior of the new FRT feature under various conditions.
MSIDAccountCredentialCache.m: Implemented methods to check and update FRT settings based on feature flags and keychain items.
MSIDFamilyRefreshToken.m: Added a new class to represent the Family Refresh Token, including initialization, equality checks, and cache handling.

ameyapat · 2025-03-20T21:28:54Z

"Added 2 Inline Code Review comment(s) at the following location(s):

/msal-from-github/MSAL/IdentityCore/IdentityCore/src/oauth2/token/MSIDFamilyRefreshToken.h at Line 33
/msal-from-github/MSAL/IdentityCore/IdentityCore/src/MSIDRequestContext.h at Lines 33-35

AI-generated content may be incorrect

"

ameyapat · 2025-03-20T21:28:55Z

"AI code review (iteration 1)
It might be better to add a null check for the refreshToken parameter in the initializer method to ensure that the object is properly initialized and to avoid potential runtime errors.

Here is the suggested code:

This comment refers to line 33 in the new file.
AI-generated content may be incorrect

ameyapat · 2025-03-20T21:28:56Z

"AI code review (iteration 1)
The comment mentions that the property will be removed in the future. It might be better to add a deprecation warning or annotation to inform developers that this property is temporary and will be removed.
Here is the suggested code:

/**
 * Temporal property to disable Family Refresh Token. This will be removed in future, added to allow 1P apps to disable this feature themselves.
 * Enabled by default, also configured to be enabled/disabled remotely by Microsoft.
 * @deprecated This property will be removed in future versions.
 */
@property (nonatomic, readwrite) BOOL disableFRT;

This comment refers to line 33 to 35 in the new file.
AI-generated content may be incorrect

ameyapat · 2025-03-21T01:22:50Z

Cloned PR for jarias/use-single-frt

AI description (iteration 1)

PR Classification

New feature

PR Summary

This pull request introduces a new feature to check and update Family Refresh Token (FRT) settings based on feature flags.

MSIDAccountCredentialsCacheTests.m: Added multiple tests to verify the behavior of the new FRT feature.
MSIDAccountCredentialCache.m: Implemented methods to check and update FRT settings based on feature flags.
MSIDFamilyRefreshToken.m: Added a new class to handle Family Refresh Tokens, including initialization, equality checks, and cache handling.

# Conflicts: # changelog.md

antrix1989 · 2025-04-08T22:32:28Z

MSAL/src/native_auth/network/parameters/MSALNativeAuthRequestContext.swift

@@ -29,10 +29,17 @@ class MSALNativeAuthRequestContext: MSIDRequestContext {
    private let _correlationId: UUID
    private let _telemetryRequestId: String
    private var _serverCorrelationId: UUID? // TODO: Setting the server correlation id here is wrong. Needs refactoring.
+    var disableFRT: Bool


do we need it to be public property?

Property 'disableFRT' must be as accessible as its enclosing type because it matches a requirement in protocol 'MSIDRequestContext'

This can change if there is an equivalent to MSALGlobalConfig in CommonCore (the other PR)

This is no longer needed, removed.

antrix1989 · 2025-04-08T22:34:50Z

MSAL/test/app/ios/MSALTestAppCacheViewController.m

@@ -469,6 +470,20 @@ - (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(N
                }
                break;
            }
+            case MSIDFamilyRefreshTokenType:
+            {
+                MSIDRefreshToken *refreshToken = (MSIDRefreshToken *) token;


should we do "isKindOfClass" before casting?

The switch is reading credentialType from each individual class; but it was casting to the base class instead of the right class. Updated

antrix1989 · 2025-04-08T22:35:35Z

MSAL/test/app/mac/MSALCacheViewController.m

@@ -365,6 +366,20 @@ - (NSView *)outlineView:(NSOutlineView *)outlineView viewForTableColumn:(NSTable
            MSIDBaseToken *token = (MSIDBaseToken *)item;
            switch (token.credentialType)
            {
+                case MSIDFamilyRefreshTokenType:
+                {
+                    MSIDRefreshToken *refreshToken = (MSIDRefreshToken *) token;


same here: isKindOfClass?

Same as above

# Conflicts: # CHANGELOG.md # MSAL/IdentityCore

… use method from MSIDAccountCredentialCache instead.

- MSAL/IdentityCore

juan-arias added 4 commits February 13, 2025 17:44

Update MSAL to support SFRT

a42bc75

Merge branch 'dev' into jarias/use-single-frt

ffdc650

# Conflicts: # MSAL/IdentityCore

Add support to the new FRT in test apps

96e9701

Merge from 'dev'

0686f29

juan-arias requested review from a team as code owners March 12, 2025 18:19

juan-arias requested review from antrix1989 and ameyapat March 12, 2025 18:19

juan-arias added 4 commits March 12, 2025 11:20

Update submodule and changelog

8dcd2d3

Update submodule

7050246

Fix build error

cdcf343

Update submodule

5dbb967

Veena11 previously approved these changes Mar 13, 2025

View reviewed changes

Merge from dev

1ff020c

Update submodule

eedc446

juan-arias added 3 commits March 27, 2025 11:52

Merge branch 'dev' into jarias/use-single-frt

d867010

# Conflicts: # changelog.md

Update submodule

a84d67d

Update submodule

a5bd224

juan-arias dismissed Veena11’s stale review via a5bd224 April 1, 2025 02:57

antrix1989 reviewed Apr 8, 2025

View reviewed changes

juan-arias added 4 commits April 21, 2025 17:10

Merge branch 'dev' into jarias/use-single-frt

ae2014a

# Conflicts: # CHANGELOG.md # MSAL/IdentityCore

Address comments

892c089

Do not use context variable to allow client MSAL disable FRT feature;…

5ac148e

… use method from MSIDAccountCredentialCache instead.

Merge from 'dev' conflicts:

c393647

- MSAL/IdentityCore

antrix1989 approved these changes Apr 23, 2025

View reviewed changes

juan-arias merged commit 7ef79b5 into dev Apr 23, 2025
15 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Use single FRT [MSAL] #2550

Use single FRT [MSAL] #2550

juan-arias commented Mar 12, 2025

ameyapat commented Mar 13, 2025

ameyapat commented Mar 13, 2025

ameyapat commented Mar 13, 2025

ameyapat commented Mar 20, 2025

ameyapat commented Mar 20, 2025

ameyapat commented Mar 20, 2025

ameyapat commented Mar 20, 2025

ameyapat commented Mar 21, 2025

antrix1989 Apr 8, 2025

juan-arias Apr 22, 2025

juan-arias Apr 23, 2025

antrix1989 Apr 8, 2025

juan-arias Apr 22, 2025

antrix1989 Apr 8, 2025

juan-arias Apr 22, 2025

Use single FRT [MSAL] #2550

Use single FRT [MSAL] #2550

Conversation

juan-arias commented Mar 12, 2025

Proposed changes

Type of change

Risk

Additional information

ameyapat commented Mar 13, 2025

AI description (iteration 1)

PR Classification

PR Summary

ameyapat commented Mar 13, 2025

ameyapat commented Mar 13, 2025

ameyapat commented Mar 20, 2025

AI description (iteration 1)

PR Classification

PR Summary

ameyapat commented Mar 20, 2025

ameyapat commented Mar 20, 2025

ameyapat commented Mar 20, 2025

ameyapat commented Mar 21, 2025

AI description (iteration 1)

PR Classification

PR Summary

antrix1989 Apr 8, 2025

Choose a reason for hiding this comment

juan-arias Apr 22, 2025

Choose a reason for hiding this comment

juan-arias Apr 23, 2025

Choose a reason for hiding this comment

antrix1989 Apr 8, 2025

Choose a reason for hiding this comment

juan-arias Apr 22, 2025

Choose a reason for hiding this comment

antrix1989 Apr 8, 2025

Choose a reason for hiding this comment

juan-arias Apr 22, 2025

Choose a reason for hiding this comment