Skip to content

Commit f5c445b

Browse files
rizafranrizafran
authored
Merge branch 'main' into auth-actionCodeOp
2 parents 27a7834 + 2d79f91 commit f5c445b

Some content is hidden

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

49 files changed

+368
-101
lines changed

‎.github/workflows/abtesting.yml

Lines changed: 22 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -23,20 +23,23 @@ jobs:
2323
strategy:
2424
matrix:
2525
include:
26+
- os: macos-13
27+
xcode: Xcode_15.2
28+
target: ios
2629
- os: macos-14
27-
xcode: Xcode_16.2
30+
xcode: Xcode_15.4
2831
target: ios
2932
- os: macos-15
30-
xcode: Xcode_16.3
33+
xcode: Xcode_16.2
3134
target: ios
3235
- os: macos-15
33-
xcode: Xcode_16.3
36+
xcode: Xcode_16.2
3437
target: tvos
3538
- os: macos-15
36-
xcode: Xcode_16.3
39+
xcode: Xcode_16.2
3740
target: macos
3841
- os: macos-15
39-
xcode: Xcode_16.3
42+
xcode: Xcode_16.2
4043
target: watchos
4144
runs-on: ${{ matrix.os }}
4245
steps:
@@ -84,26 +87,29 @@ jobs:
8487
strategy:
8588
matrix:
8689
include:
90+
- os: macos-13
91+
xcode: Xcode_15.2
92+
target: iOS
8793
- os: macos-14
88-
xcode: Xcode_16.2
94+
xcode: Xcode_15.4
8995
target: iOS
9096
- os: macos-15
91-
xcode: Xcode_16.3
97+
xcode: Xcode_16.2
9298
target: iOS
9399
- os: macos-15
94-
xcode: Xcode_16.3
100+
xcode: Xcode_16.2
95101
target: tvOS
96102
- os: macos-15
97-
xcode: Xcode_16.3
103+
xcode: Xcode_16.2
98104
target: macOS
99105
- os: macos-15
100-
xcode: Xcode_16.3
106+
xcode: Xcode_16.2
101107
target: watchOS
102108
- os: macos-15
103-
xcode: Xcode_16.3
109+
xcode: Xcode_16.2
104110
target: catalyst
105111
- os: macos-15
106-
xcode: Xcode_16.3
112+
xcode: Xcode_16.2
107113
target: visionOS
108114
runs-on: ${{ matrix.os }}
109115
steps:
@@ -131,7 +137,7 @@ jobs:
131137
# Don't run on private repo unless it is a PR.
132138
if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request'
133139

134-
runs-on: macos-14
140+
runs-on: macos-15
135141
steps:
136142
- uses: actions/checkout@v4
137143
- uses: mikehardy/buildcache-action@c87cea0ccd718971d6cc39e672c4f26815b6c126
@@ -140,6 +146,8 @@ jobs:
140146
- uses: ruby/setup-ruby@354a1ad156761f5ee2b7b13fa8e09943a5e8d252 # v1
141147
- name: Setup Bundler
142148
run: scripts/setup_bundler.sh
149+
- name: Xcode
150+
run: sudo xcode-select -s /Applications/Xcode_16.2.app/Contents/Developer
143151
- uses: nick-fields/retry@ce71cc2ab81d554ebbe88c79ab5975992d79ba08 # v3
144152
with:
145153
timeout_minutes: 120
@@ -207,7 +215,7 @@ jobs:
207215
# Don't run on private repo.
208216
if: github.event_name == 'schedule' && github.repository == 'Firebase/firebase-ios-sdk'
209217

210-
runs-on: macos-15
218+
runs-on: macos-14
211219
strategy:
212220
matrix:
213221
target: [ios, tvos, macos]

‎.github/workflows/appdistribution.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ jobs:
9595
# Don't run on private repo unless it is a PR.
9696
if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request'
9797

98-
runs-on: macos-14
98+
runs-on: macos-15
9999
steps:
100100
- uses: actions/checkout@v4
101101
- uses: mikehardy/buildcache-action@c87cea0ccd718971d6cc39e672c4f26815b6c126
@@ -104,6 +104,8 @@ jobs:
104104
- uses: ruby/setup-ruby@354a1ad156761f5ee2b7b13fa8e09943a5e8d252 # v1
105105
- name: Setup Bundler
106106
run: scripts/setup_bundler.sh
107+
- name: Xcode
108+
run: sudo xcode-select -s /Applications/Xcode_16.2.app/Contents/Developer
107109
- name: Setup project and Build for Catalyst
108110
run: scripts/test_catalyst.sh FirebaseAppDistribution test FirebaseAppDistribution-Unit-unit
109111

