@tryvital/vital-node 1.6.5 → 2.1.1

package/.github/workflows/test-build.yaml

@@ -2,7 +2,10 @@ on:
   push:
     branches-ignore:
       - master
-
+env:
+  TEST_EU_API_KEY: ${{ secrets.TEST_EU_API_KEY }}
+  TEST_US_API_KEY: ${{ secrets.TEST_US_API_KEY }}
+  TEST_ENVIRONMENT: "sandbox"
 name: Test compile
 jobs:
   test-build:
@@ -16,3 +19,14 @@ jobs:
           registry-url: 'https://registry.npmjs.org'
       - run: npm ci
       - run: npm run build
+  test-code:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      # Setup .npmrc file to publish to npm
+      - uses: actions/setup-node@v2
+        with:
+          node-version: '16.x'
+          registry-url: 'https://registry.npmjs.org'
+      - run: npm ci
+      - run: npm run test-client

package/__tests__/activity.test.ts

@@ -1,18 +1,17 @@
 import { VitalClient } from "..";
-import { testClient, testEuClient, testApiKeyClient, getUserId } from "./arrange";
+import { testUSClient, testEUClient, getUserId } from "./arrange";
 
 
 describe('Activity', () => {
     it.each([
-        ["us", testClient],
-        ["eu", testEuClient],
-        ["us_api_key", testApiKeyClient],
+        ["eu_api_key", testEUClient],
+        ["us_api_key", testUSClient],
     ])('should return activity data %p', async (region: string, client: VitalClient) => {
         const userId = await getUserId(client)
         const data = await client.Activity.get(
             userId,
             new Date("2020-01-01"),
-            new Date("2022-01-02"),
+            new Date("2022-12-01"),
         )
         expect(data.activity.length).toBeGreaterThan(0)
     });

package/__tests__/arrange.ts

@@ -3,22 +3,15 @@ require('dotenv').config({
     path: '.env'
 })
 
-export const testClient = new VitalClient({
-    client_id: process.env.TEST_CLIENT_ID,
-    client_secret: process.env.TEST_CLIENT_SECRET,
+export const testEUClient = new VitalClient({
+    api_key: process.env.TEST_EU_API_KEY,
     environment: process.env.TEST_ENVIRONMENT as any,
-    region: "us",
-});
-
-export const testEuClient = new VitalClient({
-    client_id: process.env.TEST_EU_CLIENT_ID,
-    client_secret: process.env.TEST_EU_CLIENT_SECRET,
-    environment: "development",
     region: "eu",
 });
 
-export const testApiKeyClient = new VitalClient({
-    api_key: process.env.TEST_API_KEY,
+
+export const testUSClient = new VitalClient({
+    api_key: process.env.TEST_US_API_KEY,
     environment: process.env.TEST_ENVIRONMENT as any,
     region: "us",
 });

package/__tests__/body.test.ts

@@ -1,17 +1,16 @@
 import { VitalClient } from "..";
-import { getUserId, testApiKeyClient, testClient, testEuClient } from "./arrange";
+import { testEUClient, testUSClient, getUserId } from "./arrange";
 
 describe('Body', () => {
     it.each([
-        ["us", testClient],
-        ["eu", testEuClient],
-        ["us_api_key", testApiKeyClient],
+        ["eu_api_key", testEUClient],
+        ["us_api_key", testUSClient],
     ])('should return body data %p', async (region: string, client: VitalClient) => {
         const userId = await getUserId(client)
         const data = await client.Body.get(
             userId,
             new Date("2021-01-01"),
-            new Date("2022-01-02"),
+            new Date("2022-12-01"),
         )
         expect(data.body.length).toBeGreaterThan(0)
     });

package/__tests__/link.test.ts

@@ -1,11 +1,10 @@
 import { VitalClient } from "..";
-import { getUserId, testApiKeyClient, testClient, testEuClient } from "./arrange";
+import { testEUClient, testUSClient, getUserId } from "./arrange";
 
 describe('Link', () => {
     it.each([
-        ["us", testClient],
-        ["eu", testEuClient],
-        ["us_api_key", testApiKeyClient],
+        ["eu_api_key", testEUClient],
+        ["us_api_key", testUSClient],
     ])('should create a link token %p', async (region: string, client: VitalClient) => {
         const userId = await getUserId(client)
         const data = await client.Link.create(

package/__tests__/profile.test.ts

@@ -1,11 +1,10 @@
 import { VitalClient } from "..";
-import { testClient, testEuClient, getUserId, testApiKeyClient } from "./arrange";
+import { testEUClient, testUSClient, getUserId } from "./arrange";
 
 describe('Profile', () => {
     it.each([
-        ["us", testClient],
-        ["eu", testEuClient],
-        ["us_api_key", testApiKeyClient],
+        ["eu_api_key", testEUClient],
+        ["us_api_key", testUSClient],
     ])('should return profile data %p', async (region: string, client: VitalClient) => {
         const userId = await getUserId(client)
         const data = await client.Profile.get(

package/__tests__/providers.test.ts

@@ -1,6 +1,6 @@
-import { testApiKeyClient } from "./arrange";
+import { testUSClient } from "./arrange";
 
 it('should return supported providers', async () => {
-    const data = await testApiKeyClient.Providers.getSupportedProviders()
+    const data = await testUSClient.Providers.getSupportedProviders()
     expect(data.length).toBeGreaterThan(0)
 })

package/__tests__/sleep.test.ts

@@ -1,31 +1,29 @@
 import { VitalClient } from "..";
-import { testClient, testEuClient, getUserId, testApiKeyClient } from "./arrange";
+import { testEUClient, testUSClient, getUserId } from "./arrange";
 
 describe('Sleep', () => {
     it.each([
-        ["us", testClient],
-        ["eu", testEuClient],
-        ["us_api_key", testApiKeyClient],
+        ["eu_api_key", testEUClient],
+        ["us_api_key", testUSClient],
     ])('should return sleep data %p', async (region: string, client: VitalClient) => {
         const userId = await getUserId(client)
         const data = await client.Sleep.get(
             userId,
             new Date("2021-01-01"),
-            new Date("2022-01-02"),
+            new Date("2022-12-01"),
         )
         expect(data.sleep.length).toBeGreaterThan(0)
     });
 
     it.each([
-        ["us", testClient],
-        ["eu", testEuClient],
-        ["us_api_key", testApiKeyClient],
+        ["eu_api_key", testEUClient],
+        ["us_api_key", testUSClient],
     ])('should return sleep stream data %p', async (region: string, client: VitalClient) => {
         const userId = await getUserId(client)
         const data = await client.Sleep.getSleepWithStream(
             userId,
-            new Date("2021-09-10"),
-            new Date("2021-10-10"),
+            new Date("2022-10-30"),
+            new Date("2022-11-01"),
         )
         expect(data.sleep.length).toBeGreaterThan(0)
         expect(data.sleep[0].sleep_stream).toBeDefined()

package/__tests__/user.test.ts

@@ -1,12 +1,11 @@
 import { VitalClient } from "..";
-import { getUserId, randomString, testApiKeyClient, testClient, testEuClient, test_user_id } from "./arrange";
+import { testEUClient, testUSClient, getUserId, randomString, test_user_id } from "./arrange";
 
 describe('User', () => {
     const user_id = randomString(10);
     it.each([
-        ["us", testClient],
-        ["eu", testEuClient],
-        ["us_api_key", testApiKeyClient],
+        ["eu_api_key", testEUClient],
+        ["us_api_key", testUSClient],
     ])('should create a user %p', async (region: string, client: VitalClient) => {
         const user = await client.User.create(
             user_id,
@@ -15,9 +14,8 @@ describe('User', () => {
     });
 
     it.each([
-        testClient,
-        testEuClient,
-        testApiKeyClient
+        testEUClient,
+        testUSClient,
     ])('should find a user', async (client: VitalClient) => {
         const user = await client.User.resolve(
             test_user_id,
@@ -26,9 +24,8 @@ describe('User', () => {
     });
 
     it.each([
-        testClient,
-        testEuClient,
-        testApiKeyClient
+        testEUClient,
+        testUSClient,
     ])('should delete a user', async (client: VitalClient) => {
         const userToDelete = await getUserId(client, user_id);
         const user = await client.User.delete(

package/__tests__/vitals.test.ts

@@ -1,17 +1,16 @@
 import { VitalClient } from "..";
-import { testClient, testEuClient, getUserId, testApiKeyClient } from "./arrange";
+import { testEUClient, testUSClient, getUserId } from "./arrange";
 
 describe('Vitals', () => {
     it.each([
-        ["us", testClient],
-        ["eu", testEuClient],
-        ["us_api_key", testApiKeyClient],
-    ])('should return glucose data %p', async (region: string, client: VitalClient) => {
+        ["eu_api_key", testEUClient],
+        ["us_api_key", testUSClient],
+    ])('should return heartrate data %p', async (region: string, client: VitalClient) => {
         const userId = await getUserId(client)
-        const data = await client.Vitals.glucose(
+        const data = await client.Vitals.heartrate(
             userId,
-            new Date("2021-01-01"),
-            new Date("2022-01-02"),
+            new Date("2022-10-01"),
+            new Date("2022-11-01"),
         )
         expect(data.length).toBeGreaterThan(0)
     });

package/__tests__/workouts.test.ts

@@ -1,17 +1,16 @@
 import { VitalClient } from "..";
-import { testClient, testEuClient, getUserId, testApiKeyClient } from "./arrange";
+import { testEUClient, testUSClient, getUserId } from "./arrange";
 
 describe('Workouts', () => {
     it.each([
-        ["us", testClient],
-        ["eu", testEuClient],
-        ["us_api_key", testApiKeyClient],
+        ["eu_api_key", testEUClient],
+        ["us_api_key", testUSClient],
     ])('should return workout data %p', async (region: string, client: VitalClient) => {
         const userId = await getUserId(client)
         const data = await client.Workouts.get(
             userId,
             new Date("2021-01-01"),
-            new Date("2022-01-02"),
+            new Date("2022-12-01"),
         )
         expect(data.workouts.length).toBeGreaterThan(0)
     });

package/client/LabTests.ts

@@ -96,8 +96,6 @@ export class ResultsApi {
 
 
 
-
-
 export class LabTestsApi {
     baseURL: string;
     client: AxiosInstance;

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { ActivityApi, BodyApi, LinkApi, SleepApi, UserApi, WebhooksApi, WorkoutsApi, ProfileApi, DevicesAPI, MealsApi, TestkitsApi } from './client';
+import { ActivityApi, BodyApi, LinkApi, SleepApi, UserApi, WebhooksApi, WorkoutsApi, ProfileApi, DevicesAPI, MealsApi, LabTestsApi } from './client';
 import { ClientConfig } from './lib/models';
 import { VitalsApi } from './client/Vitals';
 import { ProviderApi } from './client/Provider';
@@ -13,7 +13,7 @@ export declare class VitalClient {
     Workouts: WorkoutsApi;
     Webhooks: WebhooksApi;
     Vitals: VitalsApi;
-    Testkits: TestkitsApi;
+    LabTests: LabTestsApi;
     Profile: ProfileApi;
     Providers: ProviderApi;
     Devices: DevicesAPI;

package/dist/index.js

@@ -93,7 +93,7 @@ var VitalClient = /** @class */ (function () {
         this.Workouts = new client_1.WorkoutsApi(baseURL.concat('/v2'), axiosApiInstance);
         this.Webhooks = new client_1.WebhooksApi(baseURL.concat('/v2'), axiosApiInstance);
         this.Vitals = new Vitals_1.VitalsApi(baseURL.concat('/v2'), axiosApiInstance);
-        this.Testkits = new client_1.TestkitsApi(baseURL.concat('/v2'), axiosApiInstance);
+        this.LabTests = new client_1.LabTestsApi(baseURL.concat('/v3'), axiosApiInstance);
         this.Profile = new client_1.ProfileApi(baseURL.concat('/v2'), axiosApiInstance);
         this.Providers = new Provider_1.ProviderApi(baseURL.concat('/v2'), axiosApiInstance);
         this.Devices = new client_1.DevicesAPI(baseURL.concat('/v2'), axiosApiInstance);

package/index.ts

@@ -11,7 +11,7 @@ import {
   ProfileApi,
   DevicesAPI,
   MealsApi,
-  TestkitsApi
+  LabTestsApi
 } from './client';
 import { ClientConfig } from './lib/models';
 import CONFIG from './lib/config';
@@ -29,7 +29,7 @@ export class VitalClient {
   Workouts: WorkoutsApi;
   Webhooks: WebhooksApi;
   Vitals: VitalsApi;
-  Testkits: TestkitsApi;
+  LabTests: LabTestsApi;
   Profile: ProfileApi;
   Providers: ProviderApi;
   Devices: DevicesAPI;
@@ -75,7 +75,7 @@ export class VitalClient {
     this.Workouts = new WorkoutsApi(baseURL.concat('/v2'), axiosApiInstance);
     this.Webhooks = new WebhooksApi(baseURL.concat('/v2'), axiosApiInstance);
     this.Vitals = new VitalsApi(baseURL.concat('/v2'), axiosApiInstance);
-    this.Testkits = new TestkitsApi(baseURL.concat('/v2'), axiosApiInstance);
+    this.LabTests = new LabTestsApi(baseURL.concat('/v3'), axiosApiInstance);
     this.Profile = new ProfileApi(baseURL.concat('/v2'), axiosApiInstance);
     this.Providers = new ProviderApi(baseURL.concat('/v2'), axiosApiInstance);
     this.Devices = new DevicesAPI(baseURL.concat('/v2'), axiosApiInstance);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tryvital/vital-node",
-  "version": "1.6.5",
+  "version": "2.1.1",
   "description": "Node client for Vital",
   "author": "maitham",
   "keywords": [
@@ -15,7 +15,7 @@
   "scripts": {
     "build": "tsc --outDir dist/",
     "prepublishOnly": "npm run build",
-    "test": "env TS_NODE_PROJECT=\"tsconfig.testing.json\" mocha --require ts-node/register './test/**/*.ts'",
+    "test": "env TS_NODE_PROJECT=\"tsconfig.testing.json\" mocha --require ts-node/register './__tests__/**/*.ts'",
     "test-typescript": "tsc --build types/test",
     "test-client": "jest --config jest.config.js",
     "test-single": "jest --config -i __tests__/user.test.ts jest.config.js",

package/__tests__/devices.test.ts

@@ -1,16 +0,0 @@
-import { VitalClient } from "..";
-import { testClient, testEuClient, getUserId, testApiKeyClient } from "./arrange";
-
-describe('Devices', () => {
-    it.each([
-        ["us", testClient],
-        ["eu", testEuClient],
-        ["us_api_key", testApiKeyClient],
-    ])('should return device data %p', async (region: string, client: VitalClient) => {
-        const userId = await getUserId(client)
-        const data = await client.Devices.get_raw(
-            userId,
-        )
-        expect(data.devices.length).toBeGreaterThan(0)
-    });
-})