@hedhog/admin 0.46.4 → 0.46.6

package/dist/auth/guards/auth.guard.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"auth.guard.d.ts","sourceRoot":"","sources":["../../../src/auth/guards/auth.guard.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,WAAW,EACX,gBAAgB,EAGjB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAEzC,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAG9C,qBACa,SAAU,YAAW,WAAW;IAEzC,OAAO,CAAC,IAAI;IACZ,OAAO,CAAC,SAAS;gBADT,IAAI,EAAE,WAAW,EACjB,SAAS,EAAE,SAAS;IAGxB,WAAW,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,OAAO,CAAC;IA0B9D,OAAO,CAAC,sBAAsB;CAK/B"}
+{"version":3,"file":"auth.guard.d.ts","sourceRoot":"","sources":["../../../src/auth/guards/auth.guard.ts"],"names":[],"mappings":"AACA,OAAO,EACL,WAAW,EACX,gBAAgB,EAGjB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAEzC,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAE9C,qBACa,SAAU,YAAW,WAAW;IAEzC,OAAO,CAAC,IAAI;IACZ,OAAO,CAAC,SAAS;gBADT,IAAI,EAAE,WAAW,EACjB,SAAS,EAAE,SAAS;IAGxB,WAAW,CAAC,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,OAAO,CAAC;IA8B9D,OAAO,CAAC,sBAAsB;CAK/B"}

package/dist/auth/guards/auth.guard.js

@@ -10,34 +10,41 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AuthGuard = void 0;
+const core_1 = require("@hedhog/core");
 const common_1 = require("@nestjs/common");
-const core_1 = require("@nestjs/core");
+const core_2 = require("@nestjs/core");
 const auth_service_1 = require("../auth.service");
