@sogni-ai/sogni-client 3.4.0-alpha.1 → 4.0.0-alpha.2

package/dist/index.js

@@ -54,6 +54,7 @@ const Project_1 = __importDefault(require("./Projects/Project"));
 exports.Project = Project_1.default;
 // Stats API
 const Stats_1 = __importDefault(require("./Stats"));
+const AuthManager_1 = require("./lib/AuthManager");
 class SogniClient {
     constructor(config) {
         this.account = new Account_1.default(config);
@@ -64,6 +65,44 @@ class SogniClient {
     get currentAccount() {
         return this.account.currentAccount;
     }
+    /**
+     * When using token authentication, this method can be used to set the tokens.
+     * This is useful when the tokens are stored in a secure location and you want to resume the session.
+     * @param tokens
+     */
+    setTokens(tokens) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const auth = this.apiClient.auth;
+            if (!(auth instanceof AuthManager_1.TokenAuthManager)) {
+                throw new Error('setTokens can only be used with token authentication');
+            }
+            yield auth.authenticate(tokens);
+            yield this.account.me();
+        });
+    }
+    /**
+     * When using cookie authentication, client has no way to detect if the user is authenticated or not.
+     * This method can be used to check if the user is authenticated and populate the currentAccount.
+     * @returns
+     */
+    checkAuth() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const auth = this.apiClient.auth;
+            if (!(auth instanceof AuthManager_1.CookieAuthManager)) {
+                throw Error('This method should only be called when using cookie auth');
+            }
+            try {
+                yield this.apiClient.rest.get('/v1/account/me');
+                yield auth.authenticate();
+                yield this.account.me();
+                return true;
+            }
+            catch (e) {
+                this.apiClient.logger.info('Client is not authenticated');
+                return false;
+            }
+        });
+    }
     /**
      * Create client instance, with default configuration
      * @param config
@@ -75,7 +114,15 @@ class SogniClient {
             const network = config.network || 'fast';
             const logger = config.logger || new DefaultLogger_1.DefaultLogger(config.logLevel || 'warn');
             const isTestnet = config.testnet !== undefined ? config.testnet : false;
-            const client = new ApiClient_1.default(restEndpoint, socketEndpoint, config.appId, network, logger, config.disableSocket);
+            const client = new ApiClient_1.default({
+                baseUrl: restEndpoint,
+                socketUrl: socketEndpoint,
+                appId: config.appId,
+                networkType: network,
+                logger,
+                authType: config.authType || 'token',
+                disableSocket: config.disableSocket
+            });
             const eip712 = new EIP712Helper_1.default({
                 name: isTestnet ? 'Sogni-testnet' : 'Sogni AI',
                 version: '1',

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,cAAc;AACd,wDAAmC;AACnC,8EAAsD;AAkCnC,yBAlCZ,wBAAc,CAkCY;AAjCjC,YAAY;AACZ,yDAAkD;AAgCzC,yFAhCW,oBAAQ,OAgCX;AA7BjB,QAAQ;AACR,uDAAsE;AACtE,sEAA8C;AAC9C,eAAe;AACf,0DAAqC;AACrC,yDAAgD;AAwBb,cAxB5B,aAAG,CAwB4B;AAvBtC,iEAA4D;AAuBpB,kBAvBjC,iBAAO,CAuBiC;AArB/C,YAAY;AACZ,oDAA+B;AA+D/B,MAAa,WAAW;IAOtB,YAAoB,MAAiB;QACnC,IAAI,CAAC,OAAO,GAAG,IAAI,iBAAU,CAAC,MAAM,CAAC,CAAC;QACtC,IAAI,CAAC,QAAQ,GAAG,IAAI,kBAAW,CAAC,MAAM,CAAC,CAAC;QACxC,IAAI,CAAC,KAAK,GAAG,IAAI,eAAQ,CAAC,MAAM,CAAC,CAAC;QAElC,IAAI,CAAC,SAAS,GAAG,MAAM,CAAC,MAAM,CAAC;IACjC,CAAC;IAED,IAAI,cAAc;QAChB,OAAO,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC;IACrC,CAAC;IAED;;;OAGG;IACH,MAAM,CAAO,cAAc,CAAC,MAAyB;;YACnD,MAAM,YAAY,GAAG,MAAM,CAAC,YAAY,IAAI,sBAAsB,CAAC;YACnE,MAAM,cAAc,GAAG,MAAM,CAAC,cAAc,IAAI,uBAAuB,CAAC;YACxE,MAAM,OAAO,GAAG,MAAM,CAAC,OAAO,IAAI,MAAM,CAAC;YACzC,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,IAAI,IAAI,6BAAa,CAAC,MAAM,CAAC,QAAQ,IAAI,MAAM,CAAC,CAAC;YAC7E,MAAM,SAAS,GAAG,MAAM,CAAC,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC;YAExE,MAAM,MAAM,GAAG,IAAI,mBAAS,CAC1B,YAAY,EACZ,cAAc,EACd,MAAM,CAAC,KAAK,EACZ,OAAO,EACP,MAAM,EACN,MAAM,CAAC,aAAa,CACrB,CAAC;YACF,MAAM,MAAM,GAAG,IAAI,sBAAY,CAAC;gBAC9B,IAAI,EAAE,SAAS,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,UAAU;gBAC9C,OAAO,EAAE,GAAG;gBACZ,OAAO,EAAE,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM;aACtC,CAAC,CAAC;YACH,OAAO,IAAI,WAAW,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;QAC7C,CAAC;KAAA;CACF;AA7CD,kCA6CC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}

package/dist/lib/AuthManager/AuthManagerBase.d.ts

@@ -0,0 +1,25 @@
+import { Logger } from '../DefaultLogger';
+import TypedEventEmitter from '../TypedEventEmitter';
+import { ClientOptions } from 'ws';
+interface AuthManagerEvents {
+    updated: boolean;
+}
+declare abstract class AuthManagerBase<AuthData = never> extends TypedEventEmitter<AuthManagerEvents> {
+    protected _logger: Logger;
+    constructor(logger: Logger);
+    abstract get isAuthenticated(): boolean;
+    abstract authenticateRequest(option: RequestInit): Promise<RequestInit>;
+    abstract socketOptions(): Promise<ClientOptions | undefined>;
+    /**
+     * Get the current authentication data to persist it
+     * @returns
+     */
+    abstract backup(): Promise<AuthData>;
+    /**
+     * Restore authentication from the data that was previously backed up
+     * @param data
+     */
+    abstract authenticate(data: AuthData): Promise<void>;
+    abstract clear(): void;
+}
+export default AuthManagerBase;

