mosquito-transport-js 0.3.6 → 0.3.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mosquito-transport-js",
-  "version": "0.3.6",
+  "version": "0.3.8",
   "description": "Javascript web sdk for mosquito-transport (https://github.com/brainbehindx/mosquito-transport)",
   "main": "src/index.js",
   "type": "module",

package/src/index.d.ts

@@ -389,12 +389,12 @@ interface MTAuth {
     twitterSignin: () => Promise<SignupResult>;
     githubSignin: () => Promise<SignupResult>;
     listenVerifiedStatus: (callback?: (verified?: boolean) => void, onError?: (error?: ErrorResponse) => void) => () => void;
-    listenAuthToken: (callback: (token: string) => void) => () => void;
-    getAuthToken: () => Promise<string>;
-    getRefreshToken: () => Promise<string>;
-    getRefreshTokenData: () => Promise<RefreshTokenData>;
+    listenAuthToken: (callback: (token: string | null) => void) => () => void;
+    getAuthToken: () => Promise<string | null>;
+    getRefreshToken: () => Promise<string | undefined>;
+    getRefreshTokenData: () => Promise<RefreshTokenData | undefined>;
     parseToken: (token: string) => AuthData | RefreshTokenData;
-    listenAuth: (callback: (auth: TokenEventData) => void) => () => void;
+    listenAuth: (callback: (auth: TokenEventData | null) => void) => () => void;
     getAuth: () => Promise<TokenEventData>;
     signOut: () => Promise<void>;
     forceRefreshToken: () => Promise<string>;
@@ -437,10 +437,14 @@ interface RefreshTokenData {
     uid: string;
     tokenID: string;
     isRefreshToken: true;
+    exp: number;
+    aud: string;
+    iss: string;
+    sub: string;
 }
 
 interface TokenEventData extends AuthData {
-    tokenManager: TokenManager | null;
+    tokenManager: TokenManager;
 }
 
 interface TokenManager {

package/src/index.js

@@ -1,6 +1,6 @@
 import { deserializeE2E, listenReachableServer, serializeE2E } from "./helpers/peripherals";
 import { awaitStore, releaseCacheStore } from "./helpers/utils";
-import { Scoped, CacheStore } from "./helpers/variables";
+import { CacheStore, Scoped } from "./helpers/variables";
 import { MTCollection, batchWrite, trySendPendingWrite } from "./products/database";
 import { MTStorage } from "./products/storage";
 import { ServerReachableListener, TokenRefreshListener } from "./helpers/listeners";
@@ -14,7 +14,7 @@ import { Validator } from 'guard-object';
 import sendMessage from "./helpers/broadcaster";
 import cloneDeep from 'lodash.clonedeep';
 import { Buffer } from 'buffer';
-import MTAuth from './products/auth';
+import MTAuth, { purgePendingToken } from './products/auth';
 
 const {
     _listenCollection,
@@ -133,6 +133,12 @@ export class MosquitoTransport {
         validateReleaseCacheProp({ ...prop });
         Scoped.ReleaseCacheData = { ...prop };
         releaseCacheStore({ ...prop });
+        // purge residue tokens
+        awaitStore().then(() => {
+            Object.keys(CacheStore.PendingAuthPurge).forEach(k => {
+                purgePendingToken(k);
+            });
+        });
     }
 
     getDatabase = (dbName, dbUrl) => ({

package/src/products/auth/index.js

@@ -8,13 +8,6 @@ import { deserializeE2E, encodeBinary, serializeE2E } from "../../helpers/periph
 import { simplifyCaughtError, simplifyError } from "simplify-error";
 import cloneDeep from "lodash.clonedeep";
 
-// purge residue tokens
-awaitStore().then(() => {
-    Object.keys(CacheStore.PendingAuthPurge).forEach(k => {
-        purgePendingToken(k);
-    });
-});
-
 const {
     _listenUserVerification,
     _signOut,
@@ -126,6 +119,12 @@ export default class MTAuth {
         return CacheStore.AuthStore[this.builder.projectUrl]?.refreshToken;
     }
 
+    getRefreshTokenData = async () => {
+        await awaitStore();
+        const { refreshToken } = CacheStore.AuthStore[this.builder.projectUrl] || {};
+        return refreshToken && parseToken(refreshToken);
+    }
+
     parseToken = (token) => parseToken(token);
 
     getAuthToken = () => new Promise(resolve => {
@@ -290,7 +289,7 @@ export const revokeAuthIntance = async (builder, authStore) => {
     await purgePendingToken(nodeId);
 };
 
-const purgePendingToken = async (nodeId) => {
+export const purgePendingToken = async (nodeId) => {
     const {
         auth: { token, refreshToken: r_token },
         data: { projectUrl, serverE2E_PublicKey, accessKey, uglify, extraHeaders }
@@ -300,7 +299,7 @@ const purgePendingToken = async (nodeId) => {
     try {
         let isConnected;
         try {
-            isConnected = (await (await fetch(_areYouOk(projectUrl))).json()).status === 'yes';
+            isConnected = (await (await fetch(_areYouOk(projectUrl))).json(), { cache: 'no-cache' }).status === 'yes';
         } catch (_) { }
 
         if (!isConnected)

package/src/products/http_callable/index.js

@@ -61,8 +61,8 @@ export const mfetch = async (input = '', init, config) => {
     if ('uglified' in rawHeader)
         throw '"uglified" in header is a reserved prop';
 
-    if (isBaseUrl && !rawApproach)
-        throw `please set { rawApproach: true } if you're trying to access different endpoint at "${input}"`;
+    // if (isBaseUrl && !rawApproach)
+    //     throw `please set { rawApproach: true } if you're trying to access different endpoint at "${input}"`;
 
     if (body !== undefined) {
         if (