Fix frontend domain inference

The frontend seems to be expecting the domain pattern to be different than it currently is, expose the inferred domain via gql and fix fe code accordingly

Author: michaeljguarino

apps/core/lib/core/services/cloud.ex

@@ -91,8 +91,10 @@ defmodule Core.Services.Cloud do
     |> notify(:create, user)
   end
 
-  def domain(%ConsoleInstance{name: name, domain_version: :v2}), do: "https://#{name}.console.#{domain()}/oauth/callback"
-  def domain(%ConsoleInstance{name: name}), do: "https://console.#{name}.#{domain()}/oauth/callback"
+  def fqdn(%ConsoleInstance{name: name, domain_version: :v2}), do: "#{name}.console.#{domain()}"
+  def fqdn(%ConsoleInstance{name: name}), do: "console.#{name}.#{domain()}"
+
+  def domain(%ConsoleInstance{} = inst), do: "https://#{fqdn(inst)}/oauth/callback"
 
   @doc """
   Updates base attributes of a console instance
@@ -203,7 +205,7 @@ defmodule Core.Services.Cloud do
   end
 
   def add_configuration(attrs, name, token, %OIDCProvider{} = oidc, %User{} = user) do
-    Map.merge(attrs, %{subdomain: "#{name}.#{domain()}", url: "console.#{name}.#{domain()}"})
+    Map.merge(attrs, %{subdomain: "#{name}.#{domain()}", url: "#{name}.console.#{domain()}"})
     |> Map.put(:configuration, %{
       aes_key:        aes_key(),
       encryption_key: encryption_key(),

apps/graphql/lib/graphql/resolvers/cloud.ex

@@ -15,6 +15,8 @@ defmodule GraphQl.Resolvers.Cloud do
     ok(Clusters.get_cluster_by_url("https://#{url}") || Clusters.get_cluster_by_url(url))
   end
 
+  def resolve_domain(%ConsoleInstance{} = inst, _, _), do: {:ok, Cloud.fqdn(inst)}
+
   def list_instances(args, %{context: %{current_user: user}}) do
     ConsoleInstance.for_account(user.account_id)
     |> ConsoleInstance.ordered()

apps/graphql/lib/graphql/schema/cloud.ex

@@ -52,6 +52,8 @@ defmodule GraphQl.Schema.Cloud do
     field :network, :console_instance_network, description: "the network configuration for this instance"
     field :oidc,    :console_instance_oidc,    description: "custom oidc configuration for this instance"
 
+    field :domain, :string, description: "the domain of this instance", resolve: &Cloud.resolve_domain/3
+
     field :status,    non_null(:console_instance_status),
       description: "the provisioning status of this instance, liveness is fetched through the console field"
 

schema/schema.graphql

@@ -665,6 +665,9 @@ type ConsoleInstance {
   "custom oidc configuration for this instance"
   oidc: ConsoleInstanceOidc
 
+  "the domain of this instance"
+  domain: String
+
   "the provisioning status of this instance, liveness is fetched through the console field"
   status: ConsoleInstanceStatus!
 

www/src/generated/graphql.ts

@@ -581,6 +581,8 @@ export type ConsoleInstance = {
   console?: Maybe<Cluster>;
   /** the time this instance was deleted on */
   deletedAt?: Maybe<Scalars['DateTime']['output']>;
+  /** the domain of this instance */
+  domain?: Maybe<Scalars['String']['output']>;
   id: Scalars['ID']['output'];
   insertedAt?: Maybe<Scalars['DateTime']['output']>;
   /** the name of this instance (globally unique) */