@modernman00/shared-js-lib 1.2.14 → 1.2.24

package/Utility.js

@@ -131,3 +131,21 @@ export const sanitizeInput = (input) => {
         .replace(/'/g, ''')
         .trim();
 };
+
+
+/**
+ * Binds an event listener to an element with the specified ID.
+ *
+ * @param {Object} options - An object containing the following properties:
+ *   - id {string}: The ID of the element to bind the event listener to.
+ *   - event {string} (optional): The type of event to listen for. Defaults to 'click'.
+ *   - handler {function}: The function to be called when the event occurs.
+ * @throws {Error} Throws an error if the element with the specified ID is not found,
+ *                 or if the handler is not a function.
+ */
+export function bindEvent({ id, event = 'click', handler }) {
+  const el = document.getElementById(id);
+  if (el && typeof handler === 'function') {
+    el.addEventListener(event, handler);
+  }
+}

package/__tests__/handlers.test.js

@@ -0,0 +1,152 @@
+import { createCodeSubmitHandler } from '../AcctMgt/code.js';
+import { forgotSubmitHandler } from '../AcctMgt/forgot.js';
+import { createAdminLoginHandler } from '../AcctMgt/login.js';
+import { setupPasswordChange } from '../AcctMgt/changePassword.js';
+import { loginSubmission } from '../AcctMgt/processAll.js';
+import { showPassword } from '../AcctMgt/loginUtility.js';
+
+jest.mock('../AcctMgt/processAll.js');
+jest.mock('../AcctMgt/loginUtility.js');
+
+// Utility to mock DOM elements
+const mockDOM = (ids) => {
+  ids.forEach(id => {
+    const el = document.createElement('button');
+    el.setAttribute('id', id);
+    document.body.appendChild(el);
+  });
+};
+
+afterEach(() => {
+  document.body.innerHTML = '';
+  jest.clearAllMocks();
+});
+
+describe('AcctMgt Handlers', () => {
+  test('createCodeSubmitHandler submits code form correctly', () => {
+    mockDOM(['button']);
+    createCodeSubmitHandler({
+      formId: 'codeForm',
+      inputId: 'code_id',
+      buttonId: 'button',
+      route: '/api/code',
+      redirect: '/success',
+      theme: 'bulma',
+      maxLength: 40
+    });
+
+    document.getElementById('button').dispatchEvent(new Event('click'));
+
+    expect(loginSubmission).toHaveBeenCalledWith(
+      'codeForm',
+      '/api/code',
+      '/success',
+      'bulma',
+      { maxLength: { id: ['code_id'], max: [40] } }
+    );
+  });
+
+  test('forgotSubmitHandler submits email form correctly', () => {
+    mockDOM(['button']);
+    const emailInput = document.createElement('input');
+    emailInput.setAttribute('id', 'email_id');
+    document.body.appendChild(emailInput);
+
+    forgotSubmitHandler({
+      formId: 'forgotPassword',
+      inputId: 'email_id',
+      buttonId: 'button',
+      route: '/api/forgot',
+      redirect: '/reset',
+      theme: 'bulma',
+      maxLength: 50
+    });
+
+    document.getElementById('button').dispatchEvent(new Event('click'));
+
+    expect(loginSubmission).toHaveBeenCalledWith(
+      'forgotPassword',
+      '/api/forgot',
+      '/reset',
+      'bulma',
+      { maxLength: { id: ['email_id'], max: [50] } }
+    );
+  });
+
+  test('createAdminLoginHandler sets attributes and submits login', () => {
+    mockDOM(['button', 'showPassword_id']);
+    const passwordInput = document.createElement('input');
+    passwordInput.setAttribute('id', 'password_id');
+    document.body.appendChild(passwordInput);
+
+    createAdminLoginHandler({
+      formId: 'managed',
+      emailId: 'email_id',
+      passwordId: 'password_id',
+      buttonId: 'button',
+      showToggleId: 'showPassword_id',
+      route: '/api/login',
+      redirect: '/admin',
+      theme: 'bootstrap',
+      maxLength: [30, 50]
+    });
+
+    document.getElementById('button').dispatchEvent(new Event('click'));
+    document.getElementById('showPassword_id').dispatchEvent(new Event('click'));
+
+    expect(loginSubmission).toHaveBeenCalledWith(
+      'managed',
+      '/api/login',
+      '/admin',
+      'bootstrap',
+      { maxLength: { id: ['password_id', 'email_id'], max: [30, 50] } }
+    );
+
+    expect(passwordInput.getAttribute('autocomplete')).toBe('current-password');
+    expect(showPassword).toHaveBeenCalledWith('password_id');
+  });
+
+  test('setupPasswordChange submits when passwords match', () => {
+    mockDOM(['button', 'showPassword_id']);
+    const passwordInput = document.createElement('input');
+    passwordInput.setAttribute('id', 'password_id');
+    passwordInput.value = 'Secure123!';
+    document.body.appendChild(passwordInput);
+
+    const confirmInput = document.createElement('input');
+    confirmInput.setAttribute('id', 'confirm_password_id');
+    confirmInput.value = 'Secure123!';
+    document.body.appendChild(confirmInput);
+
+    const errorEl = document.createElement('div');
+    errorEl.setAttribute('id', 'confirm_password_error');
+    document.body.appendChild(errorEl);
+
+    const helpEl = document.createElement('div');
+    helpEl.setAttribute('id', 'password_help');
+    document.body.appendChild(helpEl);
+
+    setupPasswordChange({
+      buttonId: 'button',
+      passwordId: 'password_id',
+      confirmId: 'confirm_password_id',
+      errorId: 'confirm_password_error',
+      helpId: 'password_help',
+      showToggleId: 'showPassword_id',
+      route: '/api/change-password',
+      redirect: '/dashboard',
+      theme: 'bulma',
+      maxLength: 50
+    });
+
+    document.getElementById('button').dispatchEvent(new Event('click'));
+
+    expect(loginSubmission).toHaveBeenCalledWith(
+      'changePassword',
+      '/api/change-password',
+      '/dashboard',
+      'bulma',
+      { maxLength: { id: ['password_id', 'confirm_password_id'], max: [50, 50] } }
+    );
+  });
+});

