Lyubo Marinov 8 лет назад
Родитель
Сommit
5e01abf6fb

+ 2
- 0
react/features/app/middleware.js Просмотреть файл

1
+// @flow
2
+
1
 import { SET_ROOM } from '../base/conference';
3
 import { SET_ROOM } from '../base/conference';
2
 import {
4
 import {
3
     CONNECTION_ESTABLISHED,
5
     CONNECTION_ESTABLISHED,

+ 3
- 3
react/features/base/connection/actions.native.js Просмотреть файл

1
-/* @flow */
1
+// @flow
2
 
2
 
3
 import _ from 'lodash';
3
 import _ from 'lodash';
4
 import type { Dispatch } from 'redux';
4
 import type { Dispatch } from 'redux';
263
         const state = getState();
263
         const state = getState();
264
         const { conference, joining } = state['features/base/conference'];
264
         const { conference, joining } = state['features/base/conference'];
265
 
265
 
266
-        // The conference we are joining or have already joined.
266
+        // The conference we have already joined or are joining.
267
         const conference_ = conference || joining;
267
         const conference_ = conference || joining;
268
 
268
 
269
         // Promise which completes when the conference has been left and the
269
         // Promise which completes when the conference has been left and the
286
         // Disconnect the connection.
286
         // Disconnect the connection.
287
         const { connecting, connection } = state['features/base/connection'];
287
         const { connecting, connection } = state['features/base/connection'];
288
 
288
 
289
-        // The connection we are connecting or have already connected.
289
+        // The connection we have already connected or are connecting.
290
         const connection_ = connection || connecting;
290
         const connection_ = connection || connecting;
291
 
291
 
292
         if (connection_) {
292
         if (connection_) {

+ 2
- 5
react/features/base/jwt/middleware.js Просмотреть файл

179
     const result = next(action);
179
     const result = next(action);
180
 
180
 
181
     const { locationURL } = getState()['features/base/connection'];
181
     const { locationURL } = getState()['features/base/connection'];
182
-    let jwt;
183
 
182
 
184
-    if (locationURL) {
185
-        jwt = parseJWTFromURLParams(locationURL);
186
-    }
187
-    dispatch(setJWT(jwt));
183
+    dispatch(
184
+        setJWT(locationURL ? parseJWTFromURLParams(locationURL) : undefined));
188
 
185
 
189
     return result;
186
     return result;
190
 }
187
 }

Загрузка…
Отмена
Сохранить