@translated/lara 2.0.0-beta.5 → 2.0.0-beta.7

package/lib/Documents.js

@@ -3,7 +3,7 @@ import { DocumentStatus, } from './models';
 import toFormData from './utils/formdata';
 import toSnakeCase from './utils/toSnakeCase';
 import sleep from './utils/sleep';
-import { LaraApiError, TimeoutError } from './utils/errors';
+import { LaraApiError, LaraTimeoutError } from './utils/errors';
 import toQueryString from './utils/toQueryString';
 import isNode from './utils/isNode';
 export default class Documents {
@@ -75,8 +75,8 @@ export default class Documents {
             if (status === DocumentStatus.TRANSLATED)
                 return await this.download(id, downloadOptions);
             if (status === DocumentStatus.ERROR)
-                throw new LaraApiError(500, 'DocumentError', errorReason);
+                throw new LaraApiError(500, errorReason, 'unknown');
         }
-        throw new TimeoutError();
+        throw new LaraTimeoutError();
     }
 }

package/lib/Glossaries.js

@@ -1,4 +1,4 @@
-import { TimeoutError } from './utils/errors';
+import { LaraTimeoutError } from './utils/errors';
 import toFormData from './utils/formdata';
 import sleep from './utils/sleep';
 import toQueryString from './utils/toQueryString';
