Merge branch 'dev' into mipetriu/consent_fix

merge dev to branch
AzureAD · Feb 26, 2025 · 4ed5518 · 4ed5518
2 parents 648603c + 7ce6a77
commit 4ed5518
Show file tree

Hide file tree

Showing 15 changed files with 220 additions and 309 deletions.
diff --git a/IdentityCore/IdentityCore.xcodeproj/project.pbxproj b/IdentityCore/IdentityCore.xcodeproj/project.pbxproj
@@ -524,6 +524,9 @@
 		23FB5C452255A11D002BF1EB /* MSIDClaimsRequest.m in Sources */ = {isa = PBXBuildFile; fileRef = 23FB5C24225517AA002BF1EB /* MSIDClaimsRequest.m */; };
 		23FB5C462255A135002BF1EB /* MSIDIndividualClaimRequest.m in Sources */ = {isa = PBXBuildFile; fileRef = 23FB5C29225517AA002BF1EB /* MSIDIndividualClaimRequest.m */; };
 		23FB5C472255A13A002BF1EB /* MSIDIndividualClaimRequestAdditionalInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = 23FB5C27225517AA002BF1EB /* MSIDIndividualClaimRequestAdditionalInfo.m */; };
+		2A0278912D6E3216005655B4 /* MSIDAADTokenRequestServerTelemetryTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 2A0278902D6E3216005655B4 /* MSIDAADTokenRequestServerTelemetryTests.m */; };
+		2A0278922D6E3216005655B4 /* MSIDAADTokenRequestServerTelemetryTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 2A0278902D6E3216005655B4 /* MSIDAADTokenRequestServerTelemetryTests.m */; };
+		2A0278A32D6E3787005655B4 /* MSIDLastRequestTelemetry+Tests.h in Headers */ = {isa = PBXBuildFile; fileRef = 2A0278A22D6E3787005655B4 /* MSIDLastRequestTelemetry+Tests.h */; };
 		580E25402719FD10003D1795 /* MSIDPrtHeader.h in Headers */ = {isa = PBXBuildFile; fileRef = 580E253E2719FD10003D1795 /* MSIDPrtHeader.h */; };
 		580E25412719FD10003D1795 /* MSIDPrtHeader.m in Sources */ = {isa = PBXBuildFile; fileRef = 580E253F2719FD10003D1795 /* MSIDPrtHeader.m */; };
 		580E25422719FD10003D1795 /* MSIDPrtHeader.m in Sources */ = {isa = PBXBuildFile; fileRef = 580E253F2719FD10003D1795 /* MSIDPrtHeader.m */; };
@@ -2392,6 +2395,8 @@
 		23FB5C2E22551866002BF1EB /* MSIDClaimsRequest+ClientCapabilities.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "MSIDClaimsRequest+ClientCapabilities.m"; sourceTree = "<group>"; };
 		23FB5C32225585E6002BF1EB /* MSIDClaimsRequestMock.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MSIDClaimsRequestMock.h; sourceTree = "<group>"; };
 		23FB5C33225585E6002BF1EB /* MSIDClaimsRequestMock.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MSIDClaimsRequestMock.m; sourceTree = "<group>"; };
+		2A0278902D6E3216005655B4 /* MSIDAADTokenRequestServerTelemetryTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MSIDAADTokenRequestServerTelemetryTests.m; sourceTree = "<group>"; };
+		2A0278A22D6E3787005655B4 /* MSIDLastRequestTelemetry+Tests.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "MSIDLastRequestTelemetry+Tests.h"; sourceTree = "<group>"; };
 		51E364572863C0F300A97F82 /* MSIDTelemetryConditionalCompile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MSIDTelemetryConditionalCompile.h; sourceTree = "<group>"; };
 		580E253E2719FD10003D1795 /* MSIDPrtHeader.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MSIDPrtHeader.h; sourceTree = "<group>"; };
 		580E253F2719FD10003D1795 /* MSIDPrtHeader.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MSIDPrtHeader.m; sourceTree = "<group>"; };
@@ -3712,6 +3717,7 @@
 				B431B5322AF1C3AA0020CD3D /* MSIDSSOExtensionPasskeyAssertionRequestMock.m */,
 				B431B5352AF1C3BD0020CD3D /* MSIDSSOExtensionPasskeyCredentialRequestMock.h */,
 				B431B5362AF1C3C60020CD3D /* MSIDSSOExtensionPasskeyCredentialRequestMock.m */,