‎.github/workflows/auth.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@ jobs:
200200
catalyst:
201201
# Don't run on private repo unless it is a PR.
202202
if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request'
203-
runs-on: macos-14
203+
runs-on: macos-15
204204
steps:
205205
- uses: actions/checkout@v4
206206
- uses: mikehardy/buildcache-action@c87cea0ccd718971d6cc39e672c4f26815b6c126
@@ -209,6 +209,8 @@ jobs:
209209
- uses: ruby/setup-ruby@354a1ad156761f5ee2b7b13fa8e09943a5e8d252 # v1
210210
- name: Setup Bundler
211211
run: scripts/setup_bundler.sh
212+
- name: Xcode
213+
run: sudo xcode-select -s /Applications/Xcode_16.2.app/Contents/Developer
212214
- uses: nick-fields/retry@ce71cc2ab81d554ebbe88c79ab5975992d79ba08 # v3
213215
with:
214216
timeout_minutes: 120

‎.github/workflows/core.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ jobs:
113113
# Don't run on private repo unless it is a PR.
114114
if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request'
115115

116-
runs-on: macos-13
116+
runs-on: macos-15
117117
steps:
118118
- uses: actions/checkout@v4
119119
- uses: mikehardy/buildcache-action@c87cea0ccd718971d6cc39e672c4f26815b6c126
@@ -122,6 +122,8 @@ jobs:
122122
- uses: ruby/setup-ruby@354a1ad156761f5ee2b7b13fa8e09943a5e8d252 # v1
123123
- name: Setup Bundler
124124
run: scripts/setup_bundler.sh
125+
- name: Xcode
126+
run: sudo xcode-select -s /Applications/Xcode_16.2.app/Contents/Developer
125127
- name: Setup project and Build Catalyst
126128
run: scripts/test_catalyst.sh FirebaseCore test FirebaseCore-Unit-unit
127129

‎.github/workflows/core_internal.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ jobs:
115115
catalyst:
116116
# Don't run on private repo unless it is a PR.
117117
if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request'
118-
runs-on: macos-14
118+
runs-on: macos-15
119119
steps:
120120
- uses: actions/checkout@v4
121121
- uses: mikehardy/buildcache-action@c87cea0ccd718971d6cc39e672c4f26815b6c126
@@ -124,6 +124,8 @@ jobs:
124124
- uses: ruby/setup-ruby@354a1ad156761f5ee2b7b13fa8e09943a5e8d252 # v1
125125
- name: Setup Bundler
126126
run: scripts/setup_bundler.sh
127+
- name: Xcode
128+
run: sudo xcode-select -s /Applications/Xcode_16.2.app/Contents/Developer
127129
- name: Setup Catalyst project and run unit tests
128130
run: scripts/test_catalyst.sh FirebaseCoreInternal test FirebaseCoreInternal-Unit-Unit
129131
- name: Setup Catalyst project and run integration tests

‎.github/workflows/crashlytics.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ jobs:
133133
# Don't run on private repo unless it is a PR.
134134
if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request'
135135

136-
runs-on: macos-14
136+
runs-on: macos-15
137137
steps:
138138
- uses: actions/checkout@v4
139139
- uses: mikehardy/buildcache-action@c87cea0ccd718971d6cc39e672c4f26815b6c126
@@ -142,6 +142,8 @@ jobs:
142142
- uses: ruby/setup-ruby@354a1ad156761f5ee2b7b13fa8e09943a5e8d252 # v1
143143
- name: Setup Bundler
144144
run: scripts/setup_bundler.sh
145+
- name: Xcode
146+
run: sudo xcode-select -s /Applications/Xcode_16.2.app/Contents/Developer
145147
- uses: nick-fields/retry@ce71cc2ab81d554ebbe88c79ab5975992d79ba08 # v3
146148
with:
147149
timeout_minutes: 120

‎.github/workflows/database.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@ jobs:
135135
catalyst:
136136
# Don't run on private repo unless it is a PR.
137137
if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request'
138-
runs-on: macos-14
138+
runs-on: macos-15
139139
steps:
140140
- uses: actions/checkout@v4
141141
- uses: mikehardy/buildcache-action@c87cea0ccd718971d6cc39e672c4f26815b6c126
@@ -144,6 +144,8 @@ jobs:
144144
- uses: ruby/setup-ruby@354a1ad156761f5ee2b7b13fa8e09943a5e8d252 # v1
145145
- name: Setup Bundler
146146
run: scripts/setup_bundler.sh
147+
- name: Xcode
148+
run: sudo xcode-select -s /Applications/Xcode_16.2.app/Contents/Developer
147149
- name: Setup project and Build for Catalyst
148150
run: scripts/test_catalyst.sh FirebaseDatabase test FirebaseDatabase-Unit-unit
149151

