Skip to content

Commit 082eb3a

Browse files
author
kai
committed
Address comment
1 parent 8802829 commit 082eb3a

File tree

8 files changed

+103
-38
lines changed

8 files changed

+103
-38
lines changed

‎IdentityCore/IdentityCore.xcodeproj/project.pbxproj‎

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -550,6 +550,9 @@
550550
2A36F3A02EA80A8400E27528 /* MSIDTestTelemetryProvider.m in Sources */ = {isa = PBXBuildFile; fileRef = 2A36F39D2EA80A8400E27528 /* MSIDTestTelemetryProvider.m */; };
551551
2A36F3A12EA80A8400E27528 /* MSIDTestTelemetryProvider.h in Headers */ = {isa = PBXBuildFile; fileRef = 2A36F39C2EA80A8400E27528 /* MSIDTestTelemetryProvider.h */; };
552552
2A36F3A22EA80A8400E27528 /* MSIDTestTelemetryProvider.m in Sources */ = {isa = PBXBuildFile; fileRef = 2A36F39D2EA80A8400E27528 /* MSIDTestTelemetryProvider.m */; };
553+
2A36F4232EA9360900E27528 /* MSIDClientTelemetryConstants.m in Sources */ = {isa = PBXBuildFile; fileRef = 2A36F4222EA9360900E27528 /* MSIDClientTelemetryConstants.m */; };
554+
2A36F4242EA9360900E27528 /* MSIDClientTelemetryConstants.h in Headers */ = {isa = PBXBuildFile; fileRef = 2A36F4212EA9360900E27528 /* MSIDClientTelemetryConstants.h */; };
555+
2A36F4252EA9360900E27528 /* MSIDClientTelemetryConstants.m in Sources */ = {isa = PBXBuildFile; fileRef = 2A36F4222EA9360900E27528 /* MSIDClientTelemetryConstants.m */; };
553556
2A59B4202D76618900304FB1 /* MSIDXpcProviderCache.h in Headers */ = {isa = PBXBuildFile; fileRef = 2A59B41D2D76618900304FB1 /* MSIDXpcProviderCache.h */; };
554557
2A59B4212D76618900304FB1 /* MSIDXpcProviderCache.m in Sources */ = {isa = PBXBuildFile; fileRef = 2A59B41E2D76618900304FB1 /* MSIDXpcProviderCache.m */; };
555558
2A59B42C2D776F3400304FB1 /* MSIDXpcConfiguration.m in Sources */ = {isa = PBXBuildFile; fileRef = 2A59B42B2D776F3400304FB1 /* MSIDXpcConfiguration.m */; };
@@ -2501,6 +2504,8 @@
25012504
2A36F39A2EA6B58300E27528 /* MSIDTelemetryProviding.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MSIDTelemetryProviding.h; sourceTree = "<group>"; };
25022505
2A36F39C2EA80A8400E27528 /* MSIDTestTelemetryProvider.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MSIDTestTelemetryProvider.h; sourceTree = "<group>"; };
25032506
2A36F39D2EA80A8400E27528 /* MSIDTestTelemetryProvider.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MSIDTestTelemetryProvider.m; sourceTree = "<group>"; };
2507+
2A36F4212EA9360900E27528 /* MSIDClientTelemetryConstants.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MSIDClientTelemetryConstants.h; sourceTree = "<group>"; };
2508+
2A36F4222EA9360900E27528 /* MSIDClientTelemetryConstants.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MSIDClientTelemetryConstants.m; sourceTree = "<group>"; };
25042509
2A59B41D2D76618900304FB1 /* MSIDXpcProviderCache.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MSIDXpcProviderCache.h; sourceTree = "<group>"; };
25052510
2A59B41E2D76618900304FB1 /* MSIDXpcProviderCache.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MSIDXpcProviderCache.m; sourceTree = "<group>"; };
25062511
2A59B42A2D776F3400304FB1 /* MSIDXpcConfiguration.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MSIDXpcConfiguration.h; sourceTree = "<group>"; };
@@ -4183,6 +4188,16 @@
41834188
path = claims;
41844189
sourceTree = "<group>";
41854190
};
4191+
2A36F4202EA935CC00E27528 /* client_telemetry */ = {
4192+
isa = PBXGroup;
4193+
children = (
4194+
2A36F4212EA9360900E27528 /* MSIDClientTelemetryConstants.h */,
4195+
2A36F4222EA9360900E27528 /* MSIDClientTelemetryConstants.m */,
4196+
2A36F39A2EA6B58300E27528 /* MSIDTelemetryProviding.h */,
4197+
);
4198+
path = client_telemetry;
4199+
sourceTree = "<group>";
4200+
};
41864201
2A953DF62DA45A9700A748BA /* mac */ = {
41874202
isa = PBXGroup;
41884203
children = (
@@ -4621,6 +4636,7 @@
46214636
B206578A1FC917D900412B7D /* telemetry */ = {
46224637
isa = PBXGroup;
46234638
children = (
4639+
2A36F4202EA935CC00E27528 /* client_telemetry */,
46244640
239222AC243D3791009736C4 /* request_telemetry */,
46254641
B20657A41FC91C1600412B7D /* MSIDTelemetryDispatcher.h */,
46264642
B20657981FC91BE000412B7D /* MSIDTelemetryEventInterface.h */,
@@ -4660,7 +4676,6 @@
46604676
233E96F222652C5B007FCE2A /* MSIDTelemetryEventsObserving.h */,
46614677
233E96F422652D3A007FCE2A /* MSIDAggregatedDispatcher.h */,
46624678
233E96F522652D3A007FCE2A /* MSIDAggregatedDispatcher.m */,
4663-
2A36F39A2EA6B58300E27528 /* MSIDTelemetryProviding.h */,
46644679
);
46654680
path = telemetry;
46664681
sourceTree = "<group>";
@@ -6076,6 +6091,7 @@
60766091
B2C7089C219926C200D917B8 /* MSIDBrokerResponse+Internal.h in Headers */,
60776092
2A59B43A2D78FE6B00304FB1 /* MSIDSSORemoteInteractiveTokenRequest.h in Headers */,
60786093
2A2481602CB08344006FCB34 /* MSIDXpcSilentTokenRequestController.h in Headers */,
6094+
2A36F4242EA9360900E27528 /* MSIDClientTelemetryConstants.h in Headers */,
60796095
B286B9C72389DE7F007833AD /* MSIDAccountMetadataCacheAccessor.h in Headers */,
60806096
B286B9B12389DD6C007833AD /* MSIDPKeyAuthHandler.h in Headers */,
60816097
E733EDD525C0A47600ACB79A /* MSIDThumbprintCalculatable.h in Headers */,
@@ -7583,6 +7599,7 @@
75837599
B286B99F2389DCBA007833AD /* MSIDRequestParameters+Broker.m in Sources */,
75847600
2A24814D2CB06A1A006FCB34 /* MSIDSSORemoteSilentTokenRequest.m in Sources */,
75857601
B26A0B7F2071ADCE006BD95A /* MSIDOauth2Factory.m in Sources */,
7602+
2A36F4232EA9360900E27528 /* MSIDClientTelemetryConstants.m in Sources */,
75867603
B217863A23A5994300839CE8 /* MSIDSSOExtensionSignoutController.m in Sources */,
75877604
B2C707FF2192530E00D917B8 /* MSIDDefaultSilentTokenRequest.m in Sources */,
75887605
60F94D332210E8BD0035D956 /* MSIDV1IdToken.m in Sources */,
@@ -8223,6 +8240,7 @@
82238240
235C2B032D6FAF7900DEFEFB /* MSIDSwitchBrowserOperation.m in Sources */,
82248241
B2C708732198C42200D917B8 /* MSIDLegacyBrokerResponseHandler.m in Sources */,
82258242
886F517029CCA84200F09471 /* MSIDCIAMAuthorityResolver.m in Sources */,
8243+
2A36F4252EA9360900E27528 /* MSIDClientTelemetryConstants.m in Sources */,
82268244
238E19D82086FE28004DF483 /* MSIDAADRefreshTokenGrantRequest.m in Sources */,
82278245
B2C7088E2198E48E00D917B8 /* NSData+MSIDAES.m in Sources */,
82288246
238A04902089A3C800989EE0 /* MSIDHttpRequestTelemetry.m in Sources */,

‎IdentityCore/src/network/error_handler/MSIDAADRequestErrorHandler.m‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
#import "MSIDPKeyAuthHandler.h"
3131
#import "MSIDMainThreadUtil.h"
3232
#import "MSIDRequestTelemetryConstants.h"
33+
#import "MSIDClientTelemetryConstants.h"
3334
#import "MSIDLogger+Internal.h"
3435
#import "NSString+MSIDExtensions.h"
3536

‎IdentityCore/src/requests/MSIDSilentTokenRequest.m‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
#import "MSIDFlightManager.h"
4545
#import "MSIDLogger+Internal.h"
4646
#import "NSString+MSIDExtensions.h"
47-
#import "MSIDRequestTelemetryConstants.h"
47+
#import "MSIDClientTelemetryConstants.h"
4848

4949
#if TARGET_OS_OSX && !EXCLUDE_FROM_MSALCPP
5050
#import "MSIDExternalAADCacheSeeder.h"

‎IdentityCore/src/telemetry/client_telemetry/MSIDClientTelemetryConstants.h‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
//
2+
// Copyright (c) Microsoft Corporation.
3+
// All rights reserved.
4+
//
5+
// This code is licensed under the MIT License.
6+
//
7+
// Permission is hereby granted, free of charge, to any person obtaining a copy
8+
// of this software and associated documentation files(the "Software"), to deal
9+
// in the Software without restriction, including without limitation the rights
10+
// to use, copy, modify, merge, publish, distribute, sublicense, and / or sell
11+
// copies of the Software, and to permit persons to whom the Software is
12+
// furnished to do so, subject to the following conditions :
13+
//
14+
// The above copyright notice and this permission notice shall be included in
15+
// all copies or substantial portions of the Software.
16+
//
17+
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
18+
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
19+
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
20+
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
21+
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
22+
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
23+
// THE SOFTWARE.
24+
25+
// Key
26+
extern NSString* const MSID_TELE_HANDLING_HTTP_ERROR;
27+
extern NSString* const MSID_TELE_HTTP_ERROR_CODE;
28+
extern NSString* const MSID_TELE_HTTP_SHOULD_RETRY;
29+
extern NSString* const MSID_TELE_HTTP_RETRY_INTERVAL;
30+
extern NSString* const MSID_TELE_HTTP_RETRY_INTERVAL;
31+
extern NSString* const MSID_TELE_ENROLL_ID_MATCH;
32+
extern NSString* const MSID_TELE_ACCESS_TOKEN_EXPIRED_INTERVAL;
33+
extern NSString* const MSID_TELE_FOUND_VALID_ACCESS_TOKEN;
34+
extern NSString* const MSID_TELE_ACCESS_TOKEN_REFRESHED_NEEDED;
35+
extern NSString* const MSID_TELE_SKIP_LOCAL_REFRESH_TOKEN;
36+
37+
38+
// Value
39+
extern NSString* const MSID_TELE_NO_HTTP_RESPONSE;
40+
extern NSString* const MSID_TELE_5XX_ERROR;

‎IdentityCore/src/telemetry/client_telemetry/MSIDClientTelemetryConstants.m‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
//
2+
// Copyright (c) Microsoft Corporation.
3+
// All rights reserved.
4+
//
5+
// This code is licensed under the MIT License.
6+
//
7+
// Permission is hereby granted, free of charge, to any person obtaining a copy
8+
// of this software and associated documentation files(the "Software"), to deal
9+
// in the Software without restriction, including without limitation the rights
10+
// to use, copy, modify, merge, publish, distribute, sublicense, and / or sell
11+
// copies of the Software, and to permit persons to whom the Software is
12+
// furnished to do so, subject to the following conditions :
13+
//
14+
// The above copyright notice and this permission notice shall be included in
15+
// all copies or substantial portions of the Software.
16+
//
17+
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
18+
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
19+
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
20+
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
21+
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
22+
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
23+
// THE SOFTWARE.
24+
25+
26+
#import "MSIDClientTelemetryConstants.h"
27+
28+
// Key
29+
NSString* const MSID_TELE_HANDLING_HTTP_ERROR = @"handle_http_error";
30+
NSString* const MSID_TELE_HTTP_ERROR_CODE = @"http_error_code";
31+
NSString* const MSID_TELE_HTTP_SHOULD_RETRY = @"http_should_retry";
32+
NSString* const MSID_TELE_HTTP_RETRY_INTERVAL = @"http_retry_interval";
33+
34+
NSString* const MSID_TELE_ENROLL_ID_MATCH = @"enroll_id_match";
35+
NSString* const MSID_TELE_ACCESS_TOKEN_EXPIRED_INTERVAL = @"at_exipred_interval";
36+
NSString* const MSID_TELE_FOUND_VALID_ACCESS_TOKEN = @"found_valid_at";
37+
NSString* const MSID_TELE_ACCESS_TOKEN_REFRESHED_NEEDED = @"at_refresh_needed";
38+
NSString* const MSID_TELE_SKIP_LOCAL_REFRESH_TOKEN = @"skip_local_rt";
39+
40+
// Value
41+
NSString* const MSID_TELE_NO_HTTP_RESPONSE = @"no_response";
42+
NSString* const MSID_TELE_5XX_ERROR = @"5xx_error";

IdentityCore/src/telemetry/MSIDTelemetryProviding.h renamed to IdentityCore/src/telemetry/client_telemetry/MSIDTelemetryProviding.h

File renamed without changes.

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

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -30,22 +30,3 @@ extern NSString* const MSID_WPJ_V2_TELEMETRY_KEY;
3030
extern NSString* const MSID_WPJ_V1_TELEMETRY_KEY;
3131

3232
#endif
33-
34-
/* MSAL TELEMETRY PROVIDING */
35-
36-
// Key
37-
extern NSString* const MSID_TELE_HANDLING_HTTP_ERROR;
38-
extern NSString* const MSID_TELE_HTTP_ERROR_CODE;
39-
extern NSString* const MSID_TELE_HTTP_SHOULD_RETRY;
40-
extern NSString* const MSID_TELE_HTTP_RETRY_INTERVAL;
41-
extern NSString* const MSID_TELE_HTTP_RETRY_INTERVAL;
42-
extern NSString* const MSID_TELE_ENROLL_ID_MATCH;
43-
extern NSString* const MSID_TELE_ACCESS_TOKEN_EXPIRED_INTERVAL;
44-
extern NSString* const MSID_TELE_FOUND_VALID_ACCESS_TOKEN;
45-
extern NSString* const MSID_TELE_ACCESS_TOKEN_REFRESHED_NEEDED;
46-
extern NSString* const MSID_TELE_SKIP_LOCAL_REFRESH_TOKEN;
47-
48-
49-
// Value
50-
extern NSString* const MSID_TELE_NO_HTTP_RESPONSE;
51-
extern NSString* const MSID_TELE_5XX_ERROR;

‎IdentityCore/src/telemetry/request_telemetry/MSIDRequestTelemetryConstants.m‎

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -33,20 +33,3 @@
3333
NSString* const MSID_WPJ_V1_TELEMETRY_KEY = @"wpj-v1";
3434

3535
#endif
36-
37-
/* MSAL TELEMETRY PROVIDING */
38-
// Key
39-
NSString* const MSID_TELE_HANDLING_HTTP_ERROR = @"handle_http_error";
40-
NSString* const MSID_TELE_HTTP_ERROR_CODE = @"http_error_code";
41-
NSString* const MSID_TELE_HTTP_SHOULD_RETRY = @"http_should_retry";
42-
NSString* const MSID_TELE_HTTP_RETRY_INTERVAL = @"http_retry_interval";
43-
44-
NSString* const MSID_TELE_ENROLL_ID_MATCH = @"enroll_id_match";
45-
NSString* const MSID_TELE_ACCESS_TOKEN_EXPIRED_INTERVAL = @"at_exipred_interval";
46-
NSString* const MSID_TELE_FOUND_VALID_ACCESS_TOKEN = @"found_valid_at";
47-
NSString* const MSID_TELE_ACCESS_TOKEN_REFRESHED_NEEDED = @"at_refresh_needed";
48-
NSString* const MSID_TELE_SKIP_LOCAL_REFRESH_TOKEN = @"skip_local_rt";
49-
50-
// Value
51-
NSString* const MSID_TELE_NO_HTTP_RESPONSE = @"no_response";
52-
NSString* const MSID_TELE_5XX_ERROR = @"5xx_error";

0 commit comments

Comments
 (0)