package/dist/lib/AuthManager/AuthManagerBase.js

@@ -0,0 +1,14 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const TypedEventEmitter_1 = __importDefault(require("../TypedEventEmitter"));
+class AuthManagerBase extends TypedEventEmitter_1.default {
+    constructor(logger) {
+        super();
+        this._logger = logger;
+    }
+}
+exports.default = AuthManagerBase;
+//# sourceMappingURL=AuthManagerBase.js.map

package/dist/lib/AuthManager/AuthManagerBase.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"AuthManagerBase.js","sourceRoot":"","sources":["../../../src/lib/AuthManager/AuthManagerBase.ts"],"names":[],"mappings":";;;;;AACA,6EAAqD;AAOrD,MAAe,eAAkC,SAAQ,2BAAoC;IAE3F,YAAY,MAAc;QACxB,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;IACxB,CAAC;CAqBF;AAED,kBAAe,eAAe,CAAC"}

package/dist/lib/AuthManager/CookieAuthManager.d.ts

@@ -0,0 +1,15 @@
+import AuthManagerBase from './AuthManagerBase';
+declare class CookieAuthManager extends AuthManagerBase<undefined> {
+    private _isAuthenticated;
+    /**
+     * For cookie authentication, there is no way to detect if the user is authenticated or not,
+     * except when a call to API was successful. So the REST client will set this property to true.
+     */
+    authenticate(): Promise<void>;
+    clear(): void;
+    get isAuthenticated(): boolean;
+    backup(): Promise<undefined>;
+    authenticateRequest(options: RequestInit): Promise<RequestInit>;
+    socketOptions(): Promise<undefined>;
+}
+export default CookieAuthManager;

package/dist/lib/AuthManager/CookieAuthManager.js

