diff --git a/src/app/identity.ts b/src/app/identity.ts index f4c0183481ea93857923aadf85e7cb6d269c2152..27ca4d493a1fbac976f379d0e8fd870012025b7d 100644 --- a/src/app/identity.ts +++ b/src/app/identity.ts @@ -21,6 +21,8 @@ export class Identity { id.site.name = this.site.name; id.site.cafingerprint = this.site.cafingerprint; id.site.dtn = this.site.dtn; + id.site.lscmd = this.site.lscmd; + is.site.dtnport = this.site.dtnport; return id; } displayName(): string { diff --git a/src/app/tes.service.ts b/src/app/tes.service.ts index fe92df191c705a9d81061b5ca68ada7914707354..edd09163eb8cc87b3ebe31dcb740e9aa8d524005 100644 --- a/src/app/tes.service.ts +++ b/src/app/tes.service.ts @@ -257,8 +257,13 @@ public setStatusMsg(statusMsg: BehaviorSubject<any>) { this.busy.next(true); let paramstr = this.buildParams(app,identity,batchinterface); // let body = this.buildBody(app,appparams) - let keys = this.authorisationService.getKeys(); - let body = {'app': app, 'appparams': appparams, 'keys': keys} + let keys = JSON.stringify(this.authorisationService.getKeys()); + let loggedin = JSON.stringify(this.authorisationService.loggedInAuthZ.value); + let ids = []; + for (let id of this.computesitesService.ftidentities.value) { + ids.push(id.copy_skip_catalog()) + } + let body = {'app': app, 'appparams': appparams, 'keys': keys, 'ids': JSON.stringify(JSON.stringify(ids))} this.http.post<any>(this.Base+'/submit'+'?'+paramstr, body, options) .subscribe(resp => { this.busy.next(false); diff --git a/src/assets/config/m3apps.dev.json b/src/assets/config/m3apps.dev.json index 8cbbaeb6591eefa37a90ce87406b1e2df80bb550..712503c37796e72351e5b2c00a454d63b5e1a407 100644 --- a/src/assets/config/m3apps.dev.json +++ b/src/assets/config/m3apps.dev.json @@ -24,6 +24,14 @@ "localbind": true, "applist": null }, + { "url": null, + "name": "Transfer files v2", + "startscript": "#!/bin/bash\n echo '{keys}' > keys.json ; echo {ids} > ids.json\n", + "paramscmd": null, + "client": {"cmd": null, "redir": null }, + "localbind": true, + "applist": null + }, { "url": null, "name": "CryoSPARC", diff --git a/src/assets/config/m3apps.json b/src/assets/config/m3apps.json index 8cbbaeb6591eefa37a90ce87406b1e2df80bb550..c8baa3b4e43b6335b567b32b6b34bd767b802c00 100644 --- a/src/assets/config/m3apps.json +++ b/src/assets/config/m3apps.json @@ -24,6 +24,14 @@ "localbind": true, "applist": null }, + { "url": null, + "name": "Transfer files v2", + "startscript": "#!/bin/bash\n echo '{keys}' > sshkeys.json\n", + "paramscmd": null, + "client": {"cmd": null, "redir": null }, + "localbind": true, + "applist": null + }, { "url": null, "name": "CryoSPARC",