package/axiosWrapper.js

@@ -0,0 +1,22 @@
+import { getCookieValue } from './Cookie.js';
+import axios from 'axios';
+import axiosRetry from 'axios-retry';
+
+axiosRetry(axios, { retries: 3 });
+
+const csrfToken = getCookieValue('XSRF-TOKEN');
+
+axios.interceptors.request.use(config => {
+  if (csrfToken) {
+    config.headers['X-Requested-With'] = 'XMLHttpRequest';
+        config.headers['Content-Type'] = 'application/json';
+        config.headers['Accept'] = 'application/json';
+        if (csrfToken) {
+            config.headers['X-XSRF-TOKEN'] = csrfToken; // Set CSRF token header
+        }
+        return config;
+  }
+  return config;
+});
+
+export default axios;

package/babel.config.js

@@ -0,0 +1,3 @@
+export default {
+  presets: [['@babel/preset-env', { targets: { node: 'current' } }]]
+};

package/config/version.php

@@ -0,0 +1,3 @@
+<?php
+define('APP_VERSION', 'v1.2.25');
+

package/general.js

@@ -0,0 +1,62 @@
+'use strict';
+import { id } from './UtilityHtml.js';
+
+
+/**
+ * 
+ * @param { id of the first element} first 
+ * @param {* id of the second element} second 
+ * @param {* error id - if error - where to show it} err 
+ */
+export const matchInput = (first, second, err) => {
+    let error, firstInput, secondInput;
+    error = id(err);
+    firstInput = id(first);
+    secondInput = id(second);
+
+    secondInput.addEventListener('keyup', () => {
+
+        if (secondInput.value !== firstInput.value) {
+            error.innerHTML = 'Your passwords do not match';
+            error.style.color = 'red';
+        } else {
+            error.innerHTML = 'The password is matched: <i class=\'fa fa-check\' aria-hidden=\'true\'></i>';
+            error.style.color = 'green';
+        }
+
+
+    });
+};
+
+
+
+
+/**
+ * Redirects the browser to a new URL after a specified delay.
+ *
+ * @param {string} url - The URL to redirect to.
+ * @param {number} delay - The delay, in milliseconds, before the redirect occurs.
+ * @return {void} This function does not return anything.
+ */
+export const redirectAfterDelay = (url, delay) => {
+    setTimeout(() => {
+        window.location.href = url;
+    }, delay);
+};  
+            
+
+export const parseErrorResponse = (error) => {
+    let errorMessage = 'An unknown error occurred';
+
+    if (Array.isArray(error?.response?.data?.message)) {
+        errorMessage = `<ul>${error.response.data.message.map(e => `<li>${e}</li>`).join('')}</ul>`;
+    } else if (typeof error?.response?.data?.message === 'string') {
+        errorMessage = error.response.data.message;
+    } else if (typeof error.message === 'string') {
+        errorMessage = error.message;
+    } 
+
+    return errorMessage;
+};
+
+