-const core_2 = require("@hedhog/core");
 let AuthGuard = class AuthGuard {
     constructor(auth, reflector) {
         this.auth = auth;
         this.reflector = reflector;
     }
     async canActivate(context) {
-        const isPublic = this.reflector.getAllAndOverride(core_2.IS_PUBLIC_KEY, [
+        const isPublic = this.reflector.getAllAndOverride(core_1.IS_PUBLIC_KEY, [
             context.getHandler(),
             context.getClass(),
         ]);
-        if (isPublic) {
-            return true;
-        }
         const request = context.switchToHttp().getRequest();
         const token = this.extractTokenFromHeader(request);
         if (!token) {
-            throw new common_1.UnauthorizedException();
+            if (isPublic) {
+                return true;
+            }
+            else {
+                throw new common_1.UnauthorizedException();
+            }
         }
         try {
             const payload = await this.auth.verifyToken(token);
             request['auth'] = payload;
         }
         catch (error) {
-            throw new common_1.UnauthorizedException(error);
+            if (isPublic) {
+                return true;
+            }
+            else {
+                throw new common_1.UnauthorizedException(error);
+            }
         }
         return true;
     }
@@ -51,6 +58,6 @@ exports.AuthGuard = AuthGuard;
 exports.AuthGuard = AuthGuard = __decorate([
     (0, common_1.Injectable)(),
     __metadata("design:paramtypes", [auth_service_1.AuthService,
-        core_1.Reflector])
+        core_2.Reflector])
 ], AuthGuard);
 //# sourceMappingURL=auth.guard.js.map

package/dist/auth/guards/auth.guard.js.map

@@ -1 +1 @@
-{"version":3,"file":"auth.guard.js","sourceRoot":"","sources":["../../../src/auth/guards/auth.guard.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAKwB;AACxB,uCAAyC;AAEzC,kDAA8C;AAC9C,uCAA6C;AAGtC,IAAM,SAAS,GAAf,MAAM,SAAS;IACpB,YACU,IAAiB,EACjB,SAAoB;QADpB,SAAI,GAAJ,IAAI,CAAa;QACjB,cAAS,GAAT,SAAS,CAAW;IAC3B,CAAC;IAEJ,KAAK,CAAC,WAAW,CAAC,OAAyB;QACzC,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,iBAAiB,CAAU,oBAAa,EAAE;YACxE,OAAO,CAAC,UAAU,EAAE;YACpB,OAAO,CAAC,QAAQ,EAAE;SACnB,CAAC,CAAC;QAEH,IAAI,QAAQ,EAAE,CAAC;YACb,OAAO,IAAI,CAAC;QACd,CAAC;QAED,MAAM,OAAO,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC,UAAU,EAAE,CAAC;QACpD,MAAM,KAAK,GAAG,IAAI,CAAC,sBAAsB,CAAC,OAAO,CAAC,CAAC;QAEnD,IAAI,CAAC,KAAK,EAAE,CAAC;YACX,MAAM,IAAI,8BAAqB,EAAE,CAAC;QACpC,CAAC;QACD,IAAI,CAAC;YACH,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;YAEnD,OAAO,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC;QAC5B,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,IAAI,8BAAqB,CAAC,KAAK,CAAC,CAAC;QACzC,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAEO,sBAAsB,CAAC,OAAgB;;QAC7C,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,GAAG,MAAA,MAAA,OAAO,CAAC,OAAO,CAAC,aAAa,0CAAE,KAAK,CAAC,GAAG,CAAC,mCAAI,EAAE,CAAC;QAEtE,OAAO,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC;IAC/C,CAAC;CACF,CAAA;AArCY,8BAAS;oBAAT,SAAS;IADrB,IAAA,mBAAU,GAAE;qCAGK,0BAAW;QACN,gBAAS;GAHnB,SAAS,CAqCrB"}
+{"version":3,"file":"auth.guard.js","sourceRoot":"","sources":["../../../src/auth/guards/auth.guard.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,uCAA6C;AAC7C,2CAKwB;AACxB,uCAAyC;AAEzC,kDAA8C;AAGvC,IAAM,SAAS,GAAf,MAAM,SAAS;IACpB,YACU,IAAiB,EACjB,SAAoB;QADpB,SAAI,GAAJ,IAAI,CAAa;QACjB,cAAS,GAAT,SAAS,CAAW;IAC3B,CAAC;IAEJ,KAAK,CAAC,WAAW,CAAC,OAAyB;QACzC,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,iBAAiB,CAAU,oBAAa,EAAE;YACxE,OAAO,CAAC,UAAU,EAAE;YACpB,OAAO,CAAC,QAAQ,EAAE;SACnB,CAAC,CAAC;QAEH,MAAM,OAAO,GAAG,OAAO,CAAC,YAAY,EAAE,CAAC,UAAU,EAAE,CAAC;QACpD,MAAM,KAAK,GAAG,IAAI,CAAC,sBAAsB,CAAC,OAAO,CAAC,CAAC;QAEnD,IAAI,CAAC,KAAK,EAAE,CAAC;YACX,IAAI,QAAQ,EAAE,CAAC;gBACb,OAAO,IAAI,CAAC;YACd,CAAC;iBAAM,CAAC;gBACN,MAAM,IAAI,8BAAqB,EAAE,CAAC;YACpC,CAAC;QACH,CAAC;QACD,IAAI,CAAC;YACH,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;YAEnD,OAAO,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC;QAC5B,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,QAAQ,EAAE,CAAC;gBACb,OAAO,IAAI,CAAC;YACd,CAAC;iBAAM,CAAC;gBACN,MAAM,IAAI,8BAAqB,CAAC,KAAK,CAAC,CAAC;YACzC,CAAC;QACH,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAEO,sBAAsB,CAAC,OAAgB;;QAC7C,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,GAAG,MAAA,MAAA,OAAO,CAAC,OAAO,CAAC,aAAa,0CAAE,KAAK,CAAC,GAAG,CAAC,mCAAI,EAAE,CAAC;QAEtE,OAAO,IAAI,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC;IAC/C,CAAC;CACF,CAAA;AAzCY,8BAAS;oBAAT,SAAS;IADrB,IAAA,mBAAU,GAAE;qCAGK,0BAAW;QACN,gBAAS;GAHnB,SAAS,CAyCrB"}

package/dist/menu/menu.controller.d.ts

@@ -43,31 +43,31 @@ export declare class MenuController {
         id: number;
         created_at: Date;
         updated_at: Date;
-        slug: string;
-        icon: string | null;
         menu_id: number | null;
+        slug: string;
         url: string | null;
         order: number;
+        icon: string | null;
     }>;
     create(data: CreateDTO): Promise<{
         id: number;
         created_at: Date;
         updated_at: Date;
-        slug: string;
-        icon: string | null;
         menu_id: number | null;
+        slug: string;
         url: string | null;
         order: number;
+        icon: string | null;
     }>;
     update(menuId: number, data: UpdateDTO): Promise<{
         id: number;
         created_at: Date;
         updated_at: Date;
-        slug: string;
-        icon: string | null;
         menu_id: number | null;
+        slug: string;
         url: string | null;
         order: number;
+        icon: string | null;
     }>;
     delete(data: DeleteDTO): Promise<import(".prisma/client").Prisma.BatchPayload>;
     updateOrder(data: OrderDTO): Promise<void>;

package/dist/menu/menu.service.d.ts

@@ -44,21 +44,21 @@ export declare class MenuService {
         id: number;
         created_at: Date;
         updated_at: Date;
-        slug: string;
-        icon: string | null;
         menu_id: number | null;
+        slug: string;
         url: string | null;
         order: number;
+        icon: string | null;
     }>;
     create({ slug, url, icon, order, menuId }: CreateDTO): Promise<{
         id: number;
         created_at: Date;
         updated_at: Date;
-        slug: string;
-        icon: string | null;
         menu_id: number | null;
+        slug: string;
         url: string | null;
         order: number;
+        icon: string | null;
     }>;
     update({ id, data }: {
         id: number;
@@ -67,11 +67,11 @@ export declare class MenuService {
         id: number;
         created_at: Date;
         updated_at: Date;
-        slug: string;
-        icon: string | null;
         menu_id: number | null;
+        slug: string;
         url: string | null;
         order: number;
+        icon: string | null;
     }>;
     delete({ ids }: DeleteDTO): Promise<import(".prisma/client").Prisma.BatchPayload>;
     updateOrder({ ids }: OrderDTO): Promise<void>;

package/hedhog.yaml

@@ -86,26 +86,6 @@ data:
       method: PATCH
     - url: /screen
       method: DELETE
-    - url: /setting
-      method: GET
-    - url: /setting/group/:slug
-      method: GET
-    - url: /setting/group
-      method: GET
-    - url: /setting/:settingId
-      method: GET
-    - url: /setting
-      method: POST
-    - url: /setting
-      method: PUT
-    - url: /setting/:slug
-      method: PUT
-    - url: /setting/user/:slug
-      method: PUT
-    - url: /setting/:settingId
-      method: PATCH
-    - url: /setting
-      method: DELETE
     - url: /user
       method: GET
     - url: /user/:userId/role
@@ -301,47 +281,6 @@ data:
         en: Route
         pt: Rotas
       slug: /management/route
-    - url: /management/setting
-      icon: settings
-      name:
-        en: Setting
-        pt: Configurações
-      slug: /management/setting
-    - menu_id:
-        where:
-          slug: /management
-      slug: /settings
-      icon: settings
-      name:
-        en: Settings
-        pt: Configurações
-    - menu_id:
-        where:
-          slug: /settings
-      name:
-        en: Setting Group
-        pt: Grupo de Configuração
-      icon: settings
-      url: /settings/setting-group
-      slug: /settings/setting-group
-    - menu_id:
-        where:
-          slug: /settings
-      name:
-        en: Setting User
-        pt: Configuração de Usuário
-      icon: user-cog
-      url: /settings/setting-user
-      slug: /settings/setting-user
-    - menu_id:
-        where:
-          slug: /settings
-      name:
-        en: Locale
-        pt: Locale
-      icon: world
-      url: /settings/locale
-      slug: /settings/locale
   screen:
     - slug: /management/user
       icon: user
@@ -408,48 +347,6 @@ data:
           - where:
               url:
                 like: /route%
-    - slug: /management/setting
-      icon: settings
-      name:
-        en: Setting
-        pt: Configurações
-      description:
-        en: Manage system setting and configurations.
-        pt: Gerenciar configurações e definições do sistema.
-      relations:
-        route:
-          - where:
-              url:
-                like: /setting%
-    - name:
-        en: Setting Group
-        pt: Grupo de Configuração
-      slug: /settings/setting-group
-      description:
-        en: Screen to manage a group of settings
-        pt: Tela para gerenciar grupo de configurações
-      icon: settings
-    - name:
-        en: Setting User
-        pt: Configuração de Usuário
-      slug: /settings/setting-user
-      description:
-        en: Screen to manage user settings
-        pt: Tela para gerenciar configurações de usuário
-      icon: user-cog
-    - name:
-        en: Locale
-        pt: Locale
-      slug: /settings/locale
-      description:
-        en: Screen to manage locale
-        pt: Tela para gerenciar localização/tradução
-      icon: world
-      relations:
-        route:
-          - where:
-              url:
-                like: /locale%
   multifactor:
     - name:
         en: Email
@@ -883,25 +780,3 @@ tables:
       - type: created_at
       - type: updated_at
     ifNotExists: true
-  setting_user:
-    columns:
-      - name: user_id
-        type: fk
-        isPrimary: true
-        references:
-          table: user
-          column: id
-          onDelete: CASCADE
-      - name: setting_id
-        type: fk
-        isPrimary: true
-        references:
-          table: setting
-          column: id
-          onDelete: CASCADE
-      - name: value
-        length: 1023
-        isNullable: true
-      - type: created_at
-      - type: updated_at
-    ifNotExists: true

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hedhog/admin",
-  "version": "0.46.4",
+  "version": "0.46.6",
   "private": false,
   "main": "dist/index.js",
   "scripts": {

package/src/auth/guards/auth.guard.ts

@@ -1,3 +1,4 @@
+import { IS_PUBLIC_KEY } from '@hedhog/core';
 import {
   CanActivate,
   ExecutionContext,
@@ -7,7 +8,6 @@ import {
 import { Reflector } from '@nestjs/core';
 import { Request } from 'express';
 import { AuthService } from '../auth.service';
-import { IS_PUBLIC_KEY } from '@hedhog/core';
 
 @Injectable()
 export class AuthGuard implements CanActivate {
@@ -22,22 +22,26 @@ export class AuthGuard implements CanActivate {
       context.getClass(),
     ]);
 
-    if (isPublic) {
-      return true;
-    }
-
     const request = context.switchToHttp().getRequest();
     const token = this.extractTokenFromHeader(request);
 
     if (!token) {
-      throw new UnauthorizedException();
+      if (isPublic) {
+        return true;
+      } else {
+        throw new UnauthorizedException();
+      }
     }
     try {
       const payload = await this.auth.verifyToken(token);
 
       request['auth'] = payload;
     } catch (error) {
-      throw new UnauthorizedException(error);
+      if (isPublic) {
+        return true;
+      } else {
+        throw new UnauthorizedException(error);
+      }
     }
     return true;
   }