@ztimson/momentum 0.50.6 → 0.50.7

package/dist/auth.d.ts

@@ -1,13 +1,41 @@
 import { Api } from './api';
 import { PathEvent, PathEventEmitter } from '@ztimson/utils';
+import { Meta } from './core';
 import { User } from './users';
 export type AuthOptions = {
     /** Path to login page */
     loginUrl?: string;
 };
+export type UserToken = Meta & {
+    name: string;
+    owner: string;
+    token: string;
+    expire: null | Date;
+};
+export declare class Token extends PathEventEmitter {
+    private api;
+    constructor(api: Api);
+    all(username: string): Promise<UserToken[]>;
+    create(token: {
+        name: string;
+        owner: string;
+        expire: null | Date;
+    }): Promise<UserToken>;
+    delete(id: string): Promise<void>;
+}
+export declare class Totp {
+    private api;
+    constructor(api: Api);
+    disable(username: string): import('@ztimson/utils').PromiseProgress<void>;
+    enable: (username: string) => import('@ztimson/utils').PromiseProgress<void>;
+    reset(username: string): import('@ztimson/utils').PromiseProgress<void>;
+    setup(username: string, method?: string, totp?: string): import('@ztimson/utils').PromiseProgress<void>;
+}
 export declare class Auth extends PathEventEmitter {
     private readonly opts;
     private readonly api;
+    token: Token;
+    totp: Totp;
     private _permissions;
     get permissions(): string[];
     set permissions(perms: string[]);
@@ -21,7 +49,10 @@ export declare class Auth extends PathEventEmitter {
     hasFatal: (...events: (string | PathEvent)[]) => void;
     hasAllFatal: (...events: (string | PathEvent)[]) => void;
     knownHost(host?: string): Promise<void>;
-    login(username: string, password: string, totp?: string): Promise<User | null>;
+    login(username: string, password: string, opts?: {
+        totp?: string;
+        expire?: number | Date | null;
+    }): Promise<User | null>;
     loginRedirect(host?: string): Promise<string>;
     logout(): void;
     register(u: Partial<User> & {
@@ -36,9 +67,5 @@ export declare class Auth extends PathEventEmitter {
         permissions: string[];
     } | null>;
     updatePassword(username: string, password: string, oldPassword?: string): Promise<void>;
-    disableTotp(username: string): import('@ztimson/utils').PromiseProgress<void>;
-    enableTotp: (username: string) => import('@ztimson/utils').PromiseProgress<void>;
-    resetTotp(username: string): import('@ztimson/utils').PromiseProgress<void>;
-    setupTotp(username: string, method?: string, totp?: string): import('@ztimson/utils').PromiseProgress<void>;
 }
 //# sourceMappingURL=auth.d.ts.map

package/dist/auth.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"auth.d.ts","sourceRoot":"","sources":["../src/auth.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,GAAG,EAAC,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAiB,SAAS,EAAE,gBAAgB,EAAM,MAAM,gBAAgB,CAAC;AAChF,OAAO,KAAK,EAAC,IAAI,EAAC,MAAM,SAAS,CAAC;AAElC,MAAM,MAAM,WAAW,GAAG;IACzB,yBAAyB;IACzB,QAAQ,CAAC,EAAE,MAAM,CAAC;CAClB,CAAA;AAED,qBAAa,IAAK,SAAQ,gBAAgB;IAmBV,OAAO,CAAC,QAAQ,CAAC,IAAI;IAlBpD,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAO;IAE3B,OAAO,CAAC,YAAY,CAAgB;IACpC,IAAI,WAAW,IACQ,MAAM,EAAE,CADgB;IAC/C,IAAI,WAAW,CAAC,KAAK,EAAE,MAAM,EAAE,EAG9B;IAED,OAAO,CAAC,KAAK,CAAC,CAAc;IAC5B,IAAI,IAAI,IAAI,IAAI,GAAG,IAAI,GAAG,SAAS,CAAuB;IAC1D,IAAI,IAAI,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI,GAAG,SAAS,EAKrC;gBAEW,GAAG,EAAE,GAAG,GAAG,MAAM,EAAmB,IAAI,GAAE,WAAgB;IA6BtE,MAAM,cAAe,CAAC,MAAM,GAAG,SAAS,CAAC,EAAE,iBAAmD;IAC9F,GAAG,cAAe,CAAC,MAAM,GAAG,SAAS,CAAC,EAAE,aAAgD;IACxF,MAAM,cAAe,CAAC,MAAM,GAAG,SAAS,CAAC,EAAE,aAAmD;IAC9F,QAAQ,cAAe,CAAC,MAAM,GAAG,SAAS,CAAC,EAAE,UAAqD;IAClG,WAAW,cAAe,CAAC,MAAM,GAAG,SAAS,CAAC,EAAE,UAAwD;IAExG,SAAS,CAAC,IAAI,GAAE,MAAwB,GAAG,OAAO,CAAC,IAAI,CAAC;IAKxD,KAAK,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,GAAG,IAAI,CAAC;IAmB9E,aAAa,CAAC,IAAI,GAAE,MAAwB,GAAG,OAAO,CAAC,MAAM,CAAC;IAgB9D,MAAM,IAAI,IAAI;IAMR,QAAQ,CAAC,CAAC,EAAE,OAAO,CAAC,IAAI,CAAC,GAAG;QAAC,QAAQ,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAQtF,KAAK,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IACtD,KAAK,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAe7B,OAAO,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,GAAG,UAAQ,GAAG,OAAO,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,IAAI,CAAC;QAAC,WAAW,EAAE,MAAM,EAAE,CAAA;KAAC,GAAG,IAAI,CAAC;IAiBxG,cAAc,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAa7F,WAAW,CAAC,QAAQ,EAAE,MAAM;IAI5B,UAAU,aAEU,MAAM,oDAFE;IAE5B,SAAS,CAAC,QAAQ,EAAE,MAAM;IAI1B,SAAS,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,SAAQ,EAAE,IAAI,CAAC,EAAE,MAAM;CAMzD"}
+{"version":3,"file":"auth.d.ts","sourceRoot":"","sources":["../src/auth.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,GAAG,EAAC,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAiB,SAAS,EAAE,gBAAgB,EAAM,MAAM,gBAAgB,CAAC;AAChF,OAAO,EAAC,IAAI,EAAC,MAAM,QAAQ,CAAC;AAC5B,OAAO,KAAK,EAAC,IAAI,EAAC,MAAM,SAAS,CAAC;AAElC,MAAM,MAAM,WAAW,GAAG;IACzB,yBAAyB;IACzB,QAAQ,CAAC,EAAE,MAAM,CAAC;CAClB,CAAA;AAED,MAAM,MAAM,SAAS,GAAG,IAAI,GAAG;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,IAAI,GAAG,IAAI,CAAC;CACpB,CAAA;AAED,qBAAa,KAAM,SAAQ,gBAAgB;IAC9B,OAAO,CAAC,GAAG;gBAAH,GAAG,EAAE,GAAG;IAI5B,GAAG,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC;IAO3C,MAAM,CAAC,KAAK,EAAE;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,IAAI,GAAG,IAAI,CAAA;KAAC,GAAG,OAAO,CAAC,SAAS,CAAC;IAOrF,MAAM,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAIjC;AAED,qBAAa,IAAI;IACJ,OAAO,CAAC,GAAG;gBAAH,GAAG,EAAE,GAAG;IAE5B,OAAO,CAAC,QAAQ,EAAE,MAAM;IAIxB,MAAM,aAEU,MAAM,oDAFF;IAEpB,KAAK,CAAC,QAAQ,EAAE,MAAM;IAItB,KAAK,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,SAAQ,EAAE,IAAI,CAAC,EAAE,MAAM;CAMrD;AAED,qBAAa,IAAK,SAAQ,gBAAgB;IAsBV,OAAO,CAAC,QAAQ,CAAC,IAAI;IArBpD,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAO;IAEpB,KAAK,EAAG,KAAK,CAAC;IACd,IAAI,EAAG,IAAI,CAAC;IAEnB,OAAO,CAAC,YAAY,CAAgB;IACpC,IAAI,WAAW,IACQ,MAAM,EAAE,CADgB;IAC/C,IAAI,WAAW,CAAC,KAAK,EAAE,MAAM,EAAE,EAG9B;IAED,OAAO,CAAC,KAAK,CAAC,CAAc;IAC5B,IAAI,IAAI,IAAI,IAAI,GAAG,IAAI,GAAG,SAAS,CAAuB;IAC1D,IAAI,IAAI,CAAC,IAAI,EAAE,IAAI,GAAG,IAAI,GAAG,SAAS,EAKrC;gBAEW,GAAG,EAAE,GAAG,GAAG,MAAM,EAAmB,IAAI,GAAE,WAAgB;IAiCtE,MAAM,cAAe,CAAC,MAAM,GAAG,SAAS,CAAC,EAAE,iBAAmD;IAC9F,GAAG,cAAe,CAAC,MAAM,GAAG,SAAS,CAAC,EAAE,aAAgD;IACxF,MAAM,cAAe,CAAC,MAAM,GAAG,SAAS,CAAC,EAAE,aAAmD;IAC9F,QAAQ,cAAe,CAAC,MAAM,GAAG,SAAS,CAAC,EAAE,UAAqD;IAClG,WAAW,cAAe,CAAC,MAAM,GAAG,SAAS,CAAC,EAAE,UAAwD;IAExG,SAAS,CAAC,IAAI,GAAE,MAAwB,GAAG,OAAO,CAAC,IAAI,CAAC;IAKxD,KAAK,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE;QAAC,IAAI,CAAC,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,GAAG,IAAI,GAAG,IAAI,CAAA;KAAC,GAAG,OAAO,CAAC,IAAI,GAAG,IAAI,CAAC;IAmBtH,aAAa,CAAC,IAAI,GAAE,MAAwB,GAAG,OAAO,CAAC,MAAM,CAAC;IAgB9D,MAAM,IAAI,IAAI;IAMR,QAAQ,CAAC,CAAC,EAAE,OAAO,CAAC,IAAI,CAAC,GAAG;QAAC,QAAQ,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAA;KAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAQtF,KAAK,CAAC,QAAQ,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IACtD,KAAK,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAe7B,OAAO,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,GAAG,UAAQ,GAAG,OAAO,CAAC;QAAC,KAAK,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,IAAI,CAAC;QAAC,WAAW,EAAE,MAAM,EAAE,CAAA;KAAC,GAAG,IAAI,CAAC;IAiBxG,cAAc,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,WAAW,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAU7F"}

package/dist/index.cjs

@@ -1128,10 +1128,51 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
       });
     }
   }