‎.github/workflows/firebase_app_check.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,14 @@ jobs:
4343
catalyst:
4444
# Don't run on private repo unless it is a PR.
4545
if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request'
46-
runs-on: macos-14
46+
runs-on: macos-15
4747
steps:
4848
- uses: actions/checkout@v4
4949
- uses: ruby/setup-ruby@354a1ad156761f5ee2b7b13fa8e09943a5e8d252 # v1
5050
- name: Setup Bundler
5151
run: scripts/setup_bundler.sh
52+
- name: Xcode
53+
run: sudo xcode-select -s /Applications/Xcode_16.2.app/Contents/Developer
5254
- name: Setup project and Build for Catalyst
5355
run: scripts/test_catalyst.sh FirebaseAppCheck test FirebaseAppCheck-Unit-unit
5456

‎.github/workflows/installations.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ jobs:
125125

126126
catalyst:
127127
if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request'
128-
runs-on: macos-14
128+
runs-on: macos-15
129129
steps:
130130
- uses: actions/checkout@v4
131131
- uses: mikehardy/buildcache-action@c87cea0ccd718971d6cc39e672c4f26815b6c126
@@ -134,6 +134,8 @@ jobs:
134134
- uses: ruby/setup-ruby@354a1ad156761f5ee2b7b13fa8e09943a5e8d252 # v1
135135
- name: Setup Bundler
136136
run: scripts/setup_bundler.sh
137+
- name: Xcode
138+
run: sudo xcode-select -s /Applications/Xcode_16.2.app/Contents/Developer
137139
- name: Setup project and Build for Catalyst
138140
run: scripts/test_catalyst.sh FirebaseInstallations test FirebaseInstallations-Unit-unit
139141

‎.github/workflows/messaging.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ jobs:
148148
catalyst:
149149
# Don't run on private repo unless it is a PR.
150150
if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request'
151-
runs-on: macos-14
151+
runs-on: macos-15
152152
steps:
153153
- uses: actions/checkout@v4
154154
- uses: mikehardy/buildcache-action@c87cea0ccd718971d6cc39e672c4f26815b6c126
@@ -157,6 +157,8 @@ jobs:
157157
- uses: ruby/setup-ruby@354a1ad156761f5ee2b7b13fa8e09943a5e8d252 # v1
158158
- name: Setup Bundler
159159
run: scripts/setup_bundler.sh
160+
- name: Xcode
161+
run: sudo xcode-select -s /Applications/Xcode_16.2.app/Contents/Developer
160162
- name: Setup project and Build Catalyst
161163
run: scripts/test_catalyst.sh FirebaseMessaging test FirebaseMessaging-Unit-unit
162164

‎.github/workflows/mlmodeldownloader.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ jobs:
141141

142142
catalyst:
143143
if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request'
144-
runs-on: macos-14
144+
runs-on: macos-15
145145
steps:
146146
- uses: actions/checkout@v4
147147
- uses: mikehardy/buildcache-action@c87cea0ccd718971d6cc39e672c4f26815b6c126
@@ -150,6 +150,8 @@ jobs:
150150
- uses: ruby/setup-ruby@354a1ad156761f5ee2b7b13fa8e09943a5e8d252 # v1
151151
- name: Setup Bundler
152152
run: scripts/setup_bundler.sh
153+
- name: Xcode
154+
run: sudo xcode-select -s /Applications/Xcode_16.2.app/Contents/Developer
153155
- name: Setup project and Build Catalyst
154156
run: scripts/test_catalyst.sh FirebaseMLModelDownloader test FirebaseMLModelDownloader-Unit-unit
155157

‎.github/workflows/performance.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ jobs:
178178

179179
catalyst:
180180
if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request'
181-
runs-on: macos-14
181+
runs-on: macos-15
182182
steps:
183183
- uses: actions/checkout@v4
184184
- uses: mikehardy/buildcache-action@c87cea0ccd718971d6cc39e672c4f26815b6c126
@@ -187,6 +187,8 @@ jobs:
187187
- uses: ruby/setup-ruby@354a1ad156761f5ee2b7b13fa8e09943a5e8d252 # v1
188188
- name: Setup Bundler
189189
run: scripts/setup_bundler.sh
190+
- name: Xcode
191+
run: sudo xcode-select -s /Applications/Xcode_16.2.app/Contents/Developer
190192
- name: Setup project and Build Catalyst
191193
run: scripts/test_catalyst.sh FirebasePerformance build
192194

