瀏覽代碼

code review

j8
Tudor-Ovidiu Avram 3 年之前
父節點
當前提交
0ab905bf75
共有 1 個檔案被更改,包括 10 行新增6 行删除
  1. 10
    6
      react/features/jaas/middleware.web.js

+ 10
- 6
react/features/jaas/middleware.web.js 查看文件

3
 import { CONNECTION_FAILED } from '../base/connection';
3
 import { CONNECTION_FAILED } from '../base/connection';
4
 import { JitsiConnectionErrors } from '../base/lib-jitsi-meet';
4
 import { JitsiConnectionErrors } from '../base/lib-jitsi-meet';
5
 import { MiddlewareRegistry } from '../base/redux';
5
 import { MiddlewareRegistry } from '../base/redux';
6
+import { isVpaasMeeting } from '../billing-counter/functions';
6
 
7
 
7
 import { SET_DETAILS } from './actionTypes';
8
 import { SET_DETAILS } from './actionTypes';
8
 import { getCustomerDetails } from './actions';
9
 import { getCustomerDetails } from './actions';
9
 import { STATUSES } from './constants';
10
 import { STATUSES } from './constants';
10
 
11
 
11
-const redirectErrors = [
12
-    JitsiConnectionErrors.CONNECTION_DROPPED_ERROR,
13
-    JitsiConnectionErrors.PASSWORD_REQUIRED
14
-];
15
-
16
 /**
12
 /**
17
  * The redux middleware for jaas.
13
  * The redux middleware for jaas.
18
  *
14
  *
29
     case CONNECTION_FAILED: {
25
     case CONNECTION_FAILED: {
30
         const { error } = action;
26
         const { error } = action;
31
 
27
 
32
-        if (error && redirectErrors.includes(error.name)) {
28
+        if (!isVpaasMeeting(store.getState()) || !error) {
29
+            break;
30
+        }
31
+
32
+        if (error.name === JitsiConnectionErrors.PASSWORD_REQUIRED) {
33
+            if (error.message !== 'could not obtain public key') {
34
+                break;
35
+            }
36
+
33
             store.dispatch(redirectToStaticPage('/static/planLimit.html'));
37
             store.dispatch(redirectToStaticPage('/static/planLimit.html'));
34
         }
38
         }
35
         break;
39
         break;

Loading…
取消
儲存