FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

Also accept InputStream at setServiceAccountPrivateKeyFromP12File by kliakos · Pull Request #1011 · googleapis/google-api-java-client · GitHub

/ google-api-java-client Public

Also accept InputStream at setServiceAccountPrivateKeyFromP12File #1011

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
chingor13 merged 1 commit into from
Sep 13, 2018
Conversation 5 Commits 1 Checks 0 Files changed
Merged

Also accept InputStream at setServiceAccountPrivateKeyFromP12File #1011

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension .java  (1) All 1 file type selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
26 changes: 21 additions & 5 deletions ...i-client/src/main/java/com/google/api/client/googleapis/auth/oauth2/GoogleCredential.java
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -662,17 +662,33 @@ public Builder setServiceAccountPrivateKeyId(String serviceAccountPrivateKeyId)
* the return type, but nothing else.
* </p>
*
* @param p12File input stream to the p12 file (closed at the end of this method in a finally
* block)
* @param p12File p12 file object
*/
public Builder setServiceAccountPrivateKeyFromP12File(File p12File)
throws GeneralSecurityException, IOException {
serviceAccountPrivateKey = SecurityUtils.loadPrivateKeyFromKeyStore(
SecurityUtils.getPkcs12KeyStore(), new FileInputStream(p12File), "notasecret",
"privatekey", "notasecret");
setServiceAccountPrivateKeyFromP12File(new FileInputStream(p12File));
return this;
}

/**
* Sets the private key to use with the service account flow or {@code null} for none.
*
* <p>
* Overriding is only supported for the purpose of calling the super implementation and changing
* the return type, but nothing else.
* </p>
*
* @param p12FileInputStream input stream to the p12 file (closed at the end of this method in a finally
* block)
*/
public Builder setServiceAccountPrivateKeyFromP12File(InputStream p12FileInputStream)
throws GeneralSecurityException, IOException {
serviceAccountPrivateKey = SecurityUtils.loadPrivateKeyFromKeyStore(
SecurityUtils.getPkcs12KeyStore(), p12FileInputStream, "notasecret",
"privatekey", "notasecret");
return this;
}

/**
* {@link Beta} <br/>
* Sets the private key to use with the service account flow or {@code null} for none.
Expand Down
Back | FazBrowse Home | New Git URL