@sogni-ai/sogni-client 0.4.3 → 0.5.0-alpha.1

package/dist/lib/AuthManager.d.ts

@@ -0,0 +1,51 @@
+import { ApiErrorResponse } from '../ApiClient';
+import { Logger } from './DefaultLogger';
+import TypedEventEmitter from './TypedEventEmitter';
+/**
+ * Tokens object, containing the token and refresh token
+ * @typedef {Object} Tokens
+ * @property {string} [token] - The JWT token. Optonal, if missing it will be retrieved from the server
+ * @property {string} refreshToken - The refresh token
+ */
+export interface Tokens {
+    token?: string;
+    refreshToken: string;
+}
+export type AuthUpdatedEvent = {
+    token: string;
+    refreshToken: string;
+    walletAddress: string;
+} | {
+    token: null;
+    refreshToken: null;
+    walletAddress: null;
+};
+interface AuthManagerEvents {
+    updated: AuthUpdatedEvent;
+    refreshFailed: ApiErrorResponse;
+}
+declare class AuthManager extends TypedEventEmitter<AuthManagerEvents> {
+    private _token?;
+    private _tokenExpiresAt;
+    private _refreshToken?;
+    private _refreshTokenExpiresAt;
+    private _logger;
+    private _baseUrl;
+    private _walletAddress?;
+    private _renewTokenPromise?;
+    constructor(baseUrl: string, logger: Logger);
+    get refreshToken(): string | undefined;
+    get walletAddress(): string | undefined;
+    get isAuthenticated(): boolean;
+    private _updateCookies;
+    setTokens({ refreshToken, token }: {
+        refreshToken: string;
+        token?: string;
+    }): Promise<void>;
+    getToken(): Promise<string | undefined>;
+    renewToken(): Promise<string>;
+    clear(): void;
+    private _updateTokens;
+    private _renewToken;
+}
+export default AuthManager;

package/dist/lib/AuthManager.js

@@ -0,0 +1,157 @@
+"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 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 {
+    constructor(baseUrl, logger) {
+        super();
+        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'
+            });
+        }
+    }
+    setTokens(_a) {
+        return __awaiter(this, arguments, void 0, function* ({ refreshToken, token }) {
+            if (token) {
+                this._updateTokens({ token, refreshToken });
+                return;
+            }
+            this._refreshToken = refreshToken;
+            const { expiresAt: refreshExpiresAt } = (0, utils_1.decodeRefreshToken)(refreshToken);
+            this._refreshTokenExpiresAt = refreshExpiresAt;
+            yield this.renewToken();
+        });
+    }
+    getToken() {
+        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 this._token;
+            }
+            //If there is no refresh token, return undefined, to make unauthorized requests
+            if (!this._refreshToken) {
+                return;
+            }
+            //If there is a refresh token, try to renew the token
+            return this.renewToken();
+        });
+    }
+    renewToken() {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this._renewTokenPromise) {
+                return this._renewTokenPromise;
+            }
+            this._renewTokenPromise = this._renewToken();
+            this._renewTokenPromise.finally(() => {
+                this._renewTokenPromise = undefined;
+            });
+            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;
+        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 });
+    }
+    _renewToken() {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this._refreshTokenExpiresAt < new Date()) {
+                throw new Error('Refresh token expired');
+            }
+            const url = new URL('/v1/account/refresh-token', this._baseUrl).toString();
+            const response = yield fetch(url, {
+                method: 'POST',
+                headers: {
+                    'Content-Type': 'application/json'
+                },
+                body: JSON.stringify({ refreshToken: this._refreshToken })
+            });
+            let responseData;
+            try {
+                responseData = yield response.json();
+            }
+            catch (e) {
+                this.emit('refreshFailed', {
+                    status: 'error',
+                    errorCode: 0,
+                    message: 'Failed to parse response'
+                });
+                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);
+            }
+            const { token, refreshToken } = responseData.data;
+            this._updateTokens({ token, refreshToken });
+            return this._token;
+        });
+    }
+}
+exports.default = AuthManager;
+//# sourceMappingURL=AuthManager.js.map

