Fix other integration tests

Author: lukasmalkmus

examples/ingest-file.ts

@@ -1,9 +1,7 @@
 import fs from 'fs';
-import Client, { CloudURL, datasets } from '@axiomhq/axiom-node';
+import Client, { datasets } from '@axiomhq/axiom-node';
 
-const deploymentURL = process.env.AXIOM_URL || CloudURL;
-const accessToken = process.env.AXIOM_TOKEN;
-const client = new Client(deploymentURL, accessToken);
+const client = new Client();
 
 async function ingestFile() {
     const stream = fs.createReadStream('logs.json');

lib/client.ts

@@ -15,7 +15,7 @@ export default class Client {
     starred: starred.Service;
     teams: teams.Service;
     tokens: {
-        ingest: tokens.IngestService;
+        api: tokens.APIService;
         personal: tokens.PersonalService;
     };
     users: users.Service;
@@ -29,7 +29,7 @@ export default class Client {
         this.starred = new starred.Service(basePath, accessToken, orgID);
         this.teams = new teams.Service(basePath, accessToken, orgID);
         this.tokens = {
-            ingest: new tokens.IngestService(basePath, accessToken, orgID),
+            api: new tokens.APIService(basePath, accessToken, orgID),
             personal: new tokens.PersonalService(basePath, accessToken, orgID),
         };
         this.users = new users.Service(basePath, accessToken, orgID);

lib/tokens.ts

@@ -6,12 +6,14 @@ export namespace tokens {
         id?: string;
         name: string;
         description?: string;
-        scopes: Array<string>;
+        scopes?: Array<string>; // Only for API tokens
+        permissions?: Array<string>; // Only for API tokens
     }
 
     export interface RawToken {
         token: string;
         scopes: Array<string>;
+        permissions: Array<string>;
     }
 
     class Service extends HTTPClient {
@@ -51,15 +53,10 @@ export namespace tokens {
         delete = (id: string): Promise<AxiosResponse> => this.client.delete<AxiosResponse>(this.localPath + '/' + id);
     }
 
-    export class IngestService extends Service {
+    export class APIService extends Service {
         constructor(basePath?: string, accessToken?: string, orgID?: string) {
-            super('/api/v1/tokens/ingest', basePath, accessToken, orgID);
+            super('/api/v1/tokens/api', basePath, accessToken, orgID);
         }
-
-        validate = (): Promise<boolean> =>
-            this.client.get(this.localPath + '/validate').then((response) => {
-                return response.status === 204;
-            });
     }
 
     export class PersonalService extends Service {

tests/integration/tokens.test.ts

@@ -2,15 +2,16 @@ import { expect } from 'chai';
 
 import { tokens } from '../../lib/tokens';
 
-describe('IngestTokensService', () => {
-    const client = new tokens.IngestService();
+describe('APITokensService', () => {
+    const client = new tokens.APIService();
 
     let token: tokens.Token;
 
     before(async () => {
         token = await client.create({
             name: 'Test Token',
-            scopes: [],
+            scopes: ['*'],
+            permissions: ['CanIngest'],
         });
     });
 
@@ -22,10 +23,13 @@ describe('IngestTokensService', () => {
         it('should update a token', async () => {
             const updatedToken = await client.update(token.id!, {
                 name: 'Updated Test Token',
-                scopes: [],
+                scopes: ['*'],
+                permissions: ['CanQuery'],
             });
 
             expect(updatedToken.name).to.equal('Updated Test Token');
+            expect(updatedToken.permissions).to.contain('CanQuery');
+            expect(updatedToken.permissions).to.not.contain('CanIngest');
 
             token = updatedToken;
         });
@@ -54,14 +58,6 @@ describe('IngestTokensService', () => {
             expect(tokens.length).to.be.greaterThan(0);
         });
     });
-
-    describe('validate', () => {
-        it('should validate token', async () => {
-            const valid = await client.validate();
-
-            expect(valid).to.be.true;
-        });
-    });
 });
 
 describe('PersonalTokensService', () => {

tests/unit/client.test.ts

@@ -12,7 +12,7 @@ describe('Client', () => {
         expect(client.notifiers).not.empty;
         expect(client.starred).not.empty;
         expect(client.teams).not.empty;
-        expect(client.tokens.ingest).not.empty;
+        expect(client.tokens.api).not.empty;
         expect(client.tokens.personal).not.empty;
         expect(client.users).not.empty;
         expect(client.version).not.empty;