@@ -46,7 +46,7 @@ export default class Glossaries {
         const start = Date.now();
         while (gImport.progress < 1.0) {
             if (maxWaitTime && Date.now() - start > maxWaitTime)
-                throw new TimeoutError();
+                throw new LaraTimeoutError();
             await sleep(this.pollingInterval);
             gImport = await this.getImportStatus(gImport.id);
             updateCallback && updateCallback(gImport);

package/lib/Memories.js

@@ -1,4 +1,4 @@
-import { TimeoutError } from './utils/errors';
+import { LaraTimeoutError } from './utils/errors';
 import toFormData from './utils/formdata';
 import sleep from './utils/sleep';
 export default class Memories {
@@ -79,7 +79,7 @@ export default class Memories {
         const start = Date.now();
         while (mImport.progress < 1.0) {
             if (maxWaitTime && Date.now() - start > maxWaitTime)
-                throw new TimeoutError();
+                throw new LaraTimeoutError();
             await sleep(this.pollingInterval);
             mImport = await this.getImportStatus(mImport.id);
             updateCallback && updateCallback(mImport);

package/lib/Translator.js

@@ -4,6 +4,7 @@ import { version } from './sdk-version';
 import Glossaries from './Glossaries';
 import Documents from './Documents';
 import toCamelCase from './utils/toCamelCase';
+import { LaraApiError } from './utils/errors';
 const DEFAULT_BASE_URL = 'https://api.laratranslate.com';
 export class Translator {
     constructor(accessKey, credentials, authToken, options) {
@@ -35,17 +36,16 @@ export class Translator {
             }
             return response;
         }, async (error) => {
+            var _a, _b, _c, _d, _e, _f;
             const originalRequest = error.config;
-            if (originalRequest.isRetry)
-                return Promise.reject(error);
-            if (error.response && error.response.status === 401 && error.response.data.message === 'jwt expired') {
+            if (!originalRequest.isRetry && error.response && error.response.status === 401 && error.response.data.message === 'jwt expired') {
                 this.token = undefined;
                 const token = await this.authenticate();
                 originalRequest.isRetry = true;
                 originalRequest.headers.Authorization = `Bearer ${token}`;
                 return this.client(originalRequest);
             }
-            return Promise.reject(error);
+            return Promise.reject(new LaraApiError((_b = (_a = error.response) === null || _a === void 0 ? void 0 : _a.status) !== null && _b !== void 0 ? _b : 500, (_e = (_d = (_c = error.response) === null || _c === void 0 ? void 0 : _c.data) === null || _d === void 0 ? void 0 : _d.message) !== null && _e !== void 0 ? _e : error.message, (_f = error.response) === null || _f === void 0 ? void 0 : _f.headers['x-transaction-id']));
         });
         this.memories = new Memories(this.client);
         this.glossaries = new Glossaries(this.client);
@@ -58,30 +58,30 @@ export class Translator {
             return this.token;
         // If we have a refresh token, use it to get a new token
         if (this.refreshToken) {
-            const { data } = await axios.post(`${(_b = (_a = this.options) === null || _a === void 0 ? void 0 : _a.serverUrl) !== null && _b !== void 0 ? _b : DEFAULT_BASE_URL}/v2/auth/refresh`, null, {
+            const { data, headers } = await axios.post(`${(_b = (_a = this.options) === null || _a === void 0 ? void 0 : _a.serverUrl) !== null && _b !== void 0 ? _b : DEFAULT_BASE_URL}/v2/auth/refresh`, null, {
                 headers: {
                     authorization: `Bearer ${this.refreshToken}`,
                     'X-Lara-Date': new Date().toUTCString(),
                 },
             });
             this.token = data.token;
-            this.refreshToken = data.refresh_token;
+            this.refreshToken = headers['x-lara-refresh-token'];
             return this.token;
         }
         else if (this.accessKey) {
             // Use access key to get a new token
-            const { data } = await axios.post(`${(_d = (_c = this.options) === null || _c === void 0 ? void 0 : _c.serverUrl) !== null && _d !== void 0 ? _d : DEFAULT_BASE_URL}/v2/auth`, this.accessKey, {
+            const { data, headers } = await axios.post(`${(_d = (_c = this.options) === null || _c === void 0 ? void 0 : _c.serverUrl) !== null && _d !== void 0 ? _d : DEFAULT_BASE_URL}/v2/auth`, this.accessKey, {
                 headers: {
                     'X-Lara-Date': new Date().toUTCString(),
                 },
             });
             this.token = data.token;
-            this.refreshToken = data.refresh_token;
+            this.refreshToken = headers['x-lara-refresh-token'];
             return this.token;
         }
         else if (this.credentials) {
             // Use credentials to get a new token
-            const { data } = await axios.post(
+            const { data, headers } = await axios.post(
             //FIXME: client id should be set
             `${(_f = (_e = this.options) === null || _e === void 0 ? void 0 : _e.serverUrl) !== null && _f !== void 0 ? _f : DEFAULT_BASE_URL}/v2/auth/Unknown/login`, this.credentials, {
                 headers: {
@@ -89,7 +89,7 @@ export class Translator {
                 },
             });
             this.token = data.token;
-            this.refreshToken = data.refresh_token;
+            this.refreshToken = headers['x-lara-refresh-token'];
             return this.token;
         }
         else if (this.authToken) {

package/lib/models/Authentication.d.ts

@@ -10,3 +10,6 @@ export type Credentials = {
     email: string;
     password: string;
 };
+export type AuthenticationResponse = {
+    token: string;
+};

package/lib/sdk-version.d.ts

@@ -1 +1 @@
-export declare const version = "2.0.0-beta.4";
+export declare const version = "2.0.0-beta.6";

package/lib/sdk-version.js

@@ -1 +1 @@
-export const version = '2.0.0-beta.4';
+export const version = '2.0.0-beta.6';

package/lib/utils/errors.d.ts

@@ -1,10 +1,10 @@
 export declare class LaraError extends Error {
 }
-export declare class TimeoutError extends LaraError {
+export declare class LaraTimeoutError extends LaraError {
 }
 export declare class LaraApiError extends LaraError {
     readonly statusCode: number;
-    readonly type: string;
     readonly message: string;
-    constructor(statusCode: number, type: string, message: string);
+    readonly idTransaction: string;
+    constructor(statusCode: number, message: string, idTransaction: string);
 }

package/lib/utils/errors.js

@@ -1,12 +1,12 @@
 export class LaraError extends Error {
 }
-export class TimeoutError extends LaraError {
+export class LaraTimeoutError extends LaraError {
 }
 export class LaraApiError extends LaraError {
-    constructor(statusCode, type, message) {
+    constructor(statusCode, message, idTransaction) {
         super(message);
         this.statusCode = statusCode;
-        this.type = type;
         this.message = message;
+        this.idTransaction = idTransaction;
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@translated/lara",
-  "version": "2.0.0-beta.5",
+  "version": "2.0.0-beta.7",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "engines": {