+				2A0278A22D6E3787005655B4 /* MSIDLastRequestTelemetry+Tests.h */,
 			);
 			path = mocks;
 			sourceTree = "<group>";
@@ -5717,6 +5723,7 @@
 				2347D6652D5415EB00372D20 /* MSIDSwitchBrowserResumeResponseTest.swift */,
 				2347D6682D5453A400372D20 /* MSIDSwitchBrowserOperationTest.swift */,
 				237034432D56AA7F00D6A70B /* MSIDSwitchBrowserResumeOperationTest.swift */,
+				2A0278902D6E3216005655B4 /* MSIDAADTokenRequestServerTelemetryTests.m */,
 			);
 			path = tests;
 			sourceTree = "<group>";
@@ -6261,6 +6268,7 @@
 				B217861823A57ED800839CE8 /* MSIDAuthorizationControllerMock.h in Headers */,
 				B2E4A07B24DDE5D7007CE642 /* NSUUID+MSIDTestUtil.h in Headers */,
 				B217862923A5839300839CE8 /* MSIDSSOExtensionSignoutRequestMock.h in Headers */,
+				2A0278A32D6E3787005655B4 /* MSIDLastRequestTelemetry+Tests.h in Headers */,
 				969CCB5622A9EB0300A55515 /* MSIDTestCacheDataSource.h in Headers */,
 				B28AC66421A0BB9D00A1FC4A /* MSIDTestBrokerResponseHelper.h in Headers */,
 				B23ECF031FF30BB90015FC1D /* MSIDTestIdentifiers.h in Headers */,
@@ -6822,6 +6830,7 @@
 				23AE9D9D213A06EF00B285F3 /* MSIDAadAuthorityCacheTests.m in Sources */,
 				58EB18382729BB8B00F4DD73 /* MSIDSSOExtensionGetSsoCookiesRequestTests.m in Sources */,
 				B2BE926F21A2668600F5AB8C /* MSIDBrokerInteractiveControllerIntegrationTests.m in Sources */,
+				2A0278912D6E3216005655B4 /* MSIDAADTokenRequestServerTelemetryTests.m in Sources */,
 				23AE9DAC21409A3800B285F3 /* MSIDWebMSAuthResponseTests.m in Sources */,
 				23985AB72391F8D100942308 /* MSIDBrokerOperationInteractiveTokenRequestTests.m in Sources */,
 				968871E920AD0397009D6FC3 /* MSIDWebAADAuthResponseTests.m in Sources */,
@@ -7584,6 +7593,7 @@
 				B26A0B972072B9CB006BD95A /* MSIDAADV1Oauth2FactoryTests.m in Sources */,
 				B208854C29ADC0FD00A50B88 /* MSIDPkeyAuthHelperTests.m in Sources */,
 				5837A7DD28F4977C007B3F4E /* MSIDLegacyTokenCacheKey+UTest.m in Sources */,
+				2A0278922D6E3216005655B4 /* MSIDAADTokenRequestServerTelemetryTests.m in Sources */,
 				B2DD5BA2204761660084313F /* MSIDLegacySingleResourceTokenTests.m in Sources */,
 				239DF9C020E04BC9002D428B /* MSIDAADAuthorityTests.m in Sources */,
 				D6D9A4BF1FBE712900EFA430 /* MSIDStringExtensionsTests.m in Sources */,

diff --git a/IdentityCore/src/broker_operation/response/MSIDBrokerNativeAppOperationResponse.h b/IdentityCore/src/broker_operation/response/MSIDBrokerNativeAppOperationResponse.h
@@ -53,15 +53,6 @@ NS_ASSUME_NONNULL_BEGIN
 - (instancetype)init NS_UNAVAILABLE;
 + (instancetype)new NS_UNAVAILABLE;
 
-#if !EXCLUDE_FROM_MSALCPP
-
-- (void)trackPerfTelemetryWithLastRequest:(MSIDLastRequestTelemetry *)telemetry
-                         requestStartDate:(NSDate *)requestStartDate
-                            telemetryType:(NSString *)telemetryType;
-
-#endif
-
-
 @end
 
 NS_ASSUME_NONNULL_END
diff --git a/IdentityCore/src/broker_operation/response/MSIDBrokerNativeAppOperationResponse.m b/IdentityCore/src/broker_operation/response/MSIDBrokerNativeAppOperationResponse.m
@@ -124,29 +124,4 @@ - (NSDictionary *)jsonDictionary
     return json;
 }
 
