stages/user_write: don't use create_user, create empty object and set attributes

passbook/stages/user_write/stage.py

@@ -25,33 +25,30 @@ class UserWriteStageView(StageView):
             LOGGER.debug(message)
             return self.executor.stage_invalid()
         data = self.executor.plan.context[PLAN_CONTEXT_PROMPT]
-        if PLAN_CONTEXT_PENDING_USER in self.executor.plan.context:
+        if PLAN_CONTEXT_PENDING_USER not in self.executor.plan.context:
-            user = self.executor.plan.context[PLAN_CONTEXT_PENDING_USER]
+            self.executor.plan.context[PLAN_CONTEXT_PENDING_USER] = User()
-            for key, value in data.items():
-                setter_name = f"set_{key}"
-                # Check if user has a setter for this key, like set_password
-                if hasattr(user, setter_name):
-                    setter = getattr(user, setter_name)
-                    if callable(setter):
-                        setter(value)
-                # User has this key already
-                elif hasattr(user, key):
-                    setattr(user, key, value)
-                # Otherwise we just save it as custom attribute
-                else:
-                    user.attributes[key] = value
-            user.save()
-            LOGGER.debug(
-                "Updated existing user", user=user, flow_slug=self.executor.flow.slug,
-            )
-        else:
-            user = User.objects.create_user(**data)
-            # Set created user as pending_user, so this can be chained with user_login
-            self.executor.plan.context[PLAN_CONTEXT_PENDING_USER] = user
             self.executor.plan.context[
                 PLAN_CONTEXT_AUTHENTICATION_BACKEND
             ] = class_to_path(ModelBackend)
             LOGGER.debug(
-                "Created new user", user=user, flow_slug=self.executor.flow.slug,
+                "Created new user", flow_slug=self.executor.flow.slug,
             )
+        user = self.executor.plan.context[PLAN_CONTEXT_PENDING_USER]
+        for key, value in data.items():
+            setter_name = f"set_{key}"
+            # Check if user has a setter for this key, like set_password
+            if hasattr(user, setter_name):
+                setter = getattr(user, setter_name)
+                if callable(setter):
+                    setter(value)
+            # User has this key already
+            elif hasattr(user, key):
+                setattr(user, key, value)
+            # Otherwise we just save it as custom attribute
+            else:
+                user.attributes[key] = value
+        user.save()
+        LOGGER.debug(
+            "Updated existing user", user=user, flow_slug=self.executor.flow.slug,
+        )
         return self.executor.stage_ok()

swagger.yaml

@@ -6028,7 +6028,12 @@ definitions:
           - e-mail
           - password
           - number
+          - checkbox
+          - data
+          - data-time
+          - separator
           - hidden
+          - static
       required:
         title: Required
         type: boolean
@@ -6036,6 +6041,11 @@ definitions:
         title: Placeholder
         type: string
         minLength: 1
+      order:
+        title: Order
+        type: integer
+        maximum: 2147483647
+        minimum: -2147483648
   PromptStage:
     required:
       - name