[update] - fix login

package-lock.json

@@ -21,6 +21,7 @@
         "@ng-select/ng-select": "^10.0.3",
         "bootstrap-icons": "^1.10.3",
         "date-fns": "^2.29.3",
+        "f": "^1.4.0",
         "rxjs": "~7.8.0",
         "sweetalert2": "^11.7.3",
         "tslib": "^2.3.0",
@@ -6451,6 +6452,11 @@
         "node": ">=4"
       }
     },
+    "node_modules/f": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/f/-/f-1.4.0.tgz",
+      "integrity": "sha512-THMsoTpFuIFoQ538jpbW7x/9pVaE0jdKN2O+nd7xpeUT17lECGX8M+QOaZ186ipc3XSzSFOytaXFidItHix44Q=="
+    },
     "node_modules/fast-deep-equal": {
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
@@ -15357,8 +15363,7 @@
       "version": "15.2.2",
       "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-15.2.2.tgz",
       "integrity": "sha512-xHd5CC0Wi0a/CKfKoOC4Bwb1FVjy0esj22eQAkVh0iDKeiAQH4UG/VRmsdSHvto1z0IzGbMSt4hRbv4h2aYIdw==",
-      "dev": true,
-      "requires": {}
+      "dev": true
     },
     "@nodelib/fs.scandir": {
       "version": "2.1.5",
@@ -15957,8 +15962,7 @@
       "version": "1.8.0",
       "resolved": "https://registry.npmjs.org/acorn-import-assertions/-/acorn-import-assertions-1.8.0.tgz",
       "integrity": "sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==",
-      "dev": true,
-      "requires": {}
+      "dev": true
     },
     "acorn-node": {
       "version": "1.8.2",
@@ -17549,6 +17553,11 @@
         "tmp": "^0.0.33"
       }
     },
+    "f": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/f/-/f-1.4.0.tgz",
+      "integrity": "sha512-THMsoTpFuIFoQ538jpbW7x/9pVaE0jdKN2O+nd7xpeUT17lECGX8M+QOaZ186ipc3XSzSFOytaXFidItHix44Q=="
+    },
     "fast-deep-equal": {
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
@@ -18086,8 +18095,7 @@
       "version": "5.1.0",
       "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-5.1.0.tgz",
       "integrity": "sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==",
-      "dev": true,
-      "requires": {}
+      "dev": true
     },
     "ieee754": {
       "version": "1.2.1",
@@ -18763,8 +18771,7 @@
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/karma-jasmine-html-reporter/-/karma-jasmine-html-reporter-2.0.0.tgz",
       "integrity": "sha512-SB8HNNiazAHXM1vGEzf8/tSyEhkfxuDdhYdPBX2Mwgzt0OuF2gicApQ+uvXLID/gXyJQgvrM9+1/2SxZFUUDIA==",
-      "dev": true,
-      "requires": {}
+      "dev": true
     },
     "karma-source-map-support": {
       "version": "1.4.0",
@@ -20260,8 +20267,7 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.0.0.tgz",
       "integrity": "sha512-bdHleFnP3kZ4NYDhuGlVK+CMrQ/pqUm8bx/oGL93K6gVwiclvX5x0n76fYMKuIGKzlABOy13zsvqjb0f92TEXw==",
-      "dev": true,
-      "requires": {}
+      "dev": true
     },
     "postcss-modules-local-by-default": {
       "version": "4.0.0",
@@ -21515,8 +21521,7 @@
           "version": "3.5.2",
           "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
           "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
-          "dev": true,
-          "requires": {}
+          "dev": true
         },
         "json-schema-traverse": {
           "version": "0.4.1",
@@ -21943,8 +21948,7 @@
           "version": "3.5.2",
           "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
           "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
-          "dev": true,
-          "requires": {}
+          "dev": true
         },
         "json-schema-traverse": {
           "version": "0.4.1",
@@ -22143,8 +22147,7 @@
       "version": "8.11.0",
       "resolved": "https://registry.npmjs.org/ws/-/ws-8.11.0.tgz",
       "integrity": "sha512-HPG3wQd9sNQoT9xHyNCXoDUa+Xw/VevmY9FoHyQ+g+rrMn4j6FB4np7Z0OhdTgjx6MgQLK7jwSy1YecU1+4Asg==",
-      "dev": true,
-      "requires": {}
+      "dev": true
     },
     "xtend": {
       "version": "4.0.2",

package.json

@@ -23,6 +23,7 @@
     "@ng-select/ng-select": "^10.0.3",
     "bootstrap-icons": "^1.10.3",
     "date-fns": "^2.29.3",
+    "f": "^1.4.0",
     "rxjs": "~7.8.0",
     "sweetalert2": "^11.7.3",
     "tslib": "^2.3.0",

src/app/auth/login/login.component.ts

@@ -46,11 +46,12 @@ export class LoginComponent implements OnInit {
     try {
       // const result = await lastValueFrom(this.authService.login(this.dataForm));
       let cathayResult: any = await lastValueFrom(this.cathayAuthService.login(this.cathayForm));
-            let isAdmin = cathayResult.token.userName == ROLE_ADMIN ? true : false
+      let isAdmin = cathayResult.userName == ROLE_ADMIN ? true : false
       cathayResult = {
         ...cathayResult,
         isAdmin: isAdmin
       }
+
       this.appService.setToken(cathayResult.token.token)
       this.appService.setAuth(cathayResult);
 

src/app/pages/@layouts/layouts.component.ts

@@ -35,6 +35,7 @@ export class PagesLayoutsComponent implements OnInit {
   }
   async initAuth() {
     this.auth = this.app.auth();
+    console.log(this.auth)
     console.log(this.auth.isAdmin)
     this.menus = this.menus.map(r => {
       if (this.auth.isAdmin) {
@@ -50,6 +51,8 @@ export class PagesLayoutsComponent implements OnInit {
       }
     })
 
+
+
     if (!this.permissionCheck) {
       // const users = await lastValueFrom(this.app.get(`${API.users}/getById/${this.auth.id}`));
       // this.permission = users.permission;