occam-open-cli 4.0.68 → 5.0.3

package/bin/operation/repository.js

@@ -0,0 +1,29 @@
+"use strict";
+
+const post = require("../post");
+
+const { CLONE_API_URI } = require("../uris");
+
+function repositoryOperation(proceed, abort, context) {
+  const { releaseName } = context,
+        uri = `${CLONE_API_URI}/${releaseName}`,
+        json = {};
+
+  post(uri, json, (json) => {
+    const { repository = null } = json;
+
+    if (repository === null) {
+      abort();
+
+      return;
+    }
+
+    Object.assign(context, {
+      repository
+    });
+
+    proceed();
+  });
+}
+
+module.exports = repositoryOperation;

package/bin/operation/resetPassword.js

@@ -0,0 +1,19 @@
+"use strict";
+
+const post = require("../post");
+
+const { RESET_PASSWORD_API_URI } = require("../uris");
+
+function resetPasswordOperation(proceed, abort, context) {
+  const { emailAddress } = context,
+        uri = RESET_PASSWORD_API_URI,
+        json = {
+          emailAddress
+        };
+
+  post(uri, json, (json) => {
+    proceed();
+  });
+}
+
+module.exports = resetPasswordOperation;

package/bin/operation/setIdentityToken.js

@@ -0,0 +1,13 @@
+"use strict";
+
+const { setIdentityToken } = require("../configuration");
+
+function setIdentityTokenOperation(proceed, abort, context) {
+  const { identityToken } = context;
+
+  setIdentityToken(identityToken);
+
+  proceed();
+}
+
+module.exports = setIdentityTokenOperation;

package/bin/operation/setOptions.js

@@ -0,0 +1,25 @@
+"use strict";
+
+const { setOptions } = require("../configuration");
+
+function setOptionsOperation(proceed, abort, context) {
+  const { useSSH } = context,
+        options = {};
+
+  if (useSSH) {
+    const { gitHubHostName } = context,
+          ssh = {
+            gitHubHostName
+          };
+
+    Object.assign(options, {
+      ssh
+    });
+  }
+
+  setOptions(options);
+
+  proceed();
+}
+
+module.exports = setOptionsOperation;

package/bin/operation/signIn.js

@@ -0,0 +1,32 @@
+"use strict";
+
+const post = require("../post");
+
+const { SIGN_IN_API_URI } = require("../uris");
+
+function signInOperation(proceed, abort, context) {
+  const { emailAddressOrUsername, password } = context,
+        uri = SIGN_IN_API_URI,
+        json = {
+          emailAddressOrUsername,
+          password
+        };
+
+  post(uri, json, (json) => {
+    const { identityToken = null } = json;
+
+    if (identityToken === null) {
+      abort();
+
+      return;
+    }
+
+    Object.assign(context, {
+      identityToken
+    });
+
+    proceed();
+  });
+}
+
+module.exports = signInOperation;

package/bin/post.js

@@ -1,34 +1,33 @@
 "use strict";
 
-const os = require("os");
-
 const { Readable } = require("stream");
 const { headers, contentTypes, requestUtilities } = require("necessary");
 
-const { OPEN_CLI } = require("./constants"),
-      { retrieveHostURL } = require("./configuration"),
+const { getHost } = require("./configuration"),
       { getPackageVersion } = require("./utilities/packageJSON"),
       { contentFromResponse } = require("./utilities/response"),
-      { SERVER_ERROR_MESSAGE, SERVER_FAILED_TO_RESPOND_ERROR_MESSAGE } = require("./messages");
+      { SERVER_FAILED_TO_RESPOND_ERROR_MESSAGE } = require("./messages");
 
 const { createPostRequest } = requestUtilities,
-      { USER_AGENT_HEADER, CONTENT_TYPE_HEADER } = headers,
+      { CONTENT_TYPE_HEADER } = headers,
       { APPLICATION_JSON_CHARSET_UTF_8_CONTENT_TYPE } = contentTypes;
 
