Add UiSettings validation & Kibana default route redirection

packages/kbn-config-schema/src/errors/validation_error.ts

@@ -44,5 +44,8 @@ export class ValidationError extends SchemaError {
 
   constructor(error: SchemaTypeError, namespace?: string) {
     super(ValidationError.extractMessage(error, namespace), error);
+
+    // https://github.com/Microsoft/TypeScript/wiki/Breaking-Changes#extending-built-ins-like-error-array-and-map-may-no-longer-work
+    Object.setPrototypeOf(this, ValidationError.prototype);
   }
 }

src/core/public/ui_settings/ui_settings_api.ts

@@ -152,10 +152,14 @@ export class UiSettingsApi {
         },
       });
     } catch (err) {
-      if (err.response && err.response.status >= 300) {
-        throw new Error(`Request failed with status code: ${err.response.status}`);
+      if (err.response) {
+        if (err.response.status === 400) {
+          throw new Error(err.body.message);
+        }
+        if (err.response.status > 400) {
+          throw new Error(`Request failed with status code: ${err.response.status}`);
+        }
       }
-
       throw err;
     } finally {
       this.loadingCount$.next(this.loadingCount$.getValue() - 1);

src/core/server/server.ts

@@ -122,8 +122,6 @@ export class Server {
       context: contextServiceSetup,
     });
 
-    this.registerDefaultRoute(httpSetup);
-
     const capabilitiesSetup = this.capabilities.setup({ http: httpSetup });
 
     const elasticsearchServiceSetup = await this.elasticsearch.setup({
@@ -167,6 +165,7 @@ export class Server {
     });
 
     this.registerCoreContext(coreSetup, renderingSetup);
+    this.registerDefaultRoute(httpSetup);
 
     return coreSetup;
   }
@@ -218,8 +217,19 @@ export class Server {
   }
 
   private registerDefaultRoute(httpSetup: InternalHttpServiceSetup) {
-    const router = httpSetup.createRouter('/core');
-    router.get({ path: '/', validate: false }, async (context, req, res) =>
+    const router = httpSetup.createRouter('/');
+    router.get({ path: '/', validate: false }, async (context, req, res) => {
+      const defaultRoute = await context.core.uiSettings.client.get<string>('defaultRoute');
+      const basePath = httpSetup.basePath.get(req);
+      const url = `${basePath}${defaultRoute}`;
+
+      return res.redirected({
+        headers: {
+          location: url,
+        },
+      });
+    });
+    router.get({ path: '/core', validate: false }, async (context, req, res) =>
       res.ok({ body: { version: '0.0.1' } })
     );
   }

src/core/server/ui_settings/integration_tests/routes.test.ts

@@ -0,0 +1,66 @@
+/*
+ * Licensed to Elasticsearch B.V. under one or more contributor
+ * license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright
+ * ownership. Elasticsearch B.V. licenses this file to you under
+ * the Apache License, Version 2.0 (the "License"); you may
+ * not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+import { schema } from '@kbn/config-schema';
+import * as kbnTestServer from '../../../../test_utils/kbn_server';
+
+describe('ui settings service', () => {
+  describe('routes', () => {
+    let root: ReturnType<typeof kbnTestServer.createRoot>;
+    beforeAll(async () => {
+      root = kbnTestServer.createRoot();
+
+      const { uiSettings } = await root.setup();
+      uiSettings.register({
+        custom: {
+          value: '42',
+          schema: schema.string(),
+        },
+      });
+
+      await root.start();
+    }, 30000);
+    afterAll(async () => await root.shutdown());
+
+    describe('set', () => {
+      it('validates value', async () => {
+        const response = await kbnTestServer.request
+          .post(root, '/api/kibana/settings/custom')
+          .send({ value: 100 })
+          .expect(400);
+
+        expect(response.body.message).toBe(
+          '[validation [custom]]: expected value of type [string] but got [number]'
+        );
+      });
+    });
+    describe('set many', () => {
+      it('validates value', async () => {
+        const response = await kbnTestServer.request
+          .post(root, '/api/kibana/settings')
+          .send({ changes: { custom: 100 } })
+          .expect(400);
+
+        expect(response.body.message).toBe(
+          '[validation [custom]]: expected value of type [string] but got [number]'
+        );
+      });
+    });
+  });
+});

src/core/server/ui_settings/routes/set.ts

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { schema } from '@kbn/config-schema';
+import { schema, ValidationError } from '@kbn/config-schema';
 
 import { IRouter } from '../../http';
 import { SavedObjectsErrorHelpers } from '../../saved_objects';
@@ -56,7 +56,7 @@ export function registerSetRoute(router: IRouter) {
           });
         }
 
-        if (error instanceof CannotOverrideError) {
+        if (error instanceof CannotOverrideError || error instanceof ValidationError) {
           return response.badRequest({ body: error });
         }
 

src/core/server/ui_settings/routes/set_many.ts

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-import { schema } from '@kbn/config-schema';
+import { schema, ValidationError } from '@kbn/config-schema';
 
 import { IRouter } from '../../http';
 import { SavedObjectsErrorHelpers } from '../../saved_objects';
@@ -50,7 +50,7 @@ export function registerSetManyRoute(router: IRouter) {
         });
       }
 
-      if (error instanceof CannotOverrideError) {
+      if (error instanceof CannotOverrideError || error instanceof ValidationError) {
         return response.badRequest({ body: error });
       }
 

src/core/server/ui_settings/types.ts

@@ -41,7 +41,7 @@ export interface IUiSettingsClient {
   /**
    * Returns registered uiSettings values {@link UiSettingsParams}
    */
-  getRegistered: () => Readonly<Record<string, UiSettingsParams>>;
+  getRegistered: () => Readonly<Record<string, Omit<UiSettingsParams, 'schema'>>>;
   /**
    * Retrieves uiSettings values set by the user with fallbacks to default values if not specified.
    */