Skip to content

Updating getAuthToken to return creation timestamp #884

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.

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
merged 5 commits into from
Oct 9, 2019
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
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
2 changes: 2 additions & 0 deletions firebase-installations-interop/api.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ package com.google.firebase.installations {
ctor public InstallationTokenResult();
method @NonNull public static com.google.firebase.installations.InstallationTokenResult.Builder builder();
method @NonNull public abstract String getToken();
method @NonNull public abstract long getTokenCreationTimestampInSecs();
method @NonNull public abstract long getTokenExpirationInSecs();
method @NonNull public abstract com.google.firebase.installations.InstallationTokenResult.Builder toBuilder();
}
Expand All @@ -13,6 +14,7 @@ package com.google.firebase.installations {
ctor public InstallationTokenResult.Builder();
method @NonNull public abstract com.google.firebase.installations.InstallationTokenResult build();
method @NonNull public abstract com.google.firebase.installations.InstallationTokenResult.Builder setToken(@NonNull String);
method @NonNull public abstract com.google.firebase.installations.InstallationTokenResult.Builder setTokenCreationTimestampInSecs(long);
method @NonNull public abstract com.google.firebase.installations.InstallationTokenResult.Builder setTokenExpirationInSecs(long);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,12 @@ public abstract class InstallationTokenResult {
@NonNull
public abstract long getTokenExpirationInSecs();

/**
* The amount of time, in seconds, when the auth-token was created for this Firebase Installation.
*/
@NonNull
public abstract long getTokenCreationTimestampInSecs();

@NonNull
public abstract Builder toBuilder();

Expand All @@ -47,6 +53,9 @@ public abstract static class Builder {
@NonNull
public abstract Builder setTokenExpirationInSecs(long value);

@NonNull
public abstract Builder setTokenCreationTimestampInSecs(long value);

@NonNull
public abstract InstallationTokenResult build();
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -528,6 +528,7 @@ public void testGetAuthToken_multipleCallsForceRefresh_fetchedNewTokenTwice() th
InstallationTokenResult.builder()
.setToken(TEST_AUTH_TOKEN_3)
.setTokenExpirationInSecs(TEST_TOKEN_EXPIRATION_TIMESTAMP)
.setTokenCreationTimestampInSecs(TEST_CREATION_TIMESTAMP_1)
.build()))
.doAnswer(
AdditionalAnswers.answersWithDelay(
Expand All @@ -536,6 +537,7 @@ public void testGetAuthToken_multipleCallsForceRefresh_fetchedNewTokenTwice() th
InstallationTokenResult.builder()
.setToken(TEST_AUTH_TOKEN_4)
.setTokenExpirationInSecs(TEST_TOKEN_EXPIRATION_TIMESTAMP)
.setTokenCreationTimestampInSecs(TEST_CREATION_TIMESTAMP_1)
.build()))
.when(backendClientReturnsOk)
.generateAuthToken(anyString(), anyString(), anyString(), anyString());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,12 +50,14 @@ public final class FisAndroidTestConstants {
InstallationTokenResult.builder()
.setToken(TEST_AUTH_TOKEN)
.setTokenExpirationInSecs(TEST_TOKEN_EXPIRATION_TIMESTAMP)
.setTokenCreationTimestampInSecs(TEST_CREATION_TIMESTAMP_1)
.build())
.build();

public static final InstallationTokenResult TEST_INSTALLATION_TOKEN_RESULT =
InstallationTokenResult.builder()
.setToken(TEST_AUTH_TOKEN_2)
.setTokenExpirationInSecs(TEST_TOKEN_EXPIRATION_TIMESTAMP)
.setTokenCreationTimestampInSecs(TEST_CREATION_TIMESTAMP_1)
.build();
}
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ public boolean onStateReached(PersistedFidEntry persistedFidEntry) {
InstallationTokenResult.builder()
.setToken(persistedFidEntry.getAuthToken())
.setTokenExpirationInSecs(persistedFidEntry.getExpiresInSecs())
.setTokenCreationTimestampInSecs(persistedFidEntry.getTokenCreationEpochInSecs())
.build());
return true;
}
Expand Down