Skip to content

Commit d8cc32a

Browse files
utkrishtsahuutkrishtsahu
authored
Merge branch 'main' into docs/sync-2026-06-24
2 parents de0a47b + 607702a commit d8cc32a

20 files changed

Lines changed: 82 additions & 45 deletions

File tree

‎.github/actions/setup-darwin/action.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ runs:
3636
shell: bash
3737

3838
- name: Set up Ruby
39-
uses: ruby/setup-ruby@afeafc3d1ab54a631816aba4c914a0081c12ff2f # pin@v1.310.0
39+
uses: ruby/setup-ruby@89f90524b88a01fe6e0b732220432cc6142926af # pin@v1.313.0
4040
with:
4141
ruby-version: ${{ inputs.ruby }}
4242
bundler-cache: true
@@ -65,7 +65,7 @@ runs:
6565

6666
- id: restore-pods-cache
6767
name: Restore Pods cache
68-
uses: actions/cache@v5
68+
uses: actions/cache@v6
6969
with:
7070
path: auth0_flutter/example/${{ steps.lowercase-platform.outputs.platform }}/Pods
7171
key: pods-${{ hashFiles('Podfile.lock') }}-${{ hashFiles('.xcode-version') }}-v1

‎.github/dependabot.yml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,19 @@ updates:
3434
- ignore title check
3535
- dependencies
3636

37+
- package-ecosystem: gradle
38+
directory: auth0_flutter/android
39+
schedule:
40+
interval: daily
41+
allow:
42+
- dependency-name: 'com.auth0.android:auth0'
43+
ignore:
44+
- dependency-name: '*'
45+
update-types: ['version-update:semver-major']
46+
labels:
47+
- ignore title check
48+
- dependencies
49+
3750
- package-ecosystem: github-actions
3851
directory: /
3952
schedule:

‎.github/workflows/check-symlinks.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919

2020
steps:
2121
- name: Checkout
22-
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3
22+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0
2323

2424
- name: Run check
2525
run: |

‎.github/workflows/main.yml‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ concurrency:
1515
env:
1616
ruby: '3.3.1'
1717
flutter: '3.x'
18-
ios-simulator: iPhone 16
18+
ios-simulator: iPhone 17
1919
java: 17
2020

2121
jobs:
@@ -26,7 +26,7 @@ jobs:
2626

2727
steps:
2828
- name: Checkout
29-
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3
29+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0
3030

3131
- name: Install Flutter
3232
uses: subosito/flutter-action@1a449444c387b1966244ae4d4f8c696479add0b2 # pin@v2.23.0
@@ -49,7 +49,7 @@ jobs:
4949

5050
steps:
5151
- name: Checkout
52-
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3
52+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0
5353

5454
- name: Install Flutter
5555
uses: subosito/flutter-action@1a449444c387b1966244ae4d4f8c696479add0b2 # pin@v2.23.0
@@ -80,7 +80,7 @@ jobs:
8080

8181
steps:
8282
- name: Checkout
83-
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3
83+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0
8484

8585
- name: Install Flutter
8686
uses: subosito/flutter-action@1a449444c387b1966244ae4d4f8c696479add0b2 # pin@v2.23.0
@@ -99,7 +99,7 @@ jobs:
9999

100100
steps:
101101
- name: Checkout
102-
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3
102+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0
103103

104104
- name: Install Flutter
105105
uses: subosito/flutter-action@1a449444c387b1966244ae4d4f8c696479add0b2 # pin@v2.23.0
@@ -133,7 +133,7 @@ jobs:
133133

134134
steps:
135135
- name: Checkout
136-
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3
136+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0
137137

138138
- name: Set up environment
139139
uses: ./.github/actions/setup-darwin
@@ -178,7 +178,7 @@ jobs:
178178

179179
# steps:
180180
# - name: Checkout
181-
# uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3
181+
# uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0
182182

183183
# - name: Set up environment
184184
# uses: ./.github/actions/setup-darwin
@@ -211,7 +211,7 @@ jobs:
211211

212212
steps:
213213
- name: Checkout
214-
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3
214+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0
215215

216216
- name: Set up environment
217217
uses: ./.github/actions/setup-darwin
@@ -251,7 +251,7 @@ jobs:
251251