package/index.js

@@ -10,4 +10,11 @@ export * from './FormHelper.js';
 export * from './Loader.js';
 export * from './ShowResponse.js';
 export * from './DateTime.js';
-export * from './CountryCode.js'
+export * from './CountryCode.js'
+export * from './AcctMgt/changePassword.js';
+export * from './AcctMgt/code.js';
+export * from './AcctMgt/forgot.js';
+export * from './AcctMgt/login.js';
+export * from './AcctMgt/loginUtility.js';
+export * from './AcctMgt/processAll.js';
+export * from './general.js';

package/jest.config.js

@@ -0,0 +1,6 @@
+export default {
+  transform: {
+    '^.+\\.js$': 'babel-jest'
+  },
+  testEnvironment: 'jsdom'
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@modernman00/shared-js-lib",
-  "version": "1.2.14",
+  "version": "1.2.24",
   "description": "Reusable JS utilities for numerous js problems",
   "homepage": "https://github.com/modernman00/shared-js-lib#readme",
   "keywords": [
@@ -20,7 +20,7 @@
   "author": "olawale olaogun",
   "main": "index.js",
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
+    "test": "jest"
   },
   "dependencies": {
     "axios": "^1.9.0",
@@ -28,5 +28,29 @@
   },
   "publishConfig": {
     "access": "public"
+  },
+  "devDependencies": {
+    "@babel/core": "^7.28.3",
+    "@babel/preset-env": "^7.28.3",
+    "@semantic-release/changelog": "^6.0.3",
+    "@semantic-release/git": "^10.0.1",
+    "@semantic-release/github": "^11.0.4",
+    "@semantic-release/npm": "^12.0.2",
+    "auto-changelog": "^2.5.0",
+    "babel-jest": "^30.0.5",
+    "jest": "^30.0.5",
+    "jest-environment-jsdom": "^30.0.5",
+    "semantic-release": "^24.2.7"
+  },
+  "release": {
+    "branches": [
+      "main"
+    ],
+    "plugins": [
+      "@semantic-release/npm",
+      "@semantic-release/changelog",
+      "@semantic-release/git",
+      "@semantic-release/github"
+    ]
   }
 }

package/release.sh

