commit e6ce0b4fb0a9848c312b110974225b22d76c4b94
author Michael Ochmann <michael.ochmann@sap.com> Mon Oct 19 17:00:07 2015 +0200
committer Michael Ochmann <michael.ochmann@sap.com> Tue Oct 20 15:16:45 2015 +0200
tree c22a9347a7dfd9dc5d2dac4502c874e756f5109f
parent 0cf96b75c9911038b8ad8fc9bd901bb2022dac11

Skip init step if auth type is not OAUTH

Change-Id: Ib78d320a3ce5257d43e1d4f3fcb7eddc10706ebb
Signed-off-by: Michael Ochmann <michael.ochmann@sap.com>

src/main/java/com/googlesource/gerrit/plugins/cfoauth/InitOAuthConfig.java

diff --git a/src/main/java/com/googlesource/gerrit/plugins/cfoauth/InitOAuthConfig.java b/src/main/java/com/googlesource/gerrit/plugins/cfoauth/InitOAuthConfig.java
index fa7bdfb..c532357 100644
--- a/src/main/java/com/googlesource/gerrit/plugins/cfoauth/InitOAuthConfig.java
+++ b/src/main/java/com/googlesource/gerrit/plugins/cfoauth/InitOAuthConfig.java
@@ -20,6 +20,7 @@
 import com.google.gerrit.pgm.init.api.InitFlags;
 import com.google.gerrit.pgm.init.api.InitStep;
 import com.google.gerrit.pgm.init.api.Section;
+import com.google.gerrit.reviewdb.client.AuthType;
 import com.google.inject.Inject;
 
 class InitOAuthConfig implements InitStep {
@@ -47,6 +48,11 @@
 
   @Override
   public void run() throws Exception {
+    AuthType authType =
+        flags.cfg.getEnum(AuthType.values(), "auth", null, "type", null);
+    if (authType != AuthType.OAUTH) {
+      return;
+    }
     ui.header("Cloud Foundry UAA OAuth 2.0 Authentication Provider");
     cfg.string("UAA server URL", SERVER_URL, DEFAULT_SERVER_URL);
     cfg.string("Client id", CLIENT_ID, DEFAULT_CLIENT_ID);