@placetime/corptime-conference 0.0.13 → 1.0.0

package/package.json

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

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

@@ -39,13 +39,6 @@ import { IReloadNowOptions, IStore } from './types';
 
 export * from './actions.any';
 
-export function setRoomNameGlobal(roomName: string) {
-    return {
-        type: SET_ROOM_NAME,
-        roomName,
-    }
-}
-
 /**
  * Triggers an in-app navigation to a specific route. Allows navigation to be
  * abstracted between the mobile/React Native and Web/React applications.

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

@@ -120,6 +120,12 @@ export function maybeRedirectToWelcomePage(options: { feedbackSubmitted?: boolea
             enableClosePage
         } = getState()['features/base/config'];
 
+        const { jwt } = getState()['features/base/jwt'];
+        // save whether current user is guest or not, and pass auth token,
+        // before navigating to close page
+        window.sessionStorage.setItem('guest', (!jwt).toString());
+        window.sessionStorage.setItem('jwt', jwt ?? '');
+
         // if close page is enabled redirect to it, without further action
         if (enableClosePage) {
             if (isVpaasMeeting(getState())) {
@@ -135,15 +141,9 @@ export function maybeRedirectToWelcomePage(options: { feedbackSubmitted?: boolea
                 return;
             }
 
-            const { jwt } = getState()['features/base/jwt'];
 
             let hashParam;
 
-            // save whether current user is guest or not, and pass auth token,
-            // before navigating to close page
-            window.sessionStorage.setItem('guest', (!jwt).toString());
-            window.sessionStorage.setItem('jwt', jwt ?? '');
-
             let path = 'close.html';
 
             if (interfaceConfig.SHOW_PROMOTIONAL_CLOSE_PAGE) {
@@ -176,6 +176,12 @@ export function maybeRedirectToWelcomePage(options: { feedbackSubmitted?: boolea
                     dispatch(redirectWithStoredParams('/'));
                 },
                 options.showThankYou ? 3000 : 500);
+        } else {
+            setTimeout(
+                () => {
+                    window.location.reload();
+                },
+                10);
         }
     };
 }

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

@@ -14,6 +14,7 @@ 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';
 
@@ -23,8 +24,6 @@ import { AbstractApp, IProps as AbstractAppProps } from './AbstractApp';
 import '../middlewares.native';
 import '../reducers.native';
 
-import { setRoomNameGlobal } from '../../app/actions.native';
-
 declare let __DEV__: any;
 
 const { AppInfo } = NativeModules;

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

@@ -1,6 +1,5 @@
 import ReducerRegistry from '../base/redux/ReducerRegistry';
 import { _ROOT_NAVIGATION_READY } from '../mobile/navigation/actionTypes';
-import { SET_ROOM_NAME } from '../base/conference/actionTypes';
 
 /**
  * Listen for actions which changes the state of the app feature.
@@ -17,11 +16,6 @@ ReducerRegistry.register('features/app', (state: Object = {}, action) => {
             ...state,
             ready: action.ready
         };
-    case SET_ROOM_NAME:
-        return {
-            ...state,
-            roomName: action.roomName
-        };
     default:
         return state;
     }

package/react/features/app/reducers.any.ts

@@ -56,3 +56,4 @@ import '../video-quality/reducer';
 import '../videosipgw/reducer';
 import '../visitors/reducer';
 import '../whiteboard/reducer';
+import '../overlay/reducer';

package/react/features/app/types.ts

@@ -81,6 +81,7 @@ import { IVirtualBackground } from '../virtual-background/reducer';
 import { IVisitorsState } from '../visitors/reducer';
 import { IWebHid } from '../web-hid/reducer';
 import { IWhiteboardState } from '../whiteboard/reducer';
+import { IOverlayState } from '../overlay/reducer';
 
 export interface IStore {
     dispatch: ThunkDispatch<IReduxState, void, AnyAction>;
@@ -173,6 +174,7 @@ export interface IReduxState {
     'features/web-hid': IWebHid;
     'features/whiteboard': IWhiteboardState;
     'features/app': any;
+    'features/overlay': IOverlayState;
 }
 
 export interface IReloadNowOptions {

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

@@ -183,9 +183,8 @@ export function getConferenceName(stateful: IStateful): string {
     const state = toState(stateful);
     const { callee } = state['features/base/jwt'];
     const { callDisplayName } = state['features/base/config'];
-    const { localSubject, pendingSubjectChange, room, subject } = getConferenceState(state);
+    const { localSubject, pendingSubjectChange, room, roomName, subject } = getConferenceState(state);
 
-    const { roomName } = state['features/app'];
     let conferenceName = (localSubject
         || pendingSubjectChange
         || subject

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

@@ -19,6 +19,8 @@ export const SET_DELAYED_LOAD_OF_AVATAR_URL = 'SET_DELAYED_LOAD_OF_AVATAR_URL';
  */
 export const SET_JWT = 'SET_JWT';
 
