Skip to content

Commit 4265573

Browse files
paulb777paulb777
authored
Auth repo-relative headers (#5332)
1 parent 7bd8faa commit 4265573

File tree

273 files changed

+969
-998
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

273 files changed

+969
-998
lines changed

‎FirebaseAuth.podspec

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,8 @@ supports email and password accounts, as well as several 3rd party authenticatio
3636
'GCC_C_LANGUAGE_STANDARD' => 'c99',
3737
'GCC_PREPROCESSOR_DEFINITIONS' =>
3838
'FIRAuth_VERSION=' + s.version.to_s +
39-
' FIRAuth_MINOR_VERSION=' + s.version.to_s.split(".")[0] + "." + s.version.to_s.split(".")[1]
39+
' FIRAuth_MINOR_VERSION=' + s.version.to_s.split(".")[0] + "." + s.version.to_s.split(".")[1],
40+
'HEADER_SEARCH_PATHS' => '"${PODS_TARGET_SRCROOT}"'
4041
}
4142
s.framework = 'Security'
4243
s.ios.framework = 'SafariServices'
@@ -76,10 +77,6 @@ supports email and password accounts, as well as several 3rd party authenticatio
7677
]
7778
# app_host is needed for tests with keychain
7879
unit_tests.requires_app_host = true
79-
unit_tests.pod_target_xcconfig = {
80-
# Unit tests do library imports using FirebaseAuth/Sources recursive relative paths.
81-
'HEADER_SEARCH_PATHS' => '"${PODS_TARGET_SRCROOT}"/FirebaseAuth/Sources/**',
82-
}
8380
unit_tests.dependency 'OCMock'
8481
end
8582
end

‎FirebaseAuth/Sources/Auth/FIRActionCodeSettings.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
#import "FIRActionCodeSettings.h"
17+
#import <FirebaseAuth/FIRActionCodeSettings.h>
1818

1919
NS_ASSUME_NONNULL_BEGIN
2020

‎FirebaseAuth/Sources/Auth/FIRAuth.m

Lines changed: 50 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,13 @@
1616

1717
#import <Foundation/Foundation.h>
1818

19-
#import "FIRAuth_Internal.h"
19+
#import "FirebaseAuth/Sources/Auth/FIRAuth_Internal.h"
2020

2121
#if __has_include(<UIKit/UIKit.h>)
2222
#import <UIKit/UIKit.h>
2323
#endif
2424

25+
#import <FirebaseAuth/FirebaseAuth.h>
2526
#import <FirebaseCore/FIRAppInternal.h>
2627
#import <FirebaseCore/FIRComponent.h>
2728
#import <FirebaseCore/FIRComponentContainer.h>
@@ -32,57 +33,55 @@
3233
#import <GoogleUtilities/GULAppEnvironmentUtil.h>
3334
#import <GoogleUtilities/GULSceneDelegateSwizzler.h>
3435

