contensis-cli 1.0.0-beta.15 → 1.0.0-beta.17

package/dist/providers/CredentialProvider.js

@@ -47,7 +47,10 @@ class CredentialProvider {
       import_keytar.default.findCredentials(this.serviceId)
     );
     if (err && this.passwordFallback) {
-      this.current = { account: this.userId, password: this.passwordFallback };
+      this.current = {
+        account: this.userId,
+        password: this.passwordFallback
+      };
     }
     if (!err) {
       this.remarks = { secure: true };
@@ -57,6 +60,10 @@ class CredentialProvider {
           return ((_a = u == null ? void 0 : u.account) == null ? void 0 : _a.toLowerCase()) === this.userId.toLowerCase();
         }
       )) || null;
+      if (!this.current && this.passwordFallback) {
+        await this.Save(this.passwordFallback);
+        return await this.Init();
+      }
     }
     return [err, this];
   };

package/dist/providers/CredentialProvider.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../src/providers/CredentialProvider.ts"],
-  "sourcesContent": ["import keytar from 'keytar';\nimport to from 'await-to-js';\nimport { Logger } from '~/util/logger';\n\nconst SERVICE_NAME = 'contensis-cli';\n\ninterface Remarks {\n  secure: boolean;\n}\n\nclass CredentialProvider {\n  private serviceId: string;\n  private userId: string = '';\n  private passwordFallback?: string;\n\n  current: {\n    account: string;\n    password: string;\n  } | null = null;\n  remarks: Remarks = { secure: false };\n\n  constructor(\n    { userId, alias }: { userId: string; alias?: string },\n    passwordFallback?: string\n  ) {\n    this.serviceId =\n      typeof alias !== 'undefined' ? `${SERVICE_NAME}_${alias}` : SERVICE_NAME;\n    this.userId = userId;\n    this.passwordFallback = passwordFallback;\n  }\n\n  Init = async (): Promise<[Error, CredentialProvider]> => {\n    const [err, stored] = (await to(\n      keytar.findCredentials(this.serviceId)\n    )) as [\n      Error,\n      {\n        account: string;\n        password: string;\n      }[]\n    ];\n    if (err && this.passwordFallback) {\n      this.current = { account: this.userId, password: this.passwordFallback };\n      // this.remarks = { secure: false };\n    }\n    if (!err) {\n      this.remarks = { secure: true };\n      this.current =\n        stored?.find(\n          u => u?.account?.toLowerCase() === this.userId.toLowerCase()\n        ) || null;\n    }\n    return [err, this];\n  };\n\n  Save = async (password: string) => {\n    const [err] = await to(\n      keytar.setPassword(this.serviceId, this.userId, password)\n    );\n\n    // if (!err) Logger.info(`${this.serviceId} - credentials saved`);\n    return err && !this.passwordFallback ? err : true;\n  };\n\n  Delete = async () => {\n    if (this.passwordFallback) {\n      this.passwordFallback = undefined;\n      return true;\n    } else {\n      const [err] = await to(\n        keytar.deletePassword(this.serviceId, this.userId)\n      );\n\n      Logger.warning(`${this.serviceId} - invalid credentials removed`);\n      return err || true;\n    }\n  };\n\n  // GetPassword = async () => {\n  //   const [err, password] = await to(\n  //     keytar.getPassword(this.serviceId, this.userId)\n  //   );\n\n  //   return err || password;\n  // };\n}\n\nexport default CredentialProvider;\n"],
-  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,oBAAmB;AACnB,yBAAe;AACf,oBAAuB;AAEvB,MAAM,eAAe;AAMrB,MAAM,mBAAmB;AAAA,EACf;AAAA,EACA,SAAiB;AAAA,EACjB;AAAA,EAER,UAGW;AAAA,EACX,UAAmB,EAAE,QAAQ,MAAM;AAAA,EAEnC,YACE,EAAE,QAAQ,MAAM,GAChB,kBACA;AACA,SAAK,YACH,OAAO,UAAU,cAAc,GAAG,gBAAgB,UAAU;AAC9D,SAAK,SAAS;AACd,SAAK,mBAAmB;AAAA,EAC1B;AAAA,EAEA,OAAO,YAAkD;AACvD,UAAM,CAAC,KAAK,MAAM,IAAK,UAAM,mBAAAA;AAAA,MAC3B,cAAAC,QAAO,gBAAgB,KAAK,SAAS;AAAA,IACvC;AAOA,QAAI,OAAO,KAAK,kBAAkB;AAChC,WAAK,UAAU,EAAE,SAAS,KAAK,QAAQ,UAAU,KAAK,iBAAiB;AAAA,IAEzE;AACA,QAAI,CAAC,KAAK;AACR,WAAK,UAAU,EAAE,QAAQ,KAAK;AAC9B,WAAK,WACH,iCAAQ;AAAA,QACN,OAAE;AAjDZ;AAiDe,+CAAG,YAAH,mBAAY,mBAAkB,KAAK,OAAO,YAAY;AAAA;AAAA,YACxD;AAAA,IACT;AACA,WAAO,CAAC,KAAK,IAAI;AAAA,EACnB;AAAA,EAEA,OAAO,OAAO,aAAqB;AACjC,UAAM,CAAC,GAAG,IAAI,UAAM,mBAAAD;AAAA,MAClB,cAAAC,QAAO,YAAY,KAAK,WAAW,KAAK,QAAQ,QAAQ;AAAA,IAC1D;AAGA,WAAO,OAAO,CAAC,KAAK,mBAAmB,MAAM;AAAA,EAC/C;AAAA,EAEA,SAAS,YAAY;AACnB,QAAI,KAAK,kBAAkB;AACzB,WAAK,mBAAmB;AACxB,aAAO;AAAA,IACT,OAAO;AACL,YAAM,CAAC,GAAG,IAAI,UAAM,mBAAAD;AAAA,QAClB,cAAAC,QAAO,eAAe,KAAK,WAAW,KAAK,MAAM;AAAA,MACnD;AAEA,2BAAO,QAAQ,GAAG,KAAK,yCAAyC;AAChE,aAAO,OAAO;AAAA,IAChB;AAAA,EACF;AASF;AAEA,IAAO,6BAAQ;",
+  "sourcesContent": ["import keytar from 'keytar';\nimport to from 'await-to-js';\nimport { Logger } from '~/util/logger';\n\nconst SERVICE_NAME = 'contensis-cli';\n\ninterface Remarks {\n  secure: boolean;\n}\n\nclass CredentialProvider {\n  private serviceId: string;\n  private userId: string = '';\n  private passwordFallback?: string;\n\n  current: {\n    account: string;\n    password: string;\n  } | null = null;\n  remarks: Remarks = { secure: false };\n\n  constructor(\n    { userId, alias }: { userId: string; alias?: string },\n    passwordFallback?: string\n  ) {\n    this.serviceId =\n      typeof alias !== 'undefined' ? `${SERVICE_NAME}_${alias}` : SERVICE_NAME;\n    this.userId = userId;\n    this.passwordFallback = passwordFallback;\n  }\n\n  Init = async (): Promise<[Error, CredentialProvider]> => {\n    const [err, stored] = (await to(\n      keytar.findCredentials(this.serviceId)\n    )) as [\n      Error,\n      {\n        account: string;\n        password: string;\n      }[]\n    ];\n    if (err && this.passwordFallback) {\n      this.current = {\n        account: this.userId,\n        password: this.passwordFallback,\n      };\n    }\n    if (!err) {\n      this.remarks = { secure: true };\n      this.current =\n        stored?.find(\n          u => u?.account?.toLowerCase() === this.userId.toLowerCase()\n        ) || null;\n\n      if (!this.current && this.passwordFallback) {\n        await this.Save(this.passwordFallback);\n        return await this.Init();\n      }\n    }\n    return [err, this];\n  };\n\n  Save = async (password: string) => {\n    const [err] = await to(\n      keytar.setPassword(this.serviceId, this.userId, password)\n    );\n\n    // if (!err) Logger.info(`${this.serviceId} - credentials saved`);\n    return err && !this.passwordFallback ? err : true;\n  };\n\n  Delete = async () => {\n    if (this.passwordFallback) {\n      this.passwordFallback = undefined;\n      return true;\n    } else {\n      const [err] = await to(\n        keytar.deletePassword(this.serviceId, this.userId)\n      );\n\n      Logger.warning(`${this.serviceId} - invalid credentials removed`);\n      return err || true;\n    }\n  };\n\n  // GetPassword = async () => {\n  //   const [err, password] = await to(\n  //     keytar.getPassword(this.serviceId, this.userId)\n  //   );\n\n  //   return err || password;\n  // };\n}\n\nexport default CredentialProvider;\n"],
+  "mappings": ";;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA,oBAAmB;AACnB,yBAAe;AACf,oBAAuB;AAEvB,MAAM,eAAe;AAMrB,MAAM,mBAAmB;AAAA,EACf;AAAA,EACA,SAAiB;AAAA,EACjB;AAAA,EAER,UAGW;AAAA,EACX,UAAmB,EAAE,QAAQ,MAAM;AAAA,EAEnC,YACE,EAAE,QAAQ,MAAM,GAChB,kBACA;AACA,SAAK,YACH,OAAO,UAAU,cAAc,GAAG,gBAAgB,UAAU;AAC9D,SAAK,SAAS;AACd,SAAK,mBAAmB;AAAA,EAC1B;AAAA,EAEA,OAAO,YAAkD;AACvD,UAAM,CAAC,KAAK,MAAM,IAAK,UAAM,mBAAAA;AAAA,MAC3B,cAAAC,QAAO,gBAAgB,KAAK,SAAS;AAAA,IACvC;AAOA,QAAI,OAAO,KAAK,kBAAkB;AAChC,WAAK,UAAU;AAAA,QACb,SAAS,KAAK;AAAA,QACd,UAAU,KAAK;AAAA,MACjB;AAAA,IACF;AACA,QAAI,CAAC,KAAK;AACR,WAAK,UAAU,EAAE,QAAQ,KAAK;AAC9B,WAAK,WACH,iCAAQ;AAAA,QACN,OAAE;AAnDZ;AAmDe,+CAAG,YAAH,mBAAY,mBAAkB,KAAK,OAAO,YAAY;AAAA;AAAA,YACxD;AAEP,UAAI,CAAC,KAAK,WAAW,KAAK,kBAAkB;AAC1C,cAAM,KAAK,KAAK,KAAK,gBAAgB;AACrC,eAAO,MAAM,KAAK,KAAK;AAAA,MACzB;AAAA,IACF;AACA,WAAO,CAAC,KAAK,IAAI;AAAA,EACnB;AAAA,EAEA,OAAO,OAAO,aAAqB;AACjC,UAAM,CAAC,GAAG,IAAI,UAAM,mBAAAD;AAAA,MAClB,cAAAC,QAAO,YAAY,KAAK,WAAW,KAAK,QAAQ,QAAQ;AAAA,IAC1D;AAGA,WAAO,OAAO,CAAC,KAAK,mBAAmB,MAAM;AAAA,EAC/C;AAAA,EAEA,SAAS,YAAY;AACnB,QAAI,KAAK,kBAAkB;AACzB,WAAK,mBAAmB;AACxB,aAAO;AAAA,IACT,OAAO;AACL,YAAM,CAAC,GAAG,IAAI,UAAM,mBAAAD;AAAA,QAClB,cAAAC,QAAO,eAAe,KAAK,WAAW,KAAK,MAAM;AAAA,MACnD;AAEA,2BAAO,QAAQ,GAAG,KAAK,yCAAyC;AAChE,aAAO,OAAO;AAAA,IAChB;AAAA,EACF;AASF;AAEA,IAAO,6BAAQ;",
   "names": ["to", "keytar"]
 }