+export const SET_USER_INFO_BY_JWT = 'SET_USER_INFO_BY_JWT';
+
 /**
  * The type of redux action which sets a known avatar URL.
  *

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

@@ -1,4 +1,4 @@
-import { SET_DELAYED_LOAD_OF_AVATAR_URL, SET_JWT, SET_KNOWN_AVATAR_URL } from './actionTypes';
+import {SET_DELAYED_LOAD_OF_AVATAR_URL, SET_JWT, SET_KNOWN_AVATAR_URL, SET_USER_INFO_BY_JWT} from './actionTypes';
 
 /**
  * Sets an avatar URL for delayed loading.
@@ -32,6 +32,13 @@ export function setJWT(jwt?: string) {
     };
 }
 
+export function setUserInfoByJWT(userInfo?: any) {
+    return {
+        type: SET_USER_INFO_BY_JWT,
+        userInfo
+    };
+}
+
 /**
  * Sets a known avatar URL.
  *

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

@@ -14,10 +14,11 @@ import MiddlewareRegistry from '../redux/MiddlewareRegistry';
 import StateListenerRegistry from '../redux/StateListenerRegistry';
 import { parseURIString } from '../util/uri';
 
-import { SET_JWT } from './actionTypes';
-import { setDelayedLoadOfAvatarUrl, setJWT, setKnownAvatarUrl } from './actions';
+import {SET_JWT, SET_USER_INFO_BY_JWT} from './actionTypes';
+import {setDelayedLoadOfAvatarUrl, setJWT, setKnownAvatarUrl, setUserInfoByJWT} from './actions';
 import { parseJWTFromURLParams } from './functions';
 import logger from './logger';
+import {doGetJSON} from "../util/httpUtils";
 
 /**
  * Set up a state change listener to perform maintenance tasks when the conference
@@ -59,6 +60,8 @@ MiddlewareRegistry.register(store => next => action => {
     }
     case SET_JWT:
         return _setJWT(store, next, action);
+    case SET_USER_INFO_BY_JWT:
+        return _setUserInfoByJWT(store, next, action);
     }
 
     return next(action);
@@ -127,8 +130,24 @@ function _setConfigOrLocationURL({ dispatch, getState }: IStore, next: Function,
 
     const { locationURL } = getState()['features/base/connection'];
 
-    dispatch(
-        setJWT(locationURL ? parseJWTFromURLParams(locationURL) : undefined));
+    let jwt = locationURL ? parseJWTFromURLParams(locationURL) : undefined;
+    if (!jwt) {
+        jwt = window.sessionStorage.getItem('jwt');
+    }
+    if (jwt) {
+        const backendApi = "https://jitsi.dev.placetime.host/backend/api/v1";
+        doGetJSON(backendApi + "/users/me", undefined, {
+                headers: {
+                    'Authorization': 'Bearer ' + jwt,
+                },
+            }
+        ).then(res => {
+            dispatch(setJWT(jwt));
+            if (res.data) {
+                dispatch(setUserInfoByJWT(res.data));
+            }
+        });
+    }
 
     return result;
 }
@@ -234,6 +253,28 @@ function _setJWT(store: IStore, next: Function, action: AnyAction) {
     return next(action);
 }
 
+function _setUserInfoByJWT(store: IStore, next: Function, action: AnyAction) {
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    const {userInfo} = action;
+
+    let user = {
+        id: userInfo.id,
+        name: userInfo.first_name + " " + userInfo.last_name,
+        email: userInfo.email,
+        avatarURL: userInfo.avatar,
+    };
+    console.log("AAAAAAA - User", user);
+
+    action.user = user;
+
+    const newUser = user ? { ...user } : {};
+
+    _overwriteLocalParticipant(
+        store, { ...newUser});
+
+    return next(action);
+}
+
 /**
  * Undoes/resets the values overwritten by {@link _overwriteLocalParticipant}
  * by either clearing them or setting to default values. Only the values that

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

@@ -2,7 +2,7 @@ import PersistenceRegistry from '../redux/PersistenceRegistry';
 import ReducerRegistry from '../redux/ReducerRegistry';
 import { equals } from '../redux/functions';
 
-import { SET_DELAYED_LOAD_OF_AVATAR_URL, SET_JWT, SET_KNOWN_AVATAR_URL } from './actionTypes';
+import {SET_DELAYED_LOAD_OF_AVATAR_URL, SET_JWT, SET_KNOWN_AVATAR_URL, SET_USER_INFO_BY_JWT} from './actionTypes';
 import logger from './logger';
 
 export interface IJwtState {
@@ -62,6 +62,17 @@ ReducerRegistry.register<IJwtState>(
 
             return equals(state, nextState) ? state : nextState;
         }
+        case SET_USER_INFO_BY_JWT: {
+            // eslint-disable-next-line @typescript-eslint/no-unused-vars
+            const { type, ...payload } = action;
+            const nextState = {
+                ...state,
+                ...payload
+            };
+
+            return equals(state, nextState) ? state : nextState;
+       }
+
         case SET_KNOWN_AVATAR_URL:
             return {
                 ...state,

package/react/features/base/responsive-ui/actions.ts

@@ -23,7 +23,7 @@ import { ASPECT_RATIO_NARROW, ASPECT_RATIO_WIDE } from './constants';
  * didn't fit in the height. We do need to measure the actual UI at runtime and
  * determine whether and how to render it.
  */
