@edraj/tsdmart 1.0.15 → 1.0.17

package/CHANGELOG.md

@@ -1,6 +1,6 @@
 ## 1.0.10
 
-- Implementing DMART apis up to TBD
+- Implementing DMART apis up to 1.3.x
 
 ## 1.0.8
 

package/README.md

@@ -4,8 +4,8 @@ A TypeScript implementation of the Dmart that depends on axios.
 
 ## APIs
 
-* `login(shortname: string, password: string) -> Promise<ApiResponse>` - Performs a login action (shortname).
-* `loginBy(credentials: dict, password: string) -> Promise<ApiResponse>` - Performs a login action but altering the default identifier that you can customise.
+* `login(shortname: string, password: string) -> Promise<LoginResponse>` - Performs a login action (shortname).
+* `loginBy(credentials: dict, password: string) -> Promise<LoginResponse>` - Performs a login action but altering the default identifier that you can customise.
 * `logout() -> Promise<ApiResponse>` - Performs a logout action.
 * `create_user(request: any) -> Promise<ActionResponse>` - Creates a new user.
 * `update_user(request: any) -> Promise<ActionResponse>` - Updates an existing user.

package/a

@@ -0,0 +1,2 @@
+npm login
+npm publish

package/index.ts

@@ -49,7 +49,7 @@ export type LoginResponseRecord = ApiResponseRecord & {
     };
 };
 
-// type LoginResponse = ApiResponse  & { records : Array<LoginResponseRecord> };
+type LoginResponse = ApiResponse  & { records : Array<LoginResponseRecord> };
 
 export type Permission = {
     allowed_actions: Array<ActionType>;
@@ -94,9 +94,9 @@ export type ProfileResponse = ApiResponse & {
     records: Array<ProfileResponseRecord>;
 };
 
-let headers: { [key: string]: string } = {
+export let headers: { [key: string]: string } = {
     "Content-type": "application/json",
-    //"Authorization": ""
+    "Authorization": ""
 };
 
 export type AggregationReducer = {
@@ -328,23 +328,29 @@ export default class Dmart {
 
     public static async login(shortname: string, password: string) {
         try {
-            const {data} = await axios.post<
-                ApiResponse & { records: Array<LoginResponseRecord> }
-            >(`${this.baseURL}/user/login`, {shortname, password}, {headers});
+            const response = await axios.post<LoginResponse>(`${this.baseURL}/user/login`, {shortname, password}, {headers});
+            const data: LoginResponse = response.data;
+            if (data.status == Status.success && data.records.length > 0) {
+                headers['Authorization'] = "Bearer " + data.records[0].attributes.access_token;
+            }
             return data;
         } catch (error: any) {
-            throw new Error(error.response.data)
+            throw error.response.data
         }
     }
 
     public static async loginBy(credentials: any, password: string) {
         try {
-            const {data} = await axios.post<
-                ApiResponse & { records: Array<LoginResponseRecord> }
-            >(`${this.baseURL}/user/login`, {...credentials, password}, {headers});
+            const response = await axios.post<LoginResponse>(
+                `${this.baseURL}/user/login`, {...credentials, password}, {headers}
+            );
+            const data: LoginResponse = response.data;
+            if (data.status == Status.success && data.records.length > 0) {
+                headers['Authorization'] = "Bearer " + data.records[0].attributes.access_token;
+            }
             return data;
         } catch (error: any) {
-            throw new Error(error.response.data)
+            throw error.response.data
         }
     }
 
@@ -357,7 +363,7 @@ export default class Dmart {
             );
             return data;
         } catch (error: any) {
-            throw new Error(error.response.data)
+            throw error.response.data
         }
     }
 
@@ -370,7 +376,7 @@ export default class Dmart {
             );
             return data;
         } catch (error: any) {
-            throw new Error(error.response.data)
+            throw error.response.data
         }
     }
 
@@ -383,7 +389,7 @@ export default class Dmart {
             );
             return data;
         } catch (error: any) {
-            throw new Error(error.response.data)
+            throw error.response.data
         }
     }
 
@@ -395,7 +401,7 @@ export default class Dmart {
             );
             return data;
         } catch (error: any) {
-            throw new Error(error.response.data)
+            throw error.response.data
         }
     }
 
@@ -419,7 +425,7 @@ export default class Dmart {
             }
             return data;
         } catch (error: any) {
-            throw new Error(error.response.data)
+            throw error.response.data
         }
     }
 
