Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Melodic
melodic-frontend
Commits
40ce4f00
Commit
40ce4f00
authored
Oct 25, 2019
by
Marcin Prusinski
Browse files
Merge pull request #46 in MEL/melodic-frontend from feature/MEL-963-webssh-upgrade to rc3.0
* commit '
bdd9ac32
': add password-based ssh connection
parents
5c27de43
bdd9ac32
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/app/application/vm-list/vm-list.component.ts
View file @
40ce4f00
...
...
@@ -114,7 +114,7 @@ export class VmListComponent implements OnInit {
}
userHasPermissionToSshConnection
(
vm
:
NodeCloudiator
):
boolean
{
return
(
UserRole
.
ADMIN
===
UserRole
[
this
.
userService
.
currentUser
.
userRole
]
)
&&
vm
.
loginCredential
.
privateKey
!==
null
;
return
UserRole
.
ADMIN
===
UserRole
[
this
.
userService
.
currentUser
.
userRole
];
}
onSshConnectionClick
(
vm
:
NodeCloudiator
)
{
...
...
@@ -130,7 +130,7 @@ export class VmListComponent implements OnInit {
webSshUrl
=
`
${
AppConfigService
.
settings
.
webSshUrl
}
/?hostname=
${
vm
.
publicIp
}
&username=
${
vm
.
loginCredential
.
username
}
`
+
`&password=
${
btoa
(
vm
.
loginCredential
.
password
)}
`
;
console
.
log
(
`Password-based SSH connection under address:
${
webSshUrl
}
`
);
// todo add
window.open(webSshUrl)
after webssh fixed
window
.
open
(
webSshUrl
)
;
}
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment