Wip on pivot to prod services

Author: gavinbarron

packages/mgt-chat/src/components/ManageChatMembers/ListChatMembers.tsx

@@ -21,7 +21,7 @@ interface ListChatMembersProps {
   closeParentPopover: () => void;
 }
 
-const RemovePerson = bundleIcon(Dismiss24Regular, () => null);
+const RemovePerson = bundleIcon(Dismiss24Regular, Dismiss24Regular);
 
 const ListChatMembers = ({ members, currentUserId, removeChatMember, closeParentPopover }: ListChatMembersProps) => {
   const [removeDialogOpen, setRemoveDialogOpen] = useState(false);
@@ -52,7 +52,7 @@ const ListChatMembers = ({ members, currentUserId, removeChatMember, closeParent
         <DialogSurface>
           <DialogBody>
             <DialogTitle>Remove {removeUser?.displayName || ''} from the conversation?</DialogTitle>
-            <DialogContent>They'll still have access to the chat history.</DialogContent>
+            <DialogContent>They&apos;ll still have access to the chat history.</DialogContent>
             <DialogActions>
               <Button appearance="secondary" onClick={closeDialog}>
                 Close

packages/mgt-chat/src/statefulClient/GraphConfig.ts

@@ -3,29 +3,26 @@ import { GraphEndpoint } from '@microsoft/mgt-element';
 export class GraphConfig {
   public static useCanary = false;
 
-  public static version = 'testprodbetaembedforteamswebsockets';
+  public static version = 'v1.0';
 
-  public static subscriptionConnectionVersion = 'testprodv1.0e2ewebsockets';
+  // public static subscriptionConnectionVersion = 'testprodv1.0e2ewebsockets';
 
   public static get graphEndpoint(): GraphEndpoint {
-    return GraphConfig.useCanary ? 'https://canary.graph.microsoft.com' : 'https://graph.microsoft.com';
-  }
-
-  private static get baseCanaryUrl() {
-    return `https://canary.graph.microsoft.com/${GraphConfig.version}`;
+    // return GraphConfig.useCanary ? 'https://canary.graph.microsoft.com' :
+    return 'https://graph.microsoft.com';
   }
 
   public static get subscriptionEndpoint(): string {
-    return GraphConfig.useCanary ? `${GraphConfig.baseCanaryUrl}/subscriptions` : '/subscriptions';
+    return '/subscriptions';
   }
 
-  public static adjustNotificationUrl(url: string): string {
-    let temp = url;
-    if (GraphConfig.useCanary && url) {
-      temp = url.replace('https://graph.microsoft.com/1.0', GraphConfig.baseCanaryUrl);
-      temp = temp.replace('https://graph.microsoft.com/beta', GraphConfig.baseCanaryUrl);
-    }
-    temp = temp.replace(GraphConfig.version, GraphConfig.subscriptionConnectionVersion);
-    return temp.replace('wss:', '');
-  }
+  // public static adjustNotificationUrl(url: string): string {
+  //   let temp = url;
+  //   if (GraphConfig.useCanary && url) {
+  //     temp = url.replace('https://graph.microsoft.com/1.0', GraphConfig.baseCanaryUrl);
+  //     temp = temp.replace('https://graph.microsoft.com/beta', GraphConfig.baseCanaryUrl);
+  //   }
+  //   temp = temp.replace(GraphConfig.version, GraphConfig.subscriptionConnectionVersion);
+  //   return temp.replace('wss:', '');
+  // }
 }

packages/mgt-chat/src/statefulClient/GraphNotificationClient.ts

@@ -5,7 +5,7 @@
  * -------------------------------------------------------------------------------------------
  */
 
-import { IGraph, Providers, error, log } from '@microsoft/mgt-element';
+import { BetaGraph, IGraph, Providers, error, log } from '@microsoft/mgt-element';
 import * as signalR from '@microsoft/signalr';
 import { ThreadEventEmitter } from './ThreadEventEmitter';
 import type { Subscription, ChatMessage, Chat, AadUserConversationMember } from '@microsoft/microsoft-graph-types';
@@ -43,16 +43,15 @@ export class GraphNotificationClient {
   private get graph() {
     return this._graph;
   }
+  private get beta() {
+    return BetaGraph.fromGraph(this._graph);
+  }
 
   /**
    *
    */
   constructor(private readonly emitter: ThreadEventEmitter, private readonly _graph: IGraph) {}
 
-  private get _publicKey() {
-    return 'LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tDQpNSUlGblRDQ0E0V2dBd0lCQWdJVUdJL1N3SDhjMDZ0NzB3VWtrTUxnN2UrN2hha3dEUVlKS29aSWh2Y05BUUVMDQpCUUF3WGpFTE1Ba0dBMVVFQmhNQ2RYTXhDekFKQmdOVkJBZ01BbmRoTVJBd0RnWURWUVFIREFkeVpXUnRiMjVrDQpNUkF3RGdZRFZRUUtEQWRqYjI1MGIzTnZNUXd3Q2dZRFZRUUxEQU5rWlhZeEVEQU9CZ05WQkFNTUIyMW5kQzVrDQpaWFl3SGhjTk1qTXdPREUzTVRnMU5UVTRXaGNOTWpRd09ERTJNVGcxTlRVNFdqQmVNUXN3Q1FZRFZRUUdFd0oxDQpjekVMTUFrR0ExVUVDQXdDZDJFeEVEQU9CZ05WQkFjTUIzSmxaRzF2Ym1ReEVEQU9CZ05WQkFvTUIyTnZiblJ2DQpjMjh4RERBS0JnTlZCQXNNQTJSbGRqRVFNQTRHQTFVRUF3d0hiV2QwTG1SbGRqQ0NBaUl3RFFZSktvWklodmNODQpBUUVCQlFBRGdnSVBBRENDQWdvQ2dnSUJBTFEyQnVKNWdwZ3RjMTYwM0hVMlMrUjBJaFlqOHRNd29UQ1FCc2pVDQpxVW44ZS9GRDduaUQ2ZGRpNWVvRzdXZkdHd2MrUnIzS0tYV3VDemJRQlJnb0xLZk8wbUdtVWFuaEt1a3JKYXBqDQpxYmoycDZReERYMTJCQjlORHVrQ1NEZy9ZdmdjeThTRHBEYTBSL3pyTE9UU2VTb0J1MzhzbGNEbmxBcDVMbTc3DQorTVVqNFV2cG5lWFIrOXRFUjFBQWQySVpZT1RTTFM2bllId2plUndtQ2FhV1VITHYrdnR2emQ3MUdiWmlUenBRDQpDNXNtS1dJUmVzM3VGOGoyb3hXcndJY042WVZuV3lQb3RXT2NNZEhSdmdyVDZSSjdQSCtkYmlMUlJ5OW1ORk94DQptbUJJY2ZxaWRSVHREZlFEYndNeExhNXArRlNvRW92QWhNUi9rUFRMaDkzSkkyZDJxVStEQnJnQkhYZ0dRSHZDDQo4TUZsaVBpVGJwZWJ3R09sbkNHQnZpdWp2cEJ2TUJscUhJU3RlTE0zOGwvUFRna1VsVmtrMURrdjgvRko5TlZHDQpZN2piUmV5ck4wbmlpcXRadHNUOVpNb1FQNnErdWpON0M1clA5NzdVQzlySnZ6TG9TcVhIVVh3SWhRVXUrd3dPDQpnYlBmTVpyZG1aT1NGRzMxSjQvT0tDRW0zMGNtZFR3VmdJeUJOUjNBTlJXUDdtVzdBakFsSmY5ckszVkZMK3FDDQpUM244RXlJcXVQRnVDd05uWGpWbXpQNzJZRU5MWEE4Y0lYczNFVGNDeE1VQjZ1RTlJY2hOK1ROemdpeklsNTVSDQpKa0RETFdoVmFlcHUzOFRpcldWTHI5TG8wZWRwemRMcmZoOHNXU3JJbjRYaVRTWE94d2VEMUNldW42MkRCSFl0DQpGSnMzQWdNQkFBR2pVekJSTUIwR0ExVWREZ1FXQkJScmhPQ0pZNUFUeWNTNkdhT3BwS3NscnlUWW5qQWZCZ05WDQpIU01FR0RBV2dCUnJoT0NKWTVBVHljUzZHYU9wcEtzbHJ5VFluakFQQmdOVkhSTUJBZjhFQlRBREFRSC9NQTBHDQpDU3FHU0liM0RRRUJDd1VBQTRJQ0FRQi8wRTZnd0lpMU1ESHkxc1hISFJQb2tYbVdkeFZ0YmY3YUw3elI3YllkDQpKaUVXRzEzc1J6SElFa3pETTMwUkRJT2xvZnRrbUM1bUM2R09XMmh2WTk4alMzQnM4Z0xIVktwNTU2NVpoT01mDQpheWVId0ZmK1NON1VMRDhMYVNsSTNqVkIydzlkZFFObjhHbm1oejBYckJqektOcEl0NzVyYXFaSGpXRGVwR3lxDQpkS1dsSXJ6RktSOVF6dVV4MzhTeDNxSzlaMWhRdHBQcXJ4U1R6dU92S1RzRDU4TXpMR1JEcUl3NHFmNkRxL2R0DQptTVdnRVEvNXFrMFI5b2pDNnRGYUhjVHFxZGYwSk8xcjNPYUxDTDVFMWtYNGl3WTdPSSs2K3k3NVR4ZjROZ0x1DQpLTGcyUWZrTGRLOXorS1JsQm1tWTI4Y0dOZHV5bmtzVFM3QnpyRHQzMjRSMEV0M0V5QzRzQzRlb2JyTGFTbi9ODQpKcU83S3VIaHdheE8wUmFnN0dPNTdZTWFpNy8yV0kxQ09vTlhFOTJUTEg5NXFuMFBJWWVtSlhEVmdsOE8ybzJBDQplcmU2R1JBQXc3UWFjSERpUjdFd1o5UnVwQldNTkFxbHpiNGRFNk13bzZtWkMwcDQrQng0MHZnb2hKbWtiNXhiDQozclJsME0wM0F6RmQwVWpqNGtLOGkzdy9ic0E4cDdMWUlIS3BjQkVjS3MzbGwvV2Y3UTlhVE1LS3NvTDNTdlpYDQpIT0xrS3pYbGc4K1l4blJKZ3ZoS2I4WmFQV3R1V25ZeG5oaUlYVk4yeVBqdjlzcU56NWVmWDJOTDByczhCV0Z4DQp2T0tUcCt5dnp2aVhDeVVpSW9LMFVacHpNTWlaY05LUEdOTHgxWkM4UDJVSTNENWwwL1IvWHo5UGtSTjVveFFzDQppZz09DQotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0t';
-  }
-
   private readonly getToken = async () => {
     const token = await Providers.globalProvider.getAccessToken();
     if (!token) throw new Error('Could not retrieve token for user');
@@ -156,12 +155,12 @@ export class GraphNotificationClient {
 
     log('subscribing to changes for ' + resourcePath);
     // send subscription POST to Graph
-    const subscription: Subscription = (await this.graph
+    const subscription: Subscription = (await this.beta
       .api(GraphConfig.subscriptionEndpoint)
       .post(subscriptionDefinition)) as Subscription;
     if (!subscription?.notificationUrl) throw new Error('Subscription not created');
     log(subscription);
-    subscription.notificationUrl = GraphConfig.adjustNotificationUrl(subscription.notificationUrl);
+    // subscription.notificationUrl = GraphConfig.adjustNotificationUrl(subscription.notificationUrl);
 
     const awaits: Promise<void>[] = [];
     // Cache the subscription in storage for re-hydration on page refreshes
@@ -298,7 +297,7 @@ export class GraphNotificationClient {
       if (someExpired) {
         await this.removeSubscriptions(cacheData.subscriptions);
       } else if (webSocketUrl) {
-        await this.createSignalRConnection(GraphConfig.adjustNotificationUrl(webSocketUrl));
+        await this.createSignalRConnection(webSocketUrl);
         await this.renewChatSubscriptions();
         return;
       }

samples/react-chat/src/index.tsx

@@ -11,7 +11,7 @@ brokerSettings.defaultSubscriptionLifetimeInMinutes = 7;
 brokerSettings.renewalThreshold = 65;
 brokerSettings.timerInterval = 15;
 
-GraphConfig.useCanary = true;
+// GraphConfig.useCanary = true;
 
 Providers.globalProvider = new Msal2Provider({
   baseURL: GraphConfig.graphEndpoint,