@@ -0,0 +1,53 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const AuthManagerBase_1 = __importDefault(require("./AuthManagerBase"));
+class CookieAuthManager extends AuthManagerBase_1.default {
+    constructor() {
+        super(...arguments);
+        this._isAuthenticated = false;
+    }
+    /**
+     * For cookie authentication, there is no way to detect if the user is authenticated or not,
+     * except when a call to API was successful. So the REST client will set this property to true.
+     */
+    authenticate() {
+        return __awaiter(this, void 0, void 0, function* () {
+            this._isAuthenticated = true;
+            this.emit('updated', true);
+        });
+    }
+    clear() {
+        this._isAuthenticated = false;
+        this.emit('updated', false);
+    }
+    get isAuthenticated() {
+        return this._isAuthenticated;
+    }
+    backup() {
+        throw new Error('Not supported with cookie authentication');
+    }
+    authenticateRequest(options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return Object.assign(Object.assign({}, options), { credentials: 'include' });
+        });
+    }
+    socketOptions() {
+        return __awaiter(this, void 0, void 0, function* () {
+            return undefined;
+        });
+    }
+}
+exports.default = CookieAuthManager;
+//# sourceMappingURL=CookieAuthManager.js.map

package/dist/lib/AuthManager/CookieAuthManager.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"CookieAuthManager.js","sourceRoot":"","sources":["../../../src/lib/AuthManager/CookieAuthManager.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,wEAAgD;AAEhD,MAAM,iBAAkB,SAAQ,yBAA0B;IAA1D;;QACU,qBAAgB,GAAG,KAAK,CAAC;IAkCnC,CAAC;IAhCC;;;OAGG;IACG,YAAY;;YAChB,IAAI,CAAC,gBAAgB,GAAG,IAAI,CAAC;YAC7B,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC;QAC7B,CAAC;KAAA;IAED,KAAK;QACH,IAAI,CAAC,gBAAgB,GAAG,KAAK,CAAC;QAC9B,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC;IAC9B,CAAC;IAED,IAAI,eAAe;QACjB,OAAO,IAAI,CAAC,gBAAgB,CAAC;IAC/B,CAAC;IAED,MAAM;QACJ,MAAM,IAAI,KAAK,CAAC,0CAA0C,CAAC,CAAC;IAC9D,CAAC;IAEK,mBAAmB,CAAC,OAAoB;;YAC5C,uCACK,OAAO,KACV,WAAW,EAAE,SAAS,IACtB;QACJ,CAAC;KAAA;IAEK,aAAa;;YACjB,OAAO,SAAS,CAAC;QACnB,CAAC;KAAA;CACF;AAED,kBAAe,iBAAiB,CAAC"}

package/dist/lib/AuthManager/TokenAuthManager.d.ts

@@ -0,0 +1,41 @@
+import { Logger } from '../DefaultLogger';
+import AuthManagerBase from './AuthManagerBase';
+import { ClientOptions } from 'ws';
+/**
+ * Token object, containing the token and refresh token
+ * @property {string} token - The JWT token
+ * @property {string} refreshToken - The refresh token
+ */
+export interface TokenAuthData {
+    token: string;
+    refreshToken: string;
+}
+declare class TokenAuthManager extends AuthManagerBase<TokenAuthData | null> {
+    private _token?;
+    private _tokenExpiresAt;
+    private _refreshToken?;
+    private _refreshTokenExpiresAt;
+    private _baseUrl;
+    private _renewTokenPromise?;
+    constructor(baseUrl: string, logger: Logger);
+    get isAuthenticated(): boolean;
+    backup(): Promise<{
+        token: string;
+        refreshToken: string;
+    } | null>;
+    authenticate({ refreshToken, token }: TokenAuthData): Promise<void>;
+    clear(): void;
+    authenticateRequest(option: RequestInit): Promise<RequestInit>;
+    socketOptions(): Promise<ClientOptions | undefined>;
+    private _getToken;
+    private _renewTokenSafe;
+    private _updateTokens;
+    /**
+     * This is a fallback for browsers, where we can't set headers on WebSocket requests.
+     * Normally a browser should use CookieAuthManager
+     * @private
+     */
+    private _updateCookies;
+    private _renewToken;
+}
+export default TokenAuthManager;

package/dist/lib/{AuthManager.js → AuthManager/TokenAuthManager.js}

@@ -12,72 +12,104 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const utils_1 = require("./utils");
-const ApiClient_1 = require("../ApiClient");
-const isNodejs_1 = __importDefault(require("./isNodejs"));
+const utils_1 = require("../utils");
+const ApiClient_1 = require("../../ApiClient");
+const isNodejs_1 = __importDefault(require("../isNodejs"));
 const js_cookie_1 = __importDefault(require("js-cookie"));
