autosync_backend2 1.0.61 → 1.0.62

package/dist/index.d.ts

@@ -1,8 +1,11 @@
 import { Elysia } from "elysia";
-import { auth } from "./lib/auth";
 declare const app: Elysia<"", {
     decorator: {
-        publicPermissions: import("./lib/permissions").default[];
+        publicPermissions: {
+            readonly code: import("./lib/permissions").PermissionCode;
+            description: string;
+            requiresAdmin?: boolean;
+        }[];
     };
     store: {};
     derive: {
@@ -11,7 +14,11 @@ declare const app: Elysia<"", {
     resolve: {};
 } | {
     decorator: {
-        publicPermissions: import("./lib/permissions").default[];
+        publicPermissions: {
+            readonly code: import("./lib/permissions").PermissionCode;
+            description: string;
+            requiresAdmin?: boolean;
+        }[];
     };
     store: {
         startTime?: number | undefined;
@@ -37,7 +44,7 @@ declare const app: Elysia<"", {
     standaloneSchema: {};
     macro: {
         readonly auth?: boolean | undefined;
-        readonly permission?: string | string[] | undefined;
+        readonly permission?: "INVENTORY_ITEM_UPDATE_ADMIN" | "INVENTORY_ITEM_DELETE_ADMIN" | "INVENTORY_ITEM_SELECT_OWN" | "INVENTORY_ITEM_SELECT_ADMIN" | "INVENTORY_ITEM_CREATE_OWN" | "INVENTORY_ITEM_CREATE_ADMIN" | "INVENTORY_ITEM_UPDATE_OWN" | "INVENTORY_ITEM_DELETE_OWN" | "INVENTORY_LOG_SELECT_OWN" | "INVENTORY_LOG_SELECT_ADMIN" | "MERCHANT_MERCHANT_CREATE" | "MERCHANT_MERCHANT_UPDATE_OWN" | "MERCHANT_MERCHANT_UPDATE_ADMIN" | "BACK_OFFICE_ADMIN" | "PERMISSION_ADD" | ("INVENTORY_ITEM_UPDATE_ADMIN" | "INVENTORY_ITEM_DELETE_ADMIN" | "INVENTORY_ITEM_SELECT_OWN" | "INVENTORY_ITEM_SELECT_ADMIN" | "INVENTORY_ITEM_CREATE_OWN" | "INVENTORY_ITEM_CREATE_ADMIN" | "INVENTORY_ITEM_UPDATE_OWN" | "INVENTORY_ITEM_DELETE_OWN" | "INVENTORY_LOG_SELECT_OWN" | "INVENTORY_LOG_SELECT_ADMIN" | "MERCHANT_MERCHANT_CREATE" | "MERCHANT_MERCHANT_UPDATE_OWN" | "MERCHANT_MERCHANT_UPDATE_ADMIN" | "BACK_OFFICE_ADMIN" | "PERMISSION_ADD")[] | undefined;
     };
     macroFn: {
         readonly auth: {
@@ -329,7 +336,7 @@ declare const app: Elysia<"", {
                 };
             }>;
         };
-        readonly permission: (input: string | string[]) => {
+        readonly permission: (input: import("./lib/permissions").PermissionCode | import("./lib/permissions").PermissionCode[]) => {
             resolve({ status, request: { headers } }: {
                 body: unknown;
                 query: Record<string, string>;
@@ -595,7 +602,7 @@ declare const app: Elysia<"", {
                     readonly "Network Authentication Required": 511;
                 }[Code] : Code>;
             }): Promise<import("elysia/dist/error").ElysiaCustomStatusResponse<"Unauthorized", "Unauthorized", 401> | import("elysia/dist/error").ElysiaCustomStatusResponse<"Forbidden", "Хандах эрхгүй байна.", 403> | {
-                permissions: string[];
+                permissions: ("INVENTORY_ITEM_UPDATE_ADMIN" | "INVENTORY_ITEM_DELETE_ADMIN" | "INVENTORY_ITEM_SELECT_OWN" | "INVENTORY_ITEM_SELECT_ADMIN" | "INVENTORY_ITEM_CREATE_OWN" | "INVENTORY_ITEM_CREATE_ADMIN" | "INVENTORY_ITEM_UPDATE_OWN" | "INVENTORY_ITEM_DELETE_OWN" | "INVENTORY_LOG_SELECT_OWN" | "INVENTORY_LOG_SELECT_ADMIN" | "MERCHANT_MERCHANT_CREATE" | "MERCHANT_MERCHANT_UPDATE_OWN" | "MERCHANT_MERCHANT_UPDATE_ADMIN" | "BACK_OFFICE_ADMIN" | "PERMISSION_ADD")[];
             }>;
         };
     };
@@ -612,7 +619,7 @@ declare const app: Elysia<"", {
     standaloneSchema: {};
     macro: {
         readonly auth?: boolean | undefined;
-        readonly permission?: string | string[] | undefined;
+        readonly permission?: "INVENTORY_ITEM_UPDATE_ADMIN" | "INVENTORY_ITEM_DELETE_ADMIN" | "INVENTORY_ITEM_SELECT_OWN" | "INVENTORY_ITEM_SELECT_ADMIN" | "INVENTORY_ITEM_CREATE_OWN" | "INVENTORY_ITEM_CREATE_ADMIN" | "INVENTORY_ITEM_UPDATE_OWN" | "INVENTORY_ITEM_DELETE_OWN" | "INVENTORY_LOG_SELECT_OWN" | "INVENTORY_LOG_SELECT_ADMIN" | "MERCHANT_MERCHANT_CREATE" | "MERCHANT_MERCHANT_UPDATE_OWN" | "MERCHANT_MERCHANT_UPDATE_ADMIN" | "BACK_OFFICE_ADMIN" | "PERMISSION_ADD" | ("INVENTORY_ITEM_UPDATE_ADMIN" | "INVENTORY_ITEM_DELETE_ADMIN" | "INVENTORY_ITEM_SELECT_OWN" | "INVENTORY_ITEM_SELECT_ADMIN" | "INVENTORY_ITEM_CREATE_OWN" | "INVENTORY_ITEM_CREATE_ADMIN" | "INVENTORY_ITEM_UPDATE_OWN" | "INVENTORY_ITEM_DELETE_OWN" | "INVENTORY_LOG_SELECT_OWN" | "INVENTORY_LOG_SELECT_ADMIN" | "MERCHANT_MERCHANT_CREATE" | "MERCHANT_MERCHANT_UPDATE_OWN" | "MERCHANT_MERCHANT_UPDATE_ADMIN" | "BACK_OFFICE_ADMIN" | "PERMISSION_ADD")[] | undefined;
     };
     macroFn: {
         readonly auth: {
@@ -904,7 +911,7 @@ declare const app: Elysia<"", {
                 };
             }>;
         };
-        readonly permission: (input: string | string[]) => {
+        readonly permission: (input: import("./lib/permissions").PermissionCode | import("./lib/permissions").PermissionCode[]) => {
             resolve({ status, request: { headers } }: {
                 body: unknown;
                 query: Record<string, string>;
@@ -1170,7 +1177,7 @@ declare const app: Elysia<"", {
                     readonly "Network Authentication Required": 511;
                 }[Code] : Code>;
             }): Promise<import("elysia/dist/error").ElysiaCustomStatusResponse<"Unauthorized", "Unauthorized", 401> | import("elysia/dist/error").ElysiaCustomStatusResponse<"Forbidden", "Хандах эрхгүй байна.", 403> | {
-                permissions: string[];
+                permissions: ("INVENTORY_ITEM_UPDATE_ADMIN" | "INVENTORY_ITEM_DELETE_ADMIN" | "INVENTORY_ITEM_SELECT_OWN" | "INVENTORY_ITEM_SELECT_ADMIN" | "INVENTORY_ITEM_CREATE_OWN" | "INVENTORY_ITEM_CREATE_ADMIN" | "INVENTORY_ITEM_UPDATE_OWN" | "INVENTORY_ITEM_DELETE_OWN" | "INVENTORY_LOG_SELECT_OWN" | "INVENTORY_LOG_SELECT_ADMIN" | "MERCHANT_MERCHANT_CREATE" | "MERCHANT_MERCHANT_UPDATE_OWN" | "MERCHANT_MERCHANT_UPDATE_ADMIN" | "BACK_OFFICE_ADMIN" | "PERMISSION_ADD")[];
             }>;
         };
     };
@@ -1699,6 +1706,7 @@ declare const app: Elysia<"", {
                         email?: string | null | undefined;
                         createdAt?: string | undefined;
                         updatedAt?: string | undefined;
+                        merchantId?: string | undefined;
                         deletedAt?: string | null | undefined;
                         regNumber?: string | null | undefined;
                         phone?: string | undefined;
@@ -1729,6 +1737,7 @@ declare const app: Elysia<"", {
                                 email: string | null;
                                 createdAt: string;
                                 updatedAt: string;
+                                merchantId: string;
                                 deletedAt: string | null;
                                 regNumber: string | null;
                                 phone: string;
@@ -1775,6 +1784,7 @@ declare const app: Elysia<"", {
                         isActive?: boolean | undefined;
                         name: string;
                         email: string | null;
+                        merchantId: string;
                         phone: string;
                         logoUrl: string;
                         packageId: string;
@@ -1789,6 +1799,7 @@ declare const app: Elysia<"", {
                             email: string | null;
                             createdAt: string;
                             updatedAt: string;
+                            merchantId: string;
                             deletedAt: string | null;
                             regNumber: string | null;
                             phone: string;
@@ -1823,6 +1834,7 @@ declare const app: Elysia<"", {
                         body: {
                             name?: string | undefined;
                             email?: string | null | undefined;
+                            merchantId?: string | undefined;
                             regNumber?: string | null | undefined;
                             phone?: string | undefined;
                             logoUrl?: string | undefined;
@@ -1849,6 +1861,7 @@ declare const app: Elysia<"", {
                                 email: string | null;
                                 createdAt: string;
                                 updatedAt: string;
+                                merchantId: string;
                                 deletedAt: string | null;
                                 regNumber: string | null;
                                 phone: string;
@@ -1915,7 +1928,11 @@ declare const app: Elysia<"", {
                 query: unknown;
                 headers: unknown;
                 response: {
-                    200: import("./lib/permissions").default[];
+                    200: {
+                        readonly code: import("./lib/permissions").PermissionCode;
+                        description: string;
+                        requiresAdmin?: boolean;
+                    }[];
                 };
             };
         } & {
@@ -2091,5 +2108,4 @@ declare const app: Elysia<"", {
     standaloneSchema: {};
 }>;
 export type App = typeof app;
-export type AuthType = typeof auth;
 export {};

package/dist/index.js

@@ -34291,7 +34291,8 @@ var branchTable = merchantSchema.table("branch", {
   googleMapUrl: varchar(),
   isNoat: boolean().notNull().default(false),
   isActive: boolean().notNull().default(true),
-  packageId: varchar().notNull()
+  packageId: varchar().notNull(),
+  merchantId: uuid().notNull()
 });
 var packageTable = merchantSchema.table("package", {
   ...base_schema_helper_default,
@@ -71419,15 +71420,14 @@ var auth = betterAuth({
   user: {
     additionalFields: {
       branchId: {
-        type: "string",
-        fieldName: "branch_id"
+        type: "string"
       },
       merchantId: {
-        type: "string",
-        fieldName: "merchant_id"
+        type: "string"
       }
     }
-  }
+  },
+  trustedOrigins: ["http://192.168.0.117:3000"]
 });
 var _schema;
 var getSchema2 = async () => _schema ??= auth.api.generateOpenAPISchema();
@@ -71650,25 +71650,25 @@ var merchantRoutes = new Elysia({
   tags: ["Merchant"]
 }).get("/", async ({ query }) => await service.get(query), {
   query: selectMerchantSchema,
-  permission: "MERCHANT_MERCHANT_ALL"
+  permission: "MERCHANT_MERCHANT_CREATE"
 }).post("/", async ({ body }) => {
   const result = await service.create(body);
   return result;
 }, {
   body: createMerchantSchema,
-  permission: "MERCHANT_MERCHANT_ALL"
+  permission: "MERCHANT_MERCHANT_CREATE"
 }).guard({
   params: IdSchema
 }).put("/:id", async ({ body, params: { id } }) => service.update(id, body), {
   body: updateMerchantSchema,
-  permission: ["MERCHANT_MERCHANT_ALL", "MERCHANT_MERCHANT_UPDATE_OWN"],
+  permission: ["MERCHANT_MERCHANT_CREATE", "MERCHANT_MERCHANT_UPDATE_OWN"],
   beforeHandle({ status: status2, permissions, params: { id }, user: user2 }) {
-    if (!permissions.includes("MERCHANT_MERCHANT_ALL") && id !== user2.merchantId) {
+    if (!permissions.includes("BACK_OFFICE_ADMIN") && !permissions.includes("MERCHANT_MERCHANT_UPDATE_ADMIN") && !permissions.includes("MERCHANT_MERCHANT_CREATE") && id !== user2.merchantId) {
       return status2("Forbidden", "\u0417\u04E9\u0432\u0445\u04E9\u043D \u04E9\u04E9\u0440\u0438\u0439\u043D \u0431\u0430\u0439\u0433\u0443\u0443\u043B\u043B\u0430\u0433\u044B\u043D \u043C\u044D\u0434\u044D\u044D\u043B\u044D\u043B \u0437\u0430\u0441\u0430\u0445 \u0431\u043E\u043B\u043E\u043C\u0436\u0442\u043E\u0439.");
     }
   }
 }).delete("/:id", async ({ params: { id } }) => service.delete(id), {
-  permission: "MERCHANT_MERCHANT_ALL"
+  permission: "MERCHANT_MERCHANT_CREATE"
 });
 var merchant_default = merchantRoutes;
 
@@ -71781,10 +71781,20 @@ var inventory_default2 = inventoryPermissionList;
 
 // src/lib/permissions/merchant/merchant.ts
 var merchantMerchantPermissions = [
+  {
+    code: "MERCHANT_MERCHANT_CREATE",
+    description: "\u041C\u0435\u0440\u0447\u0430\u043D\u0442 \u0431\u04AF\u0440\u0442\u0433\u044D\u0445",
+    requiresAdmin: true
+  },
   {
     code: "MERCHANT_MERCHANT_UPDATE_OWN",
     description: "\u0422\u0443\u0445\u0430\u0439\u043D \u0441\u0430\u043B\u0431\u0430\u0440\u0438\u0439\u043D \u043C\u0435\u0440\u0447\u0430\u043D\u0442\u044B\u043D \u043C\u044D\u0434\u044D\u044D\u043B\u044D\u043B \u0437\u0430\u0441\u0430\u0445",
     requiresAdmin: true
+  },
+  {
+    code: "MERCHANT_MERCHANT_UPDATE_ADMIN",
+    description: "\u0421\u0430\u043B\u0431\u0430\u0440 \u0441\u043E\u043D\u0433\u043E\u0436 \u043C\u0435\u0440\u0447\u0430\u043D\u0442\u044B\u043D \u043C\u044D\u0434\u044D\u044D\u043B\u044D\u043B \u0437\u0430\u0441\u0430\u0445",
+    requiresAdmin: true
   }
 ];
 var merchant_default3 = merchantMerchantPermissions;
@@ -71794,20 +71804,23 @@ var merchantPermissionList = [...merchant_default3];
 var merchant_default4 = merchantPermissionList;
 
 // src/lib/permissions/index.ts
-var permissionList = [
-  {
-    code: "BACK_OFFICE_ADMIN",
-    description: "\u0411\u04AF\u0445 \u044D\u0440\u0445\u0442\u044D\u0439 \u0430\u0434\u043C\u0438\u043D",
-    requiresAdmin: true
-  },
-  {
-    code: "PERMISSION_ADD",
-    description: "\u042D\u0440\u0445 \u04E9\u0433\u04E9\u0445",
-    requiresAdmin: true
-  },
+var localPermissionList = [
+  ...[
+    {
+      code: "BACK_OFFICE_ADMIN",
+      description: "\u0411\u04AF\u0445 \u044D\u0440\u0445\u0442\u044D\u0439 \u0430\u0434\u043C\u0438\u043D",
+      requiresAdmin: true
+    },
+    {
+      code: "PERMISSION_ADD",
+      description: "\u042D\u0440\u0445 \u04E9\u0433\u04E9\u0445",
+      requiresAdmin: true
+    }
+  ],
   ...inventory_default2,
   ...merchant_default4
 ];
+var permissionList = localPermissionList;
 
 // src/routes/permission/logic.ts
 var PermissionLogic = {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "autosync_backend2",
-	"version": "1.0.61",
+	"version": "1.0.62",
 	"module": "src/index.ts",
 	"type": "module",
 	"main": "dist/index.js",