-#if !EXCLUDE_FROM_MSALCPP
-
-- (void)trackPerfTelemetryWithLastRequest:(MSIDLastRequestTelemetry *)telemetry
-                         requestStartDate:(NSDate *)requestStartDate
-                            telemetryType:(NSString *)telemetryType
-{
-    if (!requestStartDate)
-    {
-        MSID_LOG_WITH_CTX(MSIDLogLevelError, nil, @"trackPerfTelemetryWithLastRequest called with nil request start date");
-        return;
-    }
-
-    NSDate *responseDate = [NSDate date];
-    NSTimeInterval totalTime = [responseDate timeIntervalSinceDate:requestStartDate];
-    NSTimeInterval ipcRequestTime = self.requestReceivedTimeStamp ? [self.requestReceivedTimeStamp timeIntervalSinceDate:requestStartDate] : 0;
-    NSTimeInterval ipcResponseTime = self.responseGenerationTimeStamp ? [responseDate timeIntervalSinceDate:self.responseGenerationTimeStamp] : 0;
-
-    [telemetry trackSSOExtensionPerformanceWithType:telemetryType
-                                    totalPerfNumber:totalTime
-                               ipcRequestPerfNumber:ipcRequestTime
-                              ipcResponsePerfNumber:ipcResponseTime];
-}
-
-#endif
-
 @end
