fix: session refresh (#85)

Author: rentallect

src/client.js

@@ -621,6 +621,19 @@ zitiFetch = async ( url, opts ) => {
 
   if (url.match( regex )) { // the request is targeting the Ziti HTTP Agent
 
+    let updb = new ZitiUPDB(ZitiUPDB.prototype);
+    await updb.init( { ctx: ziti._ctx, logger: ziti._ctx.logger } );
+    let haveCreds = await updb._haveCreds();
+    if (!haveCreds) {
+      await updb.awaitCredentialsAndAPISession();
+    } else {
+      // Remain in this loop until the creds entered on login form are acceptable to the Ziti Controller
+      let validCreds;
+      do {
+        validCreds = await ziti._ctx.ensureAPISession();
+      } while ( !validCreds );
+    }
+
     var newUrl = new URL( url );
     newUrl.hostname = zitiConfig.httpAgent.target.host;
     newUrl.port = zitiConfig.httpAgent.target.port;

src/context/context.js

@@ -281,8 +281,7 @@ ZitiContext.prototype._awaitIdentityLoadCompleteFromServiceWorker = async functi
 
     if (!isUndefined(res.error)) {
       self.logger.error(res.error.message);
-      resolve( false );
-      return;
+      return resolve( false );
     }
 
     self._apiSession = res.data;
@@ -293,7 +292,7 @@ ZitiContext.prototype._awaitIdentityLoadCompleteFromServiceWorker = async functi
 
     await ls.setWithExpiry(zitiConstants.get().ZITI_API_SESSION_TOKEN, self._apiSession, new Date( Date.parse( self._apiSession.expiresAt )));
 
-    resolve( true );
+    return resolve( true );
   });
 }
 

src/updb/updb.js

@@ -171,6 +171,10 @@ ZitiUPDB.prototype.promptForCreds = async function() {
       expiry.setMinutes(expiry.getMinutes()+5);
       await ls.setWithExpiry(zitiConstants.get().ZITI_IDENTITY_USERNAME, self._loginFormValues.username, expiry );
       await ls.setWithExpiry(zitiConstants.get().ZITI_IDENTITY_PASSWORD, self._loginFormValues.password, expiry );
+
+      // if we're restarting with updb, then purge any existing API session & cert
+      await ls.removeItem( zitiConstants.get().ZITI_API_SESSION_TOKEN );
+      await ls.removeItem( zitiConstants.get().ZITI_CLIENT_CERT_PEM );  
     });
 
     MicroModal.init({