fix: countless #13

Merged
jon_nfc merged 5 commits from fix-numerous into development 2023-08-16 15:14:12 +00:00
2 changed files with 71 additions and 54 deletions

View File

@ -5120,7 +5120,7 @@
"fieldType": "msg",
"format": "handlebars",
"syntax": "mustache",
"template": "(&(objectclass=*)(cn={{ auth.user.fname }} {{ auth.user.lname }})(givenName={{ auth.user.fname }})(sn={{ auth.user.lname }})(uid={{ auth.user.username }})(mail={{ auth.user.mail }}))",
"template": "(&(objectclass=*)(givenName={{ session.user.fname }})(sn={{ session.user.lname }})(uid={{ session.user.username }})(mail={{ session.user.mail }}))",
"output": "str",
"x": 760,
"y": 580,
@ -5732,7 +5732,7 @@
"t": "set",
"p": "payload",
"pt": "msg",
"to": "$string(msg.http.form.random & msg.payload)",
"to": "$string(msg.req.body.random & msg.password_second_half)",
"tot": "jsonata"
},
{
@ -5965,7 +5965,7 @@
"z": "4b5e055cd6b1e387",
"g": "02dc457b6549ba4e",
"name": "Form and user details must match",
"func": "var success = null;\nvar failure = null;\n\nnode.status({fill:\"yellow\",shape:\"ring\",text:\"User Details Dont match\"});\n\nif(\n msg.auth.user.username == msg.req.body.uid &&\n msg.auth.user.fname == msg.req.body.givenName &&\n msg.auth.user.lname == msg.req.body.sn &&\n msg.auth.user.mail == msg.req.body.mail\n) {\n node.status({ fill: \"green\", shape: \"dot\", text: \"User Details match\" });\n\n success = msg;\n}\n\nnode.send([\n success,\n failure\n]);",
"func": "var success = null;\nvar failure = null;\n\nnode.status({fill:\"yellow\",shape:\"ring\",text:\"User Details Dont match\"});\n\nif(\n msg.session.user.username == msg.req.body.uid &&\n msg.session.user.fname == msg.req.body.givenName &&\n msg.session.user.lname == msg.req.body.sn &&\n msg.session.user.mail == msg.req.body.mail\n) {\n node.status({ fill: \"green\", shape: \"dot\", text: \"User Details match\" });\n\n success = msg;\n}\n\nnode.send([\n success,\n failure\n]);",
"outputs": 2,
"noerr": 0,
"initialize": "",
@ -9645,35 +9645,6 @@
"y": 140,
"wires": []
},
{
"id": "82183bee2dd412fe",
"type": "change",
"z": "104f7938a23fe82f",
"name": "Debug",
"rules": [
{
"t": "set",
"p": "debug_on",
"pt": "global",
"to": "config.glpi.debug_on",
"tot": "global"
}
],
"action": "",
"property": "",
"from": "",
"to": "",
"reg": false,
"x": 1130,
"y": 220,
"wires": [
[
"cd999564657880cc",
"4146b052670fb819"
]
],
"icon": "font-awesome/fa-cogs"
},
{
"id": "9587918c59375270",
"type": "inject",
@ -9768,8 +9739,8 @@
"type": "switch",
"z": "104f7938a23fe82f",
"name": "Debug No Auto-run",
"property": "debug_on",
"propertyType": "msg",
"property": "$boolean($globalContext('config.glpi.debug_on'))\t",
"propertyType": "jsonata",
"rules": [
{
"t": "true"
@ -9885,7 +9856,8 @@
"2f0dd5172e907730",
"0e97a47512b3c7ef",
"d6e72db598c850a0",
"610fb43bda07b3c3"
"610fb43bda07b3c3",
"e852bc3458923688"
],
"x": 145,
"y": 180,
@ -9917,24 +9889,24 @@
"rules": [
{
"t": "set",
"p": "glpi.authorization",
"pt": "global",
"to": "authorization",
"tot": "msg"
"p": "authorization",
"pt": "msg",
"to": "config.glpi.authorization",
"tot": "global"
},
{
"t": "set",
"p": "glpi.app_token",
"pt": "global",
"to": "app_token",
"tot": "msg"
"p": "app_token",
"pt": "msg",
"to": "config.glpi.app_token",
"tot": "global"
},
{
"t": "set",
"p": "glpi.api_url",
"pt": "global",
"to": "api_url",
"tot": "msg"
"p": "api_url",
"pt": "msg",
"to": "config.glpi.api_url",
"tot": "global"
}
],
"action": "",
@ -9942,11 +9914,12 @@
"from": "",
"to": "",
"reg": false,
"x": 1420,
"y": 120,
"x": 1160,
"y": 220,
"wires": [
[
"a9472349e8102352"
"a9472349e8102352",
"cd999564657880cc"
]
],
"icon": "font-awesome/fa-cogs"
@ -9960,7 +9933,8 @@
"tosidebar": true,
"console": false,
"tostatus": false,
"complete": "false",
"complete": "true",
"targetType": "full",
"statusVal": "",
"statusType": "auto",
"x": 1600,
@ -9972,7 +9946,7 @@
"type": "function",
"z": "104f7938a23fe82f",
"name": "Config Exists",
"func": "var exists = null;\nvar absent = null;\nvar config_not_loaded = null;\n\nfs.stat('config.glpi.json', function (err) {\n if (err) {\n absent = msg;\n } else {\n if( global.get('config') != null ) {\n exists = msg;\n }else{\n config_not_loaded = msg;\n }\n }\n});\n\nnode.send([exists, absent, config_not_loaded]);\n",
"func": "var exists = null;\nvar absent = msg;\n\n\n// fs.stat('config.glpi.json', function (err) {\n// if (err) {\n// absent = msg;\n// node.warn('here1');\n// } else {\n// if( global.get('config') != null ) {\n// exists = msg;\n// node.warn('here2');\n// }else{\n// config_not_loaded = msg;\n// node.warn('here3');\n// }\n// }\n// node.warn('here4');\n// });\n\n// config.glpi\n//for( var key in Array(global.get('config')).keys()) {\n// for (var key in Object.keys(global.get('config') || {}).keys()) {\n\n// node.warn('key: ' + key)\n// if(key == 'glpi') {\n\n// exists = msg;\n// absent = null;\n\n// }\n// }\n\nif( Object.keys(global.get('config.glpi') || {}).length > 0 ) {\n\n exists = msg\n absent = null;\n\n}\n\nnode.send([exists, absent]);\n",
"outputs": 3,
"noerr": 0,
"initialize": "",
@ -9987,7 +9961,7 @@
"y": 220,
"wires": [
[
"82183bee2dd412fe"
"4146b052670fb819"
],
[
"e4ec88859fe76e54"
@ -10036,6 +10010,49 @@
"y": 300,
"wires": []
},
{
"id": "e852bc3458923688",
"type": "link out",
"z": "104f7938a23fe82f",
"name": "link out 5",
"mode": "link",
"links": [
"f2259793983f70a6",
"935f35904a0d89bf"
],
"x": 1235,
"y": 440,
"wires": []
},
{
"id": "2b9dec0acc865c80",
"type": "inject",
"z": "104f7938a23fe82f",
"name": "Manual Start",
"props": [
{
"p": "payload"
},
{
"p": "topic",
"vt": "str"
}
],
"repeat": "",
"crontab": "",
"once": false,
"onceDelay": 0.1,
"topic": "",
"payload": "1",
"payloadType": "num",
"x": 1080,
"y": 440,
"wires": [
[
"e852bc3458923688"
]
]
},
{
"id": "8de5bc665bc27215",
"type": "http request",

View File

@ -1,3 +1,3 @@
{
"$": "2eced33c6ed3e71f419422537cc5e047zWf8o5wk6wkrTeF6wCQLIMmiFd+bQYS/l5b+WMXk+zSbdVoFNXoN6OakVLxeHa3P9OWgMjZibtSx/ncAyanWEpGCyuUZ6fpuz4zAil6j6N0Ojw7jjw/1i413ZWBR779FKBOWjFa4oAK3pmAKsYp3wJECcFY0kxv8tfXww7aIOG6rKD6EYoYjQ8P5oTXVH/0k/FWTJ2UiDDPH+s6EIjZEbcH08d3aDF83I5LZMcgP1K7vfwXvCrPGtD2SfCiw/Q+QDIZKsW5/+mGBeTqSrm6tQLK0a5ehP2YEBZpc76OZ1q99pBEZr4f23RtpPI5l+DMU0fuokMGGXyxa3IcD/hN9SbJZW3spJE1jHMdCBO059sQYgnGK8GiK3oJge3ckNZdrpH8cKWPetxaDNP3UWE2drzMZkEHXeqN4kCUNYS2Dj3E3YFr8gjkCOLKcflgnTdiy31QP+mMhkErhpKS4HsDv9rXsrgmKCrlT19QokhjkGh64pZSURiGUkl84RDRMoB57uyUonIjnZnTVk6+0AhiSp4pE3NTvb80esYoRxpLHP+XCP90hlbXYckZfXnv+tlwCTY5rRgypoh7wYAoGVWIieKd+y6ae0mhlNIDYkTV4PTaTUX5M5OkBjbrApnpwXIObUiAQHoYz6/eLGwWThE5jD7t2phcoKKX9uiqowr3cuOVdy7q+oo96KFraaZFBzVEx6UYSyBnkP4aFw6NRyMyczRgi6qDxeLRRtzw8+ph1AAUQS1/l1lXsNesl7iaRgrAW6ueoo1wPYnoWnX2aFTjIOPmX9f298W35trgLcjhh5ngXHKVDz8o2RLn7CQXF23oMKcPfCbYNbSP2gjsYvjC9DCcbGmK4mlOPnWnUwCc3LvYZ3L3nW+0cIHwakpkRlimuXeWz001B/AyEM3NNPjXMe2V/FEw70gpA17+qU6WHO0Azo0z/XJk69c7JP+YRzJsq3p7cR0alHkk4TMaoZZYdt+qd0Mg0naD27AdKU32LspzZviya7nnkV/8uD/ERSiIPlZs1hxixTThMDkdSxNAJIvWFrc+X4UHhOHhVj0lM5e06SqghQEJ+KyxGukH5X67KLgTGdtbu/7QPfBsNqKo1hR2JnzGGNyIBAJeTKZfJYoY25mZXANvWvA=="
"$": "4aeae47ce89a8298ee97de18287450ffn3otH30s09c8fzAPKDxC1SRE5Lp7UVfQpKv9m9EqC+3IvaaTolmuzDlvrZX0mTfqVd34K8kh/xQ/456RkOdbMCkbclrjbk1rZa9LCBxB9QHf2JUl/5ZHEqcXpHyXoO1Riuy0eyicDG8j/BzBG9+fD3q+2EEh8ZecWhdFrdvxXwxE1ka47ZfP2UfRWwHnic+rY3ID2wxJRdL9G2wuCSgZJTOjHbj5SaZbbt848EEIE9IMEvbF43iVGRYUWWxt1IWbbdRcOpb0YVhrkjjXg+pYH9chDK1Ruwe3Ve/P8QPlsu8rI3RP3uMKXaNqCgR8+x+KT6KtcZwEL7tYgfUZf7dJjEvqSRF4rGxSKMJWH+paz/mo0q7aXzI8S9DkSegGy9Gu5WmNk1bpAV0bYewX7zoZ9lzZqbj+0jlefslTGolFqZemqibmI7IQ4fhsbt0QjGK1OyoFHRMwk7Eu7w5agm6R7gozDMSlI3c1lSOOyIJpLF//8Xi7dO6o0DP9MGQ09HsqPHYUCzs4Mk1ek/Exxe1enzROuhme22fKfDhN5vA6YbtPaP+3kPocDBPuXLgldjDqZaLEOXKNfoTCbe5P6eEAIC9YDVMyozdtHHq+hCGYHJg0ejjb0RYwUq1KknN9bzEej12YkgnDeERvRQW0zRD+B/zel6PCCRGrPRnZVOEzO+TE/8DVK0pXqRrIPE+R2bMvYv9CH1iOtsUBmJJFmdezvKGN72t7iVZ8eHk4i3lhM+U16Lqxjq5xIQQuUexsbgR5kdjgTuu0AafnQCtDwzBXSCdoTB+CwNhk7c+vm30n0FZOH5l9Aa1y6N0AnnJhLg4gj68m9u6KOq6NvYGkMBrXvlJIZYaafdv43oMksnDH0j4aOxlG5iqsBEgvP1JICuLyWT92EqvompE9kxz4JP6UI9U/KVzNLauFS/F01TB6bgnkLvy9m/2I39zo4DKcmyxaeRJBpxuAZcJsdmL90vovUX7qs5yJx13ly1+ddZ+EZpMGSYObbYpH9iNCcPMo1ShvVgoBVl6/z7ylfyCAdDAw8TqXpJkgdmF3waPivW+934cL3GGvwjhye3t3XR0ziX7OnW6FO5VLj6VvGL/QQs2HXRsQZImB4KFQX0J6nXqOdR7kzCWB/sdc"
}