Add optional conversation ref parameter to send and fix tenant app graph token during app.process (#291)

1. Just tested out `send` for the group oauth scenario, and we need to
plumb conversation ref through to `send` for this to work.
2. Also tested out the app-graph scenario, and it was defaulting to
using `this._tokens.graph?.toString()` which wasn't working in calling
graph successfully.

Tested both scenarios now, and both are working correctly now.

Author: heyitsaamir

packages/apps/src/app.process.ts

@@ -124,11 +124,11 @@ export async function $process<TPlugin extends IPlugin>(
   }
 
   const send = context.send.bind(context);
-  context.send = async (activity: ActivityLike) => {
-    const res = await send(activity);
+  context.send = async (activity: ActivityLike, conversationRef?: ConversationReference) => {
+    const res = await send(activity, conversationRef);
 
     this.onActivitySent(sender, {
-      ...ref,
+      ...(conversationRef ?? ref),
       sender,
       activity: res,
     });

packages/apps/src/app.ts

@@ -535,17 +535,19 @@ export class App<TPlugin extends IPlugin = IPlugin> {
     return res.token;
   }
 
-  protected async getOrRefreshTenantToken(tenantId?: string) {
+  protected async getOrRefreshTenantToken(tenantId: string) {
     let appToken =
-      this.tenantTokens.get(tenantId || 'common') || this._tokens.graph?.toString();
-    if (this.credentials && !appToken) {
+      this.tenantTokens.get(tenantId);
+    if (this.credentials && !this.tenantTokens.get(tenantId)) {
       const { access_token } = await this.api.bots.token.getGraph({
         ...this.credentials,
         tenantId: tenantId,
       });
 
+      this.log.debug(`refreshing tenant token for ${tenantId}`);
+
       appToken = access_token;
-      this.tenantTokens.set(tenantId || 'common', access_token);
+      this.tenantTokens.set(tenantId, access_token);
     }
 
     return appToken;

packages/apps/src/contexts/activity.ts

@@ -126,8 +126,9 @@ export interface IActivityContext<T extends Activity = Activity>
   /**
    * send an activity to the conversation
    * @param activity activity to send
+   * @param conversationRef optional conversation reference to send the activity to. By default, it will use the activity's conversation reference.
    */
-  send: (activity: ActivityLike) => Promise<SentActivity>;
+  send: (activity: ActivityLike, conversationRef?: ConversationReference) => Promise<SentActivity>;
 
   /**
    * reply to the inbound activity
@@ -199,8 +200,8 @@ export class ActivityContext<T extends Activity = Activity>
     }
   }
 
-  async send(activity: ActivityLike) {
-    return await this._plugin.send(toActivityParams(activity), this.ref);
+  async send(activity: ActivityLike, conversationRef?: ConversationReference) {
+    return await this._plugin.send(toActivityParams(activity), conversationRef ?? this.ref);
   }
 
   async reply(activity: ActivityLike) {
@@ -286,7 +287,7 @@ export class ActivityContext<T extends Activity = Activity>
             ],
           }),
         ],
-      }
+      }, convo
     );
   }