Skip to content

Commit a1cb565

Browse files
committed
Auth and Messaging Interop for Swift (#9314)
1 parent 6005576 commit a1cb565

Some content is hidden

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

50 files changed

+329
-248
lines changed

.github/workflows/auth.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on:
44
pull_request:
55
paths:
66
- 'FirebaseAuth**'
7-
- 'Interop/Auth/Public/*.h'
7+
- 'FirebaseAuth/Interop/*.h'
88
- '.github/workflows/auth.yml'
99
- 'Gemfile*'
1010
schedule:

.github/workflows/database.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on:
77
- 'Firebase/Database/**'
88
- 'FirebaseSharedSwift**'
99
- 'Example/Database/**'
10-
- 'Interop/Auth/Public/*.h'
10+
- 'FirebaseAuth/Interop/*.h'
1111
- '.github/workflows/database.yml'
1212
- 'Gemfile*'
1313
- 'scripts/run_database_emulator.sh'

.github/workflows/firestore.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ on:
2121
- 'Firestore/**'
2222

2323
# Interop headers
24-
- 'Interop/Auth/Public/*.h'
24+
- 'FirebaseAuth/Interop/*.h'
2525

2626
# FirebaseCore header change
2727
- 'FirebaseCore/Internal'

.github/workflows/functions.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ on:
66
- 'FirebaseFunctions**'
77
- 'FirebaseSharedSwift**'
88
- '.github/workflows/functions.yml'
9-
- 'Interop/Auth/Public/*.h'
10-
- 'FirebaseMessaging/Sources/Interop/*.h'
9+
- 'FirebaseAuth/Interop/*.h'
10+
- 'FirebaseMessaging/Interop/*.h'
1111
- 'FirebaseTestingSupport/Functions/**'
1212
- 'FirebaseCombineSwift/Sources/Functions/**'
1313
- 'scripts/setup_quickstart.sh'

.github/workflows/storage.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on:
44
pull_request:
55
paths:
66
- 'FirebaseStorage**'
7-
- 'Interop/Auth/Public/*.h'
7+
- 'FirebaseAuth/Interop/*.h'
88
- '.github/workflows/storage.yml'
99
- 'scripts/**'
1010
# Rebuild on Ruby infrastructure changes.

CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -261,8 +261,8 @@ if(FIREBASE_IOS_BUILD_TESTS)
261261
enable_testing()
262262
endif()
263263

264-
add_subdirectory(FirebaseAppCheck/Interop/)
264+
add_subdirectory(FirebaseAppCheck/Interop)
265265
add_subdirectory(FirebaseCore)
266266
add_subdirectory(Firestore)
267-
add_subdirectory(Interop/Auth)
267+
add_subdirectory(FirebaseAuth/Interop)
268268
add_subdirectory(Interop/CoreDiagnostics)

FirebaseAppCheckInterop.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,4 @@ Pod::Spec.new do |s|
2727

2828
s.source_files = 'FirebaseAppCheck/Interop/*.[hm]'
2929
s.public_header_files = 'FirebaseAppCheck/Interop/*.h'
30-
end
30+
end

FirebaseAuth.podspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ supports email and password accounts, as well as several 3rd party authenticatio
3636
s.source_files = [
3737
source + '**/*.[mh]',
3838
'FirebaseCore/Internal/*.h',
39-
'Interop/Auth/Public/*.h',
39+
'FirebaseAuth/Interop/*.h',
4040
]
4141
s.public_header_files = source + 'Public/FirebaseAuth/*.h'
4242
s.preserve_paths = [
File renamed without changes.

Interop/Auth/Public/FIRAuthInterop.h renamed to FirebaseAuth/Interop/FIRAuthInterop.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,9 @@ NS_SWIFT_NAME(AuthInterop)
3232
@protocol FIRAuthInterop
3333

3434
/// Retrieves the Firebase authentication token, possibly refreshing it if it has expired.
35-
- (void)getTokenForcingRefresh:(BOOL)forceRefresh withCallback:(FIRTokenCallback)callback;
35+
- (void)getTokenForcingRefresh:(BOOL)forceRefresh
36+
withCallback:(FIRTokenCallback)callback
37+
NS_SWIFT_NAME(getToken(forcingRefresh:completion:));
3638

3739
/// Get the current Auth user's UID. Returns nil if there is no user signed in.
3840
- (nullable NSString *)getUserID;

0 commit comments

Comments
 (0)