Skip to content

Commit cf818fb

Browse files
committed
refactor(oauth2): update actor token transport check to ContextRebuildableTransportFactory
1 parent 84ceb16 commit cf818fb

2 files changed

Lines changed: 10 additions & 7 deletions

File tree

google-auth-library-java/oauth2_http/java/com/google/auth/oauth2/IdentityPoolCredentials.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131

3232
package com.google.auth.oauth2;
3333

34+
import com.google.auth.http.ContextRebuildableTransportFactory;
3435
import com.google.auth.http.HttpTransportFactory;
3536
import com.google.auth.mtls.MtlsHttpTransportFactory;
3637
import com.google.auth.mtls.MtlsUtils;
@@ -154,7 +155,7 @@ public class IdentityPoolCredentials extends ExternalAccountCredentials {
154155
}
155156

156157
if (this.actorTokenSupplier != null
157-
&& !(this.transportFactory instanceof MtlsHttpTransportFactory)) {
158+
&& !(this.transportFactory instanceof ContextRebuildableTransportFactory)) {
158159
throw new IllegalArgumentException(
159160
"Actor tokens are only supported for mTLS token exchanges. Please configure a certificate source or MtlsHttpTransportFactory.");
160161
}
@@ -198,8 +199,7 @@ IdentityPoolSubjectTokenSupplier getIdentityPoolSubjectTokenSupplier() {
198199
}
199200

200201
@VisibleForTesting
201-
@Nullable
202-
IdentityPoolActorTokenSupplier getIdentityPoolActorTokenSupplier() {
202+
@Nullable IdentityPoolActorTokenSupplier getIdentityPoolActorTokenSupplier() {
203203
return this.actorTokenSupplier;
204204
}
205205

google-auth-library-java/oauth2_http/javatests/com/google/auth/oauth2/IdentityPoolCredentialsTest.java

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@
4545
import com.google.api.client.json.GenericJson;
4646
import com.google.api.client.util.Clock;
4747
import com.google.auth.TestUtils;
48+
import com.google.auth.http.ContextRebuildableTransportFactory;
4849
import com.google.auth.http.HttpTransportFactory;
4950
import com.google.auth.mtls.MtlsHttpTransportFactory;
5051
import com.google.auth.mtls.X509Provider;
@@ -1515,8 +1516,7 @@ void createScoped_fileSourcedWithActorToken_preservesSharedSupplierInstance() th
15151516
assertEquals(newScopes, scoped.getScopes());
15161517
// Verify scoped clone maintains a single shared supplier instance for its own cache
15171518
assertSame(
1518-
scoped.getIdentityPoolSubjectTokenSupplier(),
1519-
scoped.getIdentityPoolActorTokenSupplier());
1519+
scoped.getIdentityPoolSubjectTokenSupplier(), scoped.getIdentityPoolActorTokenSupplier());
15201520
}
15211521

15221522
@Test
@@ -1525,8 +1525,11 @@ void refreshAccessToken_withActorToken_injectsActingPartyIntoStsRequest() throws
15251525
new MockExternalAccountCredentialsTransportFactory();
15261526
KeyStore ks = KeyStore.getInstance(KeyStore.getDefaultType());
15271527
ks.load(null, null);
1528-
MtlsHttpTransportFactory mtlsTransport =
1529-
new MtlsHttpTransportFactory(ks) {
1528+
ContextRebuildableTransportFactory mtlsTransport =
1529+
new ContextRebuildableTransportFactory() {
1530+
@Override
1531+
public void rebuildContext() {}
1532+
15301533
@Override
15311534
public com.google.api.client.http.HttpTransport create() {
15321535
return transportFactory.create();

0 commit comments

Comments
 (0)