@gardenfi/utils 2.0.2 → 2.0.3

package/dist/index6.cjs

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const t=require("./index11.cjs"),d=require("./index7.cjs"),h=require("./index8.cjs"),w=require("jwt-decode"),f=require("./index3.cjs"),g=require("./index5.cjs"),y=require("./index13.cjs");class m{constructor(r,i,e){this.API="https://api.garden.finance",this.url=new g.Url("/",r??this.API),this.walletClient=i,this.domain=(e==null?void 0:e.domain)||"app.garden.finance",this.domain.startsWith("https://")&&(this.domain=this.domain.split("https://")[1]),this.signingStatement=(e==null?void 0:e.signingStatement)??"Garden.fi",this.store=(e==null?void 0:e.store)??new d.MemoryStorage}verifyToken(r,i){try{const e=u(r);if(!e)return t.Ok(!1);const n=Math.floor(Date.now()/1e3)+120;if(!e.address&&!e.user_id)return t.Ok(!1);const a=e.address?e.address.toLowerCase()===i.toLowerCase():!1,s=e.user_id?e.user_id.toLowerCase()===i.toLowerCase():!1;return t.Ok(e.exp>n&&a||s)}catch{return t.Ok(!1)}}async getToken(){var s;if(!((s=this.walletClient.account)!=null&&s.address))return t.Err("Wallet client does not have an account");const r=this.store.getItem(h.StoreKeys.AUTH_TOKEN);if(r){const o=this.verifyToken(r,this.walletClient.account.address);if(o.ok&&o.val)return t.Ok(r)}const i=await this.signStatement();if(i.error)return t.Err(i.error);const e=await t.Fetcher.post(this.url.endpoint("verify"),{body:JSON.stringify({...i.val}),headers:{"Content-Type":"application/json"}});if(e.error)return t.Err(e.error);const n=e.result;if(!n)return t.Err("Failed to get token");if(!this.verifyToken(n,this.walletClient.account.address).val)throw new Error("Token verification failed");return this.store.setItem(h.StoreKeys.AUTH_TOKEN,n),t.Ok(n)}async signStatement(){var l;if(!((l=this.walletClient.account)!=null&&l.address))return t.Err("Wallet client does not have a valid account");const r=new Date,i=new Date(r.getTime()+300*1e3),n=(await t.Fetcher.get(this.url.endpoint("nonce"))).result;if(!n)return t.Err("Failed to get nonce");const a=await this.walletClient.getChainId(),s=y.createSiweMessage({domain:this.domain,address:this.walletClient.account.address,statement:this.signingStatement,nonce:n,uri:"https://"+this.domain,version:"1",chainId:a,notBefore:i}),o=await this.walletClient.signMessage({account:this.walletClient.account,message:s});return t.Ok({message:s,signature:o,nonce:n})}}const u=c=>{try{return w.jwtDecode(c)}catch{return}};class k{constructor(r){if(!r.siwe&&!r.apiKey)throw new Error("Either siwe or apiKey must be provided");this.siwe=r.siwe,this.apiKey=r.apiKey}async getAuthHeaders(){if(this.siwe){const r=await this.siwe.getToken();return r.error?t.Err(r.error):t.Ok({Authorization:f.Authorization(r.val)})}return this.apiKey?t.Ok({"api-key":this.apiKey}):t.Err("No authentication method available")}}exports.Auth=k;exports.Siwe=m;exports.parseJwt=u;
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const r=require("./index11.cjs"),d=require("./index7.cjs"),l=require("./index8.cjs"),w=require("jwt-decode"),f=require("./index3.cjs"),g=require("./index5.cjs"),y=require("./index13.cjs");class m{constructor(t,n,e){this.API="https://api.garden.finance",this.url=new g.Url("/",t??this.API),this.walletClient=n,this.domain=(e==null?void 0:e.domain)||"app.garden.finance",this.domain.startsWith("https://")&&(this.domain=this.domain.split("https://")[1]),this.signingStatement=(e==null?void 0:e.signingStatement)??"Garden.fi",this.store=(e==null?void 0:e.store)??new d.MemoryStorage}verifyToken(t,n){try{const e=u(t);if(!e)return r.Ok(!1);const i=Math.floor(Date.now()/1e3)+120;return r.Ok(e.exp>i&&e.user_id.toLowerCase()===n.toLowerCase())}catch{return r.Ok(!1)}}async getToken(){var a;if(!((a=this.walletClient.account)!=null&&a.address))return r.Err("Wallet client does not have an account");const t=this.store.getItem(l.StoreKeys.AUTH_TOKEN);if(t){const s=this.verifyToken(t,this.walletClient.account.address);if(s.ok&&s.val)return r.Ok(t)}const n=await this.signStatement();if(n.error)return r.Err(n.error);const e=await r.Fetcher.post(this.url.endpoint("verify"),{body:JSON.stringify({...n.val}),headers:{"Content-Type":"application/json"}});if(e.error)return r.Err(e.error);const i=e.result;if(!i)return r.Err("Failed to get token");if(!this.verifyToken(i,this.walletClient.account.address).val)throw new Error("Token verification failed");return this.store.setItem(l.StoreKeys.AUTH_TOKEN,i),r.Ok(i)}async signStatement(){var h;if(!((h=this.walletClient.account)!=null&&h.address))return r.Err("Wallet client does not have a valid account");const t=new Date,n=new Date(t.getTime()+300*1e3),i=(await r.Fetcher.get(this.url.endpoint("nonce"))).result;if(!i)return r.Err("Failed to get nonce");const c=await this.walletClient.getChainId(),a=y.createSiweMessage({domain:this.domain,address:this.walletClient.account.address,statement:this.signingStatement,nonce:i,uri:"https://"+this.domain,version:"1",chainId:c,notBefore:n}),s=await this.walletClient.signMessage({account:this.walletClient.account,message:a});return r.Ok({message:a,signature:s,nonce:i})}}const u=o=>{try{return w.jwtDecode(o)}catch{return}};class k{constructor(t){if(!t.siwe&&!t.apiKey)throw new Error("Either siwe or apiKey must be provided");this.siwe=t.siwe,this.apiKey=t.apiKey}async getAuthHeaders(){if(this.siwe){const t=await this.siwe.getToken();return t.error?r.Err(t.error):r.Ok({Authorization:f.Authorization(t.val)})}return this.apiKey?r.Ok({"api-key":this.apiKey}):r.Err("No authentication method available")}}exports.Auth=k;exports.Siwe=m;exports.parseJwt=u;

