Commit 8c689a77 authored by konovalovsergey's avatar konovalovsergey

NoCritical -> Critical (jwtExpired, jwtError)

parent 7c4f7001
...@@ -748,16 +748,16 @@ ...@@ -748,16 +748,16 @@
* @param {Bool} isDisconnectAtAll окончательно ли отсоединяемся(true) или будем пробовать сделать reconnect(false) + сами отключились * @param {Bool} isDisconnectAtAll окончательно ли отсоединяемся(true) или будем пробовать сделать reconnect(false) + сами отключились
* @param {Bool} isCloseCoAuthoring * @param {Bool} isCloseCoAuthoring
*/ */
this.CoAuthoringApi.onDisconnect = function(e, errorCode) this.CoAuthoringApi.onDisconnect = function(e, error)
{ {
if (AscCommon.ConnectionState.None === t.CoAuthoringApi.get_state()) if (AscCommon.ConnectionState.None === t.CoAuthoringApi.get_state())
{ {
t.asyncServerIdEndLoaded(); t.asyncServerIdEndLoaded();
} }
if (null != errorCode) if (null != error)
{ {
t.setViewModeDisconnect(); t.setViewModeDisconnect();
t.sendEvent('asc_onError', errorCode, c_oAscError.Level.NoCritical); t.sendEvent('asc_onError', error.code, error.level);
} }
}; };
this.CoAuthoringApi.onDocumentOpen = function (inputWrap) { this.CoAuthoringApi.onDocumentOpen = function (inputWrap) {
......
...@@ -122,8 +122,8 @@ ...@@ -122,8 +122,8 @@
this._CoAuthoringApi.onLocksReleasedEnd = function() { this._CoAuthoringApi.onLocksReleasedEnd = function() {
t.callback_OnLocksReleasedEnd(); t.callback_OnLocksReleasedEnd();
}; };
this._CoAuthoringApi.onDisconnect = function(e, errorCode) { this._CoAuthoringApi.onDisconnect = function(e, error) {
t.callback_OnDisconnect(e, errorCode); t.callback_OnDisconnect(e, error);
}; };
this._CoAuthoringApi.onWarning = function(e) { this._CoAuthoringApi.onWarning = function(e) {
t.callback_OnWarning(e); t.callback_OnWarning(e);
...@@ -457,11 +457,11 @@ ...@@ -457,11 +457,11 @@
/** /**
* Event об отсоединении от сервера * Event об отсоединении от сервера
* @param {jQuery} e event об отсоединении с причиной * @param {jQuery} e event об отсоединении с причиной
* @param {Asc.c_oAscError.ID} errorCode * @param {code: Asc.c_oAscError.ID, level: Asc.c_oAscError.Level} error
*/ */
CDocsCoApi.prototype.callback_OnDisconnect = function(e, errorCode) { CDocsCoApi.prototype.callback_OnDisconnect = function(e, error) {
if (this.onDisconnect) { if (this.onDisconnect) {
this.onDisconnect(e, errorCode); this.onDisconnect(e, error);
} }
}; };
...@@ -1672,13 +1672,13 @@ ...@@ -1672,13 +1672,13 @@
this._state = ConnectionState.Reconnect; this._state = ConnectionState.Reconnect;
var bIsDisconnectAtAll = ((c_oCloseCode.serverShutdown <= evt.code && evt.code <= c_oCloseCode.jwtError) || var bIsDisconnectAtAll = ((c_oCloseCode.serverShutdown <= evt.code && evt.code <= c_oCloseCode.jwtError) ||
this.attemptCount >= this.maxAttemptCount); this.attemptCount >= this.maxAttemptCount);
var errorCode = null; var error = null;
if (bIsDisconnectAtAll) { if (bIsDisconnectAtAll) {
this._state = ConnectionState.ClosedAll; this._state = ConnectionState.ClosedAll;
errorCode = this._getDisconnectErrorCode(evt.code); error = this._getDisconnectErrorCode(evt.code);
} }
if (this.onDisconnect) { if (this.onDisconnect) {
this.onDisconnect(evt.reason, errorCode); this.onDisconnect(evt.reason, error);
} }
//Try reconect //Try reconect
if (!bIsDisconnectAtAll) { if (!bIsDisconnectAtAll) {
...@@ -1702,24 +1702,28 @@ ...@@ -1702,24 +1702,28 @@
}; };
DocsCoApi.prototype._getDisconnectErrorCode = function(opt_closeCode) { DocsCoApi.prototype._getDisconnectErrorCode = function(opt_closeCode) {
var code = this.isCloseCoAuthoring ? Asc.c_oAscError.ID.UserDrop : Asc.c_oAscError.ID.CoAuthoringDisconnect;
var level = Asc.c_oAscError.Level.NoCritical;
if (c_oCloseCode.serverShutdown === opt_closeCode) { if (c_oCloseCode.serverShutdown === opt_closeCode) {
return Asc.c_oAscError.ID.CoAuthoringDisconnect; code = Asc.c_oAscError.ID.CoAuthoringDisconnect;
} else if (c_oCloseCode.sessionIdle === opt_closeCode) { } else if (c_oCloseCode.sessionIdle === opt_closeCode) {
return Asc.c_oAscError.ID.SessionIdle; code = Asc.c_oAscError.ID.SessionIdle;
} else if (c_oCloseCode.sessionAbsolute === opt_closeCode) { } else if (c_oCloseCode.sessionAbsolute === opt_closeCode) {
return Asc.c_oAscError.ID.SessionAbsolute; code = Asc.c_oAscError.ID.SessionAbsolute;
} else if (c_oCloseCode.accessDeny === opt_closeCode) { } else if (c_oCloseCode.accessDeny === opt_closeCode) {
return Asc.c_oAscError.ID.AccessDeny; code = Asc.c_oAscError.ID.AccessDeny;
} else if (c_oCloseCode.jwtExpired === opt_closeCode) { } else if (c_oCloseCode.jwtExpired === opt_closeCode) {
if (this.jwtSession) { if (this.jwtSession) {
return Asc.c_oAscError.ID.SessionToken; code = Asc.c_oAscError.ID.SessionToken;
} else { } else {
return Asc.c_oAscError.ID.KeyExpire; code = Asc.c_oAscError.ID.KeyExpire;
level = Asc.c_oAscError.Level.Critical;
} }
} else if (c_oCloseCode.jwtError === opt_closeCode) { } else if (c_oCloseCode.jwtError === opt_closeCode) {
return Asc.c_oAscError.ID.VKeyEncrypt; code = Asc.c_oAscError.ID.VKeyEncrypt;
level = Asc.c_oAscError.Level.Critical;
} }
return this.isCloseCoAuthoring ? Asc.c_oAscError.ID.UserDrop : Asc.c_oAscError.ID.CoAuthoringDisconnect; return {code: code, level: level};
}; };
//----------------------------------------------------------export---------------------------------------------------- //----------------------------------------------------------export----------------------------------------------------
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment