@thelllabs/winehaus-sdk 0.0.4 → 0.0.6

package/dist/cjs/api/api.js

@@ -85,41 +85,23 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Api = exports.HttpClient = exports.ContentType = exports.TenantUserEntityDtoStatusEnum = exports.TenantUserEntityDtoRolesEnum = exports.OrderByEnum = exports.ListTenantUsersParamsStatusEnum = exports.ListTenantUsersParamsRolesEnum = exports.CreateTenantUserDtoRolesEnum = void 0;
-var CreateTenantUserDtoRolesEnum;
-(function (CreateTenantUserDtoRolesEnum) {
-    CreateTenantUserDtoRolesEnum["Operator"] = "operator";
-    CreateTenantUserDtoRolesEnum["Admin"] = "admin";
-    CreateTenantUserDtoRolesEnum["Owner"] = "owner";
-})(CreateTenantUserDtoRolesEnum = exports.CreateTenantUserDtoRolesEnum || (exports.CreateTenantUserDtoRolesEnum = {}));
-var ListTenantUsersParamsRolesEnum;
-(function (ListTenantUsersParamsRolesEnum) {
-    ListTenantUsersParamsRolesEnum["Operator"] = "operator";
-    ListTenantUsersParamsRolesEnum["Admin"] = "admin";
-    ListTenantUsersParamsRolesEnum["Owner"] = "owner";
-})(ListTenantUsersParamsRolesEnum = exports.ListTenantUsersParamsRolesEnum || (exports.ListTenantUsersParamsRolesEnum = {}));
-var ListTenantUsersParamsStatusEnum;
-(function (ListTenantUsersParamsStatusEnum) {
-    ListTenantUsersParamsStatusEnum["Enabled"] = "enabled";
-    ListTenantUsersParamsStatusEnum["Blocked"] = "blocked";
-})(ListTenantUsersParamsStatusEnum = exports.ListTenantUsersParamsStatusEnum || (exports.ListTenantUsersParamsStatusEnum = {}));
+exports.Api = exports.HttpClient = exports.ContentType = exports.TenantUserStatusEnum = exports.TenantRoleEnum = exports.OrderByEnum = void 0;
 var OrderByEnum;
 (function (OrderByEnum) {
     OrderByEnum["ASC"] = "ASC";
     OrderByEnum["DESC"] = "DESC";
 })(OrderByEnum = exports.OrderByEnum || (exports.OrderByEnum = {}));
