@social-mail/social-mail-client 1.2.113 → 1.2.115

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@social-mail/social-mail-client",
-  "version": "1.2.113",
+  "version": "1.2.115",
   "description": "",
   "main": "index.js",
   "scripts": {

package/src/admin/pages/users/UserDetailsPage.tsx

@@ -11,6 +11,9 @@ import EditUserMailboxPage from "./mailboxes/EditUserMailboxPage";
 import EditFileAcessPage from "./files/EditFileAccessPage";
 import { DeleteIconTextButton, SaveIconButton, SaveIconTextButton } from "../../../common/controls/buttons/IconButton";
 import Action from "@web-atoms/core/dist/view-model/Action";
+import FormField from "@web-atoms/web-controls/dist/basic/FormField";
+import PageNavigator from "@web-atoms/web-controls/dist/PageNavigator";
+import EditUserPage from "./EditUserPage";
 
 export default class UserDetailsPage extends ContentPage {
 
@@ -31,6 +34,9 @@ export default class UserDetailsPage extends ContentPage {
 
                 <div data-layout="vertical-flex-stretch-items">
                     <div data-layout="frame-vertical-flex">
+                        <FormField label="Username:">
+                            <label>{this.model.userName}</label>
+                        </FormField>
                         <div data-layout="row">
                             Status: <span
                                 data-color={ this.model.status === "active"
@@ -53,6 +59,10 @@ export default class UserDetailsPage extends ContentPage {
                                 data-submit-event="reset-mfa"
                                 text="Reset MFA"
                                 />}
+                            <SaveIconTextButton
+                                data-click-event="change-password"
+                                text="Change Password"
+                                />
                         </div>
                     </div>
                 </div>
@@ -115,4 +125,9 @@ export default class UserDetailsPage extends ContentPage {
         await this.userService.resetMFA(this.model);
         await this.init();
     }
+
+    @Action({ onEvent:"change-password"})
+    async changePassword() {
+        PageNavigator.pushPage(EditUserPage, this.model);
+    }
 }

package/src/services/LoginService.ts

@@ -5,6 +5,7 @@ import { ILoginSession, IUser, LoginSession, User } from "../model/model";
 import SocialMailApp from "../common/SocialMailApp";
 import { App } from "@web-atoms/core/dist/App";
 import WebPushService from "./WebPushService";
+import sleep from "@web-atoms/core/dist/core/sleep";
 
 @DISingleton()
 export default class LoginService {
@@ -40,6 +41,7 @@ export default class LoginService {
         session.invalid = true;
         const cloner = this.entityService.cloner(session);
         await this.entityService.save(cloner.copy);
+        await sleep(1000);
         location.reload();
     }
 

package/src/web/AppIndex.tsx

@@ -57,7 +57,7 @@ export default class AppIndex extends MobileDesktopApp {
 
         if (this.desktopApp) {
             this.desktopApp.statusBarRenderer = () => <div data-layout="row">
-                <a href="/admin" target="_blank">Admin</a>
+                { currentUser.roles?.find((x) => /^admin/i.test(x.roleName)) && <a href="/admin" target="_blank">Admin</a> }
                 <div data-flex="stretch-full"/>
                 { ... ModuleInfo}
             </div>;