@placetime/corptime-conference 1.0.10 → 1.0.11

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@placetime/corptime-conference",
-    "version": "1.0.10",
+    "version": "1.0.11",
     "description": "React Native SDK from Corptime-Conference",
     "main": "index.tsx",
     "license": "Apache-2.0",

package/react/features/app/actions.native.ts

@@ -1,4 +1,4 @@
-import { SET_ROOM_NAME } from '../base/conference/actionTypes';
+import { SET_ROOM_INFO } from '../base/conference/actionTypes';
 import { setRoom } from '../base/conference/actions';
 import { getConferenceState } from '../base/conference/functions';
 import {
@@ -36,6 +36,9 @@ import { maybeRedirectToTokenAuthUrl } from './actions.any';
 import { addTrackStateToURL, getDefaultURL } from './functions.native';
 import logger from './logger';
 import { IReloadNowOptions, IStore } from './types';
+import {doGetJSON} from "../base/util/httpUtils";
+import {setRoomInfo} from "../base/conference/actions.any";
+import {basePageVisibilityChanged, conferenceNotFoundVisibilityChanged} from "../overlay/actions.web";
 
 export * from './actions.any';
 
@@ -153,26 +156,37 @@ export function appNavigate(uri?: string, options: IReloadNowOptions = {}) {
 
         dispatch(setLocationURL(locationURL));
         dispatch(setConfig(config));
-        dispatch(setRoom(room));
 
-        if (!room) {
-            goBackToRoot(getState(), dispatch);
-
-            return;
-        }
-
-        dispatch(createDesiredLocalTracks());
-        dispatch(clearNotifications());
-
-        if (!options.hidePrejoin && isPrejoinPageEnabled(getState())) {
-            if (isUnsafeRoomWarningEnabled(getState()) && isInsecureRoomName(room)) {
-                navigateRoot(screen.unsafeRoomWarning);
-            } else {
-                navigateRoot(screen.preJoin);
-            }
+        if (room) {
+            const backendApi = config.hosts?.backendGuestApi || "https://jitsi.dev.placetime.host/backend/api";
+            doGetJSON(backendApi + "/v2/guest/conferences/rooms/info?cid=" + encodeURIComponent(room)).then(res => {
+                if (res.data) {
+                    dispatch(setRoomInfo(res.data));
+                    dispatch(setRoom(room));
+
+                    dispatch(createDesiredLocalTracks());
+                    dispatch(clearNotifications());
+
+                    if (!options.hidePrejoin && isPrejoinPageEnabled(getState())) {
+                        if (isUnsafeRoomWarningEnabled(getState()) && isInsecureRoomName(room)) {
+                            navigateRoot(screen.unsafeRoomWarning);
+                        } else {
+                            navigateRoot(screen.preJoin);
+                        }
+                    } else {
+                        dispatch(connect());
+                        navigateRoot(screen.conference.root);
+                    }
+                } else {
+                    goBackToRoot(getState(), dispatch);
+                    return;
+                }
+            }).catch(() => {
+                goBackToRoot(getState(), dispatch);
+                return;
+            });
         } else {
-            dispatch(connect());
-            navigateRoot(screen.conference.root);
+            goBackToRoot(getState(), dispatch);
         }
     };
 }

package/react/features/app/actions.web.ts

@@ -1,6 +1,6 @@
 // @ts-expect-error
 import { API_ID } from '../../../modules/API';
-import { setRoom, setRoomNameGlobal } from '../base/conference/actions.web';
+import { setRoom, setRoomInfo } from '../base/conference/actions.web';
 import {
     configWillLoad,
     setConfig
@@ -79,13 +79,13 @@ export function appNavigate(uri?: string) {
         dispatch(configWillLoad(locationURL, room));
 
         const config = await loadConfig();
-        dispatch(setLocationURL(locationURL));
         dispatch(setConfig(config));
+        dispatch(setLocationURL(locationURL));
         if (room) {
-            const backendApi = config.hosts?.backendGuestApi || "https://jitsi.dev.placetime.host/backend/api/v2/guest";
-            doGetJSON(backendApi + "/conferences/rooms/info?cid=" + encodeURIComponent(room)).then(res => {
-                if (res.data.name) {
-                    dispatch(setRoomNameGlobal(res.data.name));
+            const backendApi = config.hosts?.backendGuestApi || "https://jitsi.dev.placetime.host/backend/api";
+            doGetJSON(backendApi + "/v2/guest/conferences/rooms/info?cid=" + encodeURIComponent(room)).then(res => {
+                if (res.data) {
+                    dispatch(setRoomInfo(res.data));
                     dispatch(setRoom(room));
                     dispatch(conferenceNotFoundVisibilityChanged(false));
                 } else {

package/react/features/app/components/App.native.tsx

@@ -14,7 +14,6 @@ import DimensionsDetector from '../../base/responsive-ui/components/DimensionsDe
 import { updateSettings } from '../../base/settings/actions';
 import JitsiThemePaperProvider from '../../base/ui/components/JitsiThemeProvider.native';
 import { isEmbedded } from '../../base/util/embedUtils.native';
-import { setRoomNameGlobal } from '../../base/conference/actions.any';
 import { _getRouteToRender } from '../getRouteToRender.native';
 import logger from '../logger';
 
@@ -149,7 +148,6 @@ export class App extends AbstractApp<IProps> {
                 if (ready) {
                     clearInterval(i);
                     resolve();
-                    dispatch?.(setRoomNameGlobal(this.props.url.roomName));
                 }
             }, 50);
         });

package/react/features/base/conference/actionTypes.ts

@@ -330,11 +330,11 @@ export const SET_ROOM = 'SET_ROOM';
 * Default string type room name.
 *
 * {
-*     type: SET_ROOM_NAME,
+*     type: SET_ROOM_INFO,
 *     room: string
 * }
 */
-export const SET_ROOM_NAME = 'SET_ROOM_NAME';
+export const SET_ROOM_INFO = 'SET_ROOM_INFO';
 
 /**
  * The type of (redux) action which updates the current known status of the

package/react/features/base/conference/actions.any.ts

@@ -63,7 +63,7 @@ import {
     SET_PASSWORD_FAILED,
     SET_PENDING_SUBJECT_CHANGE,
     SET_ROOM,
-    SET_ROOM_NAME,
+    SET_ROOM_INFO,
     SET_START_MUTED_POLICY,
     SET_START_REACTIONS_MUTED,
     UPDATE_CONFERENCE_METADATA
@@ -974,10 +974,10 @@ export function setRoom(room?: string) {
     };
 }
 
-export function setRoomNameGlobal(roomName: string) {
+export function setRoomInfo(roomInfo: any) {
     return {
-        type: SET_ROOM_NAME,
-        roomName,
+        type: SET_ROOM_INFO,
+        roomInfo,
     }
 }
 

package/react/features/base/conference/reducer.ts

@@ -30,7 +30,7 @@ import {
     SET_PASSWORD,
     SET_PENDING_SUBJECT_CHANGE,
     SET_ROOM,
-    SET_ROOM_NAME,
+    SET_ROOM_INFO,
     SET_START_MUTED_POLICY,
     SET_START_REACTIONS_MUTED,
     UPDATE_CONFERENCE_METADATA
@@ -194,6 +194,7 @@ export interface IConferenceState {
     properties?: object;
     room?: string;
     roomName?: string;
+    roomInfo?: any;
     startAudioMutedPolicy?: boolean;
     startReactionsMuted?: boolean;
     startVideoMutedPolicy?: boolean;
@@ -293,8 +294,8 @@ ReducerRegistry.register<IConferenceState>('features/base/conference',
 
         case SET_ROOM:
             return _setRoom(state, action);
-        case SET_ROOM_NAME:
-             return _setRoomName(state, action);
+        case SET_ROOM_INFO:
+             return _setRoomInfo(state, action);
         case SET_START_MUTED_POLICY:
             return {
                 ...state,
@@ -694,8 +695,8 @@ function _setRoom(state: IConferenceState, action: AnyAction) {
     });
 }
 
-function _setRoomName(state: IConferenceState, action: AnyAction) {
-    let { roomName } = action;
+function _setRoomInfo(state: IConferenceState, action: AnyAction) {
+    let { roomInfo } = action;
 
     /**
      * The name of the room of the conference (to be) joined.
@@ -704,6 +705,7 @@ function _setRoomName(state: IConferenceState, action: AnyAction) {
      */
     return assign(state, {
         error: undefined,
-        roomName
+        roomName: roomInfo.name,
+        roomInfo: roomInfo
     });
 }

package/react/features/base/config/functions.any.ts

@@ -219,7 +219,7 @@ export function getWhitelistedJSON(configName: 'interfaceConfig' | 'config', con
  */
 export function isNameReadOnly(state: IReduxState): boolean {
     return Boolean(state['features/base/config'].disableProfile
-        || state['features/base/config'].readOnlyName);
+        || state['features/base/config'].readOnlyName || state['features/base/jwt'].user?.name);
 }
 
 /**

package/react/features/base/jwt/middleware.ts

@@ -111,6 +111,13 @@ function _overwriteLocalParticipant(
     }
 }
 
+function getCookie(name: string): string | undefined {
+    const matches = document.cookie.match(new RegExp(
+        "(?:^|; )" + name.replace(/([.$?*|{}()[]\/+^])/g, '\\$1') + "=([^;]*)"
+    ));
+    return matches ? matches[1] : undefined;
+}
+
 /**
  * Notifies the feature jwt that the action {@link SET_CONFIG} or
  * {@link SET_LOCATION_URL} is being dispatched within a specific redux
@@ -132,15 +139,16 @@ function _setConfigOrLocationURL({ dispatch, getState }: IStore, next: Function,
 
     const { locationURL } = getState()['features/base/connection'];
 
-    let jwt = locationURL ? parseJWTFromURLParams(locationURL) : undefined;
-    if (jwt) {
-        jitsiLocalStorage.setItem('jwt', jwt ?? '');
-    } else {
-        jwt = jitsiLocalStorage.getItem('jwt');
+    let jwt = getCookie('jwt');
+    if (!jwt) {
+        jwt = locationURL && navigator.product === 'ReactNative' ? parseJWTFromURLParams(locationURL) : undefined;
     }
+
     if (jwt) {
-        const backendApi = "https://jitsi.dev.placetime.host/backend/api/v1";
-        doGetJSON(backendApi + "/users/me", undefined, {
+        const state = getState();
+        const { hosts } = state['features/base/config'];
+        const backendApi = hosts?.backendGuestApi || "https://jitsi.dev.placetime.host/backend/api";
+        doGetJSON(backendApi + "/v1/users/me", undefined, {
                 headers: {
                     'Authorization': 'Bearer ' + jwt,
                 },

package/react/features/lobby/components/AbstractLobbyScreen.tsx

@@ -457,7 +457,7 @@ export function _mapStateToProps(state: IReduxState) {
     const showCopyUrlButton = inviteEnabledFlag || !disableInviteFunctions;
     const deviceStatusVisible = isDeviceStatusVisible(state);
     const { showHangUp = true } = getLobbyConfig(state);
-    const { roomName, membersOnly, lobbyWaitingForHost } = state['features/base/conference'];
+    const { roomName, membersOnly, lobbyWaitingForHost, roomInfo } = state['features/base/conference'];
     const { isLobbyChatActive, lobbyMessageRecipient, messages } = state['features/chat'];
     const { showModeratorLogin } = state['features/authentication'];
 
@@ -476,7 +476,7 @@ export function _mapStateToProps(state: IReduxState) {
         _participantId: participantId,
         _participantName: localParticipant?.name,
         _passwordJoinFailed: passwordJoinFailed,
-        _renderPassword: !iAmSipGateway && !lobbyWaitingForHost,
+        _renderPassword: !iAmSipGateway && !lobbyWaitingForHost && roomInfo.password_hash,
         showCopyUrlButton,
         roomName,
     };

package/react/features/recording/components/Recording/LocalRecordingManager.web.ts

@@ -274,8 +274,10 @@ const LocalRecordingManager: ILocalRecordingManager = {
         this.recorder.addEventListener('stop', async () => {
             const duration = Date.now() - this.startTime!;
 
-            this.stream?.getTracks().forEach((track: MediaStreamTrack) => track.stop());
-            gdmStream?.getTracks().forEach((track: MediaStreamTrack) => track.stop());
+            if (!onlySelf) {
+                this.stream?.getTracks().forEach((track: MediaStreamTrack) => track.stop());
+                gdmStream?.getTracks().forEach((track: MediaStreamTrack) => track.stop());
+            }
 
             // The stop event is emitted when the recorder is done, and _after_ the last buffered
             // data has been handed over to the dataavailable event.

package/react/features/room-lock/middleware.ts

@@ -47,10 +47,10 @@ MiddlewareRegistry.register(store => next => action => {
             //         titleKey: 'notify.passwordSetRemotely'
             //     }, NOTIFICATION_TIMEOUT_TYPE.SHORT));
         } else if (previousLockedState === LOCKED_REMOTELY && !currentLockedState) {
-            store.dispatch(
-                showNotification({
-                    titleKey: 'notify.passwordRemovedRemotely'
-                }, NOTIFICATION_TIMEOUT_TYPE.SHORT));
+            // store.dispatch(
+            //     showNotification({
+            //         titleKey: 'notify.passwordRemovedRemotely'
+            //     }, NOTIFICATION_TIMEOUT_TYPE.SHORT));
         }
 
         return result;