-const TypedEventEmitter_1 = __importDefault(require("./TypedEventEmitter"));
-class AuthManager extends TypedEventEmitter_1.default {
+const AuthManagerBase_1 = __importDefault(require("./AuthManagerBase"));
+class TokenAuthManager extends AuthManagerBase_1.default {
     constructor(baseUrl, logger) {
-        super();
+        super(logger);
         this._tokenExpiresAt = new Date(0);
         this._refreshTokenExpiresAt = new Date(0);
-        this._logger = logger;
         this._baseUrl = baseUrl;
     }
-    get refreshToken() {
-        return this._refreshToken;
-    }
-    get walletAddress() {
-        return this._walletAddress;
-    }
     get isAuthenticated() {
         return !!this._refreshToken && this._refreshTokenExpiresAt > new Date();
     }
-    _updateCookies() {
-        if (isNodejs_1.default) {
-            return;
-        }
-        const token = this._token;
-        if (token) {
-            js_cookie_1.default.set('authorization', token, {
-                domain: '.sogni.ai',
-                expires: 1
-            });
-        }
-        else {
-            js_cookie_1.default.remove('authorization', {
-                domain: '.sogni.ai'
-            });
-        }
+    backup() {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this._token && this._refreshToken) {
+                return { token: this._token, refreshToken: this._refreshToken };
+            }
+            return null;
+        });
     }
-    setTokens(_a) {
+    authenticate(_a) {
         return __awaiter(this, arguments, void 0, function* ({ refreshToken, token }) {
+            // If there is a token, and it is not expired, authenticate with it
             if (token) {
-                this._updateTokens({ token, refreshToken });
-                return;
+                const { expiresAt } = (0, utils_1.decodeToken)(token);
+                if (expiresAt > new Date()) {
+                    this._updateTokens({ token, refreshToken });
+                    this.emit('updated', true);
+                    return;
+                }
             }
+            // If token is expired, try to renew it with the refresh token
             this._refreshToken = refreshToken;
             const { expiresAt: refreshExpiresAt } = (0, utils_1.decodeRefreshToken)(refreshToken);
             this._refreshTokenExpiresAt = refreshExpiresAt;
-            yield this.renewToken();
+            yield this._renewTokenSafe();
+            this.emit('updated', true);
         });
     }
-    getToken() {
+    clear() {
+        // Prevent duplicate events
+        if (!this._token && !this._refreshToken) {
+            return;
+        }
+        this._refreshToken = undefined;
+        this._refreshTokenExpiresAt = new Date(0);
+        this._token = undefined;
+        this._tokenExpiresAt = new Date(0);
+        this.emit('updated', false);
+    }
+    authenticateRequest(option) {
         return __awaiter(this, void 0, void 0, function* () {
             //If there is a token, and it is not expired, return it
+            if (this._token && this._tokenExpiresAt > new Date()) {
+                return Object.assign(Object.assign({}, option), { headers: Object.assign(Object.assign({}, option.headers), { Authorization: this._token }) });
+            }
+            //If there is no refresh token, return undefined, to make unauthorized requests
+            if (!this._refreshToken) {
+                return option;
+            }
+            //If there is a refresh token, try to renew the token
+            const token = yield this._renewTokenSafe();
+            return Object.assign(Object.assign({}, option), { headers: Object.assign(Object.assign({}, option.headers), { Authorization: token }) });
+        });
+    }
+    socketOptions() {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!isNodejs_1.default) {
+                return undefined;
+            }
+            const token = yield this._getToken();
+            if (!token) {
+                return undefined;
+            }
+            return {
+                headers: {
+                    Authorization: token
+                }
+            };
+        });
+    }
+    _getToken() {
+        return __awaiter(this, void 0, void 0, function* () {
             if (this._token && this._tokenExpiresAt > new Date()) {
                 return this._token;
             }
             //If there is no refresh token, return undefined, to make unauthorized requests
             if (!this._refreshToken) {
-                return;
+                return undefined;
             }
             //If there is a refresh token, try to renew the token
-            return this.renewToken();
+            return this._renewTokenSafe();
         });
     }
