Force FE redirect to base domain 404 on InstanceNotFoundError

app/controllers/concerns/application_controller_multitenancy_concern.rb

@@ -6,7 +6,16 @@
  included do
  set_current_tenant_through_filter
  before_action :deduce_and_set_current_tenant
-
+ 
  helper_method :current_tenant
+
+ rescue_from InstanceNotFoundError, with: :handle_instance_not_found
+ end
+
+ protected
+
+ def handle_instance_not_found(exception)
+ @exception = exception
+ render json: { error: 'Instance not found' }, status: :not_found
  end
 end

app/controllers/concerns/application_multitenancy.rb

@@ -16,7 +16,7 @@
  instance = Instance.find_tenant_by_host_or_default(tenant_host)
 
  if Rails.env.production? && instance.default? && instance.host.casecmp(tenant_host) != 0
- raise ActionController::RoutingError, 'Instance Not Found'
+ raise InstanceNotFoundError
  end
 
  instance

client/app/api/ErrorHandling.ts

@@ -2,6 +2,7 @@ import { AxiosResponse } from 'axios';
 
 import {
  redirectToAuthPage,
+ redirectToBaseNotFound,
  redirectToForbidden,
  redirectToNotFound,
 } from 'lib/hooks/router/redirect';
@@ -23,6 +24,10 @@ const isComponentNotFoundResponse = (response?: AxiosResponse): boolean =>
  response?.status === 404 &&
  response.data?.error?.toLowerCase().includes('component not found'); // NOTE: This string is taken from BE's handle_component_not_found
 
+const isInstanceNotFoundResponse = (response?: AxiosResponse): boolean =>
+ response?.status === 404 &&
+ response.data?.error?.toLowerCase().includes('instance not found'); // NOTE: This string is taken from BE's handle_component_not_found
+
 export const redirectIfMatchesErrorIn = (response?: AxiosResponse): void => {
  if (isUnauthenticatedResponse(response)) {
  localStorage.clear();
@@ -32,4 +37,5 @@ export const redirectIfMatchesErrorIn = (response?: AxiosResponse): void => {
  // Should open a new window and login
  redirectToForbidden();
  if (isComponentNotFoundResponse(response)) redirectToNotFound();
+ if (isInstanceNotFoundResponse(response)) redirectToBaseNotFound();
 };

client/app/lib/hooks/router/redirect.tsx

@@ -66,6 +66,13 @@ export const redirectToNotFound = (): void => {
  window.location.href = '/404';
 };
 
+export const redirectToBaseNotFound = (): void => {
+ const url = new URL(window.location.href);
+ url.host = window.location.hostname.split('.').slice(-2).join('.');
+ url.pathname = '/404';
+ window.location.href = url.toString();
+};
+
 export const getForbiddenSourceURL = (rawURL: string): string | null => {
  const url = new URL(rawURL);
  return url.searchParams.get(FORBIDDEN_SOURCE_URL_SEARCH_PARAM);

lib/autoload/instance_not_found_error.rb

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+class InstanceNotFoundError < StandardError
+ def initialize(message = nil)
+ super(message || 'Instance not found')
+ end
+end