@prisme.ai/sdk 1.0.0 → 1.0.1

package/dist/sdk/lib/fetcher.js

@@ -14,10 +14,12 @@ var headersAsObject = function (headers) {
     }, {});
 };
 var Fetcher = /** @class */ (function () {
-    function Fetcher(host) {
+    function Fetcher(host, clientIdHeader) {
         this.token = null;
+        this.legacyToken = null;
         this._apiKey = null;
         this.host = host;
+        this.clientIdHeader = clientIdHeader;
     }
     Object.defineProperty(Fetcher.prototype, "apiKey", {
         set: function (apiKey) {
@@ -29,8 +31,11 @@ var Fetcher = /** @class */ (function () {
     Fetcher.prototype.prepareRequest = function (url, options) {
         if (options === void 0) { options = {}; }
         var headers = new Headers(options.headers || {});
-        if (this.token && !headers.has('x-prismeai-token')) {
-            headers.append('x-prismeai-token', this.token);
+        if (this.token && !headers.has('Authorization')) {
+            headers.append('Authorization', "Bearer ".concat(this.token));
+        }
+        else if (this.legacyToken && !headers.has('Authorization')) {
+            headers.append('x-prismeai-token', this.legacyToken);
         }
         if (this._apiKey && !headers.has('x-prismeai-apikey')) {
             headers.append('x-prismeai-api-key', this._apiKey);
@@ -38,12 +43,17 @@ var Fetcher = /** @class */ (function () {
         if (this.language) {
             headers.append('accept-language', this.language);
         }
+        if (options.body instanceof URLSearchParams) {
+            headers.set('Content-Type', 'application/x-www-form-urlencoded');
+        }
         if ((!options.body || !(options.body instanceof FormData)) &&
             !headers.has('Content-Type')) {
             headers.append('Content-Type', 'application/json');
         }
-        headers.append('Access-Control-Allow-Origin', '*');
-        return global.fetch("".concat(this.host).concat(url), _tslib.__assign(_tslib.__assign({}, options), { headers: headers }));
+        var fullUrl = url.startsWith('http://') || url.startsWith('https://')
+            ? url
+            : "".concat(this.host).concat(url);
+        return global.fetch(fullUrl, _tslib.__assign(_tslib.__assign({ credentials: 'include' }, options), { headers: headers }));
     };
     Fetcher.prototype._fetch = function (url, options) {
         if (options === void 0) { options = {}; }
@@ -54,6 +64,13 @@ var Fetcher = /** @class */ (function () {
                     case 0: return [4 /*yield*/, this.prepareRequest(url, options)];
                     case 1:
                         res = _b.sent();
+                        if (options.redirect === 'manual' && res.status === 0) {
+                            return [2 /*return*/, { redirected: true }];
+                        }
+                        this.lastReceivedHeaders = headersAsObject(res.headers);
+                        if (this.clientIdHeader && this.lastReceivedHeaders[this.clientIdHeader]) {
+                            this.overwriteClientId = this.lastReceivedHeaders[this.clientIdHeader];
+                        }
                         if (!!res.ok) return [3 /*break*/, 6];
                         error = void 0;
                         _b.label = 2;
@@ -111,13 +128,14 @@ var Fetcher = /** @class */ (function () {
             });
         });
     };
-    Fetcher.prototype.post = function (url, body) {
+    Fetcher.prototype.post = function (url, body, opts) {
         return _tslib.__awaiter(this, void 0, void 0, function () {
             return _tslib.__generator(this, function (_a) {
-                return [2 /*return*/, this._fetch(url, {
-                        method: 'POST',
-                        body: body && !(body instanceof FormData) ? JSON.stringify(body) : body,
-                    })];
+                return [2 /*return*/, this._fetch(url, _tslib.__assign({ method: 'POST', body: body &&
+                            !(body instanceof FormData) &&
+                            !(body instanceof URLSearchParams)
+                            ? JSON.stringify(body)
+                            : body }, opts))];
             });
         });
     };

package/lib/api.test.ts

@@ -1,5 +1,6 @@
 import api, { Api } from './api';
 import ApiError from './ApiError';
+import UsersEndpoint from './endpoints/users';
 import WorkspacesEndpoint from './endpoints/workspaces';
 import WorkspacesVersionsEndpoint from './endpoints/workspacesVersions';
 
@@ -30,7 +31,7 @@ it('should export an instance', () => {
 });
 
 it('should call /me', async () => {
-  const api = new Api('/fake/');
+  const api = new Api({ host: '/fake/' });
   api.get = jest.fn(
     async () =>
       ({
@@ -42,26 +43,20 @@ it('should call /me', async () => {
   expect(api.user).toBe(me);
 });
 
-it('should call /signin', () => {
-  const api = new Api('/fake/');
-  api.post = jest.fn();
-  api.signin('user@fake.com', 'password');
-  expect(api.post).toHaveBeenCalledWith('/login', {
-    email: 'user@fake.com',
-    password: 'password',
-  });
-});
-
 it('should call /login/anonymous', async () => {
-  const api = new Api('/fake/');
+  const api = new Api({ host: '/fake/' });
   api.post = jest.fn();
   const user = await api.createAnonymousSession();
-  expect(api.post).toHaveBeenCalledWith('/login/anonymous');
+  expect(api.post).toHaveBeenCalledWith(
+    '/login/anonymous',
+    {},
+    { credentials: 'omit' }
+  );
   expect(api.user).toBe(user);
 });
 
 it('should call /signup', () => {
-  const api = new Api('/fake/');
+  const api = new Api({ host: '/fake/' });
   api.post = jest.fn();
   api.signup('user@fake.com', 'password', 'firstname', 'lastname', 'fr');
   expect(api.post).toHaveBeenCalledWith('/signup', {
@@ -73,30 +68,22 @@ it('should call /signup', () => {
   });
 });
 
-it('should call /signout', () => {
-  const api = new Api('/fake/');
-  api.post = jest.fn();
-  api.signout();
-  expect(api.post).toHaveBeenCalledWith('/logout');
-  expect(api.token).toBeNull();
-});
-
 it('should call get /workspaces', () => {
-  const api = new Api('/fake/');
+  const api = new Api({ host: '/fake/' });
   api.get = jest.fn();
   api.getWorkspaces();
   expect(api.get).toHaveBeenCalledWith('/workspaces?limit=600');
 });
 
 it('should call get /workspaces/42', () => {
-  const api = new Api('/fake/');
+  const api = new Api({ host: '/fake/' });
   api.get = jest.fn();
   api.getWorkspace('42');
   expect(api.get).toHaveBeenCalledWith('/workspaces/42');
 });
 
 it('should call post /workspaces', () => {
-  const api = new Api('/fake/');
+  const api = new Api({ host: '/fake/' });
   api.post = jest.fn();
   api.createWorkspace('foo');
   expect(api.post).toHaveBeenCalledWith('/workspaces', {
@@ -105,7 +92,7 @@ it('should call post /workspaces', () => {
 });
 
 it('should call patch /workspaces/42', async () => {
-  const api = new Api('/fake/');
+  const api = new Api({ host: '/fake/' });
   api.patch = jest.fn();
   await api.updateWorkspace({
     id: '42',
@@ -124,14 +111,14 @@ it('should call patch /workspaces/42', async () => {
 });
 
 it('should call delete /workspaces/42', async () => {
-  const api = new Api('/fake/');
+  const api = new Api({ host: '/fake/' });
   api.delete = jest.fn();
   await api.deleteWorkspace('42');
   expect(api.delete).toHaveBeenCalledWith('/workspaces/42');
 });
 
 it('should call post /workspaces/42/automations', () => {
-  const api = new Api('/fake/');
+  const api = new Api({ host: '/fake/' });
   api.post = jest.fn();
   api.createAutomation('42', {
     name: 'foo',
@@ -144,7 +131,7 @@ it('should call post /workspaces/42/automations', () => {
 });
 
 it('should call patch /workspaces/42/automations', async () => {
-  const api = new Api('/fake/');
+  const api = new Api({ host: '/fake/' });
   api.patch = jest.fn();
   await api.updateAutomation('42', '42-1', {
     name: 'foo',
@@ -157,14 +144,14 @@ it('should call patch /workspaces/42/automations', async () => {
 });
 
 it('should call delete /workspaces/42/automations/42-1', () => {
-  const api = new Api('/fake/');
+  const api = new Api({ host: '/fake/' });
   api.delete = jest.fn();
   api.deleteAutomation('42', '42-1');
   expect(api.delete).toHaveBeenCalledWith('/workspaces/42/automations/42-1');
 });
 
 it('should call get /workspaces/42/events', async () => {
-  const api = new Api('/fake/');
+  const api = new Api({ host: '/fake/' });
   api.get = jest.fn(
     async (): Promise<any> => ({
       result: {
@@ -186,7 +173,7 @@ it('should call get /workspaces/42/events', async () => {
 });
 
 it('should replace all images data', async () => {
-  const api = new Api('/fake/');
+  const api = new Api({ host: '/fake/' });
   api.uploadFiles = jest.fn(async () => [
     { url: 'http://image1.jpg' } as any,
     { url: 'http://image2.jpg' } as any,
@@ -230,7 +217,7 @@ it('should replace all images data', async () => {
 });
 
 it('should upload file', async () => {
-  const api = new Api('/fake/');
+  const api = new Api({ host: '/fake/' });
   // @ts-ignore
   api._fetch = jest.fn(() => [{}]);
   await api.uploadFiles(
@@ -250,7 +237,7 @@ it('should upload file', async () => {
 });
 
 it('should generate api key', async () => {
-  const api = new Api('/fake/');
+  const api = new Api({ host: '/fake/' });
   api.post = jest.fn((): any => ({
     apiKey: 'api-key',
   }));
@@ -286,7 +273,7 @@ it('should generate api key', async () => {
 });
 
 it('should update api key', async () => {
-  const api = new Api('/fake/');
+  const api = new Api({ host: '/fake/' });
   api.put = jest.fn((): any => ({
     apiKey: 'api-key',
   }));
@@ -327,7 +314,7 @@ it('should update api key', async () => {
 });
 
 it('should send validation mail', () => {
-  const api = new Api('/fake/');
+  const api = new Api({ host: '/fake/' });
   api.post = jest.fn();
   api.sendValidationMail('email', 'fr');
   expect(api.post).toHaveBeenCalledWith('/user/validate', {
@@ -337,7 +324,7 @@ it('should send validation mail', () => {
 });
 
 it('should validate mail', () => {
-  const api = new Api('/fake/');
+  const api = new Api({ host: '/fake/' });
   api.post = jest.fn();
   api.validateMail('token');
   expect(api.post).toHaveBeenCalledWith('/user/validate', {
@@ -346,7 +333,7 @@ it('should validate mail', () => {
 });
 
 it('should send password reset mail', () => {
-  const api = new Api('/fake/');
+  const api = new Api({ host: '/fake/' });
   api.post = jest.fn();
   api.sendPasswordResetMail('email', 'fr');
   expect(api.post).toHaveBeenCalledWith('/user/password', {
@@ -356,7 +343,7 @@ it('should send password reset mail', () => {
 });
 
 it('should reset password', () => {
-  const api = new Api('/fake/');
+  const api = new Api({ host: '/fake/' });
   api.post = jest.fn();
   api.passwordReset('token', 'azerty');
   expect(api.post).toHaveBeenCalledWith('/user/password', {
@@ -366,7 +353,7 @@ it('should reset password', () => {
 });
 
 it('should get pages', async () => {
-  const api = new Api('/fake/');
+  const api = new Api({ host: '/fake/' });
   api.get = jest.fn((): any => [
     {
       id: '123',
@@ -388,28 +375,28 @@ it('should get pages', async () => {
 });
 
 it('should get page', () => {
-  const api = new Api('/fake/');
+  const api = new Api({ host: '/fake/' });
   api.get = jest.fn((): any => ({}));
   api.getPage('42', '123');
   expect(api.get).toHaveBeenCalledWith('/workspaces/42/pages/123');
 });
 
 it('should get page by slug', () => {
-  const api = new Api('/fake/');
+  const api = new Api({ host: '/fake/' });
   api.get = jest.fn((): any => ({}));
   api.getPageBySlug('42', '123');
   expect(api.get).toHaveBeenCalledWith('/pages/42/123');
 });
 
 it('should create page', () => {
-  const api = new Api('/fake/');
+  const api = new Api({ host: '/fake/' });
   api.post = jest.fn((): any => ({}));
   api.createPage('42', {} as Prismeai.Page);
   expect(api.post).toHaveBeenCalledWith(`/workspaces/42/pages`, {});
 });
 
 it('should update page', async () => {
-  const api = new Api('/fake/');
+  const api = new Api({ host: '/fake/' });
   api.patch = jest.fn((): any => ({ slug: 'my-page' }));
   await api.updatePage('42', { id: '123', slug: 'my-page' } as Prismeai.Page);
   expect(api.patch).toHaveBeenCalledWith(`/workspaces/42/pages/my-page`, {
@@ -419,14 +406,14 @@ it('should update page', async () => {
 });
 
 it('should delete page', () => {
-  const api = new Api('/fake/');
+  const api = new Api({ host: '/fake/' });
   api.delete = jest.fn((): any => ({ id: '123' }));
   api.deletePage('42', '123');
   expect(api.delete).toHaveBeenCalledWith('/workspaces/42/pages/123');
 });
 
 it('should stream events', async () => {
-  const api = new Api('/fake/');
+  const api = new Api({ host: '/fake/' });
 
   const events = await api.streamEvents('42');
   expect((events.constructor as any).mockedConstructor).toHaveBeenCalledWith({
@@ -436,6 +423,7 @@ it('should stream events', async () => {
     apiHost: '/fake/',
     filters: undefined,
     api,
+    legacyToken: '',
   });
   expect(events.once).toHaveBeenCalled();
   (events.constructor as any).mockedConstructor.mockClear();
@@ -448,6 +436,7 @@ it('should stream events', async () => {
     apiHost: '/fake/',
     filters: {},
     api,
+    legacyToken: '',
   });
   expect(events2.once).toHaveBeenCalled();
 
@@ -465,6 +454,7 @@ it('should stream events', async () => {
       'source.sessionId': 'session id',
     },
     api,
+    legacyToken: '',
   });
   expect(events3.once).toHaveBeenCalled();
 
@@ -480,12 +470,13 @@ it('should stream events', async () => {
     apiHost: '/fake/',
     filters: undefined,
     api,
+    legacyToken: '',
   });
   expect(events3.close).toHaveBeenCalled();
 });
 
 it('should get events', async () => {
-  const api = new Api('/fake/');
+  const api = new Api({ host: '/fake/' });
   api.get = jest.fn((): any => ({
     result: { events: [{ createdAt: '2022-01-01', id: '123' }] },
   }));
@@ -504,7 +495,7 @@ it('should get events', async () => {
 });
 
 it('should post events', async () => {
-  const api = new Api('/fake/');
+  const api = new Api({ host: '/fake/' });
   api.post = jest.fn((): any => {});
   const res = await api.postEvents('42', [
     {
@@ -535,7 +526,7 @@ it('should post events', async () => {
 });
 
 describe('permissions', () => {
-  const api = new Api('/fake/');
+  const api = new Api({ host: '/fake/' });
   api.get = jest.fn((path: string): any => {
     if (path === '/pages/id/permissions') {
       return {
@@ -600,7 +591,7 @@ describe('permissions', () => {
 });
 
 it('should get apps', async () => {
-  const api = new Api('/fake/');
+  const api = new Api({ host: '/fake/' });
   const get: jest.Mock = (api.get = jest.fn((): any => {}));
   api.getApps({});
   expect(api.get).toHaveBeenCalledWith('/apps?');
@@ -617,7 +608,7 @@ it('should get apps', async () => {
 });
 
 it('should install app', async () => {
-  const api = new Api('/fake/');
+  const api = new Api({ host: '/fake/' });
   api.post = jest.fn((): any => {});
   api.installApp('42', { appSlug: 'app' });
   expect(api.post).toHaveBeenCalledWith('/workspaces/42/apps', {
@@ -626,7 +617,7 @@ it('should install app', async () => {
 });
 
 it('should update app', async () => {
-  const api = new Api('/fake/');
+  const api = new Api({ host: '/fake/' });
   api.patch = jest.fn((): any => {});
   api.updateApp('42', 'app', { appSlug: 'app' });
   expect(api.patch).toHaveBeenCalledWith('/workspaces/42/apps/app', {
@@ -635,49 +626,49 @@ it('should update app', async () => {
 });
 
 it('should uninstall app', async () => {
-  const api = new Api('/fake/');
+  const api = new Api({ host: '/fake/' });
   api.delete = jest.fn((): any => {});
   api.uninstallApp('42', 'app');
   expect(api.delete).toHaveBeenCalledWith('/workspaces/42/apps/app');
 });
 
 it('should publish app', async () => {
-  const api = new Api('/fake/');
+  const api = new Api({ host: '/fake/' });
   api.post = jest.fn((): any => {});
   api.publishApp({ workspaceId: '42' });
   expect(api.post).toHaveBeenCalledWith('/apps', { workspaceId: '42' });
 });
 
 it('should list app instances', async () => {
-  const api = new Api('/fake/');
+  const api = new Api({ host: '/fake/' });
   api.get = jest.fn((): any => {});
   api.listAppInstances('42');
   expect(api.get).toHaveBeenCalledWith('/workspaces/42/apps');
 });
 
 it('should get app config', async () => {
-  const api = new Api('/fake/');
+  const api = new Api({ host: '/fake/' });
   api.get = jest.fn((): any => {});
   api.getAppConfig('42', 'app');
   expect(api.get).toHaveBeenCalledWith('/workspaces/42/apps/app/config');
 });
 
 it('should update app config', async () => {
-  const api = new Api('/fake/');
+  const api = new Api({ host: '/fake/' });
   api.patch = jest.fn((): any => {});
   api.updateAppConfig('42', 'app', {});
   expect(api.patch).toHaveBeenCalledWith('/workspaces/42/apps/app/config', {});
 });
 
 it('should save app instance', async () => {
-  const api = new Api('/fake/');
+  const api = new Api({ host: '/fake/' });
   api.patch = jest.fn((): any => {});
   api.saveAppInstance('42', 'app', {});
   expect(api.patch).toHaveBeenCalledWith('/workspaces/42/apps/app', {});
 });
 
 it('should upload files', async () => {
-  const api = new Api('/fake/');
+  const api = new Api({ host: '/fake/' });
   // @ts-ignore
   let fetch: jest.Mock = (api._fetch = jest.fn((): any => {}));
   api.uploadFiles('data:text/plain;base64,SGVsbG8gV29ybGQ', '42');
@@ -706,7 +697,7 @@ it('should upload files', async () => {
 });
 
 it('should call automation', () => {
-  const api = new Api('/fake/');
+  const api = new Api({ host: '/fake/' });
   api.post = jest.fn((): any => {});
   api.callAutomation('42', 'automation');
   expect(api.post).toHaveBeenCalledWith(
@@ -716,7 +707,7 @@ it('should call automation', () => {
 });
 
 it('should get workspace usage', () => {
-  const api = new Api('/fake/');
+  const api = new Api({ host: '/fake/' });
   const get: jest.Mock = (api.get = jest.fn((): any => {}));
   api.getWorkspaceUsage('42');
   expect(api.get).toHaveBeenCalledWith('/workspaces/42/usage?');
@@ -755,3 +746,27 @@ describe('Workspaces', () => {
     });
   });
 });
+
+describe('User', () => {
+  it('should access user methods', () => {
+    expect(api.users('42')).toBeInstanceOf(UsersEndpoint);
+  });
+  it('should access user methods with current user', () => {
+    // @ts-ignore
+    api._user = { id: '42' } as any;
+    expect(api.users()).toBeInstanceOf(UsersEndpoint);
+  });
+
+  it('should set meta data', () => {
+    api.post = jest.fn();
+    api.users().setMeta('foo', 'bar');
+    expect(api.post).toHaveBeenCalledWith('/user/meta', {
+      foo: 'bar',
+    });
+  });
+  it('should delete meta data', () => {
+    api.delete = jest.fn();
+    api.users().deleteMeta('foo');
+    expect(api.delete).toHaveBeenCalledWith('/user/meta/foo');
+  });
+});