@tryvital/vital-node 1.3.1 → 1.3.4

package/__tests__/activity.test.ts

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

package/__tests__/arrange.ts

@@ -17,6 +17,12 @@ export const testEuClient = new VitalClient({
     region: "eu",
 });
 
+export const testApiKeyClient = new VitalClient({
+    api_key: process.env.TEST_API_KEY,
+    environment: process.env.TEST_ENVIRONMENT as any,
+    region: "us",
+});
+
 export const test_user_id = "test_user_1234";
 
 export const getUserId = async (client: VitalClient, user_id: string = test_user_id) => {

package/__tests__/body.test.ts

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

package/__tests__/devices.test.ts

@@ -1,10 +1,11 @@
 import { VitalClient } from "..";
-import { testClient, testEuClient, getUserId } from "./arrange";
+import { testClient, testEuClient, getUserId, testApiKeyClient } from "./arrange";
 
 describe('Devices', () => {
     it.each([
         ["us", testClient],
-        ["eu", testEuClient]
+        ["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(

package/__tests__/link.test.ts

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

package/__tests__/sleep.test.ts

@@ -1,10 +1,11 @@
 import { VitalClient } from "..";
-import { testClient, testEuClient, getUserId } from "./arrange";
+import { testClient, testEuClient, getUserId, testApiKeyClient } from "./arrange";
 
 describe('Sleep', () => {
     it.each([
         ["us", testClient],
-        ["eu", testEuClient]
+        ["eu", testEuClient],
+        ["us_api_key", testApiKeyClient],
     ])('should return sleep data %p', async (region: string, client: VitalClient) => {
         const userId = await getUserId(client)
         const data = await client.Sleep.get(
@@ -14,4 +15,19 @@ describe('Sleep', () => {
         )
         expect(data.sleep.length).toBeGreaterThan(0)
     });
+
+    it.each([
+        ["us", testClient],
+        ["eu", testEuClient],
+        ["us_api_key", testApiKeyClient],
+    ])('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"),
+        )
+        expect(data.sleep.length).toBeGreaterThan(0)
+        expect(data.sleep[0].sleep_stream).toBeDefined()
+    });
 })

package/__tests__/user.test.ts

@@ -1,11 +1,12 @@
 import { VitalClient } from "..";
-import { getUserId, randomString, testClient, testEuClient, test_user_id } from "./arrange";
+import { getUserId, randomString, testApiKeyClient, testClient, testEuClient, test_user_id } from "./arrange";
 
 describe('User', () => {
     const user_id = randomString(10);
     it.each([
         ["us", testClient],
-        ["eu", testEuClient]
+        ["eu", testEuClient],
+        ["us_api_key", testApiKeyClient],
     ])('should create a user %p', async (region: string, client: VitalClient) => {
         const user = await client.User.create(
             user_id,
@@ -15,7 +16,8 @@ describe('User', () => {
 
     it.each([
         testClient,
-        testEuClient
+        testEuClient,
+        testApiKeyClient
     ])('should find a user', async (client: VitalClient) => {
         const user = await client.User.resolve(
             test_user_id,
@@ -25,7 +27,8 @@ describe('User', () => {
 
     it.each([
         testClient,
-        testEuClient
+        testEuClient,
+        testApiKeyClient
     ])('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,10 +1,11 @@
 import { VitalClient } from "..";
-import { testClient, testEuClient, getUserId } from "./arrange";
+import { testClient, testEuClient, getUserId, testApiKeyClient } from "./arrange";
 
 describe('Vitals', () => {
     it.each([
         ["us", testClient],
-        ["eu", testEuClient]
+        ["eu", testEuClient],
+        ["us_api_key", testApiKeyClient],
     ])('should return glucose data %p', async (region: string, client: VitalClient) => {
         const userId = await getUserId(client)
         const data = await client.Vitals.glucose(

package/__tests__/workouts.test.ts

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

package/client/Link.ts

@@ -18,11 +18,13 @@ export class LinkApi {
 
   public async create(
     userId: string,
-    provider: string = null
+    provider: string = null,
+    redirect_url: string = null
   ): Promise<LinkTokenExchangeResponse> {
     const resp = await this.client.post(this.baseURL.concat('/link/token/'), {
       user_key: userId,
       provider,
+      redirect_url,
     });
     return resp.data;
   }

package/client/Sleep.ts

@@ -29,6 +29,21 @@ export class SleepApi {
     return resp.data;
   }
 
+  public async getSleepWithStream(
+    userId: string,
+    startDate: Date,
+    endDate?: Date,
+    provider?: string
+  ): Promise<ClientSleepResponse> {
+    const resp = await this.client.get(
+      this.baseURL.concat(`/summary/sleep/${userId}/stream`),
+      {
+        params: { start_date: startDate, end_date: endDate, provider },
+      }
+    );
+    return resp.data;
+  }
+
   public async getStream(sleepId: string): Promise<ClientSleepStreamResponse> {
     const resp = await this.client.get(
       this.baseURL.concat(`/timeseries/sleep/${sleepId}/stream`)

package/client/models/sleep_models.ts

@@ -127,6 +127,13 @@ export interface ClientFacingSleep {
    * @memberof ClientFacingSleep
    */
   user_id: string;
+  /**
+   * UTC time when the sleep period started
+   * @type {ClientSleepStreamResponse}
+   * @memberof ClientFacingSleep
+   * 
+   */
+  sleep_stream: ClientSleepStreamResponse[];
 }
 
 export interface ClientSleepResponse {

package/dist/client/Link.d.ts

@@ -5,7 +5,7 @@ export declare class LinkApi {
     baseURL: string;
     client: AxiosInstance;
     constructor(baseURL: string, axios: AxiosInstance);
-    create(userId: string, provider?: string): Promise<LinkTokenExchangeResponse>;
+    create(userId: string, provider?: string, redirect_url?: string): Promise<LinkTokenExchangeResponse>;
     connectProvider(linkToken: string, provider: PasswordProviders, username: string, password: string): Promise<ProviderLinkResponse>;
     connectEmailProvider(linkToken: string, provider: EmailProviders, email: string): Promise<ProviderLinkResponse>;
     getOAuthLink(linkToken: string, provider: OAuthProviders): Promise<SourceWithLinkInfo>;

package/dist/client/Link.js

@@ -42,8 +42,9 @@ var LinkApi = /** @class */ (function () {
         this.baseURL = baseURL;
         this.client = axios;
     }
-    LinkApi.prototype.create = function (userId, provider) {
+    LinkApi.prototype.create = function (userId, provider, redirect_url) {
         if (provider === void 0) { provider = null; }
+        if (redirect_url === void 0) { redirect_url = null; }
         return __awaiter(this, void 0, void 0, function () {
             var resp;
             return __generator(this, function (_a) {
@@ -51,6 +52,7 @@ var LinkApi = /** @class */ (function () {
                     case 0: return [4 /*yield*/, this.client.post(this.baseURL.concat('/link/token/'), {
                             user_key: userId,
                             provider: provider,
+                            redirect_url: redirect_url,
                         })];
                     case 1:
                         resp = _a.sent();

package/dist/client/Sleep.d.ts

@@ -6,6 +6,7 @@ export declare class SleepApi {
     client: AxiosInstance;
     constructor(baseURL: string, axios: AxiosInstance);
     get(userId: string, startDate: Date, endDate?: Date, provider?: string, with_stream?: boolean): Promise<ClientSleepResponse>;
+    getSleepWithStream(userId: string, startDate: Date, endDate?: Date, provider?: string): Promise<ClientSleepResponse>;
     getStream(sleepId: string): Promise<ClientSleepStreamResponse>;
     get_raw(userId: string, startDate: Date, endDate?: Date, provider?: string): Promise<ClientSleepRawResponse>;
 }

package/dist/client/Sleep.js

@@ -58,6 +58,21 @@ var SleepApi = /** @class */ (function () {
             });
         });
     };
+    SleepApi.prototype.getSleepWithStream = function (userId, startDate, endDate, provider) {
+        return __awaiter(this, void 0, void 0, function () {
+            var resp;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, this.client.get(this.baseURL.concat("/summary/sleep/" + userId + "/stream"), {
+                            params: { start_date: startDate, end_date: endDate, provider: provider },
+                        })];
+                    case 1:
+                        resp = _a.sent();
+                        return [2 /*return*/, resp.data];
+                }
+            });
+        });
+    };
     SleepApi.prototype.getStream = function (sleepId) {
         return __awaiter(this, void 0, void 0, function () {
             var resp;

package/dist/client/models/sleep_models.d.ts

@@ -126,6 +126,13 @@ export interface ClientFacingSleep {
      * @memberof ClientFacingSleep
      */
     user_id: string;
+    /**
+     * UTC time when the sleep period started
+     * @type {ClientSleepStreamResponse}
+     * @memberof ClientFacingSleep
+     *
+     */
+    sleep_stream: ClientSleepStreamResponse[];
 }
 export interface ClientSleepResponse {
     /**

package/dist/index.js

@@ -59,7 +59,14 @@ var VitalClient = /** @class */ (function () {
     function VitalClient(config) {
         var _this = this;
         this.config = config;
-        this.clientCredentials = new credentials_1.ClientCredentials(config);
+        if (!config.api_key) {
+            try {
+                this.clientCredentials = new credentials_1.ClientCredentials(config);
+            }
+            catch (error) {
+                throw new Error("You must provide either an API key or a client ID and secret");
+            }
+        }
         var baseURL;
         if (this.config.region && this.config.region === 'eu') {
             baseURL = config_1.default.baseEUUrls[config.environment];
@@ -73,13 +80,21 @@ var VitalClient = /** @class */ (function () {
             retryDelay: axios_retry_1.default.exponentialDelay,
         });
         axiosApiInstance.interceptors.request.use(function (config) { return __awaiter(_this, void 0, void 0, function () {
-            var token;
+            var headers, token;
             return __generator(this, function (_a) {
                 switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.clientCredentials.access_token()];
-                    case 1:
+                    case 0:
+                        headers = config.headers;
+                        if (!this.config.api_key) return [3 /*break*/, 1];
+                        headers["x-vital-api-key"] = this.config.api_key;
+                        return [3 /*break*/, 3];
+                    case 1: return [4 /*yield*/, this.clientCredentials.access_token()];
+                    case 2:
                         token = _a.sent();
-                        config.headers = __assign(__assign({}, config.headers), { 'x-vital-client-id': this.config.client_id, Authorization: "Bearer " + token });
+                        headers["Authorization"] = "Bearer " + token;
+                        _a.label = 3;
+                    case 3:
+                        config.headers = __assign(__assign({}, headers), { 'x-vital-client-id': this.config.client_id });
                         return [2 /*return*/, config];
                 }
             });

package/dist/lib/models.d.ts

@@ -1,6 +1,7 @@
 export interface ClientConfig {
-    client_id: string;
-    client_secret: string;
+    client_id?: string;
+    client_secret?: string;
+    api_key?: string;
     environment: 'prod' | 'production' | 'sandbox' | 'development';
     region?: 'us' | 'eu';
 }

package/index.ts

@@ -36,7 +36,13 @@ export class VitalClient {
 
   constructor(config: ClientConfig) {
     this.config = config;
-    this.clientCredentials = new ClientCredentials(config);
+    if(!config.api_key){
+      try {
+        this.clientCredentials = new ClientCredentials(config);
+      } catch (error) {
+        throw new Error("You must provide either an API key or a client ID and secret");
+      }
+    }
     let baseURL;
     if (this.config.region && this.config.region === 'eu') {
       baseURL = CONFIG.baseEUUrls[config.environment];
@@ -52,11 +58,16 @@ export class VitalClient {
 
     axiosApiInstance.interceptors.request.use(
       async (config) => {
-        const token = await this.clientCredentials.access_token();
+        const headers = config.headers;
+        if(this.config.api_key){
+          headers["x-vital-api-key"] = this.config.api_key;
+        } else {
+          const token = await this.clientCredentials.access_token();
+          headers["Authorization"] = `Bearer ${token}`;
+        }
         config.headers = {
-          ...config.headers,
+          ...headers,
           'x-vital-client-id': this.config.client_id,
-          Authorization: `Bearer ${token}`,
         };
         return config;
       },

package/lib/models.ts

@@ -1,6 +1,7 @@
 export interface ClientConfig {
-  client_id: string;
-  client_secret: string;
+  client_id?: string;
+  client_secret?: string;
+  api_key?: string;
   environment: 'prod' | 'production' | 'sandbox' | 'development';
   region?: 'us' | 'eu';
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tryvital/vital-node",
-  "version": "1.3.1",
+  "version": "1.3.4",
   "description": "Node client for Vital",
   "author": "maitham",
   "keywords": [