package/dist/lib/AuthManager.js.map

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

package/dist/lib/RestClient.d.ts

@@ -1,16 +1,13 @@
 import TypedEventEmitter, { EventMap } from './TypedEventEmitter';
 import { JSONValue } from '../types/json';
 import { Logger } from './DefaultLogger';
-export interface AuthData {
-    token: string;
-}
+import AuthManager from './AuthManager';
 declare class RestClient<E extends EventMap = never> extends TypedEventEmitter<E> {
     readonly baseUrl: string;
-    protected _auth: AuthData | null;
+    protected _auth: AuthManager;
     protected _logger: Logger;
-    constructor(baseUrl: string, logger: Logger);
-    get auth(): AuthData | null;
-    set auth(auth: AuthData | null);
+    constructor(baseUrl: string, auth: AuthManager, logger: Logger);
+    get auth(): AuthManager;
     private formatUrl;
     private request;
     private processResponse;

package/dist/lib/RestClient.js

@@ -15,18 +15,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const ApiClient_1 = require("../ApiClient");
 const TypedEventEmitter_1 = __importDefault(require("./TypedEventEmitter"));
 class RestClient extends TypedEventEmitter_1.default {
-    constructor(baseUrl, logger) {
+    constructor(baseUrl, auth, logger) {
         super();
-        this._auth = null;
         this.baseUrl = baseUrl;
+        this._auth = auth;
         this._logger = logger;
     }
     get auth() {
         return this._auth;
     }
-    set auth(auth) {
-        this._auth = auth;
-    }
     formatUrl(relativeUrl, query = {}) {
         const url = new URL(relativeUrl, this.baseUrl);
         Object.keys(query).forEach((key) => {
@@ -34,8 +31,11 @@ class RestClient extends TypedEventEmitter_1.default {
         });
         return url.toString();
     }
-    request(url, options = {}) {
-        return fetch(url, Object.assign(Object.assign({}, options), { headers: Object.assign(Object.assign({}, (options.headers || {})), (this.auth ? { Authorization: this.auth.token } : {})) })).then((r) => this.processResponse(r));
+    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), { headers: Object.assign(Object.assign({}, (options.headers || {})), (token ? { Authorization: token } : {})) })).then((r) => this.processResponse(r));
+        });
     }
     processResponse(response) {
         return __awaiter(this, void 0, void 0, function* () {

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;AAQlE,MAAM,UAAuC,SAAQ,2BAAoB;IAKvE,YAAY,OAAe,EAAE,MAAc;QACzC,KAAK,EAAE,CAAC;QAJA,UAAK,GAAoB,IAAI,CAAC;QAKtC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;IACxB,CAAC;IAED,IAAI,IAAI;QACN,OAAO,IAAI,CAAC,KAAK,CAAC;IACpB,CAAC;IAED,IAAI,IAAI,CAAC,IAAqB;QAC5B,IAAI,CAAC,KAAK,GAAG,IAAI,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;IAEO,OAAO,CAAgB,GAAW,EAAE,UAAuB,EAAE;QACnE,OAAO,KAAK,CAAC,GAAG,kCACX,OAAO,KACV,OAAO,kCACF,CAAC,OAAO,CAAC,OAAO,IAAI,EAAE,CAAC,GACvB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,aAAa,EAAE,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,KAE1D,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,CAAM,CAAC,CAAC;IAC/C,CAAC;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,KAAK,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;YACzC,OAAO,KAAK,CAAC,GAAG,kCACX,OAAO,KACV,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"}

package/dist/lib/utils.d.ts

@@ -0,0 +1,8 @@
+export declare function decodeToken(token: string): {
+    walletAddress: string;
+    expiresAt: Date;
+};
+export declare function decodeRefreshToken(token: string): {
+    env: string;
+    expiresAt: Date;
+};

package/dist/lib/utils.js

@@ -0,0 +1,20 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.decodeToken = decodeToken;
+exports.decodeRefreshToken = decodeRefreshToken;
+const jwt_decode_1 = require("jwt-decode");
+function decodeToken(token) {
+    const data = (0, jwt_decode_1.jwtDecode)(token);
+    return {
+        walletAddress: data.addr,
+        expiresAt: new Date(data.exp * 1000)
+    };
+}
+function decodeRefreshToken(token) {
+    const data = (0, jwt_decode_1.jwtDecode)(token);
+    return {
+        env: data.env,
+        expiresAt: new Date(data.exp * 1000)
+    };
+}
+//# sourceMappingURL=utils.js.map

package/dist/lib/utils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/lib/utils.ts"],"names":[],"mappings":";;AAEA,kCAMC;AAED,gDAMC;AAhBD,2CAAuC;AAEvC,SAAgB,WAAW,CAAC,KAAa;IACvC,MAAM,IAAI,GAAG,IAAA,sBAAS,EAA0D,KAAK,CAAC,CAAC;IACvF,OAAO;QACL,aAAa,EAAE,IAAI,CAAC,IAAI;QACxB,SAAS,EAAE,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC;KACrC,CAAC;AACJ,CAAC;AAED,SAAgB,kBAAkB,CAAC,KAAa;IAC9C,MAAM,IAAI,GAAG,IAAA,sBAAS,EAA0D,KAAK,CAAC,CAAC;IACvF,OAAO;QACL,GAAG,EAAE,IAAI,CAAC,GAAG;QACb,SAAS,EAAE,IAAI,IAAI,CAAC,IAAI,CAAC,GAAG,GAAG,IAAI,CAAC;KACrC,CAAC;AACJ,CAAC"}

package/dist/version.d.ts

@@ -1 +1 @@
-export declare const LIB_VERSION = "0.4.3";
+export declare const LIB_VERSION = "0.5.0-alpha.1";

package/dist/version.js

@@ -1,5 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LIB_VERSION = void 0;
-exports.LIB_VERSION = "0.4.3";
+exports.LIB_VERSION = "0.5.0-alpha.1";
 //# sourceMappingURL=version.js.map

package/dist/version.js.map

@@ -1 +1 @@
-{"version":3,"file":"version.js","sourceRoot":"","sources":["../src/version.ts"],"names":[],"mappings":";;;AAAa,QAAA,WAAW,GAAG,OAAO,CAAC"}
+{"version":3,"file":"version.js","sourceRoot":"","sources":["../src/version.ts"],"names":[],"mappings":";;;AAAa,QAAA,WAAW,GAAG,eAAe,CAAC"}

package/package.json

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

package/src/Account/CurrentAccount.ts

@@ -1,12 +1,10 @@
 import DataEntity from '../lib/DataEntity';
 import { BalanceData } from './types';
-import { jwtDecode } from 'jwt-decode';
 import { SupernetType } from '../ApiClient/WebSocketClient/types';
 /**
  * @inline
  */
 export interface AccountData {
-  token: string | null;
   /**
    * Current network status:\
    * - `connected` - connected to the socket
@@ -21,13 +19,13 @@ export interface AccountData {
   network: SupernetType | null;
   balance: BalanceData;
   walletAddress?: string;
-  expiresAt?: Date;
   username?: string;
+  token?: string;
+  refreshToken?: string;
 }
 
 function getDefaults(): AccountData {
   return {
-    token: null,
     networkStatus: 'disconnected',
     network: null,
     balance: {
@@ -35,15 +33,11 @@ function getDefaults(): AccountData {
       debit: '0',
       net: '0',
       settled: '0'
-    }
-  };
-}
-
-function decodeToken(token: string) {
-  const data = jwtDecode<{ addr: string; env: string; iat: number; exp: number }>(token);
-  return {
-    walletAddress: data.addr,
-    expiresAt: new Date(data.exp * 1000)
+    },
+    walletAddress: undefined,
+    username: undefined,
+    token: undefined,
+    refreshToken: undefined
   };
 }
 
@@ -56,29 +50,10 @@ class CurrentAccount extends DataEntity<AccountData> {
     super(data || getDefaults());
   }
 
-  _update<K extends keyof AccountData>(delta: Partial<AccountData>) {
-    this.data = { ...this.data, ...(delta as Partial<AccountData>) };
-    const keys = Object.keys(delta);
-    if (delta.hasOwnProperty('token')) {
-      if (delta.token) {
-        Object.assign(this.data, decodeToken(delta.token));
-      } else {
-        delete this.data.walletAddress;
-        delete this.data.expiresAt;
-      }
-      keys.push('walletAddress', 'expiresAt');
-    }
-    this.emit('updated', keys);
-  }
-
   _clear() {
     this._update(getDefaults());
   }
 
-  get isAuthenicated() {
-    return !!this.data.token && !!this.data.expiresAt && this.data.expiresAt > new Date();
-  }
-
   get networkStatus() {
     return this.data.networkStatus;
   }
@@ -95,10 +70,6 @@ class CurrentAccount extends DataEntity<AccountData> {
     return this.data.walletAddress;
   }
 
-  get expiresAt() {
-    return this.data.expiresAt;
-  }
-
   get username() {
     return this.data.username;
   }
@@ -106,6 +77,10 @@ class CurrentAccount extends DataEntity<AccountData> {
   get token() {
     return this.data.token;
   }
+
+  get refreshToken() {
+    return this.data.refreshToken;
+  }
 }
 
 export default CurrentAccount;

package/src/Account/index.ts

@@ -14,6 +14,7 @@ import { Wallet, pbkdf2, toUtf8Bytes, Signature, parseEther } from 'ethers';
 import { ApiError, ApiReponse } from '../ApiClient';
 import CurrentAccount from './CurrentAccount';
 import { SupernetType } from '../ApiClient/WebSocketClient/types';
+import { AuthUpdatedEvent, Tokens } from '../lib/AuthManager';
 
 /**
  * Account API methods that let you interact with the user's account.
@@ -34,6 +35,7 @@ class AccountApi extends ApiGroup {
     this.client.socket.on('balanceUpdate', this.handleBalanceUpdate.bind(this));
     this.client.on('connected', this.handleServerConnected.bind(this));
     this.client.on('disconnected', this.handleServerDisconnected.bind(this));
+    this.client.auth.on('updated', this.handleAuthUpdated.bind(this));
   }
 
   private handleBalanceUpdate(data: BalanceData) {
@@ -51,6 +53,14 @@ class AccountApi extends ApiGroup {
     this.currentAccount._clear();
   }
 
+  private handleAuthUpdated({ refreshToken, token, walletAddress }: AuthUpdatedEvent) {
+    if (!refreshToken) {
+      this.currentAccount._clear();
+    } else {
+      this.currentAccount._update({ walletAddress, token, refreshToken });
+    }
+  }
+
   private async getNonce(walletAddress: string): Promise<string> {
     const res = await this.client.rest.post<ApiReponse<Nonce>>('/v1/account/nonce', {
       walletAddress
@@ -111,12 +121,12 @@ class AccountApi extends ApiGroup {
       referralCode,
       signature
     });
-    this.setToken(username, res.data.token);
+    await this.setToken(username, { refreshToken: res.data.refreshToken, token: res.data.token });
     return res.data;
   }
 
   /**
-   * Restore session with username and access token.
+   * Restore session with username and refresh token.
    *
    * You can save access token that you get from the login method and restore the session with this method.
    *
@@ -138,13 +148,13 @@ class AccountApi extends ApiGroup {
    * ```
    *
    * @param username
-   * @param token
+   * @param tokens - Refresh token, access token pair { refreshToken: string, token: string }
    */
-  setToken(username: string, token: string): void {
-    this.client.authenticate(token);
+  async setToken(username: string, tokens: Tokens): Promise<void> {
+    await this.client.authenticate(tokens);
     this.currentAccount._update({
-      token,
-      username
+      username,
+      walletAddress: this.client.auth.walletAddress
     });
   }
 
@@ -171,7 +181,7 @@ class AccountApi extends ApiGroup {
       walletAddress: wallet.address,
       signature
     });
-    this.setToken(username, res.data.token);
+    await this.setToken(username, { refreshToken: res.data.refreshToken, token: res.data.token });
     return res.data;
   }
 

package/src/Account/types.ts

@@ -4,10 +4,12 @@ export interface Nonce {
 
 export interface AccountCreateData {
   token: string;
+  refreshToken: string;
 }
 
 export interface LoginData {
   token: string;
+  refreshToken: string;
   username: string;
 }
 

package/src/ApiClient/WebSocketClient/index.ts

@@ -1,13 +1,13 @@
 import { MessageType, SocketMessageMap } from './messages';
 import { SocketEventMap } from './events';
-import RestClient, { AuthData } from '../../lib/RestClient';
+import RestClient from '../../lib/RestClient';
 import { SupernetType } from './types';
 import WebSocket, { CloseEvent, ErrorEvent, MessageEvent } from 'isomorphic-ws';
 import { base64Decode, base64Encode } from '../../lib/base64';
 import isNodejs from '../../lib/isNodejs';
-import Cookie from 'js-cookie';
 import { LIB_VERSION } from '../../version';
 import { Logger } from '../../lib/DefaultLogger';
+import AuthManager from '../../lib/AuthManager';
 
 const PING_INTERVAL = 15000;
 
@@ -18,34 +18,23 @@ class WebSocketClient extends RestClient<SocketEventMap> {
   private _supernetType: SupernetType;
   private _pingInterval: NodeJS.Timeout | null = null;
 
-  constructor(baseUrl: string, appId: string, supernetType: SupernetType, logger: Logger) {
+  constructor(
+    baseUrl: string,
+    auth: AuthManager,
+    appId: string,
+    supernetType: SupernetType,
+    logger: Logger
+  ) {
     const _baseUrl = new URL(baseUrl);
     if (_baseUrl.protocol === 'wss:') {
       _baseUrl.protocol = 'https:';
     }
-    super(_baseUrl.toString(), logger);
+    super(_baseUrl.toString(), auth, logger);
     this.appId = appId;
     this.baseUrl = _baseUrl.toString();
     this._supernetType = supernetType;
   }
 
-  set auth(auth: AuthData | null) {
-    //In browser, set the cookie
-    if (!isNodejs) {
-      if (auth) {
-        Cookie.set('authorization', auth.token, {
-          domain: '.sogni.ai',
-          expires: 1
-        });
-      } else {
-        Cookie.remove('authorization', {
-          domain: '.sogni.ai'
-        });
-      }
-    }
-    this._auth = auth;
-  }
-
   get supernetType(): SupernetType {
     return this._supernetType;
   }
@@ -54,7 +43,7 @@ class WebSocketClient extends RestClient<SocketEventMap> {
     return !!this.socket;
   }
 
-  connect() {
+  async connect() {
     if (this.socket) {
       this.disconnect();
     }
@@ -71,7 +60,7 @@ class WebSocketClient extends RestClient<SocketEventMap> {
     if (isNodejs) {
       params = {
         headers: {
-          Authorization: this._auth?.token,
+          Authorization: await this.auth.getToken(),
           'User-Agent': userAgent
         }
       };
@@ -114,7 +103,7 @@ class WebSocketClient extends RestClient<SocketEventMap> {
   }
 
   switchNetwork(supernetType: SupernetType): Promise<SupernetType> {
-    return new Promise<SupernetType>(async (resolve, reject) => {
+    return new Promise<SupernetType>(async (resolve) => {
       this.once('changeNetwork', ({ network }) => {
         this._supernetType = network;
         resolve(network);