diff --git a/IdentityCore/src/network/request_server_telemetry/MSIDAADTokenRequestServerTelemetry.m b/IdentityCore/src/network/request_server_telemetry/MSIDAADTokenRequestServerTelemetry.m
@@ -51,26 +51,22 @@ - (void)handleError:(nullable NSError *)error
             context:(id<MSIDRequestContext>)context
 {
     if (error == nil) {
-        MSID_LOG_WITH_CTX(MSIDLogLevelError, context, @"Failed to handle telemetry. Error is nil");
-        return;
+        MSID_LOG_WITH_CTX(MSIDLogLevelInfo, context, @"Error is nil, reset MSID telemetry");
     }
 
-    NSString *errorString = [error msidServerTelemetryErrorString];
-
-    [self handleError:error
-          errorString:errorString
-              context:context];
+    [self.lastRequestTelemetry updateWithApiId:self.currentRequestTelemetry.apiId
+                                   errorString:[error msidServerTelemetryErrorString]
+                                       context:context];
 }
 
 - (void)handleError:(nullable NSError *)error
         errorString:(NSString *)errorString
             context:(id<MSIDRequestContext>)context
 {
     if (error == nil) {
-        MSID_LOG_WITH_CTX(MSIDLogLevelError, context, @"Failed to handle telemetry. Error is nil");
-        return;
+        MSID_LOG_WITH_CTX(MSIDLogLevelInfo, context, @"Error is nil, reset MSID telemetry");
     }
-
+    
     [self.lastRequestTelemetry updateWithApiId:self.currentRequestTelemetry.apiId
                                    errorString:errorString
                                        context:context];

diff --git a/IdentityCore/src/requests/broker/MSIDSSOExtensionGetAccountsRequest.m b/IdentityCore/src/requests/broker/MSIDSSOExtensionGetAccountsRequest.m
@@ -103,12 +103,6 @@ - (nullable instancetype)initWithRequestParameters:(MSIDRequestParameters *)requ
 
             __typeof__(self) strongSelf = weakSelf;
 
-#if !EXCLUDE_FROM_MSALCPP
-            [operationResponse trackPerfTelemetryWithLastRequest:strongSelf.lastRequestTelemetry
-                                                requestStartDate:strongSelf.requestSentDate
-                                                   telemetryType:MSID_PERF_TELEMETRY_GETACCOUNTS_TYPE];
-#endif
-
             MSIDGetAccountsRequestCompletionBlock completionBlock = strongSelf.requestCompletionBlock;
             strongSelf.requestCompletionBlock = nil;
 

diff --git a/IdentityCore/src/requests/broker/MSIDSSOExtensionGetDeviceInfoRequest.m b/IdentityCore/src/requests/broker/MSIDSSOExtensionGetDeviceInfoRequest.m
@@ -91,12 +91,6 @@ - (nullable instancetype)initWithRequestParameters:(MSIDRequestParameters *)requ
 
             __typeof__(self) strongSelf = weakSelf;
 
-#if !EXCLUDE_FROM_MSALCPP
-            [operationResponse trackPerfTelemetryWithLastRequest:strongSelf.lastRequestTelemetry
-                                                requestStartDate:strongSelf.requestSentDate
-                                                   telemetryType:MSID_PERF_TELEMETRY_GETDEVICEINFO_TYPE];
-#endif
-
             MSIDGetDeviceInfoRequestCompletionBlock completionBlock = strongSelf.requestCompletionBlock;
             strongSelf.requestCompletionBlock = nil;
 

diff --git a/IdentityCore/src/requests/broker/MSIDSSOExtensionSignoutRequest.m b/IdentityCore/src/requests/broker/MSIDSSOExtensionSignoutRequest.m
@@ -98,12 +98,6 @@ - (nullable instancetype)initWithRequestParameters:(nonnull MSIDInteractiveReque
 
             __typeof__(self) strongSelf = weakSelf;
 
-#if !EXCLUDE_FROM_MSALCPP
-            [operationResponse trackPerfTelemetryWithLastRequest:strongSelf.lastRequestTelemetry
-                                                requestStartDate:strongSelf.requestSentDate
-                                                   telemetryType:MSID_PERF_TELEMETRY_SIGNOUT_TYPE];
-#endif
-
             MSIDSignoutRequestCompletionBlock completionBlock = strongSelf.requestCompletionBlock;
             strongSelf.requestCompletionBlock = nil;
 

diff --git a/IdentityCore/src/requests/broker/MSIDSSOExtensionSilentTokenRequest.m b/IdentityCore/src/requests/broker/MSIDSSOExtensionSilentTokenRequest.m
@@ -93,12 +93,6 @@ - (instancetype)initWithRequestParameters:(MSIDRequestParameters *)parameters
             strongSelf.ssoTokenResponseHandler.externalCacheSeeder = strongSelf.externalCacheSeeder;
 #endif
 
-#if !EXCLUDE_FROM_MSALCPP
-            [operationResponse trackPerfTelemetryWithLastRequest:strongSelf.lastRequestTelemetry
-                                                requestStartDate:strongSelf.requestSentDate
-                                                   telemetryType:MSID_PERF_TELEMETRY_SILENT_TYPE];
-#endif
-
             [strongSelf.ssoTokenResponseHandler handleOperationResponse:operationResponse
                                                       requestParameters:strongSelf.requestParameters
                                                  tokenResponseValidator:strongSelf.tokenResponseValidator

diff --git a/IdentityCore/src/telemetry/request_telemetry/MSIDLastRequestTelemetry.h b/IdentityCore/src/telemetry/request_telemetry/MSIDLastRequestTelemetry.h
@@ -34,21 +34,8 @@
 
 @end
 
-@interface MSIDRequestPerformanceInfo : NSObject <NSSecureCoding>
-
-@property (nonatomic, nullable) NSMutableArray<NSNumber *> *totalNumbers;
-@property (nonatomic, nullable) NSMutableArray<NSNumber *> *ipcRequestNumbers;
-@property (nonatomic, nullable) NSMutableArray<NSNumber *> *ipcResponseNumbers;
-
-@end
-
 NS_ASSUME_NONNULL_BEGIN
 
-extern NSString * _Nonnull const MSID_PERF_TELEMETRY_SILENT_TYPE;
-extern NSString * _Nonnull const MSID_PERF_TELEMETRY_SIGNOUT_TYPE;
-extern NSString * _Nonnull const MSID_PERF_TELEMETRY_GETACCOUNTS_TYPE;
-extern NSString * _Nonnull const MSID_PERF_TELEMETRY_GETDEVICEINFO_TYPE;
-
 @class MSIDCurrentRequestTelemetrySerializedItem;
 
 @interface MSIDLastRequestTelemetry : NSObject <MSIDTelemetryStringSerializable, NSSecureCoding>
@@ -69,11 +56,6 @@ extern NSString * _Nonnull const MSID_PERF_TELEMETRY_GETDEVICEINFO_TYPE;
 
 - (void)increaseSilentSuccessfulCount;
 
-- (void)trackSSOExtensionPerformanceWithType:(NSString *)type
-                             totalPerfNumber:(NSTimeInterval)totalPerfNumber
-                        ipcRequestPerfNumber:(NSTimeInterval)ipcRequestPerfNumber
-                       ipcResponsePerfNumber:(NSTimeInterval)ipcResponsePerfNumber;
-
 @end
 
 NS_ASSUME_NONNULL_END