Skip to content

Commit 0fed01d

Browse files
committed
Address review comment.
1 parent 0953557 commit 0fed01d

File tree

1 file changed

+22
-33
lines changed

1 file changed

+22
-33
lines changed

appcheck/firebase-appcheck-playintegrity/src/main/java/com/google/firebase/appcheck/playintegrity/internal/PlayIntegrityAppCheckProvider.java

Lines changed: 22 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -68,29 +68,22 @@ public PlayIntegrityAppCheckProvider(@NonNull FirebaseApp firebaseApp) {
6868
@Override
6969
public Task<AppCheckToken> getToken() {
7070
return getPlayIntegrityAttestation()
71-
.continueWithTask(
72-
task -> {
73-
if (task.isSuccessful()) {
74-
ExchangePlayIntegrityTokenRequest request =
75-
new ExchangePlayIntegrityTokenRequest(task.getResult().token());
76-
return Tasks.call(
77-
backgroundExecutor,
78-
() ->
79-
networkClient.exchangeAttestationForAppCheckToken(
80-
request.toJsonString().getBytes(UTF_8),
81-
NetworkClient.PLAY_INTEGRITY,
82-
retryManager));
83-
}
84-
return Tasks.forException(task.getException());
71+
.onSuccessTask(
72+
integrityTokenResponse -> {
73+
ExchangePlayIntegrityTokenRequest request =
74+
new ExchangePlayIntegrityTokenRequest(integrityTokenResponse.token());
75+
return Tasks.call(
76+
backgroundExecutor,
77+
() ->
78+
networkClient.exchangeAttestationForAppCheckToken(
79+
request.toJsonString().getBytes(UTF_8),
80+
NetworkClient.PLAY_INTEGRITY,
81+
retryManager));
8582
})
86-
.continueWithTask(
87-
task -> {
88-
if (task.isSuccessful()) {
89-
return Tasks.forResult(
90-
DefaultAppCheckToken.constructFromAppCheckTokenResponse(task.getResult()));
91-
}
92-
// TODO: Surface more error details.
93-
return Tasks.forException(task.getException());
83+
.onSuccessTask(
84+
appCheckTokenResponse -> {
85+
return Tasks.forResult(
86+
DefaultAppCheckToken.constructFromAppCheckTokenResponse(appCheckTokenResponse));
9487
});
9588
}
9689

@@ -105,17 +98,13 @@ private Task<IntegrityTokenResponse> getPlayIntegrityAttestation() {
10598
GeneratePlayIntegrityChallengeResponse.fromJsonString(
10699
networkClient.generatePlayIntegrityChallenge(
107100
generateChallengeRequest.toJsonString().getBytes(UTF_8), retryManager)));
108-
return generateChallengeTask.continueWithTask(
109-
task -> {
110-
if (task.isSuccessful()) {
111-
return integrityManager.requestIntegrityToken(
112-
IntegrityTokenRequest.builder()
113-
.setCloudProjectNumber(Long.parseLong(projectNumber))
114-
.setNonce(task.getResult().getChallenge())
115-
.build());
116-
}
117-
// TODO: Surface more error details.
118-
return Tasks.forException(task.getException());
101+
return generateChallengeTask.onSuccessTask(
102+
generatePlayIntegrityChallengeResponse -> {
103+
return integrityManager.requestIntegrityToken(
104+
IntegrityTokenRequest.builder()
105+
.setCloudProjectNumber(Long.parseLong(projectNumber))
106+
.setNonce(generatePlayIntegrityChallengeResponse.getChallenge())
107+
.build());
119108
});
120109
}
121110
}

0 commit comments

Comments
 (0)