package/dist/index6.js

@@ -1,107 +1,107 @@
-import { Ok as n, Err as s, Fetcher as d } from "./index11.js";
+import { Ok as n, Err as a, Fetcher as u } from "./index11.js";
 import { MemoryStorage as f } from "./index7.js";
-import { StoreKeys as u } from "./index8.js";
-import { jwtDecode as w } from "jwt-decode";
-import { Authorization as m } from "./index3.js";
+import { StoreKeys as d } from "./index8.js";
+import { jwtDecode as m } from "jwt-decode";
+import { Authorization as w } from "./index3.js";
 import { Url as g } from "./index5.js";
 import { createSiweMessage as y } from "./index13.js";
 class I {
-  constructor(t, i, e) {
-    this.API = "https://api.garden.finance", this.url = new g("/", t ?? this.API), this.walletClient = i, this.domain = (e == null ? void 0 : e.domain) || "app.garden.finance", this.domain.startsWith("https://") && (this.domain = this.domain.split("https://")[1]), this.signingStatement = (e == null ? void 0 : e.signingStatement) ?? "Garden.fi", this.store = (e == null ? void 0 : e.store) ?? new f();
+  constructor(e, r, t) {
+    this.API = "https://api.garden.finance", this.url = new g("/", e ?? this.API), this.walletClient = r, this.domain = (t == null ? void 0 : t.domain) || "app.garden.finance", this.domain.startsWith("https://") && (this.domain = this.domain.split("https://")[1]), this.signingStatement = (t == null ? void 0 : t.signingStatement) ?? "Garden.fi", this.store = (t == null ? void 0 : t.store) ?? new f();
   }
-  verifyToken(t, i) {
+  verifyToken(e, r) {
     try {
-      const e = p(t);
-      if (!e) return n(!1);
-      const r = Math.floor(Date.now() / 1e3) + 120;
-      if (!e.address && !e.user_id) return n(!1);
-      const o = e.address ? e.address.toLowerCase() === i.toLowerCase() : !1, a = e.user_id ? e.user_id.toLowerCase() === i.toLowerCase() : !1;
-      return n(e.exp > r && o || a);
+      const t = p(e);
+      if (!t) return n(!1);
+      const i = Math.floor(Date.now() / 1e3) + 120;
+      return n(
+        t.exp > i && t.user_id.toLowerCase() === r.toLowerCase()
+      );
     } catch {
       return n(!1);
     }
   }
   async getToken() {
-    var a;
-    if (!((a = this.walletClient.account) != null && a.address))
-      return s("Wallet client does not have an account");
-    const t = this.store.getItem(u.AUTH_TOKEN);
-    if (t) {
-      const c = this.verifyToken(
-        t,
+    var s;
+    if (!((s = this.walletClient.account) != null && s.address))
+      return a("Wallet client does not have an account");
+    const e = this.store.getItem(d.AUTH_TOKEN);
+    if (e) {
+      const o = this.verifyToken(
+        e,
         this.walletClient.account.address
       );
-      if (c.ok && c.val) return n(t);
+      if (o.ok && o.val) return n(e);
     }
-    const i = await this.signStatement();
-    if (i.error)
-      return s(i.error);
-    const e = await d.post(
+    const r = await this.signStatement();
+    if (r.error)
+      return a(r.error);
+    const t = await u.post(
       this.url.endpoint("verify"),
       {
         body: JSON.stringify({
-          ...i.val
+          ...r.val
         }),
         headers: {
           "Content-Type": "application/json"
         }
       }
     );
-    if (e.error) return s(e.error);
-    const r = e.result;
-    if (!r) return s("Failed to get token");
-    if (!this.verifyToken(r, this.walletClient.account.address).val)
+    if (t.error) return a(t.error);
+    const i = t.result;
+    if (!i) return a("Failed to get token");
+    if (!this.verifyToken(i, this.walletClient.account.address).val)
       throw new Error("Token verification failed");
-    return this.store.setItem(u.AUTH_TOKEN, r), n(r);
+    return this.store.setItem(d.AUTH_TOKEN, i), n(i);
   }
   async signStatement() {
     var l;
     if (!((l = this.walletClient.account) != null && l.address))
-      return s("Wallet client does not have a valid account");
-    const t = /* @__PURE__ */ new Date(), i = new Date(t.getTime() + 300 * 1e3), r = (await d.get(
+      return a("Wallet client does not have a valid account");
+    const e = /* @__PURE__ */ new Date(), r = new Date(e.getTime() + 300 * 1e3), i = (await u.get(
       this.url.endpoint("nonce")
     )).result;
-    if (!r)
-      return s("Failed to get nonce");
-    const o = await this.walletClient.getChainId(), a = y({
+    if (!i)
+      return a("Failed to get nonce");
+    const h = await this.walletClient.getChainId(), s = y({
       domain: this.domain,
       address: this.walletClient.account.address,
       statement: this.signingStatement,
-      nonce: r,
+      nonce: i,
       uri: "https://" + this.domain,
       version: "1",
-      chainId: o,
-      notBefore: i
-    }), c = await this.walletClient.signMessage({
+      chainId: h,
+      notBefore: r
+    }), o = await this.walletClient.signMessage({
       account: this.walletClient.account,
-      message: a
+      message: s
     });
     return n({
-      message: a,
-      signature: c,
-      nonce: r
+      message: s,
+      signature: o,
+      nonce: i
     });
   }
 }
-const p = (h) => {
+const p = (c) => {
   try {
-    return w(h);
+    return m(c);
   } catch {
     return;
   }
 };
 class E {
-  constructor(t) {
-    if (!t.siwe && !t.apiKey)
+  constructor(e) {
+    if (!e.siwe && !e.apiKey)
       throw new Error("Either siwe or apiKey must be provided");
-    this.siwe = t.siwe, this.apiKey = t.apiKey;
+    this.siwe = e.siwe, this.apiKey = e.apiKey;
   }
   async getAuthHeaders() {
     if (this.siwe) {
-      const t = await this.siwe.getToken();
-      return t.error ? s(t.error) : n({ Authorization: m(t.val) });
+      const e = await this.siwe.getToken();
+      return e.error ? a(e.error) : n({ Authorization: w(e.val) });
     }
-    return this.apiKey ? n({ "api-key": this.apiKey }) : s("No authentication method available");
+    return this.apiKey ? n({ "api-key": this.apiKey }) : a("No authentication method available");
   }
 }
 export {

package/dist/src/lib/auth/siwe.d.ts

@@ -16,8 +16,7 @@ export declare class Siwe implements ISiwe {
     private signStatement;
 }
 export declare const parseJwt: (token: string) => {
-    user_id?: string;
-    address?: string;
+    user_id: string;
     exp: number;
 } | undefined;
 export declare class Auth implements IAuth {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gardenfi/utils",
-  "version": "2.0.2",
+  "version": "2.0.3",
   "type": "module",
   "scripts": {
     "build": "vite build",