agora-appbuilder-core 4.1.0-beta-12 → 4.1.0-beta-15

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "agora-appbuilder-core",
-  "version": "4.1.0-beta-12",
+  "version": "4.1.0-beta-15",
   "description": "React Native template for RTE app builder",
   "main": "index.js",
   "files": [

package/template/defaultConfig.js

@@ -76,8 +76,8 @@ const DefaultConfig = {
   CHAT_ORG_NAME: '',
   CHAT_APP_NAME: '',
   CHAT_URL: '',
-  CLI_VERSION: '3.1.0-beta-12',
-  CORE_VERSION: '4.1.0-beta-12',
+  CLI_VERSION: '3.1.0-beta-15',
+  CORE_VERSION: '4.1.0-beta-15',
   DISABLE_LANDSCAPE_MODE: false,
   STT_AUTO_START: false,
   CLOUD_RECORDING_AUTO_START: false,

package/template/src/auth/AuthProvider.tsx

@@ -365,12 +365,7 @@ const AuthProvider = (props: AuthProviderProps) => {
         'user_details',
         'API user details query failed. User is un-authenticated. Will Login in the user',
         {
-          networkError: {
-            name: error?.networkError?.name,
-            code: error?.networkError?.result?.error?.code,
-            message: error?.networkError?.result?.error?.message,
-          },
-          error,
+          errorAsJSONString: JSON.stringify(error || {}),
           startReqTs,
           endRequestTs,
           latency: endRequestTs - startReqTs,

package/template/src/components/SettingsView.tsx

@@ -64,7 +64,7 @@ export const EditName: React.FC<EditNameProps> = (props?: EditNameProps) => {
   const {
     data: {isHost},
   } = useRoomInfo();
-  const {saveName} = useUserPreference();
+
   const {whiteboardActive} = useContext(whiteboardContext);
   const [saved, setSaved] = useState(false);
   const username = useGetName();
@@ -104,7 +104,6 @@ export const EditName: React.FC<EditNameProps> = (props?: EditNameProps) => {
       }, 2000);
       setEditable(false);
       logger.log(LogSource.Internals, 'NAME', `Name changed ${newName}`);
-      saveName(trimmedText ? trimmedText : username);
     } else {
       setEditable(true);
       inputRef.current.focus();

package/template/src/components/popups/InvitePopup.tsx

@@ -52,16 +52,7 @@ const InvitePopup = () => {
         LogSource.Internals,
         'GET_MEETING_PHRASE',
         'unable to fetch meeting details',
-        error,
-        {
-          networkError: {
-            name: error?.networkError?.name,
-            //@ts-ignore
-            code: error?.networkError?.result?.error?.code,
-            //@ts-ignore
-            message: error?.networkError?.result?.error?.message,
-          },
-        },
+        JSON.stringify(error || {}),
       );
       setGlobalErrorMessage(error);
     });

package/template/src/components/precall/joinCallBtn.native.tsx

@@ -38,7 +38,6 @@ const JoinCallBtn = (props: PreCallJoinCallBtnProps) => {
   const {isJoinDataFetched} = useRoomInfo();
   const joinRoomButton =
     useString<PrecallJoinBtnTextInterface>(precallJoinBtnText);
-  const {saveName} = useUserPreference();
   const [buttonText, setButtonText] = React.useState(
     joinRoomButton({
       waitingRoom: false,
@@ -59,7 +58,6 @@ const JoinCallBtn = (props: PreCallJoinCallBtnProps) => {
   }, [rtcProps?.role]);
 
   const onSubmit = () => {
-    saveName(username?.trim());
     setCallActive(true);
   };
 

package/template/src/components/precall/joinCallBtn.tsx

@@ -47,7 +47,6 @@ const JoinCallBtn = (props: PreCallJoinCallBtnProps) => {
   const setUsername = useSetName();
   const {isJoinDataFetched} = useRoomInfo();
   const {awake, request} = useWakeLock();
-  const {saveName} = useUserPreference();
   const joinRoomButton =
     useString<PrecallJoinBtnTextInterface>(precallJoinBtnText);
 
@@ -67,8 +66,6 @@ const JoinCallBtn = (props: PreCallJoinCallBtnProps) => {
     );
     setUsername(username.trim());
     setCallActive(true);
-    //updating name in the backend
-    saveName(username.trim());
     // Play a sound to avoid autoblocking in safari
     if (isWebInternal() || isMobileOrTablet()) {
       audio.volume = 0;

package/template/src/components/precall/joinWaitingRoomBtn.native.tsx

@@ -62,7 +62,6 @@ const JoinWaitingRoomBtn = (props: PreCallJoinWaitingRoomBtnProps) => {
 
   const waitingRoomButton =
     useString<PrecallJoinBtnTextInterface>(precallJoinBtnText);
-  const {saveName} = useUserPreference();
   const [buttonText, setButtonText] = React.useState(
     waitingRoomButton({
       waitingRoom: true,
@@ -184,8 +183,6 @@ const JoinWaitingRoomBtn = (props: PreCallJoinWaitingRoomBtnProps) => {
 
   const onSubmit = () => {
     shouldWaitingRoomPoll = true;
-    saveName(username?.trim());
-
     // Enter waiting rooom;
     setRoomInfo(prev => {
       return {...prev, isInWaitingRoom: true};

package/template/src/components/precall/joinWaitingRoomBtn.tsx

@@ -70,7 +70,6 @@ const JoinWaitingRoomBtn = (props: PreCallJoinWaitingRoomBtnProps) => {
   const setUsername = useSetName();
   const {isJoinDataFetched, isInWaitingRoom} = useRoomInfo();
   const {awake, request} = useWakeLock();
-  const {saveName} = useUserPreference();
   const waitingRoomButton =
     useString<PrecallJoinBtnTextInterface>(precallJoinBtnText);
   const {setRoomInfo} = useSetRoomInfo();
@@ -210,8 +209,6 @@ const JoinWaitingRoomBtn = (props: PreCallJoinWaitingRoomBtnProps) => {
   const onSubmit = () => {
     shouldWaitingRoomPoll = true;
     setUsername(username.trim());
-    //updating name in the backend
-    saveName(username.trim());
     //setCallActive(true);
 
     // add the waitingRoomStatus to the uid

package/template/src/components/useUserPreference.tsx

@@ -44,7 +44,6 @@ export interface UserUids {
 interface UserPreferenceContextInterface {
   displayName: string;
   setDisplayName: React.Dispatch<React.SetStateAction<string>>;
-  saveName: (name: string) => void;
   uids: UserUids;
 }
 
@@ -52,7 +51,7 @@ const UserPreferenceContext =
   React.createContext<UserPreferenceContextInterface>({
     displayName: '',
     setDisplayName: () => {},
-    saveName: () => {},
+
     uids: {},
   });
 
@@ -114,92 +113,6 @@ const UserPreferenceProvider = (props: {
     } catch (error) {}
   }, [languageCode, screenShareData]);
 
-  const saveName = (name: string) => {
-    if (name && name?.trim() !== '') {
-      const requestId = getUniqueID();
-      const startReqTs = Date.now();
-      try {
-        logger.log(
-          LogSource.Internals,
-          'NAME',
-          'Trying to save the display name',
-          {
-            requestId,
-            startReqTs,
-          },
-        );
-        updateUserName({
-          context: {
-            headers: {
-              'X-Request-Id': requestId,
-              'X-Session-Id': logger.getSessionId(),
-            },
-          },
-          variables: {
-            name,
-          },
-        })
-          .then(res => {
-            const endReqTs = Date.now();
-            logger.log(
-              LogSource.Internals,
-              'NAME',
-              'name updated successfully',
-              {
-                responseData: res,
-                startReqTs,
-                endReqTs,
-                latency: endReqTs - startReqTs,
-                requestId,
-              },
-            );
-          })
-          .catch(error => {
-            const endReqTs = Date.now();
-            logger.error(
-              LogSource.Internals,
-              'NAME',
-              'ERROR, could not save the name',
-              error,
-              {
-                networkError: {
-                  name: error?.networkError?.name,
-                  //@ts-ignore
-                  code: error?.networkError?.result?.error?.code,
-                  //@ts-ignore
-                  message: error?.networkError?.result?.error?.message,
-                },
-                startReqTs,
-                endReqTs,
-                latency: endReqTs - startReqTs,
-                requestId,
-              },
-            );
-          });
-      } catch (error) {
-        const endReqTs = Date.now();
-        logger.error(
-          LogSource.Internals,
-          'NAME',
-          'ERROR, could not save the name',
-          error,
-          {
-            networkError: {
-              name: error?.networkError?.name,
-              //@ts-ignore
-              code: error?.networkError?.result?.error?.code,
-              //@ts-ignore
-              message: error?.networkError?.result?.error?.message,
-            },
-            startReqTs,
-            endReqTs,
-            latency: endReqTs - startReqTs,
-            requestId,
-          },
-        );
-      }
-    }
-  };
   const userText = useString(videoRoomUserFallbackText)();
   const pstnUserLabel = useString(PSTNUserLabel)();
   const getScreenShareName = useString(videoRoomScreenshareText);
@@ -309,7 +222,6 @@ const UserPreferenceProvider = (props: {
       value={{
         setDisplayName,
         displayName,
-        saveName,
         uids,
       }}>
       {props.children}

package/template/src/pages/Create.tsx

@@ -235,16 +235,7 @@ const Create = () => {
           LogSource.Internals,
           'CREATE_MEETING',
           'There was error while creating meeting',
-          error,
-          {
-            networkError: {
-              name: error?.networkError?.name,
-              //@ts-ignore
-              code: error?.networkError?.result?.error?.code,
-              //@ts-ignore
-              message: error?.networkError?.result?.error?.message,
-            },
-          },
+          JSON.stringify(error || {}),
         );
         if (
           createRoomErrorToastHeadingText ||

package/template/src/pages/Join.tsx

@@ -134,16 +134,7 @@ const Join = () => {
           LogSource.Internals,
           'JOIN_MEETING',
           'Error on join room page',
-          error,
-          {
-            networkError: {
-              name: error?.networkError?.name,
-              //@ts-ignore
-              code: error?.networkError?.result?.error?.code,
-              //@ts-ignore
-              message: error?.networkError?.result?.error?.message,
-            },
-          },
+          JSON.stringify(error || {}),
         );
         const isInvalidUrl =
           error?.message.toLowerCase().trim() === 'invalid passphrase' || false;

package/template/src/pages/VideoCall.tsx

@@ -249,22 +249,19 @@ const VideoCall: React.FC = () => {
   useEffect(() => {
     if (!SdkJoinState.phrase) {
       useJoin(phrase, RoomInfoDefaultValue.roomPreference)
-        .then(() => {})
+        .then(() => {
+          logger.log(
+            LogSource.Internals,
+            'JOIN_MEETING',
+            'Join channel success',
+          );
+        })
         .catch(error => {
           logger.error(
             LogSource.Internals,
             'JOIN_MEETING',
             'Join channel error',
-            error,
-            {
-              networkError: {
-                name: error?.networkError?.name,
-                //@ts-ignore
-                code: error?.networkError?.result?.error?.code,
-                //@ts-ignore
-                message: error?.networkError?.result?.error?.message,
-              },
-            },
+            JSON.stringify(error || {}),
           );
           setGlobalErrorMessage(error);
           history.push('/');
@@ -303,27 +300,26 @@ const VideoCall: React.FC = () => {
     } else if (sdkMeetingPhrase) {
       setQueryComplete(false);
       currentMeetingPhrase.current = sdkMeetingPath;
-      useJoin(sdkMeetingPhrase, preference).catch(error => {
-        logger.error(
-          LogSource.Internals,
-          'JOIN_MEETING',
-          'Join channel error',
-          error,
-          {
-            networkError: {
-              name: error?.networkError?.name,
-              //@ts-ignore
-              code: error?.networkError?.result?.error?.code,
-              //@ts-ignore
-              message: error?.networkError?.result?.error?.message,
-            },
-          },
-        );
-        setGlobalErrorMessage(error);
-        history.push('/');
-        currentMeetingPhrase.current = '';
-        promise.rej(error);
-      });
+      useJoin(sdkMeetingPhrase, preference)
+        .then(() => {
+          logger.log(
+            LogSource.Internals,
+            'JOIN_MEETING',
+            'Join channel success',
+          );
+        })
+        .catch(error => {
+          logger.error(
+            LogSource.Internals,
+            'JOIN_MEETING',
+            'Join channel error',
+            JSON.stringify(error || {}),
+          );
+          setGlobalErrorMessage(error);
+          history.push('/');
+          currentMeetingPhrase.current = '';
+          promise.rej(error);
+        });
     }
   }, [SdkJoinState]);
 

package/template/src/subComponents/recording/useRecording.tsx

@@ -369,15 +369,8 @@ const RecordingProvider = (props: RecordingProviderProps) => {
           LogSource.NetworkRest,
           'recording_start',
           'Error while start recording',
-          err,
+          JSON.stringify(err || {}),
           {
-            networkError: {
-              name: err?.networkError?.name,
-              //@ts-ignore
-              code: err?.networkError?.result?.error?.code,
-              //@ts-ignore
-              message: err?.networkError?.result?.error?.message,
-            },
             startReqTs,
             endRequestTs,
             latency,

package/template/src/subComponents/recording/useRecordingLayoutQuery.tsx

@@ -68,15 +68,8 @@ function useRecordingLayoutQuery() {
           LogSource.Internals,
           'RECORDING',
           'setPresenterQuery failure',
-          error,
+          JSON.stringify(error || {}),
           {
-            networkError: {
-              name: error?.networkError?.name,
-              //@ts-ignore
-              code: error?.networkError?.result?.error?.code,
-              //@ts-ignore
-              message: error?.networkError?.result?.error?.message,
-            },
             startReqTs,
             endReqTs,
             latency: endReqTs - startReqTs,
@@ -126,15 +119,8 @@ function useRecordingLayoutQuery() {
           LogSource.Internals,
           'RECORDING',
           'executeNormalQuery failure',
-          error,
+          JSON.stringify(error || {}),
           {
-            networkError: {
-              name: error?.networkError?.name,
-              //@ts-ignore
-              code: error?.networkError?.result?.error?.code,
-              //@ts-ignore
-              message: error?.networkError?.result?.error?.message,
-            },
             startReqTs,
             endReqTs,
             latency: endReqTs - startReqTs,

package/template/src/utils/useCreateRoom.ts

@@ -79,15 +79,8 @@ export default function useCreateRoom(): createRoomFun {
         LogSource.NetworkRest,
         'createChannel',
         'API createChannel failed. There was an error',
-        error,
+        JSON.stringify(error || {}),
         {
-          networkError: {
-            name: error?.networkError?.name,
-            //@ts-ignore
-            code: error?.networkError?.result?.error?.code,
-            //@ts-ignore
-            message: error?.networkError?.result?.error?.message,
-          },
           startReqTs,
           endReqTs,
           latency: latency,

package/template/src/utils/useGetMeetingPhrase.ts

@@ -56,15 +56,8 @@ export default function useGetMeetingPhrase() {
         LogSource.Internals,
         'GET_MEETING_PHRASE',
         'Query GET_MEETING_PHRASE failed',
-        response.error,
+        JSON.stringify(response?.error || {}),
         {
-          networkError: {
-            name: response?.error?.networkError?.name,
-            //@ts-ignore
-            code: response?.error?.networkError?.result?.error?.code,
-            //@ts-ignore
-            message: response?.error?.networkError?.result?.error?.message,
-          },
           requestId,
           startReqTs,
           endReqTs,

package/template/src/utils/useJoinRoom.ts

@@ -217,15 +217,8 @@ export default function useJoinRoom() {
             isWaitingRoomEnabled ? 'channel_join_request' : 'joinChannel'
           } failed.`,
           'Join Channel Failed',
-          response?.error,
+          JSON.stringify(response?.error || {}),
           {
-            networkError: {
-              name: response?.error?.networkError?.name,
-              //@ts-ignore
-              code: response?.error?.networkError?.result?.error?.code,
-              //@ts-ignore
-              message: response?.error?.networkError?.result?.error?.message,
-            },
             startReqTs,
             endReqTs,
             latency,

package/template/src/utils/useMutePSTN.ts

@@ -53,15 +53,8 @@ const useMutePSTN = () => {
           LogSource.Internals,
           'MUTE_PSTN',
           'Mutation MUTE_PSTN success',
-          error,
+          JSON.stringify(error || {}),
           {
-            networkError: {
-              name: error?.networkError?.name,
-              //@ts-ignore
-              code: error?.networkError?.result?.error?.code,
-              //@ts-ignore
-              message: error?.networkError?.result?.error?.message,
-            },
             startReqTs,
             endReqTs,
             latency: endReqTs - startReqTs,