experimental fix

google · Jan 13, 2020 · 5844cc2 · 5844cc2
1 parent b26807a
commit 5844cc2
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 16 deletions.
diff --git a/src/auth.ts b/src/auth.ts
@@ -244,7 +244,8 @@ async function authorizeWithLocalhost(
     });
     const authUrl = client.generateAuthUrl(oAuth2ClientAuthUrlOpts);
     console.log(LOG.AUTHORIZE(authUrl));
-    open(authUrl);
+    const escapeDoubleQuoteOnWindows = (url: string): string => process.platform === "win32" ? url.replace(/"/g, '%22') : url;
+    open(escapeDoubleQuoteOnWindows(authUrl));
   });
   server.close();
   return (await client.getToken(authCode)).tokens;

diff --git a/src/commands/apis.ts b/src/commands/apis.ts
@@ -22,9 +22,10 @@ export default async (options: { open?: string }) => {
   if (options.open) {
     const apisUrl = URL.APIS(await getProjectId());
     console.log(apisUrl);
-    await open(apisUrl);
-    process.exit();
-    // return;
+    const escapeDoubleQuoteOnWindows = (url: string): string => process.platform === "win32" ? url.replace(/"/g, '%22') : url;
+    await open(escapeDoubleQuoteOnWindows(apisUrl));
+    // process.exit();
+    return;
   }
 
   // The apis subcommands.

diff --git a/src/commands/logs.ts b/src/commands/logs.ts
@@ -36,9 +36,10 @@ export default async (cmd: {
   if (cmd.open) {
     const url = URL.LOGS(projectId);
     console.log(`Opening logs: ${url}`);
-    await open(url);
-    process.exit();
-    // return;
+    const escapeDoubleQuoteOnWindows = (url: string): string => process.platform === "win32" ? url.replace(/"/g, '%22') : url;
+    await open(escapeDoubleQuoteOnWindows(url));
+    // process.exit();
+    return;
   }
 
   // Otherwise, if not opening StackDriver, load StackDriver logs.

diff --git a/src/commands/openCmd.ts b/src/commands/openCmd.ts
@@ -32,19 +32,21 @@ export default async (
     const projectId = projectSettings.projectId;
     if (projectId) {
       console.log(LOG.OPEN_CREDS(projectId));
-      await open(URL.CREDS(projectId));
-      process.exit();
-      // return;
+      const escapeDoubleQuoteOnWindows = (url: string): string => process.platform === "win32" ? url.replace(/"/g, '%22') : url;
+      await open(escapeDoubleQuoteOnWindows(URL.CREDS(projectId)));
+      // process.exit();
+      return;
     }
     logError(null, ERROR.NO_GCLOUD_PROJECT);
   }
 
   // If we're not a web app, open the script URL.
   if (!cmd.webapp) {
     console.log(LOG.OPEN_PROJECT(scriptId));
-    await open(URL.SCRIPT(scriptId));
-    process.exit();
-    // return;
+    const escapeDoubleQuoteOnWindows = (url: string): string => process.platform === "win32" ? url.replace(/"/g, '%22') : url;
+    await open(escapeDoubleQuoteOnWindows(URL.SCRIPT(scriptId)));
+    // process.exit();
+    return;
   }
 
   // Web app: Otherwise, open the latest deployment.
@@ -86,9 +88,10 @@ export default async (
     console.log(LOG.OPEN_WEBAPP(answers.deployment.deploymentId));
     const target = getWebApplicationURL(deployment.data);
     if (target) {
-      await open(target, { wait: false });
-      process.exit();
-      // return;
+      const escapeDoubleQuoteOnWindows = (url: string): string => process.platform === "win32" ? url.replace(/"/g, '%22') : url;
+      await open(escapeDoubleQuoteOnWindows(target));
+      // process.exit();
+      return;
     } else {
       logError(null, `Could not open deployment: ${deployment}`);
     }