zydronium/google-nomulus
1
0
Fork 0
mirror of https://github.com/google/nomulus.git synced 2025-05-13 16:07:15 +02:00
Code Issues Projects Releases Packages Wiki Activity

Fix nomulus tool NPEs on login/logout commands when printing usage

Browse source 
-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=149535358
This commit is contained in:
shikhman 2017-03-08 07:16:37 -08:00 • committed by Ben McIlwain
parent 0c7443815a
commit b05afd2153
2 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
java/google/registry/tools/LoginCommand.java
View file

@ -14,12 +14,14 @@
package google.registry.tools; package google.registry.tools;
import com.beust.jcommander.Parameters;
import com.google.api.client.extensions.java6.auth.oauth2.AuthorizationCodeInstalledApp; import com.google.api.client.extensions.java6.auth.oauth2.AuthorizationCodeInstalledApp;
import com.google.api.client.extensions.jetty.auth.oauth2.LocalServerReceiver; import com.google.api.client.extensions.jetty.auth.oauth2.LocalServerReceiver;
import com.google.api.client.googleapis.auth.oauth2.GoogleAuthorizationCodeFlow; import com.google.api.client.googleapis.auth.oauth2.GoogleAuthorizationCodeFlow;
import javax.inject.Inject; import javax.inject.Inject;
/** Authorizes the nomulus tool for OAuth 2.0 access to remote resources. */ /** Authorizes the nomulus tool for OAuth 2.0 access to remote resources. */
@Parameters(commandDescription = "Create local OAuth credentials")
final class LoginCommand implements Command { final class LoginCommand implements Command {
@Inject GoogleAuthorizationCodeFlow flow; @Inject GoogleAuthorizationCodeFlow flow;

2
java/google/registry/tools/LogoutCommand.java
View file

@ -14,6 +14,7 @@
package google.registry.tools; package google.registry.tools;
import com.beust.jcommander.Parameters;
import com.google.api.client.auth.oauth2.StoredCredential; import com.google.api.client.auth.oauth2.StoredCredential;
import com.google.api.client.util.store.AbstractDataStoreFactory; import com.google.api.client.util.store.AbstractDataStoreFactory;
import google.registry.util.FormattingLogger; import google.registry.util.FormattingLogger;
@ -21,6 +22,7 @@ import java.io.IOException;
import javax.inject.Inject; import javax.inject.Inject;
/** Logout (invalidates OAuth credentials). */ /** Logout (invalidates OAuth credentials). */
@Parameters(commandDescription = "Remove local OAuth credentials")
class LogoutCommand implements Command { class LogoutCommand implements Command {
private static final FormattingLogger logger = FormattingLogger.getLoggerForCallerClass(); private static final FormattingLogger logger = FormattingLogger.getLoggerForCallerClass();