Accidental refactor, split out legacy.py into separate sumodules and update all call sites.

endpoints/api/suconfig.py

@@ -2,10 +2,9 @@
 
 import logging
 import os
-import json
 import signal
 
-from flask import abort, Response
+from flask import abort
 from endpoints.api import (ApiResource, nickname, resource, internal_only, show_if,
                            require_fresh_login, request, validate_json_request, verify_not_prod)
 
@@ -14,17 +13,17 @@ from app import app, CONFIG_PROVIDER, superusers
 from data import model
 from data.database import configure
 from auth.permissions import SuperUserPermission
-from auth.auth_context import get_authenticated_user
 from data.database import User
 from util.config.configutil import add_enterprise_config_defaults
-from util.config.provider import CannotWriteConfigException
 from util.config.validator import validate_service_for_config, CONFIG_FILENAMES
 from data.runmigration import run_alembic_migration
 
 import features
 
+
 logger = logging.getLogger(__name__)
 
+
 def database_is_valid():
   """ Returns whether the database, as configured, is valid. """
   if app.config['TESTING']:
@@ -310,7 +309,7 @@ class SuperUserCreateInitialSuperUser(ApiResource):
       email = data['email']
 
       # Create the user in the database.
-      superuser = model.create_user(username, password, email, auto_verify=True)
+      superuser = model.user.create_user(username, password, email, auto_verify=True)
 
       # Add the user to the config.
       config_object = CONFIG_PROVIDER.get_yaml()