252252
# steps:
253253
# - name: Checkout
254-
# uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3
254+
# uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0
255255

256256
# - name: Set up environment
257257
# uses: ./.github/actions/setup-darwin
@@ -276,7 +276,7 @@ jobs:
276276

277277
steps:
278278
- name: Checkout
279-
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3
279+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0
280280

281281
- name: Set up environment
282282
uses: ./.github/actions/setup-android
@@ -314,7 +314,7 @@ jobs:
314314

315315
steps:
316316
- name: Checkout
317-
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3
317+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0
318318

319319
- name: Install Flutter
320320
uses: subosito/flutter-action@1a449444c387b1966244ae4d4f8c696479add0b2 # pin@v2.23.0
@@ -335,7 +335,7 @@ jobs:
335335
vcpkgGitCommitId: '66c0373dc7fca549e5803087b9487edfe3aca0a1'
336336

337337
- name: Cache vcpkg packages and binaries
338-
uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # pin@v5.0.5
338+
uses: actions/cache@2c8a9bd7457de244a408f35966fab2fb45fda9c8 # pin@v6.0.0
339339
with:
340340
path: |
341341
${{ github.workspace }}/vcpkg/installed
@@ -352,7 +352,7 @@ jobs:
352352
VCPKG_BINARY_SOURCES: 'clear;files,${{ github.workspace }}/vcpkg-binary-cache,readwrite'
353353

354354
- name: Cache Windows example app build
355-
uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # pin@v5.0.5
355+
uses: actions/cache@2c8a9bd7457de244a408f35966fab2fb45fda9c8 # pin@v6.0.0
356356
with:
357357
path: auth0_flutter/example/build/windows
358358
key: win-example-build-${{ runner.os }}-${{ hashFiles('auth0_flutter/windows/**/*.cpp', 'auth0_flutter/windows/**/*.h', 'auth0_flutter/windows/CMakeLists.txt', 'auth0_flutter/windows/vcpkg.json') }}-${{ hashFiles('auth0_flutter/example/lib/**/*.dart') }}
@@ -373,7 +373,7 @@ jobs:
373373
shell: powershell
374374

375375
- name: Cache Windows unit test build
376-
uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # pin@v5.0.5
376+
uses: actions/cache@2c8a9bd7457de244a408f35966fab2fb45fda9c8 # pin@v6.0.0
377377
with:
378378
path: auth0_flutter/windows/build
379379
key: win-test-build-${{ runner.os }}-${{ hashFiles('auth0_flutter/windows/**/*.cpp', 'auth0_flutter/windows/**/*.h', 'auth0_flutter/windows/CMakeLists.txt', 'auth0_flutter/windows/test/**', 'auth0_flutter/windows/vcpkg.json') }}
@@ -420,7 +420,7 @@ jobs:
420420

421421
# steps:
422422
# - name: Checkout
423-
# uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3
423+
# uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0
424424

425425
# - name: Gradle cache
426426
# uses: gradle/gradle-build-action@ef76a971e2fa3f867b617efd72f2fbd72cf6f8bc
@@ -523,7 +523,7 @@ jobs:
523523

524524
steps:
525525
- name: Checkout
526-
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3
526+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0
527527

528528
- name: Download coverage report for auth0_flutter
529529
uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c

‎.github/workflows/publish-af.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838

3939
steps:
4040
- name: Checkout
41-
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3
41+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0
4242

4343
- name: Setup Flutter and Dart SDK
4444
uses: ./.github/actions/setup-publish

‎.github/workflows/publish-afpi.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838

3939
steps:
4040
- name: Checkout
41-
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3
41+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0
4242

4343
- name: Setup Flutter and Dart SDK
4444
uses: ./.github/actions/setup-publish

‎.github/workflows/rl-scanner.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
rl-scanner:
2929
runs-on: ubuntu-latest
3030
steps:
31-
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
31+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
3232
with:
3333
fetch-depth: 0
3434

