Disable Teams org creation (#3193)

Author: aleDsz

lib/livebook/teams.ex

@@ -13,20 +13,6 @@ defmodule Livebook.Teams do
 
   @teams_key_prefix Teams.Constants.teams_key_prefix()
 
-  @doc """
-  Creates an Org.
-
-  With success, returns the response from Livebook Teams API to continue the org creation flow.
-  Otherwise, it will return an error tuple with changeset.
-  """
-  @spec create_org(Org.t(), map()) ::
-          {:ok, map()}
-          | {:error, Ecto.Changeset.t()}
-          | {:transport_error, String.t()}
-  def create_org(%Org{} = org, attrs) do
-    create_org_request(org, attrs, &Requests.create_org/1)
-  end
-
   @doc """
   Joins an Org.
 
@@ -38,14 +24,10 @@ defmodule Livebook.Teams do
           | {:error, Ecto.Changeset.t()}
           | {:transport_error, String.t()}
   def join_org(%Org{} = org, attrs) do
-    create_org_request(org, attrs, &Requests.join_org/1)
-  end
-
-  defp create_org_request(%Org{} = org, attrs, callback) when is_function(callback, 1) do
     changeset = Org.changeset(org, attrs)
 
     with {:ok, %Org{} = org} <- apply_action(changeset, :insert) do
-      case callback.(org) do
+      case Requests.join_org(org) do
         {:ok, response} ->
           {:ok, response}
 

lib/livebook/teams/requests.ex

@@ -16,14 +16,6 @@ defmodule Livebook.Teams.Requests do
   @doc false
   def error_message(), do: @error_message
 
-  @doc """
-  Send a request to Livebook Team API to create a new org.
-  """
-  @spec create_org(Teams.Org.t()) :: api_result()
-  def create_org(org) do
-    post("/api/v1/org-request", %{name: org.name, key_hash: Teams.Org.key_hash(org)})
-  end
-
   @doc """
   Send a request to Livebook Team API to join an org.
   """

lib/livebook_web/live/hub/new_live.ex

@@ -15,21 +15,18 @@ defmodule LivebookWeb.Hub.NewLive do
 
   @impl true
   def mount(_params, _session, socket) do
-    socket =
-      assign(socket,
-        selected_option: "new-org",
-        page_title: "Workspace - Livebook",
-        requested_code: false,
-        org: nil,
-        verification_uri: nil,
-        form: nil,
-        button_label: nil,
-        request_code_info: nil
-      )
-
-    socket = assign_form(socket, "new-org")
-
-    {:ok, socket}
+    {:ok,
+     socket
+     |> assign(
+       page_title: "Workspace - Livebook",
+       requested_code: false,
+       org: nil,
+       verification_uri: nil,
+       form: nil,
+       button_label: nil,
+       request_code_info: nil
+     )
+     |> assign_form()}
   end
 
   @impl true
@@ -60,38 +57,31 @@ defmodule LivebookWeb.Hub.NewLive do
               Livebook Teams</a> enables you to deploy notebooks as internal apps or turn Livebook into a controlled environment for runbooks and production operations.
           </p>
           <p class="mt-4 text-gray-700">
-            To use it, you need to create or join a Teams organization.
+            To use it, you need to join a Teams organization.
           </p>
         </div>
-        <!-- TABS -->
         <div class="flex flex-col space-y-4">
           <div class="flex flex-col justify-center sm:items-center sm:m-auto">
             <div class="flex rounded-xl bg-gray-100 p-1">
               <ul class="flex flex-col sm:flex-row md:flex-col lg:flex-row w-full list-none gap-1">
-                <!-- New Org -->
-                <.tab_button
-                  id="new-org"
-                  selected={@selected_option}
-                  title="Create a new organization"
-                  icon="lightbulb-flash-line"
-                />
-                <!-- Join Org -->
-                <.tab_button
-                  id="join-org"
-                  selected={@selected_option}
-                  title="Join an existing organization"
-                  icon="organization-chart"
-                />
+                <li class="group button flex w-full sm:w-72 items-center justify-center gap-1 md:gap-2 rounded-lg border py-3 md:py-2.5 px-5 transition-opacity duration-100 border-black/10 bg-white drop-shadow-sm hover:opacity-100!">
+                  <.remix_icon
+                    icon="organization-chart"
+                    class="group-hover:text-blue-600 text-lg text-blue-600"
+                  />
+                  <span class="truncate text-sm font-medium">
+                    Join an existing organization
+                  </span>
+                </li>
               </ul>
             </div>
           </div>
         </div>
-        <!-- FORMS -->
-        <div :if={@selected_option} class="flex flex-col space-y-4">
+        <div class="flex flex-col space-y-4">
           <.form
             :let={f}
             for={@form}
-            id={"#{@selected_option}-form"}
+            id="join-org-form"
             class="flex flex-col space-y-4"
             phx-submit="save"
             phx-change="validate"
@@ -102,7 +92,6 @@ defmodule LivebookWeb.Hub.NewLive do
             </div>
 
             <.password_field
-              :if={@selected_option == "join-org"}
               field={f[:teams_key]}
               label="Livebook Teams key"
             />
@@ -168,56 +157,7 @@ defmodule LivebookWeb.Hub.NewLive do
     """
   end
 
-  defp tab_button(assigns) do
-    ~H"""
-    <li class="group/toggle w-full">
-      <button
-        type="button"
-        id={@id}
-        aria-haspopup="menu"
-        aria-expanded="false"
-        data-state="closed"
-        class="w-full"
-        phx-click="select_option"
-        phx-value-option={@id}
-      >
-        <div class={[
-          "group button flex w-full sm:w-72 items-center justify-center gap-1 md:gap-2 rounded-lg border py-3 md:py-2.5 px-5 transition-opacity duration-100",
-          selected_tab_button(@id, @selected)
-        ]}>
-          <.remix_icon
-            icon={@icon}
-            class={[
-              "group-hover:text-blue-600 text-lg",
-              if @selected == @id do
-                "text-blue-600"
-              else
-                "text-gray-500"
-              end
-            ]}
-          />
-          <span class="truncate text-sm font-medium">
-            {@title}
-          </span>
-        </div>
-      </button>
-    </li>
-    """
-  end
-
-  defp selected_tab_button(id, id),
-    do: "border-black/10 bg-white drop-shadow-sm hover:opacity-100!"
-
-  defp selected_tab_button(_, _), do: "border-transparent text-gray-500 hover:text-gray-800"
-
   @impl true
-  def handle_event("select_option", %{"option" => option}, socket) do
-    {:noreply,
-     socket
-     |> assign(selected_option: option, requested_code: false, verification_uri: nil)
-     |> assign_form(option)}
-  end
-
   def handle_event("validate", %{"org" => attrs}, socket) do
     changeset =
       socket.assigns.org
@@ -228,13 +168,7 @@ defmodule LivebookWeb.Hub.NewLive do
   end
 
   def handle_event("save", %{"org" => attrs}, socket) do
-    result =
-      case socket.assigns.selected_option do
-        "new-org" -> Teams.create_org(socket.assigns.org, attrs)
-        "join-org" -> Teams.join_org(socket.assigns.org, attrs)
-      end
-
-    case result do
+    case Teams.join_org(socket.assigns.org, attrs) do
       {:ok, %{"device_code" => device_code} = response} ->
         attrs = Map.merge(attrs, response)
         changeset = Teams.change_org(socket.assigns.org, attrs)
@@ -314,7 +248,7 @@ defmodule LivebookWeb.Hub.NewLive do
 
   def handle_info(_any, socket), do: {:noreply, socket}
 
-  defp assign_form(socket, "join-org") do
+  defp assign_form(socket) do
     org = %Org{emoji: random_emoji()}
     changeset = Teams.change_org(org)
 
@@ -327,19 +261,6 @@ defmodule LivebookWeb.Hub.NewLive do
     |> assign_form(changeset)
   end
 
-  defp assign_form(socket, "new-org") do
-    org = %Org{emoji: random_emoji(), teams_key: Org.teams_key()}
-    changeset = Teams.change_org(org)
-
-    socket
-    |> assign(
-      org: org,
-      button_label: "Create",
-      request_code_info: "Verify your new organization"
-    )
-    |> assign_form(changeset)
-  end
-
   defp assign_form(socket, %Ecto.Changeset{} = changeset) do
     assign(socket, form: to_form(changeset))
   end

test/livebook_teams/teams_test.exs

@@ -11,28 +11,6 @@ defmodule Livebook.TeamsTest do
   @moduletag subscribe_to_hubs_topics: [:connection, :file_systems, :secrets]
   @moduletag subscribe_to_teams_topics: [:clients, :deployment_groups, :app_deployments, :agents]
 
-  describe "create_org/1" do
-    test "returns the device flow data to confirm the org creation" do
-      org = build(:org)
-
-      assert {:ok,
-              %{
-                "device_code" => _device_code,
-                "expires_in" => 300,
-                "id" => _org_id,
-                "user_code" => _user_code,
-                "verification_uri" => _verification_uri
-              }} = Teams.create_org(org, %{})
-    end
-
-    test "returns changeset errors when data is invalid" do
-      org = build(:org)
-
-      assert {:error, changeset} = Teams.create_org(org, %{name: nil})
-      assert "can't be blank" in errors_on(changeset).name
-    end
-  end
-
   describe "join_org/1" do
     test "returns the device flow data to confirm the org creation", %{node: node} do
       org = build(:org)