Hide Azure and Google from the admin gui

inverse-inc · Jun 29, 2021 · d6a60d9 · d6a60d9
1 parent 3d1cdf7
commit d6a60d9
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 87 deletions.
diff --git a/html/pfappserver/lib/pfappserver/Form/Config/Cloud/Azure.pm b/html/pfappserver/lib/pfappserver/Form/Config/Cloud/Azure.pm
@@ -14,46 +14,6 @@ use HTML::FormHandler::Moose;
 extends 'pfappserver::Form::Config::Cloud';
 with 'pfappserver::Base::Form::Role::Help';
 
-use pf::config;
-use pf::util;
-use File::Find qw(find);
-
-has_field 'tenant_id' =>
-  (
-   type => 'Text',
-   label => 'Tenant ID',
-   required => 1,
-   messages => { required => 'Please specify the Tenant ID for the Azure Service' },
-  );
-
-has_field 'client_id' =>
-  (
-   type => 'Text',
-   label => 'Client ID',
-   required => 1,
-   messages => { required => 'Please specify the Client ID for the Azure Service' },
-  );
-
-has_field 'client_secret' =>
-  (
-   type => 'ObfuscatedText',
-   label => 'Client Secret',
-   required => 1,
-   messages => { required => 'Please specify the Tenant ID for the Azure Service' },
-  );
-
-
-has_field 'type' =>
-  (
-   type => 'Hidden',
-   default => 'Azure',
-  );
-
-has_block definition =>
-  (
-   render_list => [ qw(id tenant_id client_id client_secret) ],
-  );
-
 =over
 
 =back

diff --git a/html/pfappserver/lib/pfappserver/Form/Config/Cloud/Google.pm b/html/pfappserver/lib/pfappserver/Form/Config/Cloud/Google.pm
@@ -14,46 +14,6 @@ use HTML::FormHandler::Moose;
 extends 'pfappserver::Form::Config::Cloud';
 with 'pfappserver::Base::Form::Role::Help';
 
-use pf::config;
-use pf::util;
-use File::Find qw(find);
-
-has_field 'tenant_id' =>
-  (
-   type => 'Text',
-   label => 'Tenant ID',
-   required => 1,
-   messages => { required => 'Please specify the Tenant ID for the Google Service' },
-  );
-
-has_field 'client_id' =>
-  (
-   type => 'Text',
-   label => 'Client ID',
-   required => 1,
-   messages => { required => 'Please specify the Client ID for the Google Service' },
-  );
-
-has_field 'client_secret' =>
-  (
-   type => 'ObfuscatedText',
-   label => 'Client Secret',
-   required => 1,
-   messages => { required => 'Please specify the Tenant ID for the Google Service' },
-  );
-
-
-has_field 'type' =>
-  (
-   type => 'Hidden',
-   default => 'Google',
-  );
-
-has_block definition =>
-  (
-   render_list => [ qw(id tenant_id client_id client_secret) ],
-  );
-
 =over
 
 =back

diff --git a/html/pfappserver/root/src/views/Configuration/_components/CloudsList.vue b/html/pfappserver/root/src/views/Configuration/_components/CloudsList.vue
@@ -11,8 +11,9 @@
       </template>
       <template v-slot:buttonAdd>
         <b-dropdown :text="$t('New Cloud')" variant="outline-primary">
-          <b-dropdown-item :to="{ name: 'newCloud', params: { cloudType: 'Azure' } }">Microsoft Azure</b-dropdown-item>
+<!--          <b-dropdown-item :to="{ name: 'newCloud', params: { cloudType: 'Azure' } }">Microsoft Azure</b-dropdown-item>
           <b-dropdown-item :to="{ name: 'newCloud', params: { cloudType: 'Google' } }">Google Cloud</b-dropdown-item>
+-->
           <b-dropdown-item :to="{ name: 'newCloud', params: { cloudType: 'Intune' } }">Microsoft Intune</b-dropdown-item>
         </b-dropdown>
       </template>

diff --git a/html/pfappserver/root/src/views/Configuration/clouds/_components/FormTypeAzure.vue b/html/pfappserver/root/src/views/Configuration/clouds/_components/FormTypeAzure.vue
@@ -10,21 +10,24 @@
       :disabled="!isNew && !isClone"
     />
 
+<!--
     <form-group-tenant-id namespace="tenant_id"
-      :column-label="$i18n.t('The tenant ID of the intune service')"
+      :column-label="$i18n.t('The tenant ID of the Azure service')"
       :text="$i18n.t('Define the tenant ID defined in the Azure admin portal.')"
     />
 
     <form-group-client-id namespace="client_id"
-      :column-label="$i18n.t('The client ID of the intune service')"
+      :column-label="$i18n.t('The client ID of the Azure service')"
       :text="$i18n.t('Define the client ID defined in the Azure admin portal.')"
     />
 
     <form-group-client-secret namespace="client_secret"
-      :column-label="$i18n.t('The client secret of the intune service')"
+      :column-label="$i18n.t('The client secret of the Azure service')"
       :text="$i18n.t('Define the client secret defined in the Azure admin portal.')"
     />
 
+-->
+
   </base-form>
 </template>
 <script>

diff --git a/html/pfappserver/root/src/views/Configuration/clouds/_components/FormTypeGoogle.vue b/html/pfappserver/root/src/views/Configuration/clouds/_components/FormTypeGoogle.vue
@@ -10,20 +10,22 @@
       :disabled="!isNew && !isClone"
     />
 
+<!--
     <form-group-tenant-id namespace="tenant_id"
-      :column-label="$i18n.t('The tenant ID of the intune service')"
+      :column-label="$i18n.t('The tenant ID of the Google service')"
       :text="$i18n.t('Define the tenant ID defined in the Azure admin portal.')"
     />
 
     <form-group-client-id namespace="client_id"
-      :column-label="$i18n.t('The client ID of the intune service')"
+      :column-label="$i18n.t('The client ID of the Google service')"
       :text="$i18n.t('Define the client ID defined in the Azure admin portal.')"
     />
 
     <form-group-client-secret namespace="client_secret"
-      :column-label="$i18n.t('The client secret of the intune service')"
+      :column-label="$i18n.t('The client secret of the Google service')"
       :text="$i18n.t('Define the client secret defined in the Azure admin portal.')"
     />
+-->
 
   </base-form>
 </template>