‎appium-test/package-lock.json‎

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎auth0_flutter/android/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ android {
7373

7474
dependencies {
7575
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
76-
implementation 'com.auth0.android:auth0:3.18.0'
76+
implementation 'com.auth0.android:auth0:3.19.0'
7777
implementation 'com.google.code.gson:gson:2.10.1'
7878
testImplementation 'junit:junit:4.13.2'
7979
testImplementation 'org.hamcrest:java-hamcrest:2.0.0.0'

‎auth0_flutter/android/src/test/kotlin/com/auth0/auth0_flutter/request_handlers/api/CustomTokenExchangeApiRequestHandlerTest.kt‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ class CustomTokenExchangeApiRequestHandlerTest {
7676
"openid profile email"
7777
)
7878

79-
whenever(mockApi.customTokenExchange(any(), any(), isNull())).thenReturn(mockRequest)
79+
whenever(mockApi.customTokenExchange(any(), any(), isNull(), isNull())).thenReturn(mockRequest)
8080
whenever(mockRequest.validateClaims()).thenReturn(mockRequest)
8181

8282
doAnswer {
@@ -90,6 +90,7 @@ class CustomTokenExchangeApiRequestHandlerTest {
9090
verify(mockApi).customTokenExchange(
9191
"urn:acme:legacy-token",
9292
"external-token-123",
93+
null,
9394
null
9495
)
9596
verify(mockRequest).validateClaims()
@@ -115,7 +116,7 @@ class CustomTokenExchangeApiRequestHandlerTest {
115116
on { getDescription() } doReturn "Token validation failed"
116117
}
117118

118-
whenever(mockApi.customTokenExchange(any(), any(), isNull())).thenReturn(mockRequest)
119+
whenever(mockApi.customTokenExchange(any(), any(), isNull(), isNull())).thenReturn(mockRequest)
119120
whenever(mockRequest.validateClaims()).thenReturn(mockRequest)
120121

121122
doAnswer {
@@ -152,7 +153,7 @@ class CustomTokenExchangeApiRequestHandlerTest {
152153
"openid"
153154
)
154155

155-
whenever(mockApi.customTokenExchange(any(), any(), isNull())).thenReturn(mockRequest)
156+
whenever(mockApi.customTokenExchange(any(), any(), isNull(), isNull())).thenReturn(mockRequest)
156157
whenever(mockRequest.setAudience(any())).thenReturn(mockRequest)
157158
whenever(mockRequest.validateClaims()).thenReturn(mockRequest)
158159

@@ -191,7 +192,7 @@ class CustomTokenExchangeApiRequestHandlerTest {
191192
"openid profile email read:data"
192193
)
193194

194-
whenever(mockApi.customTokenExchange(any(), any(), isNull())).thenReturn(mockRequest)
195+
whenever(mockApi.customTokenExchange(any(), any(), isNull(), isNull())).thenReturn(mockRequest)
195196
whenever(mockRequest.setScope(any())).thenReturn(mockRequest)
196197
whenever(mockRequest.validateClaims()).thenReturn(mockRequest)
197198

@@ -231,7 +232,7 @@ class CustomTokenExchangeApiRequestHandlerTest {
231232
"openid profile email"
232233
)
233234

234-
whenever(mockApi.customTokenExchange(any(), any(), isNull())).thenReturn(mockRequest)
235+
whenever(mockApi.customTokenExchange(any(), any(), isNull(), isNull())).thenReturn(mockRequest)
235236
whenever(mockRequest.setAudience(any())).thenReturn(mockRequest)
236237
whenever(mockRequest.setScope(any())).thenReturn(mockRequest)
237238
whenever(mockRequest.validateClaims()).thenReturn(mockRequest)
@@ -273,7 +274,7 @@ class CustomTokenExchangeApiRequestHandlerTest {
273274
"openid"
274275
)
275276

276-
whenever(mockApi.customTokenExchange(any(), any(), eq("org_abc123"))).thenReturn(mockRequest)
277+
whenever(mockApi.customTokenExchange(any(), any(), eq("org_abc123"), isNull())).thenReturn(mockRequest)
277278
whenever(mockRequest.validateClaims()).thenReturn(mockRequest)
278279

279280
doAnswer {
@@ -287,7 +288,8 @@ class CustomTokenExchangeApiRequestHandlerTest {
287288
verify(mockApi).customTokenExchange(
288289
"urn:acme:legacy-token",
289290
"external-token-org",
290-
"org_abc123"
291+
"org_abc123",
292+
null
291293
)
292294
verify(mockResult).success(any())
293295
}

0 commit comments

Comments
 (0)