-var TenantUserEntityDtoRolesEnum;
-(function (TenantUserEntityDtoRolesEnum) {
-    TenantUserEntityDtoRolesEnum["Operator"] = "operator";
-    TenantUserEntityDtoRolesEnum["Admin"] = "admin";
-    TenantUserEntityDtoRolesEnum["Owner"] = "owner";
-})(TenantUserEntityDtoRolesEnum = exports.TenantUserEntityDtoRolesEnum || (exports.TenantUserEntityDtoRolesEnum = {}));
-/** @example "enabled" */
-var TenantUserEntityDtoStatusEnum;
-(function (TenantUserEntityDtoStatusEnum) {
-    TenantUserEntityDtoStatusEnum["Enabled"] = "enabled";
-    TenantUserEntityDtoStatusEnum["Blocked"] = "blocked";
-})(TenantUserEntityDtoStatusEnum = exports.TenantUserEntityDtoStatusEnum || (exports.TenantUserEntityDtoStatusEnum = {}));
+var TenantRoleEnum;
+(function (TenantRoleEnum) {
+    TenantRoleEnum["Operator"] = "operator";
+    TenantRoleEnum["Admin"] = "admin";
+    TenantRoleEnum["Owner"] = "owner";
+})(TenantRoleEnum = exports.TenantRoleEnum || (exports.TenantRoleEnum = {}));
+var TenantUserStatusEnum;
+(function (TenantUserStatusEnum) {
+    TenantUserStatusEnum["Enabled"] = "enabled";
+    TenantUserStatusEnum["Blocked"] = "blocked";
+})(TenantUserStatusEnum = exports.TenantUserStatusEnum || (exports.TenantUserStatusEnum = {}));
 var axios_1 = __importDefault(require("axios"));
 var ContentType;
 (function (ContentType) {

package/dist/cjs/sdk.js

@@ -150,13 +150,13 @@ var WinehausSDK = /** @class */ (function () {
                     case 0:
                         if (!(((_a = error === null || error === void 0 ? void 0 : error.response) === null || _a === void 0 ? void 0 : _a.status) === 401 &&
                             this.authToken &&
-                            this.refreshToken &&
+                            // ToDO: Uncomment this this.refreshToken &&
                             !refreshTokenUsed.has(this.refreshToken))) return [3 /*break*/, 4];
                         refreshTokenUsed.add(this.refreshToken);
                         _c.label = 1;
                     case 1:
                         _c.trys.push([1, 3, , 4]);
-                        return [4 /*yield*/, this.refreshTokens()];
+                        return [4 /*yield*/, this.refreshTokens({ throwError: true })];
                     case 2:
                         _c.sent();
                         return [3 /*break*/, 4];
@@ -184,10 +184,22 @@ var WinehausSDK = /** @class */ (function () {
                     case 0:
                         if (!(opts === null || opts === void 0 ? void 0 : opts.avoidEvents))
                             this.emitter.emit('connecting');
+                        if (!((credential === null || credential === void 0 ? void 0 : credential.email) && (credential === null || credential === void 0 ? void 0 : credential.password))) return [3 /*break*/, 2];
                         return [4 /*yield*/, this.authenticateAsUser(credential)];
                     case 1:
                         _a.sent();
-                        this.credential = credential;
+                        this.signInCredential = credential;
+                        return [3 /*break*/, 5];
+                    case 2:
+                        if (!(credential === null || credential === void 0 ? void 0 : credential.authToken)) return [3 /*break*/, 4];
+                        // ToDO add && (credential as any)?.refreshToken after refreshToken is ready
+                        return [4 /*yield*/, this.authenticateAsToken(credential)];
+                    case 3:
+                        // ToDO add && (credential as any)?.refreshToken after refreshToken is ready
+                        _a.sent();
+                        return [3 /*break*/, 5];
+                    case 4: throw new Error("Invalid auth credential type format");
+                    case 5:
                         if (!(opts === null || opts === void 0 ? void 0 : opts.avoidEvents))
                             this.emitter.emit('connected');
                         this.hookTimer();
@@ -196,14 +208,17 @@ var WinehausSDK = /** @class */ (function () {
             });
         });
     };
-    WinehausSDK.prototype.reAuthenticate = function () {
+    WinehausSDK.prototype.reAuthenticate = function (opts) {
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        if (!this.credential)
-                            throw new Error('No credential found');
-                        return [4 /*yield*/, this.authenticate(this.credential)];
+                        if (!this.signInCredential) {
+                            if (opts === null || opts === void 0 ? void 0 : opts.throwError)
+                                new Error("No SignIn set to make re-auth");
+                            return [2 /*return*/];
+                        }
+                        return [4 /*yield*/, this.authenticate(this.signInCredential, { avoidEvents: true })];
                     case 1:
                         _a.sent();
                         return [2 /*return*/];
@@ -232,7 +247,8 @@ var WinehausSDK = /** @class */ (function () {
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
-                        if (!this.authToken || !this.refreshToken) {
+                        //Todo: add || !this.refreshToken after implementing it here
+                        if (!this.authToken) {
                             return [2 /*return*/, this.clearTokens()];
                         }
                         if (!((_a = this.authTokenDecoded) === null || _a === void 0 ? void 0 : _a.exp)) {
@@ -277,14 +293,14 @@ var WinehausSDK = /** @class */ (function () {
     WinehausSDK.prototype.getRefreshToken = function () {
         return this.refreshToken.toString();
     };
-    WinehausSDK.prototype.refreshTokens = function () {
+    WinehausSDK.prototype.refreshTokens = function (opts) {
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         // ToDo: Refresh token is not implemented under this version. For a while, lets just re-auth
                         this.clearTokens();
-                        return [4 /*yield*/, this.reAuthenticate()];
+                        return [4 /*yield*/, this.reAuthenticate(opts)];
                     case 1:
                         _a.sent();
                         return [2 /*return*/];
@@ -310,6 +326,14 @@ var WinehausSDK = /** @class */ (function () {
             });
         });
     };
+    WinehausSDK.prototype.authenticateAsToken = function (credential) {
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                this.setTokens({ token: credential.authToken, refreshToken: credential.refreshToken });
+                return [2 /*return*/];
+            });
+        });
+    };
     WinehausSDK.prototype.setTokens = function (data) {
         this.setAuthToken(data.token);
         this.setRefreshToken(data.refreshToken);

package/dist/esm/api/api.js

@@ -80,40 +80,22 @@ var __rest = (this && this.__rest) || function (s, e) {
         }
     return t;
 };
-export var CreateTenantUserDtoRolesEnum;
-(function (CreateTenantUserDtoRolesEnum) {
-    CreateTenantUserDtoRolesEnum["Operator"] = "operator";
-    CreateTenantUserDtoRolesEnum["Admin"] = "admin";
-    CreateTenantUserDtoRolesEnum["Owner"] = "owner";
-})(CreateTenantUserDtoRolesEnum || (CreateTenantUserDtoRolesEnum = {}));
-export var ListTenantUsersParamsRolesEnum;
-(function (ListTenantUsersParamsRolesEnum) {
-    ListTenantUsersParamsRolesEnum["Operator"] = "operator";
-    ListTenantUsersParamsRolesEnum["Admin"] = "admin";
-    ListTenantUsersParamsRolesEnum["Owner"] = "owner";
-})(ListTenantUsersParamsRolesEnum || (ListTenantUsersParamsRolesEnum = {}));
-export var ListTenantUsersParamsStatusEnum;
-(function (ListTenantUsersParamsStatusEnum) {
-    ListTenantUsersParamsStatusEnum["Enabled"] = "enabled";
-    ListTenantUsersParamsStatusEnum["Blocked"] = "blocked";
-})(ListTenantUsersParamsStatusEnum || (ListTenantUsersParamsStatusEnum = {}));
 export var OrderByEnum;
 (function (OrderByEnum) {
     OrderByEnum["ASC"] = "ASC";
     OrderByEnum["DESC"] = "DESC";
 })(OrderByEnum || (OrderByEnum = {}));
-export var TenantUserEntityDtoRolesEnum;
-(function (TenantUserEntityDtoRolesEnum) {
-    TenantUserEntityDtoRolesEnum["Operator"] = "operator";
-    TenantUserEntityDtoRolesEnum["Admin"] = "admin";
-    TenantUserEntityDtoRolesEnum["Owner"] = "owner";
-})(TenantUserEntityDtoRolesEnum || (TenantUserEntityDtoRolesEnum = {}));
-/** @example "enabled" */
-export var TenantUserEntityDtoStatusEnum;
-(function (TenantUserEntityDtoStatusEnum) {
-    TenantUserEntityDtoStatusEnum["Enabled"] = "enabled";
-    TenantUserEntityDtoStatusEnum["Blocked"] = "blocked";
-})(TenantUserEntityDtoStatusEnum || (TenantUserEntityDtoStatusEnum = {}));
+export var TenantRoleEnum;
+(function (TenantRoleEnum) {
+    TenantRoleEnum["Operator"] = "operator";
+    TenantRoleEnum["Admin"] = "admin";
+    TenantRoleEnum["Owner"] = "owner";
+})(TenantRoleEnum || (TenantRoleEnum = {}));
+export var TenantUserStatusEnum;
+(function (TenantUserStatusEnum) {
+    TenantUserStatusEnum["Enabled"] = "enabled";
+    TenantUserStatusEnum["Blocked"] = "blocked";
+})(TenantUserStatusEnum || (TenantUserStatusEnum = {}));
 import axios from "axios";
 export var ContentType;
 (function (ContentType) {

package/dist/esm/sdk.js

@@ -121,13 +121,13 @@ var WinehausSDK = /** @class */ (function () {
                     case 0:
                         if (!(((_a = error === null || error === void 0 ? void 0 : error.response) === null || _a === void 0 ? void 0 : _a.status) === 401 &&
                             this.authToken &&
-                            this.refreshToken &&
+                            // ToDO: Uncomment this this.refreshToken &&
                             !refreshTokenUsed.has(this.refreshToken))) return [3 /*break*/, 4];
                         refreshTokenUsed.add(this.refreshToken);
                         _c.label = 1;
                     case 1:
                         _c.trys.push([1, 3, , 4]);
-                        return [4 /*yield*/, this.refreshTokens()];
+                        return [4 /*yield*/, this.refreshTokens({ throwError: true })];
                     case 2:
                         _c.sent();
                         return [3 /*break*/, 4];
@@ -155,10 +155,22 @@ var WinehausSDK = /** @class */ (function () {
                     case 0:
                         if (!(opts === null || opts === void 0 ? void 0 : opts.avoidEvents))
                             this.emitter.emit('connecting');
+                        if (!((credential === null || credential === void 0 ? void 0 : credential.email) && (credential === null || credential === void 0 ? void 0 : credential.password))) return [3 /*break*/, 2];
                         return [4 /*yield*/, this.authenticateAsUser(credential)];
                     case 1:
                         _a.sent();
-                        this.credential = credential;
+                        this.signInCredential = credential;
+                        return [3 /*break*/, 5];
+                    case 2:
+                        if (!(credential === null || credential === void 0 ? void 0 : credential.authToken)) return [3 /*break*/, 4];
+                        // ToDO add && (credential as any)?.refreshToken after refreshToken is ready
+                        return [4 /*yield*/, this.authenticateAsToken(credential)];
+                    case 3:
+                        // ToDO add && (credential as any)?.refreshToken after refreshToken is ready
+                        _a.sent();
+                        return [3 /*break*/, 5];
+                    case 4: throw new Error("Invalid auth credential type format");
+                    case 5:
                         if (!(opts === null || opts === void 0 ? void 0 : opts.avoidEvents))
                             this.emitter.emit('connected');
                         this.hookTimer();
@@ -167,14 +179,17 @@ var WinehausSDK = /** @class */ (function () {
             });
         });
     };
-    WinehausSDK.prototype.reAuthenticate = function () {
+    WinehausSDK.prototype.reAuthenticate = function (opts) {
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        if (!this.credential)
-                            throw new Error('No credential found');
-                        return [4 /*yield*/, this.authenticate(this.credential)];
+                        if (!this.signInCredential) {
+                            if (opts === null || opts === void 0 ? void 0 : opts.throwError)
+                                new Error("No SignIn set to make re-auth");
+                            return [2 /*return*/];
+                        }
+                        return [4 /*yield*/, this.authenticate(this.signInCredential, { avoidEvents: true })];
                     case 1:
                         _a.sent();
                         return [2 /*return*/];
@@ -203,7 +218,8 @@ var WinehausSDK = /** @class */ (function () {
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
-                        if (!this.authToken || !this.refreshToken) {
+                        //Todo: add || !this.refreshToken after implementing it here
+                        if (!this.authToken) {
                             return [2 /*return*/, this.clearTokens()];
                         }
                         if (!((_a = this.authTokenDecoded) === null || _a === void 0 ? void 0 : _a.exp)) {
@@ -248,14 +264,14 @@ var WinehausSDK = /** @class */ (function () {
     WinehausSDK.prototype.getRefreshToken = function () {
         return this.refreshToken.toString();
     };
-    WinehausSDK.prototype.refreshTokens = function () {
+    WinehausSDK.prototype.refreshTokens = function (opts) {
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         // ToDo: Refresh token is not implemented under this version. For a while, lets just re-auth
                         this.clearTokens();
-                        return [4 /*yield*/, this.reAuthenticate()];
+                        return [4 /*yield*/, this.reAuthenticate(opts)];
                     case 1:
                         _a.sent();
                         return [2 /*return*/];
@@ -281,6 +297,14 @@ var WinehausSDK = /** @class */ (function () {
             });
         });
     };
+    WinehausSDK.prototype.authenticateAsToken = function (credential) {
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                this.setTokens({ token: credential.authToken, refreshToken: credential.refreshToken });
+                return [2 /*return*/];
+            });
+        });
+    };
     WinehausSDK.prototype.setTokens = function (data) {
         this.setAuthToken(data.token);
         this.setRefreshToken(data.refreshToken);

package/dist/types/api/api.d.ts

@@ -7,12 +7,7 @@ export interface CreateTenantUserDto {
      */
     password?: string;
     /** @example ["operator"] */
-    roles: CreateTenantUserDtoRolesEnum[];
-}
-export declare enum CreateTenantUserDtoRolesEnum {
-    Operator = "operator",
-    Admin = "admin",
-    Owner = "owner"
+    roles: TenantRoleEnum[];
 }
 export interface HttpExceptionDto {
     /** @example null */
@@ -27,15 +22,6 @@ export interface HttpExceptionDto {
     /** @example "2022-07-25T17:24:07.042Z" */
     timestamp: string;
 }
-export declare enum ListTenantUsersParamsRolesEnum {
-    Operator = "operator",
-    Admin = "admin",
-    Owner = "owner"
-}
-export declare enum ListTenantUsersParamsStatusEnum {
-    Enabled = "enabled",
-    Blocked = "blocked"
-}
 export declare enum OrderByEnum {
     ASC = "ASC",
     DESC = "DESC"
@@ -87,31 +73,30 @@ export interface SigninResponseDto {
     token: string;
     user: UserEntityDto;
 }
+export declare enum TenantRoleEnum {
+    Operator = "operator",
+    Admin = "admin",
+    Owner = "owner"
+}
 export interface TenantUserEntityDto {
-    roles: TenantUserEntityDtoRolesEnum[];
+    roles: TenantRoleEnum[];
     /** @example "enabled" */
-    status: TenantUserEntityDtoStatusEnum;
+    status: TenantUserStatusEnum;
     /** @format uuid */
     tenantId: string;
     user: UserEntityDto;
     /** @format uuid */
     userId: string;
 }
-export declare enum TenantUserEntityDtoRolesEnum {
-    Operator = "operator",
-    Admin = "admin",
-    Owner = "owner"
-}
-/** @example "enabled" */
-export declare enum TenantUserEntityDtoStatusEnum {
-    Enabled = "enabled",
-    Blocked = "blocked"
-}
 export interface TenantUserEntityPaginationDto {
     items: TenantUserEntityDto[];
     links?: PaginationLinksDto;
     meta: PaginationMetaDto;
 }
+export declare enum TenantUserStatusEnum {
+    Enabled = "enabled",
+    Blocked = "blocked"
+}
 export interface UpdateUserPasswordDto {
     /** @example "P@ssw0rd" */
     currentPassword: string;
@@ -320,10 +305,10 @@ export declare namespace Admin {
              * @example 1
              */
             page?: number;
-            roles?: ListTenantUsersParamsRolesEnum[];
+            roles?: TenantRoleEnum[];
             search?: string;
             sortBy?: string[];
-            status?: ListTenantUsersParamsStatusEnum[];
+            status?: TenantUserStatusEnum[];
         };
         type RequestBody = never;
         type RequestHeaders = {};
@@ -510,10 +495,10 @@ export declare class Api<SecurityDataType extends unknown> extends HttpClient<Se
              * @example 1
              */
             page?: number;
-            roles?: ListTenantUsersParamsRolesEnum[];
+            roles?: TenantRoleEnum[];
             search?: string;
             sortBy?: string[];
-            status?: ListTenantUsersParamsStatusEnum[];
+            status?: TenantUserStatusEnum[];
         }, params?: RequestParams) => Promise<TenantUserEntityPaginationDto>;
     };
 }

package/dist/types/interfaces.d.ts

@@ -1,3 +1,4 @@
+import { SigninDto } from './api/api';
 export interface SDKOptions {
     baseURL: string;
     autoRefresh?: boolean;
@@ -14,3 +15,8 @@ export type SDKEvents = {
         refreshToken: string;
     };
 };
+export interface AuthenticatedCredential {
+    authToken: string;
+    refreshToken: string;
+}
+export type AuthCredential = SigninDto | AuthenticatedCredential;

package/dist/types/sdk.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="node" />
-import { SDKOptions, ApiSecurityDataType, SDKEvents } from './interfaces';
+import { SDKOptions, ApiSecurityDataType, SDKEvents, AuthCredential } from './interfaces';
 import { JwtPayload } from 'jwt-decode';
 import { Api, SigninDto } from './api/api';
 import { Emitter } from 'mitt';
@@ -11,7 +11,7 @@ export declare class WinehausSDK {
     protected refreshToken: string;
     protected options: SDKOptions;
     protected autoRefreshTimer: NodeJS.Timeout | undefined;
-    protected credential: SigninDto | undefined;
+    protected signInCredential: SigninDto | undefined;
     emitter: Emitter<SDKEvents>;
     protected defaultOptions: Partial<SDKOptions>;
     constructor(options: SDKOptions);
@@ -20,10 +20,12 @@ export declare class WinehausSDK {
     private hookTimer;
     private hookInterceptors;
     clearTokens(): void;
-    authenticate(credential: SigninDto, opts?: {
+    authenticate(credential: AuthCredential, opts?: {
         avoidEvents?: boolean;
     }): Promise<void>;
-    reAuthenticate(): Promise<void>;
+    reAuthenticate(opts?: {
+        throwError?: boolean;
+    }): Promise<void>;
     isAuthenticated(): boolean;
     protected setAuthToken(token: string): void;
     triggerRefreshToken(): Promise<void>;
@@ -31,8 +33,11 @@ export declare class WinehausSDK {
     getAuthToken(): string;
     protected setRefreshToken(refreshToken: string): void;
     getRefreshToken(): string;
-    refreshTokens(): Promise<void>;
+    refreshTokens(opts?: {
+        throwError?: boolean;
+    }): Promise<void>;
     private authenticateAsUser;
+    private authenticateAsToken;
     private setTokens;
     getAuthTokenDecoded(): JwtPayload | undefined;
     getRefreshTokenDecoded(): JwtPayload | undefined;

package/dist/umd/index.ts

@@ -16087,13 +16087,13 @@ var WinehausSDK = /** @class */ (function () {
                     case 0:
                         if (!(((_a = error === null || error === void 0 ? void 0 : error.response) === null || _a === void 0 ? void 0 : _a.status) === 401 &&
                             this.authToken &&
-                            this.refreshToken &&
+                            // ToDO: Uncomment this this.refreshToken &&
                             !refreshTokenUsed.has(this.refreshToken))) return [3 /*break*/, 4];
                         refreshTokenUsed.add(this.refreshToken);
                         _c.label = 1;
                     case 1:
                         _c.trys.push([1, 3, , 4]);
-                        return [4 /*yield*/, this.refreshTokens()];
+                        return [4 /*yield*/, this.refreshTokens({ throwError: true })];
                     case 2:
                         _c.sent();
                         return [3 /*break*/, 4];
@@ -16121,10 +16121,22 @@ var WinehausSDK = /** @class */ (function () {
                     case 0:
                         if (!(opts === null || opts === void 0 ? void 0 : opts.avoidEvents))
                             this.emitter.emit('connecting');
+                        if (!((credential === null || credential === void 0 ? void 0 : credential.email) && (credential === null || credential === void 0 ? void 0 : credential.password))) return [3 /*break*/, 2];
                         return [4 /*yield*/, this.authenticateAsUser(credential)];
                     case 1:
                         _a.sent();
-                        this.credential = credential;
+                        this.signInCredential = credential;
+                        return [3 /*break*/, 5];
+                    case 2:
+                        if (!(credential === null || credential === void 0 ? void 0 : credential.authToken)) return [3 /*break*/, 4];
+                        // ToDO add && (credential as any)?.refreshToken after refreshToken is ready
+                        return [4 /*yield*/, this.authenticateAsToken(credential)];
+                    case 3:
+                        // ToDO add && (credential as any)?.refreshToken after refreshToken is ready
+                        _a.sent();
+                        return [3 /*break*/, 5];
+                    case 4: throw new Error("Invalid auth credential type format");
+                    case 5:
                         if (!(opts === null || opts === void 0 ? void 0 : opts.avoidEvents))
                             this.emitter.emit('connected');
                         this.hookTimer();
@@ -16133,14 +16145,17 @@ var WinehausSDK = /** @class */ (function () {
             });
         });
     };
-    WinehausSDK.prototype.reAuthenticate = function () {
+    WinehausSDK.prototype.reAuthenticate = function (opts) {
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        if (!this.credential)
-                            throw new Error('No credential found');
-                        return [4 /*yield*/, this.authenticate(this.credential)];
+                        if (!this.signInCredential) {
+                            if (opts === null || opts === void 0 ? void 0 : opts.throwError)
+                                new Error("No SignIn set to make re-auth");
+                            return [2 /*return*/];
+                        }
+                        return [4 /*yield*/, this.authenticate(this.signInCredential, { avoidEvents: true })];
                     case 1:
                         _a.sent();
                         return [2 /*return*/];
@@ -16169,7 +16184,8 @@ var WinehausSDK = /** @class */ (function () {
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
-                        if (!this.authToken || !this.refreshToken) {
+                        //Todo: add || !this.refreshToken after implementing it here
+                        if (!this.authToken) {
                             return [2 /*return*/, this.clearTokens()];
                         }
                         if (!((_a = this.authTokenDecoded) === null || _a === void 0 ? void 0 : _a.exp)) {
@@ -16214,14 +16230,14 @@ var WinehausSDK = /** @class */ (function () {
     WinehausSDK.prototype.getRefreshToken = function () {
         return this.refreshToken.toString();
     };
-    WinehausSDK.prototype.refreshTokens = function () {
+    WinehausSDK.prototype.refreshTokens = function (opts) {
         return __awaiter(this, void 0, void 0, function () {
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         // ToDo: Refresh token is not implemented under this version. For a while, lets just re-auth
                         this.clearTokens();
-                        return [4 /*yield*/, this.reAuthenticate()];
+                        return [4 /*yield*/, this.reAuthenticate(opts)];
                     case 1:
                         _a.sent();
                         return [2 /*return*/];
@@ -16247,6 +16263,14 @@ var WinehausSDK = /** @class */ (function () {
             });
         });
     };
+    WinehausSDK.prototype.authenticateAsToken = function (credential) {
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                this.setTokens({ token: credential.authToken, refreshToken: credential.refreshToken });
+                return [2 /*return*/];
+            });
+        });
+    };
     WinehausSDK.prototype.setTokens = function (data) {
         this.setAuthToken(data.token);
         this.setRefreshToken(data.refreshToken);
@@ -18386,41 +18410,23 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", ({ value: true }));
-exports.Api = exports.HttpClient = exports.ContentType = exports.TenantUserEntityDtoStatusEnum = exports.TenantUserEntityDtoRolesEnum = exports.OrderByEnum = exports.ListTenantUsersParamsStatusEnum = exports.ListTenantUsersParamsRolesEnum = exports.CreateTenantUserDtoRolesEnum = void 0;
-var CreateTenantUserDtoRolesEnum;
-(function (CreateTenantUserDtoRolesEnum) {
-    CreateTenantUserDtoRolesEnum["Operator"] = "operator";
-    CreateTenantUserDtoRolesEnum["Admin"] = "admin";
-    CreateTenantUserDtoRolesEnum["Owner"] = "owner";
-})(CreateTenantUserDtoRolesEnum = exports.CreateTenantUserDtoRolesEnum || (exports.CreateTenantUserDtoRolesEnum = {}));
-var ListTenantUsersParamsRolesEnum;
-(function (ListTenantUsersParamsRolesEnum) {
-    ListTenantUsersParamsRolesEnum["Operator"] = "operator";
-    ListTenantUsersParamsRolesEnum["Admin"] = "admin";
-    ListTenantUsersParamsRolesEnum["Owner"] = "owner";
-})(ListTenantUsersParamsRolesEnum = exports.ListTenantUsersParamsRolesEnum || (exports.ListTenantUsersParamsRolesEnum = {}));
-var ListTenantUsersParamsStatusEnum;
-(function (ListTenantUsersParamsStatusEnum) {
-    ListTenantUsersParamsStatusEnum["Enabled"] = "enabled";
-    ListTenantUsersParamsStatusEnum["Blocked"] = "blocked";
-})(ListTenantUsersParamsStatusEnum = exports.ListTenantUsersParamsStatusEnum || (exports.ListTenantUsersParamsStatusEnum = {}));
+exports.Api = exports.HttpClient = exports.ContentType = exports.TenantUserStatusEnum = exports.TenantRoleEnum = exports.OrderByEnum = void 0;
 var OrderByEnum;
 (function (OrderByEnum) {
     OrderByEnum["ASC"] = "ASC";
     OrderByEnum["DESC"] = "DESC";
 })(OrderByEnum = exports.OrderByEnum || (exports.OrderByEnum = {}));
-var TenantUserEntityDtoRolesEnum;
-(function (TenantUserEntityDtoRolesEnum) {
-    TenantUserEntityDtoRolesEnum["Operator"] = "operator";
-    TenantUserEntityDtoRolesEnum["Admin"] = "admin";
-    TenantUserEntityDtoRolesEnum["Owner"] = "owner";
-})(TenantUserEntityDtoRolesEnum = exports.TenantUserEntityDtoRolesEnum || (exports.TenantUserEntityDtoRolesEnum = {}));
-/** @example "enabled" */
-var TenantUserEntityDtoStatusEnum;
-(function (TenantUserEntityDtoStatusEnum) {
-    TenantUserEntityDtoStatusEnum["Enabled"] = "enabled";
-    TenantUserEntityDtoStatusEnum["Blocked"] = "blocked";
-})(TenantUserEntityDtoStatusEnum = exports.TenantUserEntityDtoStatusEnum || (exports.TenantUserEntityDtoStatusEnum = {}));
+var TenantRoleEnum;
+(function (TenantRoleEnum) {
+    TenantRoleEnum["Operator"] = "operator";
+    TenantRoleEnum["Admin"] = "admin";
+    TenantRoleEnum["Owner"] = "owner";
+})(TenantRoleEnum = exports.TenantRoleEnum || (exports.TenantRoleEnum = {}));
+var TenantUserStatusEnum;
+(function (TenantUserStatusEnum) {
+    TenantUserStatusEnum["Enabled"] = "enabled";
+    TenantUserStatusEnum["Blocked"] = "blocked";
+})(TenantUserStatusEnum = exports.TenantUserStatusEnum || (exports.TenantUserStatusEnum = {}));
 var axios_1 = __importDefault(__webpack_require__(6425));
 var ContentType;
 (function (ContentType) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@thelllabs/winehaus-sdk",
-  "version": "0.0.4",
+  "version": "0.0.6",
   "description": "Winehaus SDK",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",