@@ -437,7 +443,7 @@ export default class Dmart {
             );
             return data;
         } catch (error: any) {
-            throw new Error(error.response.data)
+            throw error.response.data
         }
     }
 
@@ -453,7 +459,7 @@ export default class Dmart {
             );
             return data;
         } catch (error: any) {
-            throw new Error(error.response.data)
+            throw error.response.data
         }
     }
 
@@ -466,7 +472,7 @@ export default class Dmart {
             );
             return data;
         } catch (error: any) {
-            throw new Error(error.response.data)
+            throw error.response.data
         }
     }
 
@@ -479,7 +485,7 @@ export default class Dmart {
             );
             return data;
         } catch (error: any) {
-            throw new Error(error.response.data)
+            throw error.response.data
         }
     }
 
@@ -502,7 +508,7 @@ export default class Dmart {
             );
             return data;
         } catch (error: any) {
-            throw new Error(error.response.data)
+            throw error.response.data
         }
     }
 
@@ -551,7 +557,7 @@ export default class Dmart {
 
             return data;
         } catch (error: any) {
-            throw new Error(error.response.data)
+            throw error.response.data
         }
     }
 
@@ -584,7 +590,7 @@ export default class Dmart {
             );
             return data;
         } catch (error: any) {
-            throw new Error(error.response.data)
+            throw error.response.data
         }
     }
 
@@ -641,7 +647,7 @@ export default class Dmart {
             >(`${this.baseURL}/managed/health/${space_name}`, {headers});
             return data;
         } catch (error: any) {
-            throw new Error(error.response.data)
+            throw error.response.data
         }
     }
 
@@ -659,7 +665,7 @@ export default class Dmart {
             );
             return data;
         } catch (error: any) {
-            throw new Error(error.response.data)
+            throw error.response.data
         }
     }
 
@@ -678,7 +684,7 @@ export default class Dmart {
             );
             return data;
         } catch (error: any) {
-            throw new Error(error.response.data)
+            throw error.response.data
         }
     }
 
@@ -697,7 +703,7 @@ export default class Dmart {
             );
             return data;
         }catch (error: any) {
-            throw new Error(error.response.data)
+            throw error.response.data
         }
     }
 
@@ -726,7 +732,7 @@ export default class Dmart {
             );
             return data;
         } catch (error: any) {
-            throw new Error(error.response.data)
+            throw error.response.data
         }
     }
 
@@ -744,7 +750,7 @@ export default class Dmart {
             );
             return data;
         } catch (error: any) {
-            throw new Error(error.response.data)
+            throw error.response.data
         }
     }
 
@@ -755,7 +761,7 @@ export default class Dmart {
             });
             return data;
         } catch (error: any) {
-            throw new Error(error.response.data)
+            throw error.response.data
         }
     }
 
@@ -766,7 +772,7 @@ export default class Dmart {
             });
             return data;
         } catch (error: any) {
-            throw new Error(error.response.data)
+            throw error.response.data
         }
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@edraj/tsdmart",
-  "version": "1.0.15",
+  "version": "1.0.17",
   "description": "A TypeScript implementation of the Dmart that depends on axios.",
   "author": "Kefah T. Issa",
   "email": "kefah.issa@gmail.com",
@@ -21,6 +21,6 @@
     "typescript": "^5.4.2"
   },
   "dependencies": {
-    "axios": "^1.7.9"
+    "axios": "^1.9.0"
   }
 }

package/test.ts

@@ -0,0 +1,46 @@
+import Dmart from "./index";
+
+
+Dmart.baseURL = 'http://localhost:8282';
+
+const r = await Dmart.login('dmart', 'Test1234')
+console.log({r});
+const request:any = {
+  space_name: "management",
+  request_type: "update",
+  records: [
+    {
+      resource_type: "user",
+      shortname: "zainebfrontend",
+      subpath: "/users",
+      attributes: {
+        description: {
+          ar: "desc ar",
+          en: "HelloWorld en",
+          ku: "desc ku"
+        },
+        displayname: {
+          ar: "name ar",
+          en: "myName en",
+          ku: "name ku"
+        },
+        is_active: true,
+        invitation: "",
+        payload: {
+          body: {
+            email: "zainebb@gmail.com",
+            first_name: "Jo",
+            last_name: "Do",
+            mobile: "792211703",
+            language: "english"
+          },
+          content_type: "json",
+          // schema_shortname: "user"
+        },
+        tags: []
+      }
+    }
+  ]
+};
+const u = await Dmart.request(request);
+console.log({u});