From 3516e9e68268ecc09f487abb0781482156cb0250 Mon Sep 17 00:00:00 2001 From: Federico Stagni Date: Thu, 13 Feb 2025 16:49:53 +0100 Subject: [PATCH 1/3] fix: fix of record ID --- src/WebAppDIRAC/WebApp/handler/ProxyManagerHandler.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/WebAppDIRAC/WebApp/handler/ProxyManagerHandler.py b/src/WebAppDIRAC/WebApp/handler/ProxyManagerHandler.py index b43d1222..7fcf50c0 100644 --- a/src/WebAppDIRAC/WebApp/handler/ProxyManagerHandler.py +++ b/src/WebAppDIRAC/WebApp/handler/ProxyManagerHandler.py @@ -61,9 +61,8 @@ def web_getProxyManagerData( if self.getUserName().lower() == "anonymous": return {"success": "false", "error": "You are not authorize to access these data"} req = self.__prepareParameters(username, expiredBefore, expiredAfter) - gLogger.info("!!! S O R T : ", sort := [[sortField, sortDirection]]) + sort = [[sortField, sortDirection]] result = gProxyManager.getDBContents(req, sort, start, limit) - gLogger.info(f"*!*!*! RESULT: \n{result}") if not result["OK"]: return {"success": "false", "error": result["Message"]} svcData = result["Value"] @@ -72,9 +71,9 @@ def web_getProxyManagerData( proxies.append( { "proxyid": f"{record[1]}@{record[2]}", - "UserName": str(record[0]), + "UserName": record[0], "UserDN": record[1], - "ExpirationTime": str(record[3]), + "ExpirationTime": str(record[2]), } ) timestamp = datetime.datetime.utcnow().strftime("%Y-%m-%d %H:%M [UTC]") From 82cbf727c50336e0be83cd31a0c8fc7d2fbe01a9 Mon Sep 17 00:00:00 2001 From: Federico Stagni Date: Thu, 13 Feb 2025 16:53:22 +0100 Subject: [PATCH 2/3] fix: removed example --- .../WebApp/handler/ExampleAppHandler.py | 21 ------------------- 1 file changed, 21 deletions(-) delete mode 100644 src/WebAppDIRAC/WebApp/handler/ExampleAppHandler.py diff --git a/src/WebAppDIRAC/WebApp/handler/ExampleAppHandler.py b/src/WebAppDIRAC/WebApp/handler/ExampleAppHandler.py deleted file mode 100644 index f3aa64c1..00000000 --- a/src/WebAppDIRAC/WebApp/handler/ExampleAppHandler.py +++ /dev/null @@ -1,21 +0,0 @@ -from WebAppDIRAC.Lib.WebHandler import WebHandler -import datetime - - -class ExampleAppHandler(WebHandler): - DEFAULT_AUTHORIZATION = "all" - - def web_getJobData(self): - timestamp = datetime.datetime.utcnow().strftime("%Y-%m-%d %H:%M [UTC]") - total = 5 - values = [ - {"ExampleId": 1, "ExampleValue": "Zoli"}, - {"ExampleId": 2, "ExampleValue": "a"}, - {"ExampleId": 3, "ExampleValue": "aaaa"}, - {"ExampleId": 4, "ExampleValue": "bbbb"}, - {"ExampleId": 5, "ExampleValue": "adsd"}, - ] - return {"success": "true", "result": values, "total": total, "date": timestamp} - - def web_getSelectionData(self): - return {"firstName": ["A", "C", "D"], "lastName": ["wwww", "dsds", "sads"]} From fc0101c0c26f68347f67307347321117ff966549 Mon Sep 17 00:00:00 2001 From: Federico Stagni Date: Fri, 14 Feb 2025 09:16:56 +0100 Subject: [PATCH 3/3] fix: simpler proxyid Co-authored-by: aldbr --- src/WebAppDIRAC/WebApp/handler/ProxyManagerHandler.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/WebAppDIRAC/WebApp/handler/ProxyManagerHandler.py b/src/WebAppDIRAC/WebApp/handler/ProxyManagerHandler.py index 7fcf50c0..0b6f672f 100644 --- a/src/WebAppDIRAC/WebApp/handler/ProxyManagerHandler.py +++ b/src/WebAppDIRAC/WebApp/handler/ProxyManagerHandler.py @@ -70,7 +70,7 @@ def web_getProxyManagerData( for record in svcData["Records"]: proxies.append( { - "proxyid": f"{record[1]}@{record[2]}", + "proxyid": f"{record[1]}", "UserName": record[0], "UserDN": record[1], "ExpirationTime": str(record[2]),