-    renewToken() {
+    _renewTokenSafe() {
         return __awaiter(this, void 0, void 0, function* () {
             if (this._renewTokenPromise) {
                 return this._renewTokenPromise;
@@ -89,32 +121,41 @@ class AuthManager extends TypedEventEmitter_1.default {
             return this._renewTokenPromise;
         });
     }
-    clear() {
-        // Prevent duplicate events
-        if (!this._token && !this._refreshToken) {
-            return;
-        }
-        this._refreshToken = undefined;
-        this._refreshTokenExpiresAt = new Date(0);
-        this._token = undefined;
-        this._tokenExpiresAt = new Date(0);
-        this._walletAddress = undefined;
-        this.emit('updated', { token: null, refreshToken: null, walletAddress: null });
-    }
     _updateTokens({ token, refreshToken }) {
         // Prevent duplicate events
         if (this._token === token && this._refreshToken === refreshToken) {
             return;
         }
         this._token = token;
-        const { expiresAt, walletAddress } = (0, utils_1.decodeToken)(token);
-        this._walletAddress = walletAddress;
+        const { expiresAt } = (0, utils_1.decodeToken)(token);
         this._tokenExpiresAt = expiresAt;
         this._refreshToken = refreshToken;
         const { expiresAt: refreshExpiresAt } = (0, utils_1.decodeRefreshToken)(refreshToken);
         this._refreshTokenExpiresAt = refreshExpiresAt;
         this._updateCookies();
-        this.emit('updated', { token, refreshToken, walletAddress });
+        this.emit('updated', true);
+    }
+    /**
+     * This is a fallback for browsers, where we can't set headers on WebSocket requests.
+     * Normally a browser should use CookieAuthManager
+     * @private
+     */
+    _updateCookies() {
+        if (isNodejs_1.default) {
+            return;
+        }
+        const token = this._token;
+        if (token) {
+            js_cookie_1.default.set('authorization', token, {
+                domain: '.sogni.ai',
+                expires: 1
+            });
+        }
+        else {
+            js_cookie_1.default.remove('authorization', {
+                domain: '.sogni.ai'
+            });
+        }
     }
     _renewToken() {
         return __awaiter(this, void 0, void 0, function* () {
@@ -134,16 +175,11 @@ class AuthManager extends TypedEventEmitter_1.default {
                 responseData = yield response.json();
             }
             catch (e) {
-                this.emit('refreshFailed', {
-                    status: 'error',
-                    errorCode: 0,
-                    message: 'Failed to parse response'
-                });
+                this.clear();
                 this._logger.error('Failed to parse response:', e);
                 throw new Error('Failed to parse response');
             }
             if (!response.ok) {
-                this.emit('refreshFailed', responseData);
                 this.clear();
                 throw new ApiClient_1.ApiError(response.status, responseData);
             }
@@ -153,5 +189,5 @@ class AuthManager extends TypedEventEmitter_1.default {
         });
     }
 }
-exports.default = AuthManager;
-//# sourceMappingURL=AuthManager.js.map
+exports.default = TokenAuthManager;
+//# sourceMappingURL=TokenAuthManager.js.map

package/dist/lib/AuthManager/TokenAuthManager.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"TokenAuthManager.js","sourceRoot":"","sources":["../../../src/lib/AuthManager/TokenAuthManager.ts"],"names":[],"mappings":"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"}

package/dist/lib/AuthManager/index.d.ts

@@ -0,0 +1,5 @@
+import CookieAuthManager from './CookieAuthManager';
+import TokenAuthManager, { TokenAuthData } from './TokenAuthManager';
+export type { TokenAuthData };
+export { CookieAuthManager, TokenAuthManager };
+export type AuthManager = CookieAuthManager | TokenAuthManager;

package/dist/lib/AuthManager/index.js

@@ -0,0 +1,11 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TokenAuthManager = exports.CookieAuthManager = void 0;
+const CookieAuthManager_1 = __importDefault(require("./CookieAuthManager"));
+exports.CookieAuthManager = CookieAuthManager_1.default;
+const TokenAuthManager_1 = __importDefault(require("./TokenAuthManager"));
+exports.TokenAuthManager = TokenAuthManager_1.default;
+//# sourceMappingURL=index.js.map

package/dist/lib/AuthManager/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/lib/AuthManager/index.ts"],"names":[],"mappings":";;;;;;AAAA,4EAAoD;AAK3C,4BALF,2BAAiB,CAKE;AAJ1B,0EAAqE;AAIzC,2BAJrB,0BAAgB,CAIqB"}

package/dist/lib/RestClient.d.ts

@@ -1,7 +1,7 @@
 import TypedEventEmitter, { EventMap } from './TypedEventEmitter';
 import { JSONValue } from '../types/json';
 import { Logger } from './DefaultLogger';
-import AuthManager from './AuthManager';
+import { AuthManager } from './AuthManager';
 declare class RestClient<E extends EventMap = never> extends TypedEventEmitter<E> {
     readonly baseUrl: string;
     protected _auth: AuthManager;

package/dist/lib/RestClient.js

@@ -33,8 +33,8 @@ class RestClient extends TypedEventEmitter_1.default {
     }
     request(url_1) {
         return __awaiter(this, arguments, void 0, function* (url, options = {}) {
-            const token = yield this.auth.getToken();
-            return fetch(url, Object.assign(Object.assign({}, options), { credentials: 'include', headers: Object.assign(Object.assign({}, (options.headers || {})), (token ? { Authorization: token } : {})) })).then((r) => this.processResponse(r));
+            const init = yield this.auth.authenticateRequest(options);
+            return fetch(url, init).then((r) => this.processResponse(r));
         });
     }
     processResponse(response) {
@@ -47,6 +47,10 @@ class RestClient extends TypedEventEmitter_1.default {
                 this._logger.error('Failed to parse response:', e);
                 throw new Error('Failed to parse response');
             }
+            // 401 means that the client instance is not authenticated, so we clear the authentication
+            if (response.status === 401 && this.auth.isAuthenticated) {
+                this.auth.clear();
+            }
             if (!response.ok) {
                 throw new ApiClient_1.ApiError(response.status, responseData);
             }

package/dist/lib/RestClient.js.map

@@ -1 +1 @@
-{"version":3,"file":"RestClient.js","sourceRoot":"","sources":["../../src/lib/RestClient.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,4CAA0D;AAC1D,4EAAkE;AAKlE,MAAM,UAAuC,SAAQ,2BAAoB;IAKvE,YAAY,OAAe,EAAE,IAAiB,EAAE,MAAc;QAC5D,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;QAClB,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;IACxB,CAAC;IAED,IAAI,IAAI;QACN,OAAO,IAAI,CAAC,KAAK,CAAC;IACpB,CAAC;IAEO,SAAS,CAAC,WAAmB,EAAE,QAAgC,EAAE;QACvE,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,WAAW,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;QAC/C,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;YACjC,GAAG,CAAC,YAAY,CAAC,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC;QAC3C,CAAC,CAAC,CAAC;QACH,OAAO,GAAG,CAAC,QAAQ,EAAE,CAAC;IACxB,CAAC;IAEa,OAAO;6DAAgB,GAAW,EAAE,UAAuB,EAAE;YACzE,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;YACzC,OAAO,KAAK,CAAC,GAAG,kCACX,OAAO,KACV,WAAW,EAAE,SAAS,EACtB,OAAO,kCACF,CAAC,OAAO,CAAC,OAAO,IAAI,EAAE,CAAC,GACvB,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,aAAa,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,KAE5C,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,CAAM,CAAC,CAAC;QAC/C,CAAC;KAAA;IAEa,eAAe,CAAC,QAAkB;;YAC9C,IAAI,YAAY,CAAC;YACjB,IAAI,CAAC;gBACH,YAAY,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;YACvC,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACX,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,2BAA2B,EAAE,CAAC,CAAC,CAAC;gBACnD,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAC;YAC9C,CAAC;YACD,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;gBACjB,MAAM,IAAI,oBAAQ,CAAC,QAAQ,CAAC,MAAM,EAAE,YAAgC,CAAC,CAAC;YACxE,CAAC;YACD,OAAO,YAAyB,CAAC;QACnC,CAAC;KAAA;IAED,GAAG,CAAgB,IAAY,EAAE,QAA6B,EAAE;QAC9D,OAAO,IAAI,CAAC,OAAO,CAAI,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,KAAK,CAAC,EAAE,KAAK,CAAC,CAAC;IAC7D,CAAC;IAED,IAAI,CAAgB,IAAY,EAAE,OAAgC,EAAE;QAClE,OAAO,IAAI,CAAC,OAAO,CAAI,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE;YAC3C,MAAM,EAAE,MAAM;YACd,OAAO,EAAE;gBACP,cAAc,EAAE,kBAAkB;aACnC;YACD,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC;SAC3B,CAAC,CAAC;IACL,CAAC;CACF;AAED,kBAAe,UAAU,CAAC"}
+{"version":3,"file":"RestClient.js","sourceRoot":"","sources":["../../src/lib/RestClient.ts"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,4CAA0D;AAC1D,4EAAkE;AAKlE,MAAM,UAAuC,SAAQ,2BAAoB;IAKvE,YAAY,OAAe,EAAE,IAAiB,EAAE,MAAc;QAC5D,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC;QAClB,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;IACxB,CAAC;IAED,IAAI,IAAI;QACN,OAAO,IAAI,CAAC,KAAK,CAAC;IACpB,CAAC;IAEO,SAAS,CAAC,WAAmB,EAAE,QAAgC,EAAE;QACvE,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,WAAW,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;QAC/C,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;YACjC,GAAG,CAAC,YAAY,CAAC,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC;QAC3C,CAAC,CAAC,CAAC;QACH,OAAO,GAAG,CAAC,QAAQ,EAAE,CAAC;IACxB,CAAC;IAEa,OAAO;6DAAgB,GAAW,EAAE,UAAuB,EAAE;YACzE,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,mBAAmB,CAAC,OAAO,CAAC,CAAC;YAC1D,OAAO,KAAK,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,CAAM,CAAC,CAAC;QACpE,CAAC;KAAA;IAEa,eAAe,CAAC,QAAkB;;YAC9C,IAAI,YAAY,CAAC;YACjB,IAAI,CAAC;gBACH,YAAY,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;YACvC,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACX,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,2BAA2B,EAAE,CAAC,CAAC,CAAC;gBACnD,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAC;YAC9C,CAAC;YACD,0FAA0F;YAC1F,IAAI,QAAQ,CAAC,MAAM,KAAK,GAAG,IAAI,IAAI,CAAC,IAAI,CAAC,eAAe,EAAE,CAAC;gBACzD,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;YACpB,CAAC;YACD,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;gBACjB,MAAM,IAAI,oBAAQ,CAAC,QAAQ,CAAC,MAAM,EAAE,YAAgC,CAAC,CAAC;YACxE,CAAC;YACD,OAAO,YAAyB,CAAC;QACnC,CAAC;KAAA;IAED,GAAG,CAAgB,IAAY,EAAE,QAA6B,EAAE;QAC9D,OAAO,IAAI,CAAC,OAAO,CAAI,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,KAAK,CAAC,EAAE,KAAK,CAAC,CAAC;IAC7D,CAAC;IAED,IAAI,CAAgB,IAAY,EAAE,OAAgC,EAAE;QAClE,OAAO,IAAI,CAAC,OAAO,CAAI,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE;YAC3C,MAAM,EAAE,MAAM;YACd,OAAO,EAAE;gBACP,cAAc,EAAE,kBAAkB;aACnC;YACD,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC;SAC3B,CAAC,CAAC;IACL,CAAC;CACF;AAED,kBAAe,UAAU,CAAC"}

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "3.4.0-alpha.1",
+  "version": "4.0.0-alpha.2",
   "description": "Sogni Supernet Client",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/Account/CurrentAccount.ts

@@ -19,8 +19,7 @@ export interface AccountData {
   balance: Balances;
   walletAddress?: string;
   username?: string;
-  token?: string;
-  refreshToken?: string;
+  email?: string;
 }
 
 function getDefaults(): AccountData {
@@ -43,9 +42,7 @@ function getDefaults(): AccountData {
       }
     },
     walletAddress: undefined,
-    username: undefined,
-    token: undefined,
-    refreshToken: undefined
+    username: undefined
   };
 }
 
@@ -63,7 +60,7 @@ class CurrentAccount extends DataEntity<AccountData> {
   }
 
   get isAuthenicated() {
-    return !!this.data.refreshToken;
+    return !!this.data.walletAddress;
   }
 
   get networkStatus() {
@@ -86,12 +83,8 @@ class CurrentAccount extends DataEntity<AccountData> {
     return this.data.username;
   }
 
-  get token() {
-    return this.data.token;
-  }
-
-  get refreshToken() {
-    return this.data.refreshToken;
+  get email() {
+    return this.data.email;
   }
 }