Skip to content

Commit b0a16c7

Browse files
skadefroskadefro
committed
Use nodered token and not user token for ui querie
1 parent d0c004e commit b0a16c7

5 files changed

Lines changed: 13 additions & 33 deletions

File tree

‎OpenFlow/src/public/Controllers.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4372,7 +4372,7 @@ export class NoderedCtrl {
43724372
await NoderedUtil.UpdateOne("users", null, this.user, 1, false, null, 2);
43734373
this.loading = false;
43744374
this.messages = 'update complete\n' + this.messages;
4375-
// this.EnsureNoderedInstance();
4375+
this.EnsureNoderedInstance();
43764376
} catch (error) {
43774377
this.errormessage = error.message ? error.message : error;
43784378
}

‎OpenFlowNodeRED/src/nodered/nodes/api_nodes.ts‎

Lines changed: 5 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -802,13 +802,11 @@ export class api_map_reduce {
802802

803803
export async function get_api_roles(req, res) {
804804
try {
805-
const rawAssertion = req.user.getAssertionXml();
806-
const token = await NoderedUtil.GetTokenFromSAML(rawAssertion);
807805
let q: any = { _type: "role" };
808806
if (!NoderedUtil.IsNullEmpty(req.query.name)) {
809807
q = { _type: "role", name: { $regex: ".*" + req.query.name + ".*" } };
810808
}
811-
const result: any[] = await NoderedUtil.Query('users', q, { name: 1 }, { name: -1 }, 1000, 0, token.jwt, null, null, 1);
809+
const result: any[] = await NoderedUtil.Query('users', q, { name: 1 }, { name: -1 }, 1000, 0, null, null, null, 1);
812810

813811
res.json(result);
814812
} catch (error) {
@@ -819,8 +817,6 @@ export async function get_api_roles(req, res) {
819817

820818
export async function get_api_userroles(req, res) {
821819
try {
822-
const rawAssertion = req.user.getAssertionXml();
823-
const token = await NoderedUtil.GetTokenFromSAML(rawAssertion);
824820
let q: any = { $or: [{ _type: "role" }, { _type: "user" }] };
825821
const ors = [];
826822
if (!NoderedUtil.IsNullEmpty(req.query.name)) {
@@ -838,11 +834,11 @@ export async function get_api_userroles(req, res) {
838834
};
839835
}
840836

841-
const result: any[] = await NoderedUtil.Query('users', q, { name: 1 }, { name: -1 }, 100, 0, token.jwt, null, null, 1);
837+
const result: any[] = await NoderedUtil.Query('users', q, { name: 1 }, { name: -1 }, 100, 0, null, null, null, 1);
842838
if (!NoderedUtil.IsNullEmpty(req.query.id)) {
843839
const exists = result.filter(x => x._id == req.query.id);
844840
if (exists.length == 0) {
845-
const result2: any[] = await NoderedUtil.Query('users', { _id: req.query.id }, { name: 1 }, { name: -1 }, 1, 0, token.jwt, null, null, 1);
841+
const result2: any[] = await NoderedUtil.Query('users', { _id: req.query.id }, { name: 1 }, { name: -1 }, 1, 0, null, null, null, 1);
846842
if (result2.length == 1) {
847843
result.push(result2[0]);
848844
}
@@ -857,8 +853,6 @@ export async function get_api_userroles(req, res) {
857853

858854
export async function get_api_users(req, res) {
859855
try {
860-
const rawAssertion = req.user.getAssertionXml();
861-
const token = await NoderedUtil.GetTokenFromSAML(rawAssertion);
862856
let q: any = { _type: "user" };
863857
const ors = [];
864858
if (!NoderedUtil.IsNullEmpty(req.query.name)) {
@@ -876,11 +870,11 @@ export async function get_api_users(req, res) {
876870
};
877871
}
878872

879-
const result: any[] = await NoderedUtil.Query('users', q, { name: 1 }, { name: -1 }, 100, 0, token.jwt, null, null, 1);
873+
const result: any[] = await NoderedUtil.Query('users', q, { name: 1 }, { name: -1 }, 100, 0, null, null, null, 1);
880874
if (!NoderedUtil.IsNullEmpty(req.query.id)) {
881875
const exists = result.filter(x => x._id == req.query.id);
882876
if (exists.length == 0) {
883-
const result2: any[] = await NoderedUtil.Query('users', { _id: req.query.id }, { name: 1 }, { name: -1 }, 1, 0, token.jwt, null, null, 1);
877+
const result2: any[] = await NoderedUtil.Query('users', { _id: req.query.id }, { name: 1 }, { name: -1 }, 1, 0, null, null, null, 1);
884878
if (result2.length == 1) {
885879
result.push(result2[0]);
886880
}

‎OpenFlowNodeRED/src/nodered/nodes/googleauth_nodes.ts‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -173,11 +173,9 @@ export class googleauth_credentials {
173173
}
174174
export async function get_rpa_workflows(req, res) {
175175
try {
176-
const rawAssertion = req.user.getAssertionXml();
177-
const token = await NoderedUtil.GetTokenFromSAML(rawAssertion);
178176
const q: any = { _type: "workflow" };
179177
const result: any[] = await NoderedUtil.Query('openrpa', q,
180-
{ name: 1, projectandname: 1 }, { projectid: -1, name: -1 }, 1000, 0, token.jwt, req.query.queue, null, 1)
178+
{ name: 1, projectandname: 1 }, { projectid: -1, name: -1 }, 1000, 0, null, req.query.queue, null, 1)
181179
res.json(result);
182180
} catch (error) {
183181
res.status(500).json(error);

‎OpenFlowNodeRED/src/nodered/nodes/rpa_nodes.ts‎

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -513,44 +513,36 @@ export class rpa_killworkflows_node {
513513

514514
export async function get_rpa_detectors(req, res) {
515515
try {
516-
const rawAssertion = req.user.getAssertionXml();
517-
const token = await NoderedUtil.GetTokenFromSAML(rawAssertion);
518516
const result: any[] = await NoderedUtil.Query('openrpa', { _type: "detector" },
519-
{ name: 1 }, { name: -1 }, 1000, 0, token.jwt, null, null, 1)
517+
{ name: 1 }, { name: -1 }, 1000, 0, null, null, null, 1)
520518
res.json(result);
521519
} catch (error) {
522520
res.status(500).json(error);
523521
}
524522
}
525523
export async function get_rpa_robots_roles(req, res) {
526524
try {
527-
const rawAssertion = req.user.getAssertionXml();
528-
const token = await NoderedUtil.GetTokenFromSAML(rawAssertion);
529525
const result: any[] = await NoderedUtil.Query('users', { $or: [{ _type: "user", _rpaheartbeat: { "$exists": true } }, { _type: "role", rparole: true }] },
530-
{ name: 1 }, { name: -1 }, 1000, 0, token.jwt, null, null, 1)
526+
{ name: 1 }, { name: -1 }, 1000, 0, null, null, null, 1)
531527
res.json(result);
532528
} catch (error) {
533529
res.status(500).json(error);
534530
}
535531
}
536532
export async function get_rpa_robots(req, res) {
537533
try {
538-
const rawAssertion = req.user.getAssertionXml();
539-
const token = await NoderedUtil.GetTokenFromSAML(rawAssertion);
540534
const result: any[] = await NoderedUtil.Query('users', { _type: "user", _rpaheartbeat: { "$exists": true } },
541-
{ name: 1 }, { name: -1 }, 1000, 0, token.jwt, null, null, 1)
535+
{ name: 1 }, { name: -1 }, 1000, 0, null, null, null, 1)
542536
res.json(result);
543537
} catch (error) {
544538
res.status(500).json(error);
545539
}
546540
}
547541
export async function get_rpa_workflows(req, res) {
548542
try {
549-
const rawAssertion = req.user.getAssertionXml();
550-
const token = await NoderedUtil.GetTokenFromSAML(rawAssertion);
551543
const q: any = { _type: "workflow" };
552544
const result: any[] = await NoderedUtil.Query('openrpa', q,
553-
{ name: 1, projectandname: 1 }, { projectid: -1, name: -1 }, 1000, 0, token.jwt, req.query.queue, null, 1)
545+
{ name: 1, projectandname: 1 }, { projectid: -1, name: -1 }, 1000, 0, null, req.query.queue, null, 1)
554546
res.json(result);
555547
} catch (error) {
556548
res.status(500).json(error);

‎OpenFlowNodeRED/src/nodered/nodes/workflow_nodes.ts‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -440,10 +440,8 @@ export class workflow_out_node {
440440

441441
export async function get_workflow_forms(req, res) {
442442
try {
443-
const rawAssertion = req.user.getAssertionXml();
444-
const token = await NoderedUtil.GetTokenFromSAML(rawAssertion);
445443
const result: any[] = await NoderedUtil.Query('forms', { _type: "form" },
446-
{ name: 1 }, { name: -1 }, 1000, 0, token.jwt, null, null, 1)
444+
{ name: 1 }, { name: -1 }, 1000, 0, null, null, null, 1)
447445
res.json(result);
448446
} catch (error) {
449447
res.status(500).json(error);
@@ -453,8 +451,6 @@ export async function get_workflow_forms(req, res) {
453451

454452
export async function get_workflows(req, res) {
455453
try {
456-
const rawAssertion = req.user.getAssertionXml();
457-
const token = await NoderedUtil.GetTokenFromSAML(rawAssertion);
458454
let q: any = { "_type": "workflow" };
459455
const ors = [];
460456
if (!NoderedUtil.IsNullEmpty(req.query.name)) {
@@ -471,7 +467,7 @@ export async function get_workflows(req, res) {
471467
]
472468
};
473469
}
474-
const result: any[] = await NoderedUtil.Query('workflow', q, { name: 1 }, { name: -1 }, 100, 0, token.jwt, null, null, 1)
470+
const result: any[] = await NoderedUtil.Query('workflow', q, { name: 1 }, { name: -1 }, 100, 0, null, null, null, 1)
475471
res.json(result);
476472
} catch (error) {
477473
res.status(500).json(error);

0 commit comments

Comments
 (0)