Merge branch 'next' into next-reply

src/views/info-view.jsx

@@ -396,14 +396,19 @@ class InfoView extends React.Component {
       return;
     }
 
+    const isMe = this.props.tinode.isMe(params.topicName);
     const menuItems = [
       {title: formatMessage(messages.edit_permissions), handler: () => {
-        this.handleLaunchPermissionsEditor('user', params.topicName);
+        this.handleLaunchPermissionsEditor(isMe ? 'want' : 'user', params.topicName);
-      }},
+      }}
-      'member_delete',
-      user.acs.isMuted() ? 'member_unmute' : 'member_mute',
-      user.acs.isJoiner() ? 'member_block' : 'member_unblock'
     ];
+    if (!isMe) {
+      menuItems.push('member_delete');
+    }
+    menuItems.push(user.acs.isMuted() ? 'member_unmute' : 'member_mute');
+    if (!isMe) {
+      menuItems.push(user.acs.isJoiner() ? 'member_block' : 'member_unblock');
+    }
     this.props.showContextMenu({
       topicName: this.props.topic,
       x: params.x,
@@ -413,7 +418,6 @@ class InfoView extends React.Component {
 
   render() {
     const args = (this.props.panel || 'info').split('/');
-    console.log("args:", args);
     const view = args[0];
     args.shift();
 
@@ -533,7 +537,6 @@ class InfoView extends React.Component {
                 </div> : null}
             </div>
             <div className="hr" />
-            <div className="panel-form-column">
             <div className="panel-form-row">
               <label>
                 <FormattedMessage id="label_muting_topic" defaultMessage="Muted:"
@@ -541,9 +544,8 @@ class InfoView extends React.Component {
               </label>
               <CheckBox name="P" checked={this.state.muted} onChange={this.handleMuted} />
             </div>
-            </div>
             <div className="hr" />
-            <div className="panel-form-column">
+            <div className="panel-form-row">
               <a href="#" className="flat-button" onClick={(e) => {e.preventDefault(); this.props.onNavigate('security');}}>
                 <i className="material-icons">security</i>&nbsp;<FormattedMessage id="button_security"
                   defaultMessage="Security" description="Navigaton button for security panel." />
@@ -552,7 +554,6 @@ class InfoView extends React.Component {
             {this.state.groupTopic && this.state.sharer ?
               <>
                 <div className="hr" />
-                <div className="panel-form-column">
                 <div className="panel-form-row">
                   <label className="small">
                     <FormattedMessage id="label_group_members" defaultMessage="Group members:"
@@ -581,7 +582,6 @@ class InfoView extends React.Component {
                     showContextMenu={this.state.admin ? this.handleContextMenu : false}
                   />
                 }</FormattedMessage>
-                </div>
               </>
               :
               null

src/views/tinode-web.jsx

@@ -565,8 +565,9 @@ class TinodeWeb extends React.Component {
     cred = Tinode.credential(cred);
     // Try to login with login/password. If they are not available, try token. If no token, ask for login/password.
     let promise = null;
-    const token = this.tinode.getAuthToken();
+    let token = this.tinode.getAuthToken();
     if (login && password) {
+      token = null;
       this.setState({password: null});
       promise = this.tinode.loginBasic(login, password, cred);
     } else if (token) {
@@ -594,7 +595,9 @@ class TinodeWeb extends React.Component {
           autoLogin: false
         });
         this.handleError(err.message, 'err');
-        localStorage.removeItem('auth-token');
+        if (token) {
+          this.handleLogout();
+        }
         HashNavigation.navigateTo('');
       });
     } else {

umd/index.dev.js

@@ -2227,12 +2227,24 @@ class InfoView extends (react__WEBPACK_IMPORTED_MODULE_0___default().Component)
       return;
     }
 
+    const isMe = this.props.tinode.isMe(params.topicName);
     const menuItems = [{
       title: formatMessage(messages.edit_permissions),
       handler: () => {
-        this.handleLaunchPermissionsEditor('user', params.topicName);
+        this.handleLaunchPermissionsEditor(isMe ? 'want' : 'user', params.topicName);
       }
-    }, 'member_delete', user.acs.isMuted() ? 'member_unmute' : 'member_mute', user.acs.isJoiner() ? 'member_block' : 'member_unblock'];
+    }];
+
+    if (!isMe) {
+      menuItems.push('member_delete');
+    }
+
+    menuItems.push(user.acs.isMuted() ? 'member_unmute' : 'member_mute');
+
+    if (!isMe) {
+      menuItems.push(user.acs.isJoiner() ? 'member_block' : 'member_unblock');
+    }
+
     this.props.showContextMenu({
       topicName: this.props.topic,
       x: params.x,
@@ -2243,7 +2255,6 @@ class InfoView extends (react__WEBPACK_IMPORTED_MODULE_0___default().Component)
 
   render() {
     const args = (this.props.panel || 'info').split('/');
-    console.log("args:", args);
     const view = args[0];
     args.shift();
     const {
@@ -2386,8 +2397,6 @@ class InfoView extends (react__WEBPACK_IMPORTED_MODULE_0___default().Component)
     })), react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", null, this.state.description)) : null), react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", {
       className: "hr"
     }), react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", {
-      className: "panel-form-column"
-    }, react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", {
       className: "panel-form-row"
     }, react__WEBPACK_IMPORTED_MODULE_0___default().createElement("label", null, react__WEBPACK_IMPORTED_MODULE_0___default().createElement(react_intl__WEBPACK_IMPORTED_MODULE_1__.FormattedMessage, {
       id: "label_muting_topic",
@@ -2399,10 +2408,10 @@ class InfoView extends (react__WEBPACK_IMPORTED_MODULE_0___default().Component)
       name: "P",
       checked: this.state.muted,
       onChange: this.handleMuted
-    }))), react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", {
+    })), react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", {
       className: "hr"
     }), react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", {