35-
#import "FIRAdditionalUserInfo_Internal.h"
36-
#import "FIRAuthBackend.h"
37-
#import "FIRAuthCredential_Internal.h"
38-
#import "FIRAuthDataResult_Internal.h"
39-
#import "FIRAuthDispatcher.h"
40-
#import "FIRAuthErrorUtils.h"
41-
#import "FIRAuthExceptionUtils.h"
42-
#import "FIRAuthGlobalWorkQueue.h"
43-
#import "FIRAuthKeychainServices.h"
44-
#import "FIRAuthOperationType.h"
45-
#import "FIRAuthRequestConfiguration.h"
46-
#import "FIRAuthSettings.h"
47-
#import "FIRAuthStoredUserManager.h"
48-
#import "FIRAuthWebUtils.h"
49-
#import "FIRCreateAuthURIRequest.h"
50-
#import "FIRCreateAuthURIResponse.h"
51-
#import "FIREmailLinkSignInRequest.h"
52-
#import "FIREmailLinkSignInResponse.h"
53-
#import "FIREmailPasswordAuthCredential.h"
54-
#import "FIRGameCenterAuthCredential.h"
55-
#import "FIRGetOOBConfirmationCodeRequest.h"
56-
#import "FIRGetOOBConfirmationCodeResponse.h"
57-
#import "FIROAuthCredential_Internal.h"
58-
#import "FIRResetPasswordRequest.h"
59-
#import "FIRResetPasswordResponse.h"
60-
#import "FIRSendVerificationCodeRequest.h"
61-
#import "FIRSendVerificationCodeResponse.h"
62-
#import "FIRSetAccountInfoRequest.h"
63-
#import "FIRSetAccountInfoResponse.h"
64-
#import "FIRSignInWithGameCenterRequest.h"
65-
#import "FIRSignInWithGameCenterResponse.h"
66-
#import "FIRSignUpNewUserRequest.h"
67-
#import "FIRSignUpNewUserResponse.h"
68-
#import "FIRUser_Internal.h"
69-
#import "FIRVerifyAssertionRequest.h"
70-
#import "FIRVerifyAssertionResponse.h"
71-
#import "FIRVerifyCustomTokenRequest.h"
72-
#import "FIRVerifyCustomTokenResponse.h"
73-
#import "FIRVerifyPasswordRequest.h"
74-
#import "FIRVerifyPasswordResponse.h"
75-
#import "FIRVerifyPhoneNumberRequest.h"
76-
#import "FIRVerifyPhoneNumberResponse.h"
77-
#import "FirebaseAuth.h"
36+
#import "FirebaseAuth/Sources/Auth/FIRAuthDataResult_Internal.h"
37+
#import "FirebaseAuth/Sources/Auth/FIRAuthDispatcher.h"
38+
#import "FirebaseAuth/Sources/Auth/FIRAuthGlobalWorkQueue.h"
39+
#import "FirebaseAuth/Sources/Auth/FIRAuthOperationType.h"
40+
#import "FirebaseAuth/Sources/AuthProvider/Email/FIREmailPasswordAuthCredential.h"
41+
#import "FirebaseAuth/Sources/AuthProvider/FIRAuthCredential_Internal.h"
42+
#import "FirebaseAuth/Sources/AuthProvider/GameCenter/FIRGameCenterAuthCredential.h"
43+
#import "FirebaseAuth/Sources/AuthProvider/OAuth/FIROAuthCredential_Internal.h"
44+
#import "FirebaseAuth/Sources/Backend/FIRAuthBackend.h"
45+
#import "FirebaseAuth/Sources/Backend/FIRAuthRequestConfiguration.h"
46+
#import "FirebaseAuth/Sources/Backend/RPC/FIRCreateAuthURIRequest.h"
47+
#import "FirebaseAuth/Sources/Backend/RPC/FIRCreateAuthURIResponse.h"
48+
#import "FirebaseAuth/Sources/Backend/RPC/FIREmailLinkSignInRequest.h"
49+
#import "FirebaseAuth/Sources/Backend/RPC/FIREmailLinkSignInResponse.h"
50+
#import "FirebaseAuth/Sources/Backend/RPC/FIRGetOOBConfirmationCodeRequest.h"
51+
#import "FirebaseAuth/Sources/Backend/RPC/FIRGetOOBConfirmationCodeResponse.h"
52+
#import "FirebaseAuth/Sources/Backend/RPC/FIRResetPasswordRequest.h"
53+
#import "FirebaseAuth/Sources/Backend/RPC/FIRResetPasswordResponse.h"
54+
#import "FirebaseAuth/Sources/Backend/RPC/FIRSendVerificationCodeRequest.h"
55+
#import "FirebaseAuth/Sources/Backend/RPC/FIRSendVerificationCodeResponse.h"
56+
#import "FirebaseAuth/Sources/Backend/RPC/FIRSetAccountInfoRequest.h"
57+
#import "FirebaseAuth/Sources/Backend/RPC/FIRSetAccountInfoResponse.h"
58+
#import "FirebaseAuth/Sources/Backend/RPC/FIRSignInWithGameCenterRequest.h"
59+
#import "FirebaseAuth/Sources/Backend/RPC/FIRSignInWithGameCenterResponse.h"
60+
#import "FirebaseAuth/Sources/Backend/RPC/FIRSignUpNewUserRequest.h"
61+
#import "FirebaseAuth/Sources/Backend/RPC/FIRSignUpNewUserResponse.h"
62+
#import "FirebaseAuth/Sources/Backend/RPC/FIRVerifyAssertionRequest.h"
63+
#import "FirebaseAuth/Sources/Backend/RPC/FIRVerifyAssertionResponse.h"
64+
#import "FirebaseAuth/Sources/Backend/RPC/FIRVerifyCustomTokenRequest.h"
65+
#import "FirebaseAuth/Sources/Backend/RPC/FIRVerifyCustomTokenResponse.h"
66+
#import "FirebaseAuth/Sources/Backend/RPC/FIRVerifyPasswordRequest.h"
67+
#import "FirebaseAuth/Sources/Backend/RPC/FIRVerifyPasswordResponse.h"
68+
#import "FirebaseAuth/Sources/Backend/RPC/FIRVerifyPhoneNumberRequest.h"
69+
#import "FirebaseAuth/Sources/Backend/RPC/FIRVerifyPhoneNumberResponse.h"
70+
#import "FirebaseAuth/Sources/Storage/FIRAuthKeychainServices.h"
71+
#import "FirebaseAuth/Sources/SystemService/FIRAuthStoredUserManager.h"
72+
#import "FirebaseAuth/Sources/User/FIRAdditionalUserInfo_Internal.h"
73+
#import "FirebaseAuth/Sources/User/FIRUser_Internal.h"
74+
#import "FirebaseAuth/Sources/Utilities/FIRAuthErrorUtils.h"
75+
#import "FirebaseAuth/Sources/Utilities/FIRAuthExceptionUtils.h"
76+
#import "FirebaseAuth/Sources/Utilities/FIRAuthWebUtils.h"
7877

