move properties to 'user' model and rename a few database props

src/Umbraco.Web.UI.Client/schemas/api/api.yml

@@ -258,6 +258,22 @@ components:
       required:
         - type
         - status
+    InstallSetupUserConfiguration:
+      type: object
+      properties:
+        name:
+          type: string
+        email:
+          type: string
+        password:
+          type: string
+        subscribeToNewsletter:
+          type: boolean
+      required:
+        - name
+        - email
+        - password
+        - subscribeToNewsletter
     InstallSetupDatabaseConfiguration:
       type: object
       properties:
@@ -272,10 +288,10 @@ components:
         username:
           type: string
           nullable: true
-        databaseName:
+        name:
           type: string
           nullable: true
-        databaseType:
+        providerName:
           type: string
           nullable: true
         useIntegratedAuthentication:
@@ -287,25 +303,15 @@ components:
     InstallSetupRequest:
       type: object
       properties:
-        name:
-          type: string
-        email:
-          type: string
-        password:
-          type: string
-        subscribeToNewsletter:
-          type: boolean
+        user:
+          $ref: '#/components/schemas/InstallSetupUserConfiguration'
         telemetryLevel:
           $ref: '#/components/schemas/ConsentLevel'
         database:
           $ref: '#/components/schemas/InstallSetupDatabaseConfiguration'
       required:
-        - name
-        - email
-        - password
-        - subscribeToNewsletter
+        - user
         - telemetryLevel
-        - database
     InstallValidateDatabaseRequest:
       type: object
       properties:

src/Umbraco.Web.UI.Client/temp-schema-generator/installer.ts

@@ -45,12 +45,9 @@ export class PostInstallValidateDatabase {
 }
 
 export interface InstallSetupRequest {
-  name: string;
-  email: string;
-  password: string;
-  subscribeToNewsletter: boolean;
+  user: InstallSetupUserConfiguration;
   telemetryLevel: ConsentLevel;
-  database: InstallSetupDatabaseConfiguration;
+  database?: InstallSetupDatabaseConfiguration;
 }
 
 export interface InstallValidateDatabaseRequest {
@@ -68,13 +65,20 @@ export interface InstallUserModel {
   consentLevels: TelemetryModel[];
 }
 
+export interface InstallSetupUserConfiguration {
+  name: string;
+  email: string;
+  password: string;
+  subscribeToNewsletter: boolean;
+}
+
 export interface InstallSetupDatabaseConfiguration {
   id?: string;
   server?: string | null;
   password?: string | null;
   username?: string | null;
-  databaseName?: string | null;
-  databaseType?: string | null;
+  name?: string | null;
+  providerName?: string | null;
   useIntegratedAuthentication?: boolean | null;
   connectionString?: string | null;
 }