-      className: "panel-form-column"
+      className: "panel-form-row"
     }, react__WEBPACK_IMPORTED_MODULE_0___default().createElement("a", {
       href: "#",
       className: "flat-button",
@@ -2421,8 +2430,6 @@ class InfoView extends (react__WEBPACK_IMPORTED_MODULE_0___default().Component)
     }))), this.state.groupTopic && this.state.sharer ? react__WEBPACK_IMPORTED_MODULE_0___default().createElement((react__WEBPACK_IMPORTED_MODULE_0___default().Fragment), null, react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", {
       className: "hr"
     }), react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", {
-      className: "panel-form-column"
-    }, react__WEBPACK_IMPORTED_MODULE_0___default().createElement("div", {
       className: "panel-form-row"
     }, react__WEBPACK_IMPORTED_MODULE_0___default().createElement("label", {
       className: "small"
@@ -2464,7 +2471,7 @@ class InfoView extends (react__WEBPACK_IMPORTED_MODULE_0___default().Component)
       noScroll: true,
       onTopicSelected: this.handleMemberSelected,
       showContextMenu: this.state.admin ? this.handleContextMenu : false
-    })))) : null));
+    }))) : null));
   }
 
 }
@@ -5421,9 +5428,10 @@ class TinodeWeb extends (react__WEBPACK_IMPORTED_MODULE_0___default().Component)
 
     cred = tinode_sdk__WEBPACK_IMPORTED_MODULE_4___default().credential(cred);
     let promise = null;
-    const token = this.tinode.getAuthToken();
+    let token = this.tinode.getAuthToken();
 
     if (login && password) {
+      token = null;
       this.setState({
         password: null
       });
@@ -5456,7 +5464,11 @@ class TinodeWeb extends (react__WEBPACK_IMPORTED_MODULE_0___default().Component)
           autoLogin: false
         });
         this.handleError(err.message, 'err');
-        localStorage.removeItem('auth-token');
+
+        if (token) {
+          this.handleLogout();
+        }
+
         _lib_navigation_js__WEBPACK_IMPORTED_MODULE_15__.default.navigateTo('');
       });
     } else {