@@ -0,0 +1,161 @@
+#!/bin/bash
+set -e
+
+# --- Config ---
+VERSION_FILE="config/version.php"
+HISTORY_FILE="release-history.md"
+REPO="origin"
+DEFAULT_BRANCH="main"
+
+# --- Utilities ---
+function detect_branch() {
+  CURRENT_BRANCH=$(git rev-parse --abbrev-ref HEAD)
+  echo "🔍 Current branch: $CURRENT_BRANCH"
+  if [[ "$CURRENT_BRANCH" != "$DEFAULT_BRANCH" && "$CURRENT_BRANCH" != "master" ]]; then
+    echo "⚠️ You're on '$CURRENT_BRANCH'. Switch to '$DEFAULT_BRANCH' or 'master' before releasing."
+    exit 1
+  fi
+}
+
+function ensure_clean_git() {
+  if [[ -n $(git status --porcelain) ]]; then
+    echo "🛑 Uncommitted changes detected."
+    git status
+    read -p "❓ Auto-commit all changes before release? (y/n): " choice
+    if [[ "$choice" == "y" ]]; then
+      git add .
+      git commit -m "🧹 Auto-commit before release"
+    else
+      echo "🚫 Aborting release."
+      exit 1
+    fi
+  fi
+}
+
+function run_tests() {
+  echo "🧪 Running tests with coverage..."
+  npm test -- --coverage || {
+    echo "❌ Tests failed. Aborting release."
+    exit 1
+  }
+  echo "✅ Tests passed."
+}
+
+function validate_dependencies() {
+  command -v gh >/dev/null || {
+    echo "❌ GitHub CLI (gh) not found. Install it to publish releases."
+    exit 1
+  }
+}
+
+function extract_version() {
+  grep -q "APP_VERSION" "$VERSION_FILE" || {
+    echo "❌ APP_VERSION not found in $VERSION_FILE"
+    exit 1
+  }
+  CURRENT=$(grep "APP_VERSION" "$VERSION_FILE" | sed -E "s/.*'([^']+)'.*/\1/")
+  IFS='.' read -r MAJOR MINOR PATCH <<< "${CURRENT//v/}"
+}
+
+function determine_bump_type() {
+  LAST_COMMIT=$(git log -1 --pretty=%s)
+  MODE="patch"
+  [[ "$LAST_COMMIT" == feat:* ]] && MODE="minor"
+  [[ "$LAST_COMMIT" == fix:* ]] && MODE="patch"
+  [[ "$LAST_COMMIT" == chore:* || "$LAST_COMMIT" == docs:* ]] && MODE="patch"
+  [[ "$LAST_COMMIT" == BREAKING:* ]] && MODE="major"
+
+  case "$MODE" in
+    major) MAJOR=$((MAJOR + 1)); MINOR=0; PATCH=0 ;;
+    minor) MINOR=$((MINOR + 1)); PATCH=0 ;;
+    patch) PATCH=$((PATCH + 1)) ;;
+  esac
+
+  SEMVER="${MAJOR}.${MINOR}.${PATCH}"
+  NEW="v$SEMVER"
+  echo "🔧 Current version: $CURRENT"
+  echo "⏫ Detected bump: $MODE → $NEW"
+  echo "📦 Last commit: $LAST_COMMIT"
+}
+
+function update_version_file() {
+  if [[ "$OSTYPE" == "darwin"* ]]; then
+    sed -i '' "s/$CURRENT/$NEW/" "$VERSION_FILE"
+  else
+    sed -i "s/$CURRENT/$NEW/" "$VERSION_FILE"
+  fi
+}
+
+function commit_and_tag() {
+  COMMIT_MSG="🔖 Bump version to $NEW"
+  npm version "$SEMVER" --no-git-tag-version
+  git add "$VERSION_FILE"
+  git commit -m "$COMMIT_MSG"
+
+  if git rev-parse "$NEW" >/dev/null 2>&1; then
+    echo "⚠️ Tag $NEW already exists. Skipping tag creation."
+  else
+    git tag "$NEW"
+    git push "$REPO" "$NEW"
+  fi
+
+  echo "🚀 Pushing changes to $REPO/$DEFAULT_BRANCH..."
+  git push "$REPO" "$DEFAULT_BRANCH" || {
+    echo "❌ Failed to push to $DEFAULT_BRANCH. Check your Git credentials or branch name."
+    exit 1
+  }
+}
+
+function generate_changelog() {
+  LAST_TAG=$(git describe --tags --abbrev=0 2>/dev/null)
+  [ "$LAST_TAG" = "$NEW" ] && LAST_TAG=$(git rev-list --tags --max-count=2 | tail -n1 | xargs git describe --tags --abbrev=0)
+  NOTES="### Changelog for $NEW\n\n"
+  NOTES+=$(git log "$LAST_TAG"..HEAD --pretty=format:"- %s _(by %an)_" --no-merges)
+  [ -z "$NOTES" ] && NOTES="Initial release."
+}
+
+function publish_github_release() {
+  gh release create "$NEW" \
+    --title "Release $NEW" \
+    --notes "$NOTES" \
+    --verify-tag
+  echo "✅ Published $NEW with changelog and updated $VERSION_FILE!"
+}
+
+function log_release_history() {
+  echo -e "\n## $NEW — $(date '+%Y-%m-%d %H:%M')\n$NOTES" >> "$HISTORY_FILE"
+  echo "📝 Logged release to $HISTORY_FILE"
+}
+
+function publish_to_npm() {
+  echo "🚀 Publishing $SEMVER to npm..."
+  npm publish --access public || {
+    echo "❌ npm publish failed. Check your credentials, registry access, or package.json config."
+    exit 1
+  }
+
+  echo "🔍 Verifying publish on npm registry..."
+  PACKAGE_NAME=$(node -p "require('./package.json').name")
+  PUBLISHED_VERSION=$(npm view "$PACKAGE_NAME" version)
+
+  if [[ "$PUBLISHED_VERSION" == "$SEMVER" ]]; then
+    echo "✅ npm publish confirmed: $PUBLISHED_VERSION is live on npmjs.org"
+  else
+    echo "⚠️ Publish may not have propagated yet. Expected $SEMVER, got $PUBLISHED_VERSION"
+  fi
+}
+
+
+# --- Execution ---
+detect_branch
+ensure_clean_git
+run_tests
+validate_dependencies
+extract_version
+determine_bump_type
+update_version_file
+commit_and_tag
+generate_changelog
+publish_github_release
+log_release_history
+publish_to_npm