-function post(uri, data, callback) {
+function post(uri, json, callback) {
   const host = getHost(),
-        headers = getHeaders(),
-        versionString = getVersionString(),
-        json = Object.assign(data, {  ///
-          versionString
-        }),
-        content = JSON.stringify(json),
         query = {},
-        postRequest = createPostRequest(host, uri, query, headers, (error, response) => {
+        headers = getHeaders(),
+        content = JSON.stringify(json), ///
+        versionString = getVersionString();
+
+  Object.assign(json, {
+    versionString
+  });
+
+  const postRequest = createPostRequest(host, uri, query, headers, (error, response) => {
           if (error) {
             console.log(SERVER_FAILED_TO_RESPOND_ERROR_MESSAGE);
 
-            process.exit(1);
+            process.exit();
           }
 
           contentFromResponse(response, (content) => {
@@ -42,24 +41,10 @@ function post(uri, data, callback) {
               if (error) {
                 console.log(SERVER_FAILED_TO_RESPOND_ERROR_MESSAGE);
 
-                process.exit(1);
+                process.exit();
               }
             }
 
-            const { message } = json;
-
-            if (message) {  ///
-              console.log(message);
-            }
-
-            ({ error } = json); ///
-
-            if (error) {
-              console.log(SERVER_ERROR_MESSAGE);
-
-              process.exit(1);
-            }
-
             callback(json);
           });
         }),
@@ -70,32 +55,14 @@ function post(uri, data, callback) {
 
 module.exports = post;
 
-function getHost() {
-  const hostURL = retrieveHostURL(),
-        host = hostURL; ///
-
-  return host;
-}
-
 function getHeaders() {
-  const headers = {},
-        userAgent = getUserAgent();
-
-  headers[USER_AGENT_HEADER] = userAgent;
+  const headers = {};
 
   headers[CONTENT_TYPE_HEADER] = APPLICATION_JSON_CHARSET_UTF_8_CONTENT_TYPE;
 
   return headers;
 }
 
-function getUserAgent() {
-  const osType = os.type(),
-        operatingSystem = osType, ///
-        userAgent = `${OPEN_CLI}/${operatingSystem}`;
-
-  return userAgent;
-}
-
 function getVersionString() {
   const packageVersion = getPackageVersion(),
         versionString = packageVersion; ///

package/bin/uris.js

@@ -1,27 +1,17 @@
 "use strict";
 
 const CLONE_API_URI = "/api/clone",
-      LOGIN_API_URI = "/api/login",
-      LOGOUT_API_URI = "/api/logout",
       PUBLISH_API_URI = "/api/publish",
-      REGISTER_API_URI = "/api/register",
+      SIGN_IN_API_URI = "/api/sign-in",
       DEPRECATE_API_URI = "/api/deprecate",
-      RESET_PASSWORD_API_URI = "/api/resetPassword",
-      CHANGE_PASSWORD_API_URI = "/api/changePassword",
-      CHANGE_EMAIL_ADDRESS_API_URI = "/api/changeEmailAddress",
-      CONFIRM_EMAIL_ADDRESS_API_URI = "/api/confirmEmailAddress",
-      RESEND_CONFIRMATION_CODE_API_URI = "/api/resendConfirmationCode";
+      RESET_PASSWORD_API_URI = "/api/reset-password",
+      CREATE_ACCOUNT_API_URI = "/api/create-account";
 
 module.exports = {
   CLONE_API_URI,
-  LOGIN_API_URI,
-  LOGOUT_API_URI,
   PUBLISH_API_URI,
-  REGISTER_API_URI,
+  SIGN_IN_API_URI,
   DEPRECATE_API_URI,
   RESET_PASSWORD_API_URI,
-  CHANGE_PASSWORD_API_URI,
-  CHANGE_EMAIL_ADDRESS_API_URI,
-  CONFIRM_EMAIL_ADDRESS_API_URI,
-  RESEND_CONFIRMATION_CODE_API_URI
+  CREATE_ACCOUNT_API_URI
 };

package/bin/utilities/validate.js

@@ -1,25 +1,42 @@
 "use strict";
 
-function validateAnswer(answer) { return /^(:?yes|no|y|n)$/i.test(answer); }
 
 function validateUsername(username) { return /^[a-z0-9]{2,16}(?:-[a-z0-9]{2,16}){0,4}$/.test(username); }
 
 function validatePassword(password) { return /^[a-zA-Z0-9!@#$%^&*_.,\-]{8,24}$/.test(password); }
 
+function validateAffirmation(affirmation) { return /^(:?yes|no|y|n)$/i.test(affirmation); }
+
 function validateReleaseName(releaseName) { return /^[a-z0-9]{2,16}(?:-[a-z0-9]{2,16}){0,4}$/.test(releaseName); }
 
 function validateEmailAddress(emailAddress) { return /^[a-z0-9._%+-]+@[a-z0-9.-]+\.[a-z]{2,16}$/.test(emailAddress); }
 
 function validateGitHubHostName(gitHubHostName) { return /^[a-zA-Z0-9.\-]*$/.test(gitHubHostName); }
 
-function validateConfirmationCode(confirmationCode) { return /^[a-zA-Z0-9]{6,10}$/.test(confirmationCode); }
+function validateEmailAddressOrUsername(emailAddressOrUsername) {
+  let valid = false;
+
+  if (!valid) {
+    const emailAddress = emailAddressOrUsername;  ///
+
+    valid = validateEmailAddress(emailAddress);
+  }
+
+  if (!valid) {
+    const username = emailAddressOrUsername;  ///
+
+    valid = validateUsername(username);
+  }
+
+  return valid;
+}
 
 module.exports = {
-  validateAnswer,
   validateUsername,
   validatePassword,
+  validateAffirmation,
   validateReleaseName,
   validateEmailAddress,
   validateGitHubHostName,
-  validateConfirmationCode
+  validateEmailAddressOrUsername
 };

package/bin/versions.js

@@ -1,13 +1,15 @@
 "use strict";
 
-const UNVERSIONED = "UNVERSIONED",  ///
+const UNVERSIONED = "unversioned",
       VERSION_1_5 = "1.5",
       VERSION_2_0 = "2.0",
-      CURRENT_VERSION = VERSION_2_0;  ///
+      VERSION_5_0 = "5.0",
+      CURRENT_VERSION = VERSION_5_0;  ///
 
 module.exports = {
   UNVERSIONED,
   VERSION_1_5,
   VERSION_2_0,
+  VERSION_5_0,
   CURRENT_VERSION
 };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "occam-open-cli",
   "author": "James Smith",
-  "version": "4.0.68",
+  "version": "5.0.3",
   "license": "MIT, Anti-996",
   "homepage": "https://github.com/djalbat/occam-open-cli",
   "description": "Occam's command line package management tool.",
@@ -12,8 +12,8 @@
   "dependencies": {
     "argumentative": "^2.0.15",
     "mkdirp": "^0.5.1",
-    "necessary": "^11.0.40",
-    "occam-parsers": "^16.0.51"
+    "necessary": "^11.1.4",
+    "occam-parsers": "^16.0.55"
   },
   "devDependencies": {
     "@swc/core": "^1.2.51",

package/bin/action/changeEmailAddress.js

@@ -1,38 +0,0 @@
-"use strict";
-
-const action = require("../action"),
-      usernamePromptOperation = require("../operation/prompt/username"),
-      emailAddressPromptOperation = require("../operation/prompt/emailAddress"),
-      retrieveAccessTokenOperation = require("../operation/retrieveAccessToken"),
-      newEmailAddressPromptOperation = require("../operation/prompt/newEmailAddress");
-
-const { CHANGE_EMAIL_ADDRESS_API_URI } = require("../uris"),
-      { FAILED_CHANGE_EMAIL_ADDRESS_MESSAGE, SUCCESSFUL_CHANGE_EMAIL_ADDRESS_MESSAGE } = require("../messages");
-
-function changeEmailAddress(argument) {
-  const username = argument,  ///
-        emailAddress = null,
-        uri = CHANGE_EMAIL_ADDRESS_API_URI,
-        operations = [
-          retrieveAccessTokenOperation,
-          usernamePromptOperation,
-          emailAddressPromptOperation,
-          newEmailAddressPromptOperation
-        ],
-        context = {
-          username,
-          emailAddress
-        };
-
-  action(operations, uri, (json) => {
-    const { success } = json;
-
-    success ?
-      console.log(SUCCESSFUL_CHANGE_EMAIL_ADDRESS_MESSAGE) :
-        console.log(FAILED_CHANGE_EMAIL_ADDRESS_MESSAGE);
-
-    process.exit();
-  }, context);
-}
-
-module.exports = changeEmailAddress;

package/bin/action/changePassword.js

@@ -1,42 +0,0 @@
-"use strict";
-
-const action = require("../action"),
-      usernamePromptOperation = require("../operation/prompt/username"),
-      passwordPromptOperation = require("../operation/prompt/password"),
-      newPasswordPromptOperation = require("../operation/prompt/newPassword"),
-      retrieveAccessTokenOperation = require("../operation/retrieveAccessToken"),
-      confirmNewPasswordPromptOperation = require("../operation/prompt/confirmNewPassword");
-
-const { CHANGE_PASSWORD_API_URI } = require("../uris"),
-      { FAILED_CHANGE_PASSWORD_MESSAGE, SUCCESSFUL_CHANGE_PASSWORD_MESSAGE } = require("../messages");
-
-function changePassword(argument) {
-  const username = argument,  ///
-        oldPassword = null,
-        newPassword = null,
-        uri = CHANGE_PASSWORD_API_URI,
-        operations = [
-          retrieveAccessTokenOperation,
-          usernamePromptOperation,
-          passwordPromptOperation,
-          newPasswordPromptOperation,
-          confirmNewPasswordPromptOperation
-        ],
-        context = {
-          username,
-          oldPassword,
-          newPassword
-        };
-
-  action(operations, uri, (json) => {
-    const { success } = json;
-
-    success ?
-      console.log(SUCCESSFUL_CHANGE_PASSWORD_MESSAGE) :
-        console.log(FAILED_CHANGE_PASSWORD_MESSAGE);
-
-    process.exit();
-  }, context);
-}
-
-module.exports = changePassword;

package/bin/action/confirmEmailAddress.js

@@ -1,36 +0,0 @@
-"use strict";
-
-const action = require("../action"),
-      emailAddressPromptOperation = require("../operation/prompt/emailAddress"),
-      retrieveAccessTokenOperation = require("../operation/retrieveAccessToken"),
-      confirmationCodePromptOperation = require("../operation/prompt/confirmationCode");
-
-const { CONFIRM_EMAIL_ADDRESS_API_URI } = require("../uris"),
-      { FAILED_CONFIRM_EMAIL_ADDRESS_MESSAGE, SUCCESSFUL_CONFIRM_EMAIL_ADDRESS_MESSAGE } = require("../messages");
-
-function confirmEmailAddress(argument) {
-  const emailAddress = argument,  ///
-        confirmationCode = null,
-        uri = CONFIRM_EMAIL_ADDRESS_API_URI,
-        operations = [
-          retrieveAccessTokenOperation,
-          emailAddressPromptOperation,
-          confirmationCodePromptOperation
-        ],
-        context = {
-          emailAddress,
-          confirmationCode
-        };
-
-  action(operations, uri, (json) => {
-    const { success } = json;
-
-    success ?
-      console.log(SUCCESSFUL_CONFIRM_EMAIL_ADDRESS_MESSAGE) :
-        console.log(FAILED_CONFIRM_EMAIL_ADDRESS_MESSAGE);
-
-    process.exit();
-  }, context);
-}
-
-module.exports = confirmEmailAddress;

package/bin/action/login.js

@@ -1,41 +0,0 @@
-"use strict";
-
-const action = require("../action"),
-      passwordPromptOperation = require("../operation/prompt/password"),
-      emailAddressPromptOperation = require("../operation/prompt/emailAddress");
-
-const { LOGIN_API_URI } = require("../uris"),
-      { addAccessToken } = require("../configuration"),
-      { FAILED_LOGIN_MESSAGE, SUCCESSFUL_LOGIN_MESSAGE } = require("../messages");
-
-function login(argument) {
-  const emailAddress = argument,  ///
-        password = null,
-        uri = LOGIN_API_URI,
-        operations = [
-          emailAddressPromptOperation,
-          passwordPromptOperation
-        ],
-        context = {
-          emailAddress,
-          password
-        };
-
-  action(operations, uri, (json) => {
-    const { success } = json;
-
-    success ?
-      console.log(SUCCESSFUL_LOGIN_MESSAGE) :
-        console.log(FAILED_LOGIN_MESSAGE);
-
-    if (success) {
-      const { accessToken } = json;
-
-      addAccessToken(accessToken);
-    }
-
-    process.exit();
-  }, context);
-}
-
-module.exports = login;

package/bin/action/logout.js

@@ -1,26 +0,0 @@
-"use strict";
-
-const action = require("../action"),
-      retrieveAccessTokenOperation = require("../operation/retrieveAccessToken");
-
-const { LOGOUT_API_URI } = require("../uris"),
-      { removeAccessToken } = require("../configuration"),
-      { LOGGED_OUT_MESSAGE } = require("../messages");
-
-function logout() {
-  const uri = LOGOUT_API_URI,
-        operations = [
-          retrieveAccessTokenOperation
-        ],
-        context = {};
-
-  action(operations, uri, (json) => {
-    removeAccessToken();
-
-    console.log(LOGGED_OUT_MESSAGE);
-
-    process.exit();
-  }, context);
-}
-
-module.exports = logout;

package/bin/action/register.js

@@ -1,40 +0,0 @@
-"use strict";
-
-const action = require("../action"),
-      usernamePromptOperation = require("../operation/prompt/username"),
-      passwordPromptOperation = require("../operation/prompt/password"),
-      emailAddressPromptOperation = require("../operation/prompt/emailAddress"),
-      confirmPasswordPromptOperation = require("../operation/prompt/confirmPassword");
-
-const { REGISTER_API_URI } = require("../uris"),
-      { FAILED_REGISTER_MESSAGE, SUCCESSFUL_REGISTER_MESSAGE } = require("../messages");
-
-function register(argument) {
-  const emailAddress = argument,  ///
-        username = null,
-        password = null,
-        uri = REGISTER_API_URI,
-        operations = [
-          emailAddressPromptOperation,
-          usernamePromptOperation,
-          passwordPromptOperation,
-          confirmPasswordPromptOperation
-        ],
-        context = {
-          username,
-          password,
-          emailAddress
-        };
-
-  action(operations, uri, (json) => {
-    const { success } = json;
-
-    success ?
-      console.log(SUCCESSFUL_REGISTER_MESSAGE) :
-        console.log(FAILED_REGISTER_MESSAGE);
-
-    process.exit();
-  }, context);
-}
-
-module.exports = register;

package/bin/action/remove.js

@@ -1,9 +0,0 @@
-"use strict";
-
-function remove(argument) {
-  const releaseName = argument; ///
-
-  console.log("This functionality is not implemented yet.");
-}
-
-module.exports = remove;

package/bin/action/resendConfirmationCode.js

@@ -1,32 +0,0 @@
-"use strict";
-
-const action = require("../action"),
-      emailAddressPromptOperation = require("../operation/prompt/emailAddress"),
-      retrieveAccessTokenOperation = require("../operation/retrieveAccessToken");
-
-const { RESEND_CONFIRMATION_CODE_API_URI } = require("../uris"),
-      { SUCCESSFUL_RESEND_CONFIRMATION_CODE_MESSAGE, FAILED_RESEND_CONFIRMATION_CODE_MESSAGE } = require("../messages");
-
-function resendConfirmationCode(argument) {
-  const emailAddress = argument,  ///
-        uri = RESEND_CONFIRMATION_CODE_API_URI,
-        operations = [
-          retrieveAccessTokenOperation,
-          emailAddressPromptOperation
-        ],
-        context = {
-          emailAddress
-        };
-
-  action(operations, uri, (json) => {
-    const { success } = json;
-
-    success ?
-      console.log(SUCCESSFUL_RESEND_CONFIRMATION_CODE_MESSAGE) :
-        console.log(FAILED_RESEND_CONFIRMATION_CODE_MESSAGE);
-
-    process.exit();
-  }, context);
-}
-
-module.exports = resendConfirmationCode;

package/bin/action.js

@@ -1,19 +0,0 @@
-"use strict";
-
-const post = require("./post");
-
-const { executeOperations } = require("./utilities/operation");
-
-function action(operations, uri, callback, context) {
-  executeOperations(operations, (completed) => {
-    if (!completed) {
-      process.exit(1);
-    }
-
-    const data = context; ///
-
-    post(uri, data, callback);
-  }, context);
-}
-
-module.exports = action;

package/bin/configuration/unversioned.js

@@ -1,24 +0,0 @@
-"use strict";
-
-const { DEFAULT_USE_SSH, DEFAULT_HOST_URL, DEFAULT_HOST_NAME_SUFFIX } = require("../defaults");
-
-function createConfiguration() {
-  const useSSH = DEFAULT_USE_SSH,
-        hostURL = DEFAULT_HOST_URL,
-        hostNameSuffix = DEFAULT_HOST_NAME_SUFFIX,
-        defaultOptions = {
-          useSSH,
-          hostURL,
-          hostNameSuffix
-        },
-        options = defaultOptions,	///
-        configuration = {
-          options
-        };
-
-  return configuration;
-}
-
-module.exports = {
-  createConfiguration
-};