Skip to content

Align the comments in the check revoked (verify id token) #23

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
avishalom merged 15 commits into from
Feb 15, 2018
Merged

Align the comments in the check revoked (verify id token) #23

Changes from 13 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
7c795b2
Align comments
avishalom Feb 14, 2018
6bcc0a6
Merge branch 'master' into align2
avishalom Feb 14, 2018
a9abc53
import
avishalom Feb 14, 2018
0efdebc
change immutable map builder
avishalom Feb 14, 2018
312e24a
imports
avishalom Feb 14, 2018
b810459
.
avishalom Feb 14, 2018
44f788b
.
avishalom Feb 14, 2018
152bd7b
.
avishalom Feb 14, 2018
d21b915
async
avishalom Feb 14, 2018
92a59a8
.
avishalom Feb 14, 2018
0463d2a
immutable
avishalom Feb 14, 2018
f46bbef
catch
avishalom Feb 14, 2018
3c3061c
Align comments
avishalom Feb 14, 2018
3834676
PR fixes
avishalom Feb 14, 2018
6ba99d9
PR fixes
avishalom Feb 15, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 12 additions & 9 deletions auth/src/main/java/com/google/firebase/quickstart/AuthSnippets.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,18 @@
package com.google.firebase.quickstart;

import com.google.auth.oauth2.GoogleCredentials;
import com.google.common.collect.ImmutableMap;
import com.google.firebase.FirebaseApp;
import com.google.firebase.FirebaseOptions;
import com.google.firebase.auth.ExportedUserRecord;
import com.google.firebase.auth.FirebaseAuth;
import com.google.firebase.auth.FirebaseAuthException;
import com.google.firebase.auth.FirebaseToken;
import com.google.firebase.auth.ListUsersPage;
import com.google.firebase.auth.UserRecord;
import com.google.firebase.auth.UserRecord.CreateRequest;
import com.google.firebase.auth.UserRecord.UpdateRequest;
import com.google.firebase.database.*;
import java.io.FileInputStream;
import java.io.IOException;
import java.util.HashMap;
Expand Down Expand Up @@ -216,13 +219,13 @@ public static void verifyIdTokenCheckRevoked(String idToken) throws InterruptedE
FirebaseToken decodedToken = FirebaseAuth.getInstance().verifyIdTokenAsync(idToken, checkRevoked).get();
// Token is valid and not revoked.
String uid = decodedToken.getUid();
}
catch (FirebaseAuthException e) {
if ("id-token-revoked".equals(e.getErrorCode())) {
// Token is valid but has been revoked.
// When this occurs, inform the user to reauthenticate or signOut() the user.
} else {
// Token is invalid.
} catch (ExecutionException e) {
if (e.getCause() instanceof FirebaseAuthException) {
if ( ((FirebaseAuthException) e.getCause()).getErrorCode().equals("id-token-revoked")) {
Copy link
Copy Markdown
Contributor

@hiranya911 hiranya911 Feb 14, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Break into a couple of lines:

FirebaseAuthException authError = ...;

// Token has been revoked. Inform the user to reauthenticate or signOut() the user.
} else {
// Token is invalid.
}
}
}
// [END verify_id_token_check_revoked]
Expand All @@ -231,7 +234,7 @@ public static void verifyIdTokenCheckRevoked(String idToken) throws InterruptedE
public static void revokeIdTokens(String idToken) throws InterruptedException, ExecutionException {
String uid="someUid";
// [START revoke_tokens]
FirebaseToken decodedToken = FirebaseAuth.getInstance().revokeRefreshTokens(uid).get();
FirebaseAuth.getInstance().revokeRefreshTokensAsync(uid).get();
UserRecord user = FirebaseAuth.getInstance().getUserAsync(uid).get();
// Convert to seconds as the auth_time in the token claims is in seconds too.
long revocationSecond = user.getTokensValidAfterTimestamp() / 1000;
Expand All @@ -240,7 +243,7 @@ public static void revokeIdTokens(String idToken) throws InterruptedException, E

// [START save_revocation_in_db]
DatabaseReference ref = FirebaseDatabase.getInstance().getReference("metadata/" + uid);
ref.setValueAsync(MapBuilder.of("revokeTime", revocationSecond)).get();
ref.setValueAsync(ImmutableMap.<String, Object>of("revokeTime", revocationSecond)).get();
Copy link
Copy Markdown
Contributor

@hiranya911 hiranya911 Feb 14, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just use HashMap here. ImmutableMap is a guava type and I don't think we want it to appear in snippets.

// [END save_revocation_in_db]

}
Expand Down