Fix changing guest name

apps/documenteditor/main/app/controller/Main.js

@@ -341,6 +341,7 @@ define([
 
                 var value = Common.localStorage.getItem("guest-username");
                 Common.Utils.InternalSettings.set("guest-username", value);
+                Common.Utils.InternalSettings.set("save-guest-username", !!value);
                 this.editorConfig.user          =
                 this.appOptions.user            = Common.Utils.fillUserInfo(this.editorConfig.user, this.editorConfig.lang, value ? (value + ' (' + this.textGuest + ')' ) : this.textAnonymous);
                 this.appOptions.isDesktopApp    = this.editorConfig.targetApp == 'desktop';
@@ -1334,6 +1335,7 @@ define([
                 this.api.asc_registerCallback('asc_onDownloadUrl',     _.bind(this.onDownloadUrl, this));
                 this.api.asc_registerCallback('asc_onAuthParticipantsChanged', _.bind(this.onAuthParticipantsChanged, this));
                 this.api.asc_registerCallback('asc_onParticipantsChanged',     _.bind(this.onAuthParticipantsChanged, this));
+                this.api.asc_registerCallback('asc_onConnectionStateChanged',  _.bind(this.onUserConnection, this));
                 this.api.asc_registerCallback('asc_onDocumentModifiedChanged', _.bind(this.onDocumentModifiedChanged, this));
             },
 
@@ -2167,6 +2169,24 @@ define([
                 this._state.usersCount = length;
             },
 
+            onUserConnection: function(change){
+                if (change && this.appOptions.user.guest && (change.asc_getIdOriginal() == this.appOptions.user.id)) { // change name of the current user
+                    var name = change.asc_getUserName();
+                    if (name && name !== Common.Utils.UserInfoParser.getCurrentName() ) {
+                        Common.Utils.UserInfoParser.setCurrentName(name);
+                        appHeader.setUserName(Common.Utils.UserInfoParser.getParsedName(name));
+
+                        var idx1 = name.lastIndexOf('('),
+                            idx2 = name.lastIndexOf(')'),
+                            str = (idx1>0) && (idx1<idx2) ? name.substring(0, idx1-1) : '';
+                        if (Common.localStorage.getItem("guest-username")!==null) {
+                            Common.localStorage.setItem("guest-username", str);
+                        }
+                        Common.Utils.InternalSettings.set("guest-username", str);
+                    }
+                }
+            },
+
             applySettings: function() {
                 if (this.appOptions.isEdit && !this.appOptions.isOffline && this.appOptions.canCoAuthoring) {
                     var oldval = this._state.fastCoauth;
@@ -2369,12 +2389,11 @@ define([
                 if (this._renameDialog) return;
 
                 var me = this;
-                var value = Common.Utils.InternalSettings.get("guest-username");
                 this._renameDialog = new Common.Views.UserNameDialog({
                     label: this.textRenameLabel,
                     error: this.textRenameError,
-                    value: value || '',
+                    value: Common.Utils.InternalSettings.get("guest-username") || '',
-                    check: (value!==null),
+                    check: Common.Utils.InternalSettings.get("save-guest-username") || false,
                     validation: function(value) {
                         return value.length<128 ? true : me.textLongName;
                     },
@@ -2388,10 +2407,9 @@ define([
                             docInfo.put_UserInfo(_user);
                             me.api.asc_changeDocInfo(docInfo);
 
-                            Common.Utils.UserInfoParser.setCurrentName(name);
-                            appHeader.setUserName(Common.Utils.UserInfoParser.getParsedName(name));
                             settings.checkbox ? Common.localStorage.setItem("guest-username", settings.input) : Common.localStorage.removeItem("guest-username");
                             Common.Utils.InternalSettings.set("guest-username", settings.input);
+                            Common.Utils.InternalSettings.set("save-guest-username", settings.checkbox);
                         }
                     }
                 });

apps/presentationeditor/main/app/controller/Main.js

@@ -306,6 +306,7 @@ define([
 
                 var value = Common.localStorage.getItem("guest-username");
                 Common.Utils.InternalSettings.set("guest-username", value);
+                Common.Utils.InternalSettings.set("save-guest-username", !!value);
                 this.editorConfig.user          =
                 this.appOptions.user            = Common.Utils.fillUserInfo(data.config.user, this.editorConfig.lang, value ? (value + ' (' + this.textGuest + ')' ) : this.textAnonymous);
                 this.appOptions.isDesktopApp    = this.editorConfig.targetApp == 'desktop';
@@ -1098,6 +1099,7 @@ define([
                     me.api.asc_registerCallback('asc_OnTryUndoInFastCollaborative',_.bind(me.onTryUndoInFastCollaborative, me));
                     me.api.asc_registerCallback('asc_onAuthParticipantsChanged', _.bind(me.onAuthParticipantsChanged, me));
                     me.api.asc_registerCallback('asc_onParticipantsChanged',     _.bind(me.onAuthParticipantsChanged, me));
+                    me.api.asc_registerCallback('asc_onConnectionStateChanged',  _.bind(me.onUserConnection, me));
                     /** coauthoring end **/
 
                     if (me.stackLongActions.exist({id: ApplyEditRights, type: Asc.c_oAscAsyncActionType['BlockInteraction']})) {
@@ -1818,6 +1820,24 @@ define([
                 this._state.usersCount = length;
             },
 
+            onUserConnection: function(change){
+                if (change && this.appOptions.user.guest && (change.asc_getIdOriginal() == this.appOptions.user.id)) { // change name of the current user
+                    var name = change.asc_getUserName();
+                    if (name && name !== Common.Utils.UserInfoParser.getCurrentName() ) {
+                        Common.Utils.UserInfoParser.setCurrentName(name);
+                        appHeader.setUserName(Common.Utils.UserInfoParser.getParsedName(name));
+
+                        var idx1 = name.lastIndexOf('('),
+                            idx2 = name.lastIndexOf(')'),
+                            str = (idx1>0) && (idx1<idx2) ? name.substring(0, idx1-1) : '';
+                        if (Common.localStorage.getItem("guest-username")!==null) {
+                            Common.localStorage.setItem("guest-username", str);
+                        }
+                        Common.Utils.InternalSettings.set("guest-username", str);
+                    }
+                }
+            },
+
             applySettings: function() {
                 if (this.appOptions.isEdit && !this.appOptions.isOffline && this.appOptions.canCoAuthoring) {
                     var oldval = this._state.fastCoauth;
@@ -2011,12 +2031,11 @@ define([
                 if (this._renameDialog) return;
 
                 var me = this;
-                var value = Common.Utils.InternalSettings.get("guest-username");
                 this._renameDialog = new Common.Views.UserNameDialog({
                     label: this.textRenameLabel,
                     error: this.textRenameError,
-                    value: value || '',
+                    value: Common.Utils.InternalSettings.get("guest-username") || '',
-                    check: (value!==null),
+                    check: Common.Utils.InternalSettings.get("save-guest-username") || false,
                     validation: function(value) {
                         return value.length<128 ? true : me.textLongName;
                     },
@@ -2030,10 +2049,9 @@ define([
                             docInfo.put_UserInfo(_user);
                             me.api.asc_changeDocInfo(docInfo);
 
-                            Common.Utils.UserInfoParser.setCurrentName(name);
-                            appHeader.setUserName(Common.Utils.UserInfoParser.getParsedName(name));
                             settings.checkbox ? Common.localStorage.setItem("guest-username", settings.input) : Common.localStorage.removeItem("guest-username");
                             Common.Utils.InternalSettings.set("guest-username", settings.input);
+                            Common.Utils.InternalSettings.set("save-guest-username", settings.checkbox);
                         }
                     }
                 });

apps/spreadsheeteditor/main/app/controller/Main.js

@@ -329,6 +329,7 @@ define([
 
                 var value = Common.localStorage.getItem("guest-username");
                 Common.Utils.InternalSettings.set("guest-username", value);
+                Common.Utils.InternalSettings.set("save-guest-username", !!value);
                 this.editorConfig.user          =
                 this.appOptions.user            = Common.Utils.fillUserInfo(this.editorConfig.user, this.editorConfig.lang, value ? (value + ' (' + this.textGuest + ')' ) : this.textAnonymous);
                 this.appOptions.isDesktopApp    = this.editorConfig.targetApp == 'desktop';
@@ -1197,6 +1198,7 @@ define([
                     /** coauthoring begin **/
                     me.api.asc_registerCallback('asc_onAuthParticipantsChanged', _.bind(me.onAuthParticipantsChanged, me));
                     me.api.asc_registerCallback('asc_onParticipantsChanged',     _.bind(me.onAuthParticipantsChanged, me));
+                    me.api.asc_registerCallback('asc_onConnectionStateChanged',  _.bind(me.onUserConnection, me));
                     /** coauthoring end **/
                     if (me.appOptions.isEditDiagram)
                         me.api.asc_registerCallback('asc_onSelectionChanged',        _.bind(me.onSelectionChanged, me));
@@ -2178,6 +2180,24 @@ define([
                 this._state.usersCount = length;
             },
 
+            onUserConnection: function(change){
+                if (change && this.appOptions.user.guest && (change.asc_getIdOriginal() == this.appOptions.user.id)) { // change name of the current user
+                    var name = change.asc_getUserName();
+                    if (name && name !== Common.Utils.UserInfoParser.getCurrentName() ) {
+                        Common.Utils.UserInfoParser.setCurrentName(name);
+                        this.headerView.setUserName(Common.Utils.UserInfoParser.getParsedName(name));
+
+                        var idx1 = name.lastIndexOf('('),
+                            idx2 = name.lastIndexOf(')'),
+                            str = (idx1>0) && (idx1<idx2) ? name.substring(0, idx1-1) : '';
+                        if (Common.localStorage.getItem("guest-username")!==null) {
+                            Common.localStorage.setItem("guest-username", str);
+                        }
+                        Common.Utils.InternalSettings.set("guest-username", str);
+                    }
+                }
+            },
+
             applySettings: function() {
                 if (this.appOptions.isEdit && !this.appOptions.isOffline && this.appOptions.canCoAuthoring) {
                     var value = Common.localStorage.getItem("sse-settings-coauthmode"),
@@ -2327,12 +2347,11 @@ define([
                 if (this._renameDialog) return;
 
                 var me = this;
-                var value = Common.Utils.InternalSettings.get("guest-username");
                 this._renameDialog = new Common.Views.UserNameDialog({
                     label: this.textRenameLabel,
                     error: this.textRenameError,
-                    value: value || '',
+                    value: Common.Utils.InternalSettings.get("guest-username") || '',
-                    check: (value!==null),
+                    check: Common.Utils.InternalSettings.get("save-guest-username") || false,
                     validation: function(value) {
                         return value.length<128 ? true : me.textLongName;
                     },
@@ -2346,10 +2365,9 @@ define([
                             docInfo.put_UserInfo(_user);
                             me.api.asc_changeDocInfo(docInfo);
 
-                            Common.Utils.UserInfoParser.setCurrentName(name);
-                            appHeader.setUserName(Common.Utils.UserInfoParser.getParsedName(name));
                             settings.checkbox ? Common.localStorage.setItem("guest-username", settings.input) : Common.localStorage.removeItem("guest-username");
                             Common.Utils.InternalSettings.set("guest-username", settings.input);
+                            Common.Utils.InternalSettings.set("save-guest-username", settings.checkbox);
                         }
                     }
                 });