Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
L
luna
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
ops
luna
Commits
b18a2729
Unverified
Commit
b18a2729
authored
7 years ago
by
liuzheng712
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix: update
parent
2af98186
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
6 deletions
+6
-6
iframe.component.ts
src/app/elements/iframe/iframe.component.ts
+4
-5
globals.ts
src/app/globals.ts
+2
-1
No files found.
src/app/elements/iframe/iframe.component.ts
View file @
b18a2729
...
...
@@ -2,7 +2,7 @@ import {Component, Input, OnInit} from '@angular/core';
import
{
DomSanitizer
}
from
'@angular/platform-browser'
;
import
{
NavList
}
from
'../../ControlPage/control/control.component'
;
import
{
User
,
guacamol
e
}
from
'../../globals'
;
import
{
User
,
DataStor
e
}
from
'../../globals'
;
import
{
HttpService
,
LogService
}
from
'../../app.service'
;
@
Component
({
...
...
@@ -15,7 +15,6 @@ export class ElementIframeComponent implements OnInit {
@
Input
()
userid
:
any
;
@
Input
()
index
:
number
;
target
:
string
;
guacamole
=
guacamole
;
constructor
(
private
sanitizer
:
DomSanitizer
,
private
_http
:
HttpService
,
...
...
@@ -25,15 +24,15 @@ export class ElementIframeComponent implements OnInit {
ngOnInit
()
{
// /guacamole/api/tokens will redirect to http://guacamole/api/tokens
const
base
=
window
.
btoa
(
this
.
host
.
hostname
+
'
\
0'
+
'c'
+
'
\
0'
+
'jumpserver'
);
if
(
this
.
guacamole
.
token
)
{
this
.
target
=
document
.
location
.
origin
+
'/guacamole/#/client/'
+
base
+
'?token='
+
this
.
guacamole
.
token
;
if
(
DataStore
.
guacamole_
token
)
{
this
.
target
=
document
.
location
.
origin
+
'/guacamole/#/client/'
+
base
+
'?token='
+
DataStore
.
guacamole_
token
;
}
else
{
this
.
_http
.
get_guacamole_token
(
User
.
name
,
this
.
host
.
id
,
this
.
userid
).
subscribe
(
data
=>
{
// /guacamole/client will redirect to http://guacamole/#/client
this
.
target
=
document
.
location
.
origin
+
'/guacamole/#/client/'
+
base
+
'?token='
+
data
[
'authToken'
];
this
.
guacamole
.
token
=
data
[
'authToken'
];
DataStore
.
guacamole_
token
=
data
[
'authToken'
];
},
error2
=>
{
this
.
_logger
.
error
(
error2
);
...
...
This diff is collapsed.
Click to expand it.
src/app/globals.ts
View file @
b18a2729
...
...
@@ -104,6 +104,7 @@ export let DataStore: {
leftbarshow
:
boolean
;
windowsize
:
Array
<
number
>
;
autologin
:
boolean
;
guacamole_token
:
string
;
}
=
{
socket
:
io
.
connect
(),
Nav
:
[{}],
...
...
@@ -115,6 +116,7 @@ export let DataStore: {
leftbarshow
:
true
,
windowsize
:
[],
autologin
:
false
,
guacamole_token
:
''
};
export
let
CSRF
=
''
;
...
...
@@ -147,4 +149,3 @@ export let wsEvent: {
export
const
i18n
=
new
Map
();
export
let
guacamole
:
{
token
:
string
}
=
{
token
:
''
};
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
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