[DO NOT MERGE] Remove api clients

Gemfile.lock

@@ -574,7 +574,7 @@ DEPENDENCIES
   will_paginate
 
 RUBY VERSION
-   ruby 3.0.0p0
+  ruby 3.0.0p0
 
 BUNDLED WITH
    2.1.4

app/controllers/comfy/admin/external_api_clients_controller.rb

@@ -30,7 +30,7 @@ def create
       respond_to do |format|
         if @external_api_client.save
           format.html { redirect_to api_namespace_external_api_client_path(api_namespace_id: @api_namespace.id, id: @external_api_client.id), notice: "Api client was successfully created." }
-          format.json { render :show, status: :created, location: @api_client }
+          format.json { render :show, status: :created, location: @external_api_client }
         else
           format.html { render :new, status: :unprocessable_entity }
           format.json { render json: @external_api_client.errors, status: :unprocessable_entity }
@@ -46,7 +46,7 @@ def update
           format.json { render :show, status: :ok, location: @external_api_client }
         else
           format.html { render :edit, status: :unprocessable_entity }
-          format.json { render json: @api_client.errors, status: :unprocessable_entity }
+          format.json { render json: @external_api_client.errors, status: :unprocessable_entity }
         end
       end
     end

app/controllers/subdomains/base_controller.rb

@@ -145,20 +145,6 @@ def ensure_authority_for_full_access_for_external_api_connections_only_in_api
     end
   end
 
-  def ensure_authority_for_read_api_clients_only_in_api
-    unless user_authorized_for_api_accessibility?(ApiNamespace::API_ACCESSIBILITIES[:read_api_clients_only])
-      flash.alert = "You do not have the permission to do that. Only users with full_access or full_read_access or full_access_for_api_clients_only or read_api_clients_only are allowed to perform that action."
-      redirect_back(fallback_location: root_url)
-    end
-  end
-
-  def ensure_authority_for_full_access_for_api_clients_only_in_api
-    unless user_authorized_for_api_accessibility?(ApiNamespace::API_ACCESSIBILITIES[:full_access_for_api_clients_only])
-      flash.alert = "You do not have the permission to do that. Only users with full_access or full_access_for_api_clients_only are allowed to perform that action."
-      redirect_back(fallback_location: root_url)
-    end
-  end
-
   def ensure_authority_for_full_access_for_api_form_only_in_api
     unless user_authorized_for_api_accessibility?(ApiNamespace::API_ACCESSIBILITIES[:full_access_for_api_form_only])
       flash.alert = "You do not have the permission to do that. Only users with full_access or full_access_for_api_form_only are allowed to perform that action."

app/models/api_namespace.rb

@@ -15,9 +15,6 @@ class ApiNamespace < ApplicationRecord
   has_one :api_form, dependent: :destroy
   accepts_nested_attributes_for :api_form
 
-  has_many :api_clients, dependent: :destroy
-  accepts_nested_attributes_for :api_clients
-
   has_many :external_api_clients, dependent: :destroy
 
   has_many :non_primitive_properties, dependent: :destroy
@@ -75,8 +72,6 @@ class ApiNamespace < ApplicationRecord
     full_access_for_api_actions_only: ['full_access', 'full_access_for_api_actions_only'],
     read_external_api_connections_only: ['full_access', 'full_read_access', 'full_access_for_external_api_connections_only', 'read_external_api_connections_only'],
     full_access_for_external_api_connections_only: ['full_access', 'full_access_for_external_api_connections_only'],
-    read_api_clients_only: ['full_access', 'full_read_access', 'full_access_for_api_clients_only', 'read_api_clients_only'],
-    full_access_for_api_clients_only: ['full_access', 'full_access_for_api_clients_only'],
     full_access_for_api_form_only: ['full_access', 'full_access_for_api_form_only'],
     read_api_keys_only: ['full_access', 'delete_access', 'read_access'],
     full_access_for_api_keys_only: ['full_access'],

app/views/comfy/admin/api_forms/_form.html.haml

@@ -1,5 +1,5 @@
 - action = @api_form.persisted? ? :put : :post
-- path = @api_form.persisted? ? api_namespace_api_form_path(api_namespace_id: @api_form.api_namespace.id, id: @api_form.id) : api_namespace_api_forms_path(api_namespace_id: @api_client.api_namespace.id)
+- path = @api_form.persisted? ? api_namespace_api_form_path(api_namespace_id: @api_form.api_namespace.id, id: @api_form.id) : api_namespace_api_forms_path(api_namespace_id: @api_form.api_namespace.id)
 - properties = @api_form.properties
 
 = form_for @api_form, url: path, method: action do |f|

config/routes.rb

@@ -66,7 +66,6 @@ def self.matches?(request)
     end
 
     resources :resources, except: [:index], controller: 'comfy/admin/api_resources'
-    resources :api_clients, controller: 'comfy/admin/api_clients'
     resources :external_api_clients, controller: 'comfy/admin/external_api_clients' do
       member do
         get 'start'

db/migrate/20221222155625_drop_api_clients.rb

@@ -0,0 +1,9 @@
+class DropApiClients < ActiveRecord::Migration[6.1]
+  def up
+    drop_table :api_clients
+  end
+
+  def down
+    fail ActiveRecord::IrreversibleMigration
+  end
+end