7978
#if TARGET_OS_IOS
80-
#import "FIRAuthAPNSToken.h"
81-
#import "FIRAuthAPNSTokenManager.h"
82-
#import "FIRAuthAppCredentialManager.h"
83-
#import "FIRAuthNotificationManager.h"
84-
#import "FIRAuthURLPresenter.h"
85-
#import "FIRPhoneAuthCredential_Internal.h"
79+
#import "FirebaseAuth/Sources/AuthProvider/Phone/FIRPhoneAuthCredential_Internal.h"
80+
#import "FirebaseAuth/Sources/SystemService/FIRAuthAPNSToken.h"
81+
#import "FirebaseAuth/Sources/SystemService/FIRAuthAPNSTokenManager.h"
82+
#import "FirebaseAuth/Sources/SystemService/FIRAuthAppCredentialManager.h"
83+
#import "FirebaseAuth/Sources/SystemService/FIRAuthNotificationManager.h"
84+
#import "FirebaseAuth/Sources/Utilities/FIRAuthURLPresenter.h"
8685
#endif
8786

8887
NS_ASSUME_NONNULL_BEGIN
@@ -481,10 +480,9 @@ - (nullable instancetype)initWithAPIKey:(NSString *)APIKey appName:(NSString *)a
481480
if (self) {
482481
_listenerHandles = [NSMutableArray array];
483482
_requestConfiguration = [[FIRAuthRequestConfiguration alloc] initWithAPIKey:APIKey];
484-
_settings = [[FIRAuthSettings alloc] init];
485483
_firebaseAppName = [appName copy];
486484
#if TARGET_OS_IOS
487-
485+
_settings = [[FIRAuthSettings alloc] init];
488486
static Class applicationClass = nil;
489487
// iOS App extensions should not call [UIApplication sharedApplication], even if UIApplication
490488
// responds to it.

‎FirebaseAuth/Sources/Auth/FIRAuthDataResult.m

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@
1414
* limitations under the License.
1515
*/
1616

17-
#import "FIRAuthDataResult_Internal.h"
17+
#import <FirebaseAuth/FIRAdditionalUserInfo.h>
18+
#import <FirebaseAuth/FIROAuthCredential.h>
19+
#import <FirebaseAuth/FIRUser.h>
1820

19-
#import "FIRAdditionalUserInfo.h"
20-
#import "FIROAuthCredential.h"
21-
#import "FIRUser.h"
21+
#import "FirebaseAuth/Sources/Auth/FIRAuthDataResult_Internal.h"
2222

2323
NS_ASSUME_NONNULL_BEGIN
2424

‎FirebaseAuth/Sources/Auth/FIRAuthDataResult_Internal.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
#import "FIRAuthDataResult.h"
17+
#import <FirebaseAuth/FIRAuthDataResult.h>
1818

1919
@class FIROAuthCredential;
2020

‎FirebaseAuth/Sources/Auth/FIRAuthDispatcher.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
#import "FIRAuthDispatcher.h"
17+
#import "FirebaseAuth/Sources/Auth/FIRAuthDispatcher.h"
1818

1919
NS_ASSUME_NONNULL_BEGIN
2020

‎FirebaseAuth/Sources/Auth/FIRAuthGlobalWorkQueue.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
#import "FIRAuthGlobalWorkQueue.h"
17+
#import "FirebaseAuth/Sources/Auth/FIRAuthGlobalWorkQueue.h"
1818

1919
NS_ASSUME_NONNULL_BEGIN
2020

‎FirebaseAuth/Sources/Auth/FIRAuthSerialTaskQueue.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414
* limitations under the License.
1515
*/
1616

17-
#import "FIRAuthSerialTaskQueue.h"
17+
#import "FirebaseAuth/Sources/Auth/FIRAuthSerialTaskQueue.h"
1818

19-
#import "FIRAuthGlobalWorkQueue.h"
19+
#import "FirebaseAuth/Sources/Auth/FIRAuthGlobalWorkQueue.h"
2020

2121
NS_ASSUME_NONNULL_BEGIN
2222

‎FirebaseAuth/Sources/Auth/FIRAuthSettings.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* limitations under the License.
1515
*/
1616

17-
#import "FIRAuthSettings.h"
17+
#import <FirebaseAuth/FIRAuthSettings.h>
1818

1919
NS_ASSUME_NONNULL_BEGIN
2020

‎FirebaseAuth/Sources/Auth/FIRAuthTokenResult.m

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,8 @@
1414
* limitations under the License.
1515
*/
1616

17-
#import "FIRAuthTokenResult_Internal.h"
18-
19-
#import "FIRAuthErrorUtils.h"
17+
#import "FirebaseAuth/Sources/Auth/FIRAuthTokenResult_Internal.h"
18+
#import "FirebaseAuth/Sources/Utilities/FIRAuthErrorUtils.h"
2019

2120
NS_ASSUME_NONNULL_BEGIN
2221

0 commit comments

Comments
 (0)