cleal localStorage on logout

This commit is contained in:
or-else
2019-02-03 17:18:44 +03:00
parent fc96d200ed
commit 6bd64b2863
8 changed files with 29 additions and 21 deletions
+1 -1
View File
@@ -64,7 +64,7 @@
"sidepanel_title_newtpk": "Start New Chat", "sidepanel_title_newtpk": "Start New Chat",
"sidepanel_title_cred": "Confirm Credentials", "sidepanel_title_cred": "Confirm Credentials",
"sidepanel_title_reset": "Reset Password", "sidepanel_title_reset": "Reset Password",
"sidepanel_title_archive": "Archived", "sidepanel_title_archive": "Archived Chats",
"update_available": "Update available. <a href=\"\">Reload</a>.", "update_available": "Update available. <a href=\"\">Reload</a>.",
"reconnect_countdown": "Disconnected. Reconnecting in {seconds}s…", "reconnect_countdown": "Disconnected. Reconnecting in {seconds}s…",
"reconnect_now": "Try now", "reconnect_now": "Try now",
+2 -2
View File
@@ -65,7 +65,7 @@
"sidepanel_title_newtpk": "Start New Chat", "sidepanel_title_newtpk": "Start New Chat",
"sidepanel_title_cred": "Confirm Credentials", "sidepanel_title_cred": "Confirm Credentials",
"sidepanel_title_reset": "Reset Password", "sidepanel_title_reset": "Reset Password",
"sidepanel_title_archive": "Archived", "sidepanel_title_archive": "Archived Chats",
"update_available": "Update available. <a href=\"\">Reload</a>.", "update_available": "Update available. <a href=\"\">Reload</a>.",
"reconnect_countdown": "Disconnected. Reconnecting in {seconds}s…", "reconnect_countdown": "Disconnected. Reconnecting in {seconds}s…",
"reconnect_now": "Try now", "reconnect_now": "Try now",
@@ -255,6 +255,6 @@
"save_attachment": "сохранить", "save_attachment": "сохранить",
"menu_item_archive_topic": "В архив", "menu_item_archive_topic": "В архив",
"archived_contacts": "Чаты в архиве ({count})", "archived_contacts": "Чаты в архиве ({count})",
"sidepanel_title_archive": "Архив" "sidepanel_title_archive": "Архив чатов"
} }
} }
+13 -3
View File
@@ -107,7 +107,7 @@ class TinodeWeb extends React.Component {
} }
getBlankState() { getBlankState() {
const settings = LocalStorageUtil.getObject("settings") || {}; const settings = LocalStorageUtil.getObject('settings') || {};
return { return {
connected: false, connected: false,
@@ -120,7 +120,7 @@ class TinodeWeb extends React.Component {
desktopAlertsEnabled: (isSecureConnection() || isLocalHost()) && desktopAlertsEnabled: (isSecureConnection() || isLocalHost()) &&
(typeof firebase != 'undefined') && (typeof navigator != 'undefined') && (typeof firebase != 'undefined') && (typeof navigator != 'undefined') &&
(typeof FIREBASE_INIT != 'undefined'), (typeof FIREBASE_INIT != 'undefined'),
firebaseToken: LocalStorageUtil.getObject("firebase-token"), firebaseToken: LocalStorageUtil.getObject('firebase-token'),
errorText: '', errorText: '',
errorLevel: null, errorLevel: null,
@@ -697,7 +697,7 @@ class TinodeWeb extends React.Component {
// User is sending a message, either plain text or a drafty object, possibly // User is sending a message, either plain text or a drafty object, possibly
// with attachments. // with attachments.
handleSendMessage(msg, promise, uploader) { handleSendMessage(msg, promise, uploader) {
let topic = this.tinode.getTopic(this.state.topicSelected); const topic = this.tinode.getTopic(this.state.topicSelected);
msg = topic.createMessage(msg, false); msg = topic.createMessage(msg, false);
// The uploader is used to show progress. // The uploader is used to show progress.
@@ -717,6 +717,11 @@ class TinodeWeb extends React.Component {
} }
topic.publishDraft(msg, promise) topic.publishDraft(msg, promise)
.then((ctrl) => {
if (topic.isArchived()) {
return topic.archive(false);
}
})
.catch((err) => { .catch((err) => {
this.handleError(err.message, 'err'); this.handleError(err.message, 'err');
}); });
@@ -955,7 +960,12 @@ class TinodeWeb extends React.Component {
handleLogout() { handleLogout() {
updateFavicon(0); updateFavicon(0);
// Remove stored data.
localStorage.removeItem('auth-token'); localStorage.removeItem('auth-token');
localStorage.removeItem('firebase-token');
localStorage.removeItem('settings');
if (this.tinode) { if (this.tinode) {
this.tinode.onDisconnect = undefined; this.tinode.onDisconnect = undefined;
this.tinode.disconnect(); this.tinode.disconnect();
+1 -1
View File
@@ -116,7 +116,7 @@ class ContextMenu extends React.Component {
console.log("Topic not found: ", params.topicName); console.log("Topic not found: ", params.topicName);
return; return;
} }
topic.setMeta({desc: {private: {arch: true}}}).catch((err) => { topic.archive(true).catch((err) => {
if (errorHandler) { if (errorHandler) {
errorHandler(err.message, 'err'); errorHandler(err.message, 'err');
} }
+9 -11
View File
File diff suppressed because one or more lines are too long
+1 -1
View File
File diff suppressed because one or more lines are too long
+1 -1
View File
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long