Move properties to protocol

Author: Swasti Gupta

CHANGELOG.md

@@ -4,7 +4,7 @@
 * Removed deprecated methods from native auth public interface (#2588)
 * Removed the deprecated MSALLogger interface and implementation class (#2591)
 * Enforced a valid broker-capable redirect URI format for AAD scenarios (#2592)
-* Merged the MSALAccount (MultiTenantAccount) category into the MSALAccount class and removed the MSALAccount+MultiTenantAccount.h (#2594)
+* Merged the MSALAccount (MultiTenantAccount) category into the MSALAccount protocol and removed the MSALAccount+MultiTenantAccount.h (#2594)
 
 ## [1.9.0]
 * Add feature flags provider to be controlled from broker (#2540)

MSAL/src/configuration/external/ios/MSALLegacySharedAccount.h

@@ -56,6 +56,9 @@ NS_ASSUME_NONNULL_BEGIN
 @property (nonatomic, readonly) NSString *accountIdentifier;
 @property (nonatomic, readonly) NSDictionary *signinStatusDictionary;
 @property (nonatomic, readonly) NSString *username;
+@property (nonatomic, readonly) NSArray<MSALTenantProfile *> *tenantProfiles;
+@property (nonatomic, readonly) MSALAccountId *homeAccountId;
+@property (nonatomic, readonly) BOOL isSSOAccount;
 
 - (nullable instancetype)initWithJSONDictionary:(NSDictionary *)jsonDictionary error:(NSError * _Nullable * _Nullable)error;
 - (BOOL)matchesParameters:(MSALAccountEnumerationParameters *)parameters;

MSAL/src/configuration/external/ios/MSALLegacySharedAccount.m

@@ -31,7 +31,9 @@ @interface MSALLegacySharedAccount()
 
 @property (nonatomic, readwrite) NSDictionary *jsonDictionary;
 @property (nonatomic, readwrite) NSString *username;
-
+@property (nonatomic, readwrite) NSArray<MSALTenantProfile *> *tenantProfiles;
+@property (nonatomic, readwrite) MSALAccountId *homeAccountId;
+@property (nonatomic, readwrite) BOOL isSSOAccount;
 @end
 
 static NSDateFormatter *s_updateDateFormatter = nil;

MSAL/src/public/MSALAccount+MultiTenantAccount.h

@@ -81,15 +81,6 @@
  */
 @property (readonly, nullable) NSDictionary<NSString *, id> *accountClaims;
 
-@end
-
-/**
-    Representation of an authenticated account in the Microsoft identity platform. MSALAccount class implements `MSALAccount` protocol.
-    @note MSALAccount should be never created directly by an application.
-    Instead, it is returned by MSAL as a result of getting a token interactively or silently (see `MSALResult`), or looked up by MSAL from cache (e.g. see `-[MSALPublicClientApplication allAccounts:]`)
-  */
-@interface MSALAccount : NSObject <MSALAccount, NSCopying>
-
 #pragma mark - Getting information about account in different AAD tenants
 
 /**
@@ -116,6 +107,15 @@
 */
 @property (readonly) BOOL isSSOAccount;
 
+@end
+
+/**
+    Representation of an authenticated account in the Microsoft identity platform. MSALAccount class implements `MSALAccount` protocol.
+    @note MSALAccount should be never created directly by an application.
+    Instead, it is returned by MSAL as a result of getting a token interactively or silently (see `MSALResult`), or looked up by MSAL from cache (e.g. see `-[MSALPublicClientApplication allAccounts:]`)
+  */
+@interface MSALAccount : NSObject <MSALAccount, NSCopying>
+
 /**
     `-[MSALAccount new]` is unavailable.
     @note MSALAccount should be never created directly.