fix: check for valid connection (#428)

* fix: check for valid connection * refactor: remove unused import
microsoft · Jul 20, 2020 · 9cb6c58 · 9cb6c58
1 parent 162a766
commit 9cb6c58
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/src/providers/storage/azureBlobStorage.ts b/src/providers/storage/azureBlobStorage.ts
@@ -63,8 +63,13 @@ export class AzureBlobStorage implements IStorageProvider {
 
     public async isValidProjectConnection() {
         try {
-            await new ServiceURL(this.options.sas, StorageURL.newPipeline(this.getCredential())).getAccountInfo(Aborter.none);
-            return (true);
+            return await new ServiceURL(this.options.sas, StorageURL.newPipeline(this.getCredential())).getAccountInfo(Aborter.timeout(5000))
+            .then(() => {
+                return true;
+            })
+            .catch(() => {
+                return false;
+            })
         } catch {
             return (false);
         }

diff --git a/src/react/components/pages/homepage/homePage.tsx b/src/react/components/pages/homepage/homePage.tsx
@@ -178,7 +178,7 @@ export default class HomePage extends React.Component<IHomePageProps, IHomePageS
             let projectStr: string;
             try {
                 const projectService = new ProjectService();
-                if (!(await projectService.isValidProjectConnection(project))) {
+                if (!(await projectService.isValidProjectConnection(decryptedProject))) {
                     return;
                 }
                 projectStr = await storageProvider.readText(

diff --git a/src/services/projectService.ts b/src/services/projectService.ts
@@ -161,7 +161,12 @@ export default class ProjectService implements IProjectService {
 
     public async isValidProjectConnection(project: IProject): Promise<boolean> {
         const storageProvider = StorageProviderFactory.createFromConnection(project.sourceConnection);
-        const isValid = await storageProvider.isValidProjectConnection();
+        let isValid;
+        try {
+            isValid = await storageProvider.isValidProjectConnection();
+        } catch {
+            isValid = false;
+        }
         if (!isValid) {
             if (project.sourceConnection.providerType === "localFileSystemProxy") {
                 await toast.error(interpolate(strings.connections.providers.local.invalidFolderMessage, {project}));