-const REDUCED_UI_THRESHOLD = 300;
+const REDUCED_UI_THRESHOLD = 200;
 
 /**
  * Indicates a resize of the window.

package/react/features/large-video/components/styles.ts

@@ -1,4 +1,4 @@
 /**
  * Size for the Avatar.
  */
-export const AVATAR_SIZE = 200;
+export const AVATAR_SIZE = 180;

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

@@ -457,11 +457,10 @@ export function _mapStateToProps(state: IReduxState) {
     const showCopyUrlButton = inviteEnabledFlag || !disableInviteFunctions;
     const deviceStatusVisible = isDeviceStatusVisible(state);
     const { showHangUp = true } = getLobbyConfig(state);
-    const { membersOnly, lobbyWaitingForHost } = state['features/base/conference'];
+    const { roomName, membersOnly, lobbyWaitingForHost } = state['features/base/conference'];
     const { isLobbyChatActive, lobbyMessageRecipient, messages } = state['features/chat'];
     const { showModeratorLogin } = state['features/authentication'];
 
-    const { roomName } = state['features/app'];
     return {
         _deviceStatusVisible: deviceStatusVisible,
         _isDisplayNameRequiredActive: Boolean(isDisplayNameRequiredError),

package/react/features/lobby/components/web/LobbyScreen.tsx

@@ -159,7 +159,9 @@ class LobbyScreen extends AbstractLobbyScreen<IProps> {
      * @inheritdoc
      */
     override _renderParticipantInfo() {
-        const { displayName } = this.state;
+        const url = new URLSearchParams(window.location.search);
+        const userName = url.get("userName");
+        const displayName = this.state?.displayName ? this.state?.displayName : (userName?.toString() || '');
         const { _isDisplayNameRequiredActive, t } = this.props;
         const showError = _isDisplayNameRequiredActive && !displayName;
 

package/react/features/overlay/functions.web.ts

@@ -15,7 +15,9 @@ import BasePageOverlay from "./components/web/BasePageOverlay";
 export function getOverlayToRender(state: IReduxState) {
     const overlays = [
         PageReloadOverlay,
-        SuspendedOverlay
+        SuspendedOverlay,
+        ConferenceNotFoundOverlay,
+        BasePageOverlay
     ];
 
     for (const overlay of overlays) {

package/react/features/toolbox/components/native/OverflowMenu.tsx

@@ -154,7 +154,7 @@ class OverflowMenu extends PureComponent<IProps, IState> {
         return (
             <BottomSheet
                 renderFooter = { this._renderReactionMenu }>
-                <Divider style = { styles.divider as ViewStyle } />
+                {/*<Divider style = { styles.divider as ViewStyle } />*/}
                 <OpenCarmodeButton { ...topButtonProps } />
                 <AudioOnlyButton { ...buttonProps } />
                 { this._renderRaiseHandButton(buttonProps) }

package/react/features/toolbox/components/native/styles.ts

@@ -99,7 +99,8 @@ const styles = {
         backgroundColor: BaseTheme.palette.uiBackground,
         flexDirection: 'column',
         maxWidth: 580,
-        marginHorizontal: 'auto',
+        marginLeft: 'auto',
+        marginRight: 'auto',
         marginVertical: BaseTheme.spacing[0],
         paddingHorizontal: BaseTheme.spacing[2],
         width: '100%'