package/ForgotPassword.js

@@ -1,102 +0,0 @@
-"use strict";
-import { id } from './UtilityHtml.js'
-import { postFormData } from "./Http.js"
-import { emailVal } from "./Utility.js"
-import { showError } from "./ShowResponse.js";
-
-// Environment detection
-const isBrowser = typeof window !== 'undefined' && typeof document !== 'undefined';
-
-// Log warning for browser-only features
-const warnNodeEnvironment = (feature) => {
-  if (!isBrowser) {
-    console.warn(`Warning: ${feature} is only available in browser environments. This code may not work as expected in Node.js.`);
-    return false;
-  }
-  return true;
-};
-
-// Initialize UI - only in browser environment
-if (isBrowser) {
-  const loaderElement = id("setLoader");
-  if (loaderElement) {
-    loaderElement.style.display = "none";
-  } else {
-    console.warn("Element 'setLoader' not found in the DOM");
-  }
-} else {
-  console.warn("Running in Node.js environment. DOM manipulation is not available.");
-}
-
-/**
- * @description Handles the forgot password submission process.
- * @param {string} formId - The ID of the form to submit.
- * @param {string} url - The URL to make the POST request to.
- * @param {string} redirectUrl - The URL to redirect the user to after the submission is complete.
- * @returns {function} - A function that handles the submission process.
- */
-export const forgotPasswordSubmission = (formId, url, redirectUrl) => {
-  // Check if we're in a browser environment before creating the helper
-  if (!warnNodeEnvironment('forgotPasswordSubmission')) {
-    // Return a no-op function in Node.js environment
-    return (e) => {
-      if (e && typeof e.preventDefault === 'function') {
-        e.preventDefault();
-      }
-      console.warn("Forgot password functionality is only available in browser environments");
-    };
-  }
-
-  const emailInput = id('email_id');
-  if (!emailInput) {
-    console.warn("Email input element not found");
-    return (e) => {
-      if (e && typeof e.preventDefault === 'function') {
-        e.preventDefault();
-      }
-      console.error("Email input element not found");
-    };
-  }
-
-  /**
-   * @description Handles the submission of the forgot password form.
-   * @param {Event} e - The event object passed by the event listener.
-   * @returns {void}
-   * @throws {Error} - If there is an error with the submission
-   */
-  const forgotPasswordSubmissionHelper = (e) => {
-    try {
-      if (e && typeof e.preventDefault === 'function') {
-        e.preventDefault();
-      }
-
-      // Ensure emailInput still exists in the DOM
-      if (!emailInput) {
-        throw new Error("Email input element not found");
-      }
-
-      const email = emailInput.value.trim();
-      if (!emailVal(email)) {
-        const loaderElement = id("setLoader");
-        if (loaderElement) {
-          loaderElement.style.display = "block";
-        }
-
-        // Only use localStorage in browser environment
-        if (typeof localStorage !== 'undefined') {
-          localStorage.setItem('redirect', redirectUrl);
-        }
-
-        postFormData(url, formId, redirectUrl);
-      }
-    } catch (error) {
-      if (typeof showError === 'function') {
-        showError(error);
-      } else {
-        console.error("Error in forgot password submission:", error);
-      }
-    }
-  };
-  
-  return forgotPasswordSubmissionHelper;
-};