+  class Token extends PathEventEmitter {
+    constructor(api) {
+      super();
+      this.api = api;
+    }
+    all(username) {
+      return this.api.request({ url: "/" + PES`api/auth/tokens/${username}` }).then((resp) => {
+        this.emit(PES`token/${username}:r`, resp);
+        return resp;
+      });
+    }
+    create(token) {
+      return this.api.request({ url: "/" + PES`api/auth/tokens/${token.owner}`, body: token }).then((resp) => {
+        this.emit(PES`token/${token.owner}:c`, token);
+        return resp;
+      });
+    }
+    delete(id) {
+      return this.api.request({ url: "/" + PES`api/auth/tokens/${id}`, method: "DELETE" }).then(() => this.emit(PES`token/${id}:d`, id));
+    }
+  }
+  class Totp {
+    constructor(api) {
+      __publicField(this, "enable", this.reset);
+      this.api = api;
+    }
+    disable(username) {
+      return this.api.request({ url: "/" + PES`api/auth/totp/${username}`, method: "DELETE" });
+    }
+    reset(username) {
+      return this.api.request({ url: "/" + PES`api/auth/totp/${username}`, method: "POST" });
+    }
+    setup(username, method = "app", totp) {
+      return this.api.request({ url: "/" + PES`api/auth/totp/${username}`, body: clean({
+        method,
+        totp
+      }) });
+    }
+  }
   class Auth extends PathEventEmitter {
     constructor(api, opts = {}) {
       super();
       __publicField(this, "api");
+      __publicField(this, "token");
+      __publicField(this, "totp");
       __publicField(this, "_permissions", []);
       __publicField(this, "_user");
       // Permission helpers
@@ -1140,9 +1181,11 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
       __publicField(this, "hasAll", (...events) => PathEvent.hasAll(this.permissions, ...events));
       __publicField(this, "hasFatal", (...events) => PathEvent.hasFatal(this.permissions, ...events));
       __publicField(this, "hasAllFatal", (...events) => PathEvent.hasAllFatal(this.permissions, ...events));
-      __publicField(this, "enableTotp", this.resetTotp);
       this.opts = opts;
       this.api = typeof api == "string" ? new Api(api) : api;
+      this.token = new Token(this.api);
+      this.totp = new Totp(this.api);
+      this.relayEvents(this.token);
       this.opts = {
         loginUrl: this.api.url + "/ui/#/login",
         ...this.opts
@@ -1185,17 +1228,17 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
       if (host.startsWith("/")) return Promise.resolve();
       return this.api.request({ url: `/api/auth/known-host?host=${encodeURI(new URL(host).origin)}` });
     }
-    login(username, password, totp) {
+    login(username, password, opts) {
       if (!username || !password) throw new Error("Cannot login, missing username or password");
       return this.api.request({
         url: "/api/auth/login",
         headers: { Authorization: void 0 },
         method: "POST",
-        body: {
+        body: clean({
           username: username.trim(),
           password: password.trim(),
-          totp
-        }
+          ...opts
+        }, true)
       }).then(async (resp) => {
         this.api.token = (resp == null ? void 0 : resp.token) || null;
         const user = await this.once("auth/user");
@@ -1271,19 +1314,6 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
         if (resp == null ? void 0 : resp.token) this.api.token = resp.token;
       });
     }
-    // TOTP ============================================================================================================
-    disableTotp(username) {
-      return this.api.request({ url: `/api/auth/totp/${username}`, method: "DELETE" });
-    }
-    resetTotp(username) {
-      return this.api.request({ url: `/api/auth/totp/${username}`, method: "POST" });
-    }
-    setupTotp(username, method = "app", totp) {
-      return this.api.request({ url: `/api/auth/totp/${username}`, body: clean({
-        method,
-        totp
-      }) });
-    }
   }
   class Client extends PathEventEmitter {
     constructor(api, settings) {
@@ -2260,6 +2290,8 @@ ${log}`;
   exports2.Socket = Socket;
   exports2.Static = Static;
   exports2.Storage = Storage$1;
+  exports2.Token = Token;
+  exports2.Totp = Totp;
   exports2.Users = Users;
   Object.defineProperty(exports2, Symbol.toStringTag, { value: "Module" });
 });

package/dist/index.mjs

@@ -1124,10 +1124,51 @@ class Analytics extends PathEventEmitter {
     });
   }
 }
+class Token extends PathEventEmitter {
+  constructor(api) {
+    super();
+    this.api = api;
+  }
+  all(username) {
+    return this.api.request({ url: "/" + PES`api/auth/tokens/${username}` }).then((resp) => {
+      this.emit(PES`token/${username}:r`, resp);
+      return resp;
+    });
+  }
+  create(token) {
+    return this.api.request({ url: "/" + PES`api/auth/tokens/${token.owner}`, body: token }).then((resp) => {
+      this.emit(PES`token/${token.owner}:c`, token);
+      return resp;
+    });
+  }
+  delete(id) {
+    return this.api.request({ url: "/" + PES`api/auth/tokens/${id}`, method: "DELETE" }).then(() => this.emit(PES`token/${id}:d`, id));
+  }
+}
+class Totp {
+  constructor(api) {
+    __publicField(this, "enable", this.reset);
+    this.api = api;
+  }
+  disable(username) {
+    return this.api.request({ url: "/" + PES`api/auth/totp/${username}`, method: "DELETE" });
+  }
+  reset(username) {
+    return this.api.request({ url: "/" + PES`api/auth/totp/${username}`, method: "POST" });
+  }
+  setup(username, method = "app", totp) {
+    return this.api.request({ url: "/" + PES`api/auth/totp/${username}`, body: clean({
+      method,
+      totp
+    }) });
+  }
+}
 class Auth extends PathEventEmitter {
   constructor(api, opts = {}) {
     super();
     __publicField(this, "api");
+    __publicField(this, "token");
+    __publicField(this, "totp");
     __publicField(this, "_permissions", []);
     __publicField(this, "_user");
     // Permission helpers
@@ -1136,9 +1177,11 @@ class Auth extends PathEventEmitter {
     __publicField(this, "hasAll", (...events) => PathEvent.hasAll(this.permissions, ...events));
     __publicField(this, "hasFatal", (...events) => PathEvent.hasFatal(this.permissions, ...events));
     __publicField(this, "hasAllFatal", (...events) => PathEvent.hasAllFatal(this.permissions, ...events));
-    __publicField(this, "enableTotp", this.resetTotp);
     this.opts = opts;
     this.api = typeof api == "string" ? new Api(api) : api;
+    this.token = new Token(this.api);
+    this.totp = new Totp(this.api);
+    this.relayEvents(this.token);
     this.opts = {
       loginUrl: this.api.url + "/ui/#/login",
       ...this.opts
@@ -1181,17 +1224,17 @@ class Auth extends PathEventEmitter {
     if (host.startsWith("/")) return Promise.resolve();
     return this.api.request({ url: `/api/auth/known-host?host=${encodeURI(new URL(host).origin)}` });
   }
-  login(username, password, totp) {
+  login(username, password, opts) {
     if (!username || !password) throw new Error("Cannot login, missing username or password");
     return this.api.request({
       url: "/api/auth/login",
       headers: { Authorization: void 0 },
       method: "POST",
-      body: {
+      body: clean({
         username: username.trim(),
         password: password.trim(),
-        totp
-      }
+        ...opts
+      }, true)
     }).then(async (resp) => {
       this.api.token = (resp == null ? void 0 : resp.token) || null;
       const user = await this.once("auth/user");
@@ -1267,19 +1310,6 @@ class Auth extends PathEventEmitter {
       if (resp == null ? void 0 : resp.token) this.api.token = resp.token;
     });
   }
-  // TOTP ============================================================================================================
-  disableTotp(username) {
-    return this.api.request({ url: `/api/auth/totp/${username}`, method: "DELETE" });
-  }
-  resetTotp(username) {
-    return this.api.request({ url: `/api/auth/totp/${username}`, method: "POST" });
-  }
-  setupTotp(username, method = "app", totp) {
-    return this.api.request({ url: `/api/auth/totp/${username}`, body: clean({
-      method,
-      totp
-    }) });
-  }
 }
 class Client extends PathEventEmitter {
   constructor(api, settings) {
@@ -2257,5 +2287,7 @@ export {
   Socket,
   Static,
   Storage$1 as Storage,
+  Token,
+  Totp,
   Users
 };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@ztimson/momentum",
-	"version": "0.50.6",
+	"version": "0.50.7",
 	"description": "Client library for momentum",
 	"keywords": ["Momentum"],
 	"author": "Zak Timson <zaktimson@gmail.com>",
@@ -24,7 +24,7 @@
 		"postbuild": "node -e \"const fs=require('fs');fs.cpSync('dist/index.mjs','../server/public/momentum.mjs');fs.cpSync('dist/index.cjs','../server/public/momentum.js')\""
 	},
 	"dependencies": {
-		"@ztimson/utils": "0.23.7",
+		"@ztimson/utils": "0.23.8",
 		"var-persist": "^1.0.1"
 	},
 	"devDependencies": {