‎.github/workflows/remoteconfig.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ jobs:
168168
catalyst:
169169
# Don't run on private repo unless it is a PR.
170170
if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request'
171-
runs-on: macos-14
171+
runs-on: macos-15
172172
steps:
173173
- uses: actions/checkout@v4
174174
- uses: mikehardy/buildcache-action@c87cea0ccd718971d6cc39e672c4f26815b6c126
@@ -177,6 +177,8 @@ jobs:
177177
- uses: ruby/setup-ruby@354a1ad156761f5ee2b7b13fa8e09943a5e8d252 # v1
178178
- name: Setup Bundler
179179
run: scripts/setup_bundler.sh
180+
- name: Xcode
181+
run: sudo xcode-select -s /Applications/Xcode_16.2.app/Contents/Developer
180182
- name: Setup project and Build for Catalyst
181183
run: scripts/test_catalyst.sh FirebaseRemoteConfig test FirebaseRemoteConfig-Unit-unit
182184

‎.github/workflows/sessions.yml

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
target: [ios, tvos, macos, watchos]
2727
build-env:
2828
- os: macos-14
29-
xcode: Xcode_15.3
29+
xcode: Xcode_16.2
3030
tests:
3131
# Flaky tests on CI
3232
- os: macos-15
@@ -51,11 +51,13 @@ jobs:
5151
spm-package-resolved:
5252
env:
5353
FIREBASECI_USE_LATEST_GOOGLEAPPMEASUREMENT: 1
54-
runs-on: macos-14
54+
runs-on: macos-15
5555
outputs:
5656
cache_key: ${{ steps.generate_cache_key.outputs.cache_key }}
5757
steps:
5858
- uses: actions/checkout@v4
59+
- name: Xcode
60+
run: sudo xcode-select -s /Applications/Xcode_16.2.app/Contents/Developer
5961
- name: Generate Swift Package.resolved
6062
id: swift_package_resolve
6163
run: |
@@ -78,11 +80,8 @@ jobs:
7880
strategy:
7981
matrix:
8082
include:
81-
- os: macos-13
82-
xcode: Xcode_15.2
83-
target: iOS
8483
- os: macos-14
85-
xcode: Xcode_15.4
84+
xcode: Xcode_16.2
8685
target: iOS
8786
- os: macos-15
8887
xcode: Xcode_16.2
@@ -128,7 +127,7 @@ jobs:
128127
# Don't run on private repo unless it is a PR.
129128
if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request'
130129

131-
runs-on: macos-14
130+
runs-on: macos-15
132131
steps:
133132
- uses: actions/checkout@v4
134133
- uses: mikehardy/buildcache-action@c87cea0ccd718971d6cc39e672c4f26815b6c126
@@ -137,6 +136,8 @@ jobs:
137136
- uses: ruby/setup-ruby@354a1ad156761f5ee2b7b13fa8e09943a5e8d252 # v1
138137
- name: Setup Bundler
139138
run: scripts/setup_bundler.sh
139+
- name: Xcode
140+
run: sudo xcode-select -s /Applications/Xcode_16.2.app/Contents/Developer
140141
- uses: nick-fields/retry@ce71cc2ab81d554ebbe88c79ab5975992d79ba08 # v3
141142
with:
142143
timeout_minutes: 120

‎FirebaseAuth/CHANGELOG.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
11
# Unreleased
2+
- [fixed] Fix a `fatalError` unenrolling from MFA. An invalid user token now throws an
3+
`invalidUserToken` error instead of crashing. (#14663)
4+
- [fixed] Fix the parameter from "languageCode" to "lang" in ActionCodeURL. (#14664)
25
- [fixed] Fix the parameters for requestType in ActionCodeOperation. (#14665)
36

47
# 11.9.0

‎FirebaseAuth/Sources/Swift/ActionCode/ActionCodeURL.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ import Foundation
5656
} else {
5757
continueURL = nil
5858
}
59-
languageCode = queryItems["languageCode"]
59+
languageCode = queryItems["lang"]
6060
}
6161

6262
class func parseURL(_ urlString: String) -> [String: String] {

‎FirebaseAuth/Sources/Swift/User/User.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1081,7 +1081,7 @@ extension User: NSSecureCoding {}
10811081
anonymous: Bool) async throws -> User {
10821082
guard let accessToken = accessToken,
10831083
let refreshToken = refreshToken else {
1084-
fatalError("Internal FirebaseAuth Error: nil token")
1084+
throw AuthErrorUtils.invalidUserTokenError(message: "Invalid user token: accessToken or refreshToken is nil")
10851085
}
10861086
let tokenService = SecureTokenService(withRequestConfiguration: auth.requestConfiguration,
10871087
accessToken: accessToken,

0 commit comments

Comments
 (0)