Skip to content

Commit 4ed5518

Browse files
mipetriumipetriu
committed
Merge branch 'dev' into mipetriu/consent_fix
merge dev to branch
2 parents 648603c + 7ce6a77 commit 4ed5518

15 files changed

+220
-309
lines changed

‎IdentityCore/IdentityCore.xcodeproj/project.pbxproj‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -524,6 +524,9 @@
524524
23FB5C452255A11D002BF1EB /* MSIDClaimsRequest.m in Sources */ = {isa = PBXBuildFile; fileRef = 23FB5C24225517AA002BF1EB /* MSIDClaimsRequest.m */; };
525525
23FB5C462255A135002BF1EB /* MSIDIndividualClaimRequest.m in Sources */ = {isa = PBXBuildFile; fileRef = 23FB5C29225517AA002BF1EB /* MSIDIndividualClaimRequest.m */; };
526526
23FB5C472255A13A002BF1EB /* MSIDIndividualClaimRequestAdditionalInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = 23FB5C27225517AA002BF1EB /* MSIDIndividualClaimRequestAdditionalInfo.m */; };
527+
2A0278912D6E3216005655B4 /* MSIDAADTokenRequestServerTelemetryTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 2A0278902D6E3216005655B4 /* MSIDAADTokenRequestServerTelemetryTests.m */; };
528+
2A0278922D6E3216005655B4 /* MSIDAADTokenRequestServerTelemetryTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 2A0278902D6E3216005655B4 /* MSIDAADTokenRequestServerTelemetryTests.m */; };
529+
2A0278A32D6E3787005655B4 /* MSIDLastRequestTelemetry+Tests.h in Headers */ = {isa = PBXBuildFile; fileRef = 2A0278A22D6E3787005655B4 /* MSIDLastRequestTelemetry+Tests.h */; };
527530
580E25402719FD10003D1795 /* MSIDPrtHeader.h in Headers */ = {isa = PBXBuildFile; fileRef = 580E253E2719FD10003D1795 /* MSIDPrtHeader.h */; };
528531
580E25412719FD10003D1795 /* MSIDPrtHeader.m in Sources */ = {isa = PBXBuildFile; fileRef = 580E253F2719FD10003D1795 /* MSIDPrtHeader.m */; };
529532
580E25422719FD10003D1795 /* MSIDPrtHeader.m in Sources */ = {isa = PBXBuildFile; fileRef = 580E253F2719FD10003D1795 /* MSIDPrtHeader.m */; };
@@ -2392,6 +2395,8 @@
23922395
23FB5C2E22551866002BF1EB /* MSIDClaimsRequest+ClientCapabilities.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "MSIDClaimsRequest+ClientCapabilities.m"; sourceTree = "<group>"; };
23932396
23FB5C32225585E6002BF1EB /* MSIDClaimsRequestMock.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MSIDClaimsRequestMock.h; sourceTree = "<group>"; };
23942397
23FB5C33225585E6002BF1EB /* MSIDClaimsRequestMock.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MSIDClaimsRequestMock.m; sourceTree = "<group>"; };
2398+
2A0278902D6E3216005655B4 /* MSIDAADTokenRequestServerTelemetryTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MSIDAADTokenRequestServerTelemetryTests.m; sourceTree = "<group>"; };
2399+
2A0278A22D6E3787005655B4 /* MSIDLastRequestTelemetry+Tests.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "MSIDLastRequestTelemetry+Tests.h"; sourceTree = "<group>"; };
23952400
51E364572863C0F300A97F82 /* MSIDTelemetryConditionalCompile.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MSIDTelemetryConditionalCompile.h; sourceTree = "<group>"; };
23962401
580E253E2719FD10003D1795 /* MSIDPrtHeader.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MSIDPrtHeader.h; sourceTree = "<group>"; };
23972402
580E253F2719FD10003D1795 /* MSIDPrtHeader.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MSIDPrtHeader.m; sourceTree = "<group>"; };
@@ -3712,6 +3717,7 @@
37123717
B431B5322AF1C3AA0020CD3D /* MSIDSSOExtensionPasskeyAssertionRequestMock.m */,
37133718
B431B5352AF1C3BD0020CD3D /* MSIDSSOExtensionPasskeyCredentialRequestMock.h */,
37143719
B431B5362AF1C3C60020CD3D /* MSIDSSOExtensionPasskeyCredentialRequestMock.m */,
3720+
2A0278A22D6E3787005655B4 /* MSIDLastRequestTelemetry+Tests.h */,
37153721
);
37163722
path = mocks;
37173723
sourceTree = "<group>";
@@ -5717,6 +5723,7 @@
57175723
2347D6652D5415EB00372D20 /* MSIDSwitchBrowserResumeResponseTest.swift */,
57185724
2347D6682D5453A400372D20 /* MSIDSwitchBrowserOperationTest.swift */,
57195725
237034432D56AA7F00D6A70B /* MSIDSwitchBrowserResumeOperationTest.swift */,
5726+
2A0278902D6E3216005655B4 /* MSIDAADTokenRequestServerTelemetryTests.m */,
57205727
);
57215728
path = tests;
57225729
sourceTree = "<group>";
@@ -6261,6 +6268,7 @@
62616268
B217861823A57ED800839CE8 /* MSIDAuthorizationControllerMock.h in Headers */,
62626269
B2E4A07B24DDE5D7007CE642 /* NSUUID+MSIDTestUtil.h in Headers */,
62636270
B217862923A5839300839CE8 /* MSIDSSOExtensionSignoutRequestMock.h in Headers */,
6271+
2A0278A32D6E3787005655B4 /* MSIDLastRequestTelemetry+Tests.h in Headers */,
62646272
969CCB5622A9EB0300A55515 /* MSIDTestCacheDataSource.h in Headers */,
62656273
B28AC66421A0BB9D00A1FC4A /* MSIDTestBrokerResponseHelper.h in Headers */,
62666274
B23ECF031FF30BB90015FC1D /* MSIDTestIdentifiers.h in Headers */,
@@ -6822,6 +6830,7 @@
68226830
23AE9D9D213A06EF00B285F3 /* MSIDAadAuthorityCacheTests.m in Sources */,
68236831
58EB18382729BB8B00F4DD73 /* MSIDSSOExtensionGetSsoCookiesRequestTests.m in Sources */,
68246832
B2BE926F21A2668600F5AB8C /* MSIDBrokerInteractiveControllerIntegrationTests.m in Sources */,
6833+
2A0278912D6E3216005655B4 /* MSIDAADTokenRequestServerTelemetryTests.m in Sources */,
68256834
23AE9DAC21409A3800B285F3 /* MSIDWebMSAuthResponseTests.m in Sources */,
68266835
23985AB72391F8D100942308 /* MSIDBrokerOperationInteractiveTokenRequestTests.m in Sources */,
68276836
968871E920AD0397009D6FC3 /* MSIDWebAADAuthResponseTests.m in Sources */,
@@ -7584,6 +7593,7 @@
75847593
B26A0B972072B9CB006BD95A /* MSIDAADV1Oauth2FactoryTests.m in Sources */,
75857594
B208854C29ADC0FD00A50B88 /* MSIDPkeyAuthHelperTests.m in Sources */,
75867595
5837A7DD28F4977C007B3F4E /* MSIDLegacyTokenCacheKey+UTest.m in Sources */,
7596+
2A0278922D6E3216005655B4 /* MSIDAADTokenRequestServerTelemetryTests.m in Sources */,
75877597
B2DD5BA2204761660084313F /* MSIDLegacySingleResourceTokenTests.m in Sources */,
75887598
239DF9C020E04BC9002D428B /* MSIDAADAuthorityTests.m in Sources */,
75897599
D6D9A4BF1FBE712900EFA430 /* MSIDStringExtensionsTests.m in Sources */,

