fix: Meeting.ts name issue (#1642)

* fix: move meeting.ts * fix: rename meeting.ts to Meeting.ts * sync with a38a9
ringcentral · Aug 18, 2020 · 2bb4993 · 2bb4993
1 parent 8f052a2
commit 2bb4993
Showing 1 changed file with 10 additions and 6 deletions.
diff --git a/...al-integration/modules/Meeting/meeting.ts → ...al-integration/modules/Meeting/Meeting.ts b/...al-integration/modules/Meeting/meeting.ts → ...al-integration/modules/Meeting/Meeting.ts
@@ -423,10 +423,11 @@ export class Meeting extends RcModule<Record<string, any>, MeetingActionTypes> {
       requirePasswordForPmiMeetings: lockedRequirePasswordForPmiMeetings,
     } = this.scheduleLockedSettings;
 
-    if (requirePasswordForPmiMeetings === PMIRequirePassword.JBH_ONLY) {
-      if (lockedRequirePasswordForPmiMeetings) {
-        processedMeeting._lockRequireMeetingPassword = allowJoinBeforeHost;
-      }
+    if (
+      lockedRequirePasswordForPmiMeetings &&
+      requirePasswordForPmiMeetings === PMIRequirePassword.JBH_ONLY
+    ) {
+      processedMeeting._lockRequireMeetingPassword = allowJoinBeforeHost;
       if (allowJoinBeforeHost) {
         processedMeeting._requireMeetingPassword = true;
       }
@@ -437,8 +438,11 @@ export class Meeting extends RcModule<Record<string, any>, MeetingActionTypes> {
 
   @proxify
   private async fetchPersonalMeeting(): Promise<MeetingInfoResponse> {
-    const serviceInfo = await this.getMeetingServiceInfo();
-    const personalMeetingId = serviceInfo.externalUserInfo.personalMeetingId;
+    let personalMeetingId = this.personalMeeting && this.personalMeeting.id;
+    if (!personalMeetingId) {
+      const serviceInfo = await this.getMeetingServiceInfo();
+      personalMeetingId = serviceInfo.externalUserInfo.personalMeetingId;
+    }
     const meetingInfoResponse = await this.getMeeting(personalMeetingId);
     return meetingInfoResponse;
   }