From 6b1b4f23ded757653d161bd0532e6aa0ed061b18 Mon Sep 17 00:00:00 2001
From: alex <alex@alexloehr.net>
Date: Mon, 16 Jun 2025 07:52:57 +0000
Subject: [PATCH] GS-2160
---
lib/libIlias.js | 2 +-
app.js | 2 +-
test/testDeleteUser.js | 10 ++++++++--
php/alex.php | 10 +++++-----
4 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/app.js b/app.js
index 97f095d..0faab46 100644
--- a/app.js
+++ b/app.js
@@ -6,7 +6,7 @@
const fs = require("node:fs")
const db = require("./lib/db")
-const libIlias = require("lib/libIlias")
+const libIlias = require("./lib/libIlias")
const settings = require("./settings")
const search = require("./lib/search.js")
diff --git a/lib/libIlias.js b/lib/libIlias.js
index b307a79..506aa7c 100644
--- a/lib/libIlias.js
+++ b/lib/libIlias.js
@@ -15,7 +15,7 @@
const sp = new URLSearchParams({
command: "deleteUser",
obj_id,
- dry : dry ? 1 : 0,
+ dry : dry ? "1" : "0",
})
let url2 = `${url}?${sp.toString()}`
console.log("libIlias.deleteUser >>>", url2)
diff --git a/php/alex.php b/php/alex.php
index 532e2c3..be5251b 100644
--- a/php/alex.php
+++ b/php/alex.php
@@ -14,7 +14,7 @@
$method = $_SERVER['REQUEST_METHOD'];
$command = $_GET["command"];
$obj_id = (int) $_GET["obj_id"];
- $dry = $_GET["dry"];
+ $dry = $_GET["dry"]; # "0" = false, "1" = true
$res = array(
"method" => $method,
@@ -51,15 +51,15 @@
###############################
-function deleteUser($obj_id, $dry = 0)
+function deleteUser($obj_id, $dry)
{
$usr = ilObjectFactory::getInstanceByObjId($obj_id);
- $msg = "deleted user {$usr->firstname} {$usr->lastname} ({$obj_id}) '{$dry}'";
- if ($dry == "1") {
+ $msg = "deleted user {$usr->firstname} {$usr->lastname} ({$obj_id})";
+ if ($dry == "0") {
$usr->delete();
return $msg;
} else {
- $msg = $msg . " DRY";
+ $msg = "DRY:: ".$msg;
return $msg;
}
}
diff --git a/test/testDeleteUser.js b/test/testDeleteUser.js
index cd8137d..f1170a4 100644
--- a/test/testDeleteUser.js
+++ b/test/testDeleteUser.js
@@ -1,3 +1,5 @@
+const expect = require("chai").expect
+
const settings = require("../settings")
const libIlias = require("../lib/libIlias")
@@ -6,9 +8,13 @@
describe("the function deleteUser", function () {
it("should delete a user", async function () {
- const obj_id = 317
- const res = await libIlias.deleteUser(obj_id, false)
+ const obj_id = 324
+ const res = await libIlias.deleteUser(obj_id, true)
console.log(res)
+ expect(res.method).to.equal("DELETE")
+ expect(res.command).to.equal("deleteUser")
+ expect(res.obj_id).to.equal(obj_id)
+ expect(res.status).to.equal("ok")
})
})
--
Gitblit v1.8.0