‎IdentityCore/src/broker_operation/response/MSIDBrokerNativeAppOperationResponse.h‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -53,15 +53,6 @@ NS_ASSUME_NONNULL_BEGIN
5353
- (instancetype)init NS_UNAVAILABLE;
5454
+ (instancetype)new NS_UNAVAILABLE;
5555

56-
#if !EXCLUDE_FROM_MSALCPP
57-
58-
- (void)trackPerfTelemetryWithLastRequest:(MSIDLastRequestTelemetry *)telemetry
59-
requestStartDate:(NSDate *)requestStartDate
60-
telemetryType:(NSString *)telemetryType;
61-
62-
#endif
63-
64-
6556
@end
6657

6758
NS_ASSUME_NONNULL_END

‎IdentityCore/src/broker_operation/response/MSIDBrokerNativeAppOperationResponse.m‎

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -124,29 +124,4 @@ - (NSDictionary *)jsonDictionary
124124
return json;
125125
}
126126

127-
#if !EXCLUDE_FROM_MSALCPP
128-
129-
- (void)trackPerfTelemetryWithLastRequest:(MSIDLastRequestTelemetry *)telemetry
130-
requestStartDate:(NSDate *)requestStartDate
131-
telemetryType:(NSString *)telemetryType
132-
{
133-
if (!requestStartDate)
134-
{
135-
MSID_LOG_WITH_CTX(MSIDLogLevelError, nil, @"trackPerfTelemetryWithLastRequest called with nil request start date");
136-
return;
137-
}
138-
139-
NSDate *responseDate = [NSDate date];
140-
NSTimeInterval totalTime = [responseDate timeIntervalSinceDate:requestStartDate];
141-
NSTimeInterval ipcRequestTime = self.requestReceivedTimeStamp ? [self.requestReceivedTimeStamp timeIntervalSinceDate:requestStartDate] : 0;
142-
NSTimeInterval ipcResponseTime = self.responseGenerationTimeStamp ? [responseDate timeIntervalSinceDate:self.responseGenerationTimeStamp] : 0;
143-
144-
[telemetry trackSSOExtensionPerformanceWithType:telemetryType
145-
totalPerfNumber:totalTime
146-
ipcRequestPerfNumber:ipcRequestTime
147-
ipcResponsePerfNumber:ipcResponseTime];
148-
}
149-
150-
#endif
151-
152127
@end

