Skip to content

Changed CredentialProviders to allow easier extending of existing CredentialProviders #350

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
merged 1 commit into from
Jul 31, 2016
Merged

Changed CredentialProviders to allow easier extending of existing CredentialProviders #350

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 7 additions & 7 deletions src/main/java/com/pokegoapi/auth/GoogleUserCredentialProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,19 +39,19 @@ public class GoogleUserCredentialProvider extends CredentialProvider {
public static final String LOGIN_URL = "https://accounts.google.com/o/oauth2/auth?client_id=848232511240-73ri3t7plvk96pj4f85uj8otdat2alem.apps.googleusercontent.com&redirect_uri=urn%3Aietf%3Awg%3Aoauth%3A2.0%3Aoob&response_type=code&scope=openid%20email%20https%3A%2F%2Fwww.googleapis.com%2Fauth%2Fuserinfo.email";
private static final String TAG = GoogleUserCredentialProvider.class.getSimpleName();
//We try and refresh token 5 minutes before it actually expires
private static final long REFRESH_TOKEN_BUFFER_TIME = 5 * 60 * 1000;
private final OkHttpClient client;
protected static final long REFRESH_TOKEN_BUFFER_TIME = 5 * 60 * 1000;
protected final OkHttpClient client;

private final Time time;
protected final Time time;

private long expiresTimestamp;
protected long expiresTimestamp;

private String tokenId;
protected String tokenId;

@Getter
private String refreshToken;
protected String refreshToken;

private AuthInfo.Builder authbuilder;
protected AuthInfo.Builder authbuilder;

/**
* Used for logging in when one has a persisted refreshToken.
Expand Down
18 changes: 9 additions & 9 deletions src/main/java/com/pokegoapi/auth/PtcCredentialProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,15 +46,15 @@ public class PtcCredentialProvider extends CredentialProvider {
public static final String USER_AGENT = "niantic";
private static final String TAG = PtcCredentialProvider.class.getSimpleName();
//We try and refresh token 5 minutes before it actually expires
private static final long REFRESH_TOKEN_BUFFER_TIME = 5 * 60 * 1000;

private final OkHttpClient client;
private final String username;
private final String password;
private final Time time;
private String tokenId;
private long expiresTimestamp;
private AuthInfo.Builder authbuilder;
protected static final long REFRESH_TOKEN_BUFFER_TIME = 5 * 60 * 1000;

protected final OkHttpClient client;
protected final String username;
protected final String password;
protected final Time time;
protected String tokenId;
protected long expiresTimestamp;
protected AuthInfo.Builder authbuilder;

/**
* Instantiates a new Ptc login.
Expand Down