@vida-global/apps-tools 1.0.7 → 1.0.9

package/lib/apps/appManager/abstractAppManager.js

@@ -18,13 +18,13 @@ class AbstractAppManager {
 
 
     get attachedToAppServer() {
-        return this.constructor.name == 'AppServerAppManager';
+        return this.constructor.name === 'AppServerAppManager';
     }
 
 
     get providerManager() {
         if (!this.#providerManager) {
-            this.#providerManager = new ProviderManager(this.redisClient, this.attachedToAppServer);
+            this.#providerManager = new ProviderManager(this, this.redisClient, this.attachedToAppServer);
         }
         return this.#providerManager;
     }

package/lib/apps/appManager/vaderApiClient.js

@@ -52,19 +52,20 @@ class VaderApiClient extends HttpClient {
 
 
     async #invokeAction(actionType, responseCls, app, actionName, actionArgs, userContext) {
-        const endpoint = `/invoke/app/${actionType}/${app.id()}/${app.version()}/${actionName}`
+        const endpoint      = `/invoke/app/${actionType}/${app.id()}/${app.version()}/${actionName}`
+        const argsParamName = `${actionType}Args`;
         const body     = {
-            userContext: userContext?.toDict() || null,
-            appManifest: await app.getCompositeManifest(),
-            actionArgs,
+            userContext:     userContext?.toDict() || null,
+            appManifest:     await app.getCompositeManifest(),
+            [argsParamName]: actionArgs,
         };
 
         try {
             const { data } = await this.post(endpoint, userContext, body);
-            if (data.data) {
-                return data.data;
-            } else {
+            if (data.functionName) {
                 return data;
+            } else {
+                return data.data;
             }
         } catch(err) {
             const appResponse   = new responseCls();

package/lib/providers/provider.js

@@ -4,7 +4,7 @@ const { logger } = require('@vida-global/core');
 
 class BaseProviderConfigurator {
     constructor(userContext, redisClient, type, name,
-                globalProviderConfig, appId, appVersion) {
+                globalProviderConfig, appId, appVersion, appManager = null) {
         this.userContext = userContext;
         this.redis = redisClient;
         this.type = type;
@@ -13,6 +13,7 @@ class BaseProviderConfigurator {
         this.appId = appId;
         this.appVersion = appVersion;
         this.hasBuiltRoutes = false;
+        this.appManager = appManager;
     }
 
     async _initialize() {
@@ -41,7 +42,7 @@ class BaseProvider {
     constructor(
       userContext, redisClient, vanillaConfig = null,
       appId = null, appVersion = null,
-      isServer = false
+      isServer = false, appManager = null
     ) {
         this.userContext = userContext;
         this.redis = redisClient;
@@ -50,17 +51,18 @@ class BaseProvider {
         this.appId = appId;
         this.appVersion = appVersion;
         this.globalConfig = {};
+        this.appManager = appManager;
     }
 
     static async get(providerCls, {
         userContext, redisClient, vanillaConfig,
         appId, appVersion,
-        isServer = false
+        isServer = false, appManager
     }) {
         const provider = new providerCls(
             userContext, redisClient, vanillaConfig,
             appId, appVersion,
-            isServer
+            isServer, appManager
         );
         await provider._initialize();
         return provider
@@ -70,7 +72,7 @@ class BaseProvider {
         const configurator = new this.configurator(
           this.userContext, this.redis, this.type, this.name,
           this.globalConfig,
-          this.appId, this.appVersion,
+          this.appId, this.appVersion, this.appManager
         )
         await configurator._initialize()
         return configurator

package/lib/providers/providerManager.js

@@ -4,9 +4,11 @@ const { logger } = require('@vida-global/core')
 class ProviderManager {
     #isServer;
     #redisClient;
+    #appManager;
 
 
-    constructor(redisClient, isServer) {
+    constructor(appManager, redisClient, isServer) {
+        this.#appManager = appManager;
         this.#isServer    = isServer;
         this.#redisClient = redisClient;
     }
@@ -41,6 +43,7 @@ class ProviderManager {
                 vanillaConfig: vanillaConfig,
                 appId, appVersion,
                 isServer: this.#isServer,
+                appManager: this.#appManager
             }
         )
     }

package/lib/providers/providers/auth/hubspot/index.js

@@ -36,7 +36,7 @@ class HubspotOAuthConfigurator extends BaseProviderConfigurator {
     let ctx = this.userContext
     if (!ctx) {
       // Build a new user context using our own
-      ctx = new VaderUserContext(this)
+      ctx = new VaderUserContext(this.appManager)
       await ctx.load({ user })
     }
     let providerConfig = await ctx.getProviderConfig(
@@ -66,6 +66,7 @@ class HubspotOAuthConfigurator extends BaseProviderConfigurator {
       logger.warn('OAuth routes already built');
       return
     }
+    logger.info('Building OAuth routes')
 
     app.get(oAuthConfig.initiateOAuthUrl, async (req, res) => {
       let {redirectUri, finalUri, userId, appId, appVersion} = req.query;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@vida-global/apps-tools",
-    "version": "1.0.7",
+    "version": "1.0.9",
     "description": "Classes for creating vida apps",
     "author": "",
     "license": "ISC",