@galadrim/galadmin 0.1.223 → 0.1.225

package/dist/types/config.d.ts

@@ -351,6 +351,7 @@ export type AuthRole = {
     passwordField: string;
     idField: string;
     filters?: string;
+    useArgon2?: boolean;
 };
 export type Config = {
     name: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@galadrim/galadmin",
-  "version": "0.1.223",
+  "version": "0.1.225",
   "main": "dist/index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",

package/src/api.ts

@@ -152,7 +152,7 @@ export default (db, config, user) => {
     const sqlAnd = (conditions) => {
         const existingConditions = [];
         for (const condition of conditions) {
-            if (condition) {
+            if (condition && condition.length > 0) {
                 existingConditions.push(condition)
             }
         }

package/src/front/ckeditor5-build/node_modules/.bin/semver

@@ -0,0 +1,12 @@
+#!/bin/sh
+basedir=$(dirname "$(echo "$0" | sed -e 's,\\,/,g')")
+
+case `uname` in
+    *CYGWIN*|*MINGW*|*MSYS*) basedir=`cygpath -w "$basedir"`;;
+esac
+
+if [ -x "$basedir/node" ]; then
+  exec "$basedir/node"  "$basedir/../semver/bin/semver.js" "$@"
+else 
+  exec node  "$basedir/../semver/bin/semver.js" "$@"
+fi

package/src/front/ckeditor5-build/node_modules/.bin/semver.cmd

@@ -0,0 +1,17 @@
+@ECHO off
+GOTO start
+:find_dp0
+SET dp0=%~dp0
+EXIT /b
+:start
+SETLOCAL
+CALL :find_dp0
+
+IF EXIST "%dp0%\node.exe" (
+  SET "_prog=%dp0%\node.exe"
+) ELSE (
+  SET "_prog=node"
+  SET PATHEXT=%PATHEXT:;.JS;=;%
+)
+
+endLocal & goto #_undefined_# 2>NUL || title %COMSPEC% & "%_prog%"  "%dp0%\..\semver\bin\semver.js" %*

package/src/front/ckeditor5-build/node_modules/.bin/semver.ps1

@@ -0,0 +1,28 @@
+#!/usr/bin/env pwsh
+$basedir=Split-Path $MyInvocation.MyCommand.Definition -Parent
+
+$exe=""
+if ($PSVersionTable.PSVersion -lt "6.0" -or $IsWindows) {
+  # Fix case when both the Windows and Linux builds of Node
+  # are installed in the same directory
+  $exe=".exe"
+}
+$ret=0
+if (Test-Path "$basedir/node$exe") {
+  # Support pipeline input
+  if ($MyInvocation.ExpectingInput) {
+    $input | & "$basedir/node$exe"  "$basedir/../semver/bin/semver.js" $args
+  } else {
+    & "$basedir/node$exe"  "$basedir/../semver/bin/semver.js" $args
+  }
+  $ret=$LASTEXITCODE
+} else {
+  # Support pipeline input
+  if ($MyInvocation.ExpectingInput) {
+    $input | & "node$exe"  "$basedir/../semver/bin/semver.js" $args
+  } else {
+    & "node$exe"  "$basedir/../semver/bin/semver.js" $args
+  }
+  $ret=$LASTEXITCODE
+}
+exit $ret

package/src/index.ts

@@ -6,7 +6,6 @@ import * as mysql2 from 'mysql2/promise';
 import * as pg from 'pg';
 import dbManager from "./utils/dbManager";
 import * as bcrypt from "bcryptjs";
-import * as argon from 'argon2';
 
 import * as fs from "fs";
 import * as path from "path";
@@ -66,15 +65,18 @@ export default (config: Config): any => {
         name: 'galadmin.sid'
     }));
 
-    const passwordMatch = async (password: string, hash: string) => {
+    const passwordMatch = async (password: string, hash: string, useArgon2: boolean) => {
         if (password === hash || bcrypt.compareSync(password, hash)) {
             return true;
         }
-        try {
-            if (await argon.verify(hash, password)) {
-                return true;
-            }
-        } catch (e) { }
+        if (useArgon2) {
+            try {
+                const argon = await import('argon2');
+                if (await argon.verify(hash, password)) {
+                    return true;
+                }
+            } catch (e) { }
+        }
         return false;
     }
 
@@ -88,7 +90,7 @@ export default (config: Config): any => {
                 const { rows } = await db.query(`SELECT * FROM ?? WHERE ?? = ? ${filters}`, [authRole.table, authRole.usernameField, req.body.username]);
                 let user;
                 for (const row of rows) {
-                    if (await passwordMatch(req.body.password, row[authRole.passwordField])) {
+                    if (await passwordMatch(req.body.password, row[authRole.passwordField], authRole.useArgon2)) {
                         user = row;
                         break;
                     }

package/src/types/config.ts

@@ -419,6 +419,7 @@ export type AuthRole = {
   passwordField: string;
   idField: string;
   filters?: string;
+  useArgon2?: boolean;
 };
 
 export type Config = {