@vitia.ai/secure-api-client-vue 0.1.1 → 0.1.3

package/dist/index.d.ts

@@ -6,10 +6,12 @@ export declare type LoginOptions = {
     username: string;
     password: string;
     scope: string;
+    oauthSession?: object;
 } | {
     email: string;
     socialLoginId: string;
     scope: string;
+    oauthSession?: object;
 } | {
     jwt: string;
 } | {

package/dist/index.mjs

@@ -2742,22 +2742,22 @@ class Ms {
     if (!(this.ws && (this.ws.readyState === WebSocket.OPEN || this.ws.readyState === WebSocket.CONNECTING))) {
       if (this._connectPromise) return this._connectPromise;
       this._connectPromise = (async () => {
-        const { url: t } = await this.client.get("/url/notifications");
-        this.ws = new WebSocket(t), this.ws.onopen = () => {
+        const { ans: t } = await this.client.get("/url/notifications"), { url: r } = t.data[0];
+        this.ws = new WebSocket(r), this.ws.onopen = () => {
           this._reconnectAttempt = 0, console.log("Notifications connected");
-        }, this.ws.onmessage = async (r) => {
+        }, this.ws.onmessage = async (s) => {
           try {
-            const s = JSON.parse(r.data), i = await this.client.decryptAndVerify(s), o = this.subscriptions.request[i == null ? void 0 : i.correlation_id];
-            o && Object.values(o).length > 0 && Object.values(o).forEach((u) => u(i));
-            const c = this.subscriptions.status[i == null ? void 0 : i.status];
-            c && Object.values(c).length > 0 && Object.values(c).forEach((u) => u(i));
-            const a = this.subscriptions.topic[i == null ? void 0 : i.topic];
-            a && Object.values(a).length > 0 && Object.values(a).forEach((u) => u(i)), Object.values(this.listeners).forEach((u) => u(i));
-          } catch (s) {
-            console.warn("Failed to process notification:", s);
+            const i = JSON.parse(s.data), o = await this.client.decryptAndVerify(i), c = this.subscriptions.request[o == null ? void 0 : o.correlation_id];
+            c && Object.values(c).length > 0 && Object.values(c).forEach((f) => f(o));
+            const a = this.subscriptions.status[o == null ? void 0 : o.status];
+            a && Object.values(a).length > 0 && Object.values(a).forEach((f) => f(o));
+            const u = this.subscriptions.topic[o == null ? void 0 : o.topic];
+            u && Object.values(u).length > 0 && Object.values(u).forEach((f) => f(o)), Object.values(this.listeners).forEach((f) => f(o));
+          } catch (i) {
+            console.warn("Failed to process notification:", i);
           }
-        }, this.ws.onerror = (r) => {
-          console.error("Notifications error", r);
+        }, this.ws.onerror = (s) => {
+          console.error("Notifications error", s);
         }, this.ws.onclose = () => {
           this.scheduleReconnect(), console.log("Notifications closed");
         };
@@ -2962,7 +2962,7 @@ ${c}`, l = await Hs(i, new TextEncoder().encode(h)), g = ne(l), w = new Headers(
     var t, r, s;
     (!this.session || !this.session.sessionId || !this.session.sessionExpiresAt || !this.session.encKey || !this.session.macKey) && await this.handshake();
     const e = new Date(Date.now() + 5 * 60 * 1e3);
-    (t = this.session) != null && t.sessionExpiresAt && new Date((r = this.session) == null ? void 0 : r.sessionExpiresAt) < e && await this.extendHandshake(), (s = this.session) != null && s.userId && this.isTokenExpired() && await this.refresh();
+    (t = this.session) != null && t.sessionExpiresAt && new Date((r = this.session) == null ? void 0 : r.sessionExpiresAt) < e && await this.extendHandshake(), (s = this.session) != null && s.accessToken && this.isTokenExpired() && await this.refresh();
   }
   async extendHandshake() {
     await this.post("/handshake/extend", {}).then(async (e) => {
@@ -2999,9 +2999,14 @@ ${c}`, l = await Hs(i, new TextEncoder().encode(h)), g = ne(l), w = new Headers(
     return r === 0;
   }
   async login(e) {
-    await this.ensureSession();
+    (!this.session || !this.session.sessionId || !this.session.sessionExpiresAt || !this.session.encKey || !this.session.macKey) && await this.handshake(), this.updateSession({
+      accessToken: void 0,
+      tokenType: void 0,
+      expiresAt: void 0,
+      refreshToken: void 0
+    });
     const t = {};
-    "username" in e && "password" in e && (t.username = e.username, t.password = e.password, t.scope = e.scope), "email" in e && "socialLoginId" in e && (t.email = e.email, t.social_login_id = e.socialLoginId, t.scope = e.scope), "jwt" in e && this.updateSession({
+    "username" in e && "password" in e && (t.username = e.username, t.password = e.password, t.scope = e.scope, t.oauth_session = e.oauthSession), "email" in e && "socialLoginId" in e && (t.email = e.email, t.social_login_id = e.socialLoginId, t.scope = e.scope, t.oauth_session = e.oauthSession), "jwt" in e && this.updateSession({
       accessToken: e.jwt,
       tokenType: "Bearer"
     }), "refreshToken" in e && (t.refresh_token = e.refreshToken);
@@ -3010,7 +3015,7 @@ ${c}`, l = await Hs(i, new TextEncoder().encode(h)), g = ne(l), w = new Headers(
       token_type: i,
       expires_at: o,
       refresh_token: c
-    } = r;
+    } = r.data[0];
     return s && this.updateSession({ accessToken: s }), i && this.updateSession({ tokenType: i }), o && this.updateSession({ expiresAt: o }), c && this.updateSession({ refreshToken: c }), {
       accessToken: s,
       tokenType: i,