summaryrefslogtreecommitdiffstats
path: root/controller-server
diff options
context:
space:
mode:
authorandreer <andreer@verizonmedia.com>2020-05-29 11:53:40 +0200
committerandreer <andreer@verizonmedia.com>2020-05-29 11:53:40 +0200
commit3cffe31a29ab7e586e650f01a173208ab34477f8 (patch)
tree12f981dd7755c71301aa6662a36fa30598cf6236 /controller-server
parentbf3d67a911a99f6351edb6f0d3a6cdf01c673a0d (diff)
add feature flag to user api for use in console
Diffstat (limited to 'controller-server')
-rw-r--r--controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/user/UserApiHandler.java12
1 files changed, 11 insertions, 1 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/user/UserApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/user/UserApiHandler.java
index 006a12a23b5..9fc77e7653d 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/user/UserApiHandler.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/user/UserApiHandler.java
@@ -18,6 +18,10 @@ import com.yahoo.slime.Inspector;
import com.yahoo.slime.Slime;
import com.yahoo.slime.SlimeStream;
import com.yahoo.slime.SlimeUtils;
+import com.yahoo.vespa.flags.BooleanFlag;
+import com.yahoo.vespa.flags.FetchVector;
+import com.yahoo.vespa.flags.FlagSource;
+import com.yahoo.vespa.flags.Flags;
import com.yahoo.vespa.hosted.controller.Controller;
import com.yahoo.vespa.hosted.controller.LockedTenant;
import com.yahoo.vespa.hosted.controller.api.integration.user.Roles;
@@ -60,12 +64,14 @@ public class UserApiHandler extends LoggingRequestHandler {
private final UserManagement users;
private final Controller controller;
+ private final BooleanFlag enable_public_signup_flow;
@Inject
- public UserApiHandler(Context parentCtx, UserManagement users, Controller controller) {
+ public UserApiHandler(Context parentCtx, UserManagement users, Controller controller, FlagSource flagSource) {
super(parentCtx);
this.users = users;
this.controller = controller;
+ this.enable_public_signup_flow = Flags.ENABLE_PUBLIC_SIGNUP_FLOW.bindTo(flagSource);
}
@Override
@@ -149,6 +155,10 @@ public class UserApiHandler extends LoggingRequestHandler {
root.setBool("isPublic", controller.system().isPublic());
root.setBool("isCd", controller.system().isCd());
+ if(enable_public_signup_flow.with(FetchVector.Dimension.CONSOLE_USER_EMAIL, user.email()).value()) {
+ root.setBool(enable_public_signup_flow.id().toString(), true);
+ }
+
toSlime(root.setObject("user"), user);
Cursor tenants = root.setObject("tenants");