package/dist/version.js

@@ -21,7 +21,7 @@ __export(version_exports, {
   LIB_VERSION: () => LIB_VERSION
 });
 module.exports = __toCommonJS(version_exports);
-const LIB_VERSION = "1.0.0-beta.15";
+const LIB_VERSION = "1.0.0-beta.17";
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   LIB_VERSION

package/dist/version.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../src/version.ts"],
-  "sourcesContent": ["export const LIB_VERSION = \"1.0.0-beta.15\";\n"],
+  "sourcesContent": ["export const LIB_VERSION = \"1.0.0-beta.17\";\n"],
   "mappings": ";;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAO,MAAM,cAAc;",
   "names": []
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "contensis-cli",
-  "version": "1.0.0-beta.15",
+  "version": "1.0.0-beta.17",
   "description": "A fully featured Contensis command line interface with a shell UI provides simple and intuitive ways to manage or profile your content in any NodeJS terminal.",
   "repository": "https://github.com/contensis/node-cli",
   "homepage": "https://github.com/contensis/node-cli/tree/main/packages/contensis-cli#readme",

package/src/providers/CredentialProvider.ts

@@ -40,8 +40,10 @@ class CredentialProvider {
       }[]
     ];
     if (err && this.passwordFallback) {
-      this.current = { account: this.userId, password: this.passwordFallback };
-      // this.remarks = { secure: false };
+      this.current = {
+        account: this.userId,
+        password: this.passwordFallback,
+      };
     }
     if (!err) {
       this.remarks = { secure: true };
@@ -49,6 +51,11 @@ class CredentialProvider {
         stored?.find(
           u => u?.account?.toLowerCase() === this.userId.toLowerCase()
         ) || null;
+
+      if (!this.current && this.passwordFallback) {
+        await this.Save(this.passwordFallback);
+        return await this.Init();
+      }
     }
     return [err, this];
   };

package/src/version.ts

@@ -1 +1 @@
-export const LIB_VERSION = "1.0.0-beta.15";
+export const LIB_VERSION = "1.0.0-beta.17";