‎IdentityCore/src/network/request_server_telemetry/MSIDAADTokenRequestServerTelemetry.m‎

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -51,26 +51,22 @@ - (void)handleError:(nullable NSError *)error
5151
context:(id<MSIDRequestContext>)context
5252
{
5353
if (error == nil) {
54-
MSID_LOG_WITH_CTX(MSIDLogLevelError, context, @"Failed to handle telemetry. Error is nil");
55-
return;
54+
MSID_LOG_WITH_CTX(MSIDLogLevelInfo, context, @"Error is nil, reset MSID telemetry");
5655
}
5756

58-
NSString *errorString = [error msidServerTelemetryErrorString];
59-
60-
[self handleError:error
61-
errorString:errorString
62-
context:context];
57+
[self.lastRequestTelemetry updateWithApiId:self.currentRequestTelemetry.apiId
58+
errorString:[error msidServerTelemetryErrorString]
59+
context:context];
6360
}
6461

6562
- (void)handleError:(nullable NSError *)error
6663
errorString:(NSString *)errorString
6764
context:(id<MSIDRequestContext>)context
6865
{
6966
if (error == nil) {
70-
MSID_LOG_WITH_CTX(MSIDLogLevelError, context, @"Failed to handle telemetry. Error is nil");
71-
return;
67+
MSID_LOG_WITH_CTX(MSIDLogLevelInfo, context, @"Error is nil, reset MSID telemetry");
7268
}
73-
69+
7470
[self.lastRequestTelemetry updateWithApiId:self.currentRequestTelemetry.apiId
7571
errorString:errorString
7672
context:context];

‎IdentityCore/src/requests/broker/MSIDSSOExtensionGetAccountsRequest.m‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -103,12 +103,6 @@ - (nullable instancetype)initWithRequestParameters:(MSIDRequestParameters *)requ
103103

104104
__typeof__(self) strongSelf = weakSelf;
105105

106-
#if !EXCLUDE_FROM_MSALCPP
107-
[operationResponse trackPerfTelemetryWithLastRequest:strongSelf.lastRequestTelemetry
108-
requestStartDate:strongSelf.requestSentDate
109-
telemetryType:MSID_PERF_TELEMETRY_GETACCOUNTS_TYPE];
110-
#endif
111-
112106
MSIDGetAccountsRequestCompletionBlock completionBlock = strongSelf.requestCompletionBlock;
113107
strongSelf.requestCompletionBlock = nil;
114108

‎IdentityCore/src/requests/broker/MSIDSSOExtensionGetDeviceInfoRequest.m‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -91,12 +91,6 @@ - (nullable instancetype)initWithRequestParameters:(MSIDRequestParameters *)requ
9191

9292
__typeof__(self) strongSelf = weakSelf;
9393

94-
#if !EXCLUDE_FROM_MSALCPP
95-
[operationResponse trackPerfTelemetryWithLastRequest:strongSelf.lastRequestTelemetry
96-
requestStartDate:strongSelf.requestSentDate
97-
telemetryType:MSID_PERF_TELEMETRY_GETDEVICEINFO_TYPE];
98-
#endif
99-
10094
MSIDGetDeviceInfoRequestCompletionBlock completionBlock = strongSelf.requestCompletionBlock;
10195
strongSelf.requestCompletionBlock = nil;
10296

‎IdentityCore/src/requests/broker/MSIDSSOExtensionSignoutRequest.m‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -98,12 +98,6 @@ - (nullable instancetype)initWithRequestParameters:(nonnull MSIDInteractiveReque
9898

9999
__typeof__(self) strongSelf = weakSelf;
100100

101-
#if !EXCLUDE_FROM_MSALCPP
102-
[operationResponse trackPerfTelemetryWithLastRequest:strongSelf.lastRequestTelemetry
103-
requestStartDate:strongSelf.requestSentDate
104-
telemetryType:MSID_PERF_TELEMETRY_SIGNOUT_TYPE];
105-
#endif
106-
107101
MSIDSignoutRequestCompletionBlock completionBlock = strongSelf.requestCompletionBlock;
108102
strongSelf.requestCompletionBlock = nil;
109103

‎IdentityCore/src/requests/broker/MSIDSSOExtensionSilentTokenRequest.m‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -93,12 +93,6 @@ - (instancetype)initWithRequestParameters:(MSIDRequestParameters *)parameters
9393
strongSelf.ssoTokenResponseHandler.externalCacheSeeder = strongSelf.externalCacheSeeder;
9494
#endif
9595

96-
#if !EXCLUDE_FROM_MSALCPP
97-
[operationResponse trackPerfTelemetryWithLastRequest:strongSelf.lastRequestTelemetry
98-
requestStartDate:strongSelf.requestSentDate
99-
telemetryType:MSID_PERF_TELEMETRY_SILENT_TYPE];
100-
#endif
101-
10296
[strongSelf.ssoTokenResponseHandler handleOperationResponse:operationResponse
10397
requestParameters:strongSelf.requestParameters
10498
tokenResponseValidator:strongSelf.tokenResponseValidator

‎IdentityCore/src/telemetry/request_telemetry/MSIDLastRequestTelemetry.h‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -34,21 +34,8 @@
3434

3535
@end
3636

37-
@interface MSIDRequestPerformanceInfo : NSObject <NSSecureCoding>
38-
39-
@property (nonatomic, nullable) NSMutableArray<NSNumber *> *totalNumbers;
40-
@property (nonatomic, nullable) NSMutableArray<NSNumber *> *ipcRequestNumbers;
41-
@property (nonatomic, nullable) NSMutableArray<NSNumber *> *ipcResponseNumbers;
42-
43-
@end
44-
4537
NS_ASSUME_NONNULL_BEGIN
4638

47-
extern NSString * _Nonnull const MSID_PERF_TELEMETRY_SILENT_TYPE;
48-
extern NSString * _Nonnull const MSID_PERF_TELEMETRY_SIGNOUT_TYPE;
49-
extern NSString * _Nonnull const MSID_PERF_TELEMETRY_GETACCOUNTS_TYPE;
50-
extern NSString * _Nonnull const MSID_PERF_TELEMETRY_GETDEVICEINFO_TYPE;
51-
5239
@class MSIDCurrentRequestTelemetrySerializedItem;
5340

5441
@interface MSIDLastRequestTelemetry : NSObject <MSIDTelemetryStringSerializable, NSSecureCoding>
@@ -69,11 +56,6 @@ extern NSString * _Nonnull const MSID_PERF_TELEMETRY_GETDEVICEINFO_TYPE;
6956

7057
- (void)increaseSilentSuccessfulCount;
7158

72-
- (void)trackSSOExtensionPerformanceWithType:(NSString *)type
73-
totalPerfNumber:(NSTimeInterval)totalPerfNumber
74-
ipcRequestPerfNumber:(NSTimeInterval)ipcRequestPerfNumber
75-
ipcResponsePerfNumber:(NSTimeInterval)ipcResponsePerfNumber;
76-
7759
@end
7860

7961
NS_ASSUME_NONNULL_END

0 commit comments

Comments
 (0)