Merge pull request #326 from opticdev/final-fixes8_3_0

Getting Ready for 8.3.0
opticdev · Aug 28, 2020 · c1c5134 · c1c5134
2 parents 45f0f04 + 6e690af
commit c1c5134
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/workspaces/cli-server/src/server.ts b/workspaces/cli-server/src/server.ts
@@ -65,7 +65,7 @@ class CliServer {
     origin: [
       // this needs to be made exclusive in prod
       'http://localhost:4005',
-      'http://app.o3c.info',
+      'https://app.o3c.info',
       'https://app.useoptic.com',
     ],
   };

diff --git a/workspaces/local-cli/src/commands/login.ts b/workspaces/local-cli/src/commands/login.ts
@@ -36,14 +36,15 @@ export default class Login extends Command {
       cli.action.start('Waiting to be authenticated...');
 
       let token: string;
-      setTimeout(() => {
+      const fallbackTimeout = setTimeout(() => {
         if (!token) {
           const launchUrl = `${loginBaseUrl}/login`;
           this.log(`Please log in at ${launchUrl}`);
           cli.open(launchUrl); //reload tab behavior is actually undesirable here
         }
       }, 5000);
       token = await tokenReceived;
+      clearTimeout(fallbackTimeout);
       await setCredentials({ token });
       cli.action.stop('Received Credentials');