Merge pull request #47 from kubenav/improve-required-data-checks

Improve required data checks
kubenav · Mar 11, 2020 · 5cf1f26 · 5cf1f26
2 parents 291cccf + 7c953df
commit 5cf1f26
Show file tree

Hide file tree

Showing 6 changed files with 53 additions and 23 deletions.
diff --git a/src/components/settings/ClustersPage.tsx b/src/components/settings/ClustersPage.tsx
@@ -27,7 +27,6 @@ const ClustersPage: React.FunctionComponent = () => {
           </IonButtons>
           <IonTitle>Clusters</IonTitle>
           {isPlatform('hybrid') ? <AddCluster /> : null}
-          <AddCluster />
         </IonToolbar>
       </IonHeader>
       <IonContent>

diff --git a/src/components/settings/clusters/aws/AWS.tsx b/src/components/settings/clusters/aws/AWS.tsx
@@ -10,6 +10,7 @@ import {
   IonList,
   IonSelect,
   IonSelectOption,
+  IonToast,
 } from '@ionic/react';
 import React, { useState } from 'react';
 
@@ -20,6 +21,7 @@ const AWS: React.FunctionComponent = () => {
   const [accessKeyID, setAccessKeyID] = useState<string>('');
   const [region, setRegion] = useState<string>('');
   const [secretKey, setSecretKey] = useState<string>('');
+  const [error, setError] = useState<string>('');
 
   const handleAccessKeyID = (event) => {
     setAccessKeyID(event.target.value);
@@ -34,16 +36,20 @@ const AWS: React.FunctionComponent = () => {
   };
 
   const importClusters = () => {
-    let tokens: IAWSTokens = readAWSTokens();
+    if (accessKeyID === '' || region === '' || secretKey === '') {
+      setError('Access Key ID, Secret Key and Region are required.');
+    } else {
+      let tokens: IAWSTokens = readAWSTokens();
 
-    tokens[region] = {
-      accessKeyID: accessKeyID,
-      secretKey: secretKey,
-    };
+      tokens[region] = {
+        accessKeyID: accessKeyID,
+        secretKey: secretKey,
+      };
 
-    saveAWSTokens(tokens);
+      saveAWSTokens(tokens);
 
-    window.location.replace(`/settings/clusters/aws/${region}`);
+      window.location.replace(`/settings/clusters/aws/${region}`);
+    }
   };
 
   return (
@@ -103,6 +109,8 @@ const AWS: React.FunctionComponent = () => {
 
         <IonButton expand="block" onClick={() => importClusters()}>Import from AWS</IonButton>
       </IonCardContent>
+
+      <IonToast isOpen={error !== ''} onDidDismiss={() => setError('')} message={error} duration={3000} />
     </IonCard>
   );
 };

diff --git a/src/components/settings/clusters/azure/Azure.tsx b/src/components/settings/clusters/azure/Azure.tsx
@@ -7,7 +7,7 @@ import {
   IonInput,
   IonItem,
   IonLabel,
-  IonList, IonToggle,
+  IonList, IonToast, IonToggle,
 } from '@ionic/react';
 import React, { useState } from 'react';
 
@@ -20,6 +20,7 @@ const Azure: React.FunctionComponent = () => {
   const [tenantID, setTenantID] = useState<string>('');
   const [resourceGroupName, setResourceGroupName] = useState<string>('');
   const [admin, setAdmin] = useState<boolean>(false);
+  const [error, setError] = useState<string>('');
 
   const handleSubscriptionID = (event) => {
     setSubscriptionID(event.target.value);
@@ -46,16 +47,26 @@ const Azure: React.FunctionComponent = () => {
   };
 
   const importClusters = () => {
-    saveAzureCredentials({
-      subscriptionID: subscriptionID,
-      clientID: clientID,
-      clientSecret: clientSecret,
-      tenantID: tenantID,
-      resourceGroupName: resourceGroupName,
-      admin: admin,
-    });
-
-    window.location.replace(`/settings/clusters/azure`);
+    if (
+      subscriptionID === ''
+      || clientID === ''
+      || clientSecret === ''
+      || tenantID === ''
+      || resourceGroupName === ''
+    ) {
+      setError('Subscription ID, Client ID, Client Secret, Tenant ID and Resource Group Name are required.');
+    } else {
+      saveAzureCredentials({
+        subscriptionID: subscriptionID,
+        clientID: clientID,
+        clientSecret: clientSecret,
+        tenantID: tenantID,
+        resourceGroupName: resourceGroupName,
+        admin: admin,
+      });
+
+      window.location.replace(`/settings/clusters/azure`);
+    }
   };
 
   return (
@@ -104,6 +115,8 @@ const Azure: React.FunctionComponent = () => {
 
         <IonButton expand="block" onClick={() => importClusters()}>Import from Azure</IonButton>
       </IonCardContent>
+
+      <IonToast isOpen={error !== ''} onDidDismiss={() => setError('')} message={error} duration={3000} />
     </IonCard>
   );
 };

diff --git a/src/components/settings/clusters/google/Google.tsx b/src/components/settings/clusters/google/Google.tsx
@@ -8,6 +8,7 @@ import {
   IonItem,
   IonLabel,
   IonList,
+  IonToast,
 } from '@ionic/react';
 import React, { useState } from 'react';
 
@@ -16,12 +17,21 @@ import { saveGoogleClientID } from '../../../../utils/storage';
 
 const Google: React.FunctionComponent = () => {
   const [clientID, setClientID] = useState<string>('');
+  const [error, setError] = useState<string>('');
 
   const handleClientID = (event) => {
     setClientID(event.target.value);
     saveGoogleClientID(event.target.value);
   };
 
+  const handleSignIn = () => {
+    if (clientID === '') {
+      setError('Client ID is required.')
+    } else {
+      window.location.replace(`${GOOGLE_OAUTH2_ENDPOINT}?client_id=${clientID}&redirect_uri=${GOOGLE_REDIRECT_URI}&response_type=${GOOGLE_RESPONSE_TYPE}&scope=${GOOGLE_SCOPE}`);
+    }
+  };
+
   return (
     <IonCard>
       <div className="card-header-image">
@@ -47,8 +57,10 @@ const Google: React.FunctionComponent = () => {
           </IonItem>
         </IonList>
 
-        <IonButton expand="block" href={`${GOOGLE_OAUTH2_ENDPOINT}?client_id=${clientID}&redirect_uri=${GOOGLE_REDIRECT_URI}&response_type=${GOOGLE_RESPONSE_TYPE}&scope=${GOOGLE_SCOPE}`} target="_blank" rel="noopener noreferrer">Sign In with Google</IonButton>
+        <IonButton expand="block" onClick={() => handleSignIn()}>Sign In with Google</IonButton>
       </IonCardContent>
+
+      <IonToast isOpen={error !== ''} onDidDismiss={() => setError('')} message={error} duration={3000} />
     </IonCard>
   );
 };

diff --git a/src/components/settings/clusters/kubeconfig/KubeconfigPage.tsx b/src/components/settings/clusters/kubeconfig/KubeconfigPage.tsx
@@ -72,7 +72,7 @@ const KubeconfigPage: React.FunctionComponent<IKubeconfigPageProps> = ({ history
           const cluster = getKubeconfigCluster(ctx.context.cluster, config.clusters);
           const user = getKubeconfigUser(ctx.context.user, config.users);
 
-          if (ctx.name === '' || cluster === null || user === null || !cluster.server || !cluster['certificate-authority-data'] || !((user['client-certificate-data'] && user['client-key-data']) || user.token || !(user.username && user.password))) {
+          if (ctx.name === '' || cluster === null || user === null || !cluster.server || !((user['client-certificate-data'] && user['client-key-data']) || user.token || !(user.username && user.password))) {
             throw new Error('Invalid kubeconfig');
           }
 

diff --git a/src/components/settings/clusters/manual/ManualPage.tsx b/src/components/settings/clusters/manual/ManualPage.tsx
@@ -73,8 +73,6 @@ const ManualPage: React.FunctionComponent<IManualPageProps> = ({ history }) => {
       setError('Server is required')
     } else if (!url.startsWith('https://')) {
       setError('Invalid URL')
-    } else if (certificateAuthorityData === '') {
-      setError('Certificate Authority Data is required')
     } else if (clientCertificateData === '' && clientKeyData === '' && token === '' && username === '' && password === '') {
       setError('Client Certificate Data and Client Key Data or Token or Username and Password is required')
     } else {