@heliyos/heliyos-api-core 1.0.22 → 1.0.23

package/dist/authentication.d.ts

@@ -10,11 +10,11 @@ export declare const authentication: (req: Request, res: Response, next: NextFun
 export interface IAuthResponseApiKey {
     id: number;
     name?: string;
-    customer_id?: string;
-    location_ids: string[] | undefined;
+    customerId?: string;
+    locationIds: string[] | undefined;
     policy: IAuthResponseApiKeyPolicy[] | undefined;
-    user_id: string;
-    organization_id: string;
+    userId: string;
+    organizationId: string;
 }
 interface IAuthResponseApiKeyPolicy {
     resource: string;

package/dist/authentication.js

@@ -41,8 +41,8 @@ const authentication = (req, res, next) => __awaiter(void 0, void 0, void 0, fun
                 auth_type: undefined,
             },
             output: {
-                is_basic_auth: false,
-                is_api_key_auth: false,
+                isBasicAuth: false,
+                isApiKeyAuth: false,
             },
         };
         //	Check for the type of authentication
@@ -51,7 +51,7 @@ const authentication = (req, res, next) => __awaiter(void 0, void 0, void 0, fun
         //	Either of BASIC / COOKIE / BEARER
         const authenticationResponse = yield authenticate_request(container);
         if (authenticationResponse) {
-            container.output.logged_in_user = authenticationResponse;
+            container.output.loggedInUser = authenticationResponse;
         }
         else {
             return res.status(401).json({
@@ -173,9 +173,9 @@ const authenticate_request = (container) => __awaiter(void 0, void 0, void 0, fu
         case "API_KEY":
             // Call API authorization server with api key
             result = yield verify_api_key(authentication_header.replace(/Bearer /, ""));
-            //	Set is_api_key_auth if there is a api key id
+            //	Set isApiKeyAuth if there is a api key id
             if (result === null || result === void 0 ? void 0 : result.id) {
-                container.output.is_api_key_auth = true;
+                container.output.isApiKeyAuth = true;
             }
             break;
         default:
@@ -203,8 +203,8 @@ const do_basic_auth = (container) => {
         error.status = "401";
         throw error;
     }
-    //	Set is_basic_auth
-    container.output.is_basic_auth = true;
+    //	Set isBasicAuth
+    container.output.isBasicAuth = true;
     // An empty object is returned because returning a falsy
     // object will means unauthorized.
     return {};
@@ -216,29 +216,29 @@ const do_basic_auth = (container) => {
  * @returns
  */
 const set_logged_in_user = function (container, req) {
-    //	If is_basic_auth, set it and return
-    const { output: { is_basic_auth, is_api_key_auth }, input: { auth_type }, } = container;
-    if (is_basic_auth) {
-        req.is_basic_auth = is_basic_auth;
+    //	If isBasicAuth, set it and return
+    const { output: { isBasicAuth, isApiKeyAuth }, input: { auth_type }, } = container;
+    if (isBasicAuth) {
+        req.isBasicAuth = isBasicAuth;
         return undefined;
     }
-    //	Set is_api_key_auth
-    if (is_api_key_auth) {
-        req.is_api_key_auth = is_api_key_auth;
-        const { output: { logged_in_user }, } = container;
+    //	Set isApiKeyAuth
+    if (isApiKeyAuth) {
+        req.isApiKeyAuth = isApiKeyAuth;
+        const { output: { loggedInUser }, } = container;
         //	Modify req object with logged in user data
-        req.logged_in_user = logged_in_user;
+        req.loggedInUser = loggedInUser;
         return undefined;
     }
     //
     //	Handle Cookie and Bearer token
-    const { output: { logged_in_user }, } = container;
-    const { token, user_id, organization_id } = logged_in_user;
+    const { output: { loggedInUser }, } = container;
+    const { token, userId, organizationId } = loggedInUser;
     //	Modify req object with logged in user data
-    req.logged_in_user = {
+    req.loggedInUser = {
         token,
-        user_id,
-        organization_id,
+        userId,
+        organizationId,
         auth_type,
     };
     return undefined;
@@ -256,12 +256,12 @@ const call_auth_api_server = (token) => __awaiter(void 0, void 0, void 0, functi
         const auth_result = yield _1.axios.auth_server.post("/v1/auth/verify_token_v2", {
             token: token,
         });
-        if ((_b = (_a = auth_result.data) === null || _a === void 0 ? void 0 : _a.data) === null || _b === void 0 ? void 0 : _b.is_valid) {
+        if ((_b = (_a = auth_result.data) === null || _a === void 0 ? void 0 : _a.data) === null || _b === void 0 ? void 0 : _b.isValid) {
             //	Resolve request with received data
             return {
                 token,
-                user_id: auth_result.data.data.payload.user_id,
-                organization_id: auth_result.data.data.payload.organization_id,
+                userId: auth_result.data.data.payload.userId,
+                organizationId: auth_result.data.data.payload.organizationId,
             };
         }
         else {

package/dist/authorization.d.ts

@@ -1,11 +1,11 @@
 /**
  * Authorize the user with the resource action
- * @param organization_id
- * @param user_id
- * @param resource_action
+ * @param organizationId
+ * @param userId
+ * @param resourceAction
  * @returns
  */
-export declare const authorize_user: <T = string, U = string>(organization_id: T, user_id: U, resource_action: string) => Promise<{
+export declare const authorize_user: <T = string, U = string>(organizationId: T, userId: U, resourceAction: string) => Promise<{
     isAllowed: string;
     userRole: string;
 }>;

package/dist/authorization.js

@@ -14,15 +14,15 @@ const customError_1 = require("./@types/globals/customError");
 const axios_1 = require("./axios");
 /**
  * Authorize the user with the resource action
- * @param organization_id
- * @param user_id
- * @param resource_action
+ * @param organizationId
+ * @param userId
+ * @param resourceAction
  * @returns
  */
 // eslint-disable-next-line import/prefer-default-export, @typescript-eslint/naming-convention
-const authorize_user = (organization_id, user_id, resource_action) => __awaiter(void 0, void 0, void 0, function* () {
+const authorize_user = (organizationId, userId, resourceAction) => __awaiter(void 0, void 0, void 0, function* () {
     try {
-        const authenticationResponse = yield axios_1.core_axios.auth_server.post(`v1/auth/user/${user_id}`, { resource_action: resource_action, organization_uuid: organization_id });
+        const authenticationResponse = yield axios_1.core_axios.auth_server.post(`v1/auth/user/${userId}`, { resourceAction, organizationId });
         return authenticationResponse.data.data;
         // eslint-disable-next-line @typescript-eslint/no-unsafe-return, @typescript-eslint/no-unsafe-member-access
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@heliyos/heliyos-api-core",
-  "version": "1.0.22",
+  "version": "1.0.23",
   "description": "Heliyos's core api functions and middlewares. Its a private package hosted on npm.",
   "main": "./dist/index.js",
   "scripts": {