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
81930fc6
Unverified
Commit
81930fc6
authored
Mar 12, 2018
by
liuzheng712
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: bypass
parent
95deb288
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
45 additions
and
41 deletions
+45
-41
app.service.ts
src/app/app.service.ts
+45
-41
No files found.
src/app/app.service.ts
View file @
81930fc6
...
...
@@ -106,8 +106,10 @@ export class HttpService {
const
params
=
new
HttpParams
()
.
set
(
'asset_token'
,
assetToken
)
.
set
(
'token'
,
token
);
// 原有:/api/session/ext/jumpserver/asset/token/add?asset_token=<asset_token>&token=<token>
// 改为:/api/ext/jumpserver/asset/token/add?asset_token=<asset_token>&token=<token>
return
this
.
http
.
get
(
'/guacamole/api/
session/
ext/jumpserver/asset/token/add'
,
'/guacamole/api/ext/jumpserver/asset/token/add'
,
{
headers
:
new
HttpHeaders
().
set
(
'Content-Type'
,
'application/x-www-form-urlencoded'
),
params
:
params
...
...
@@ -266,46 +268,48 @@ export class AppService implements OnInit {
// jQuery('angular2').show();
}
else
{
// this.browser();
this
.
_http
.
get_user_profile
()
.
subscribe
(
data
=>
{
User
.
id
=
data
[
'id'
];
User
.
name
=
data
[
'name'
];
User
.
username
=
data
[
'username'
];
User
.
email
=
data
[
'email'
];
User
.
is_active
=
data
[
'is_active'
];
User
.
is_superuser
=
data
[
'is_superuser'
];
User
.
role
=
data
[
'role'
];
// User.groups = data['groups'];
User
.
wechat
=
data
[
'wechat'
];
User
.
comment
=
data
[
'comment'
];
User
.
date_expired
=
data
[
'date_expired'
];
if
(
data
[
'phone'
])
{
User
.
phone
=
data
[
'phone'
].
toString
();
}
User
.
logined
=
data
[
'logined'
];
this
.
_logger
.
debug
(
User
);
this
.
_localStorage
.
set
(
'user'
,
data
[
'id'
]);
},
err
=>
{
// this._logger.error(err);
User
.
logined
=
false
;
window
.
location
.
href
=
document
.
location
.
origin
+
'/users/login?next='
+
document
.
location
.
pathname
+
document
.
location
.
search
;
// this._router.navigate(['login']);
},
// () => {
// if (User.logined) {
// if (document.location.pathname === '/login') {
// this._router.navigate(['']);
// } else {
// this._router.navigate([document.location.pathname]);
// }
// } else {
// this._router.navigate(['login']);
// }
// jQuery('angular2').show();
// }
);
if
(
document
.
location
.
pathname
!==
'/luna/connect'
)
{
this
.
_http
.
get_user_profile
()
.
subscribe
(
data
=>
{
User
.
id
=
data
[
'id'
];
User
.
name
=
data
[
'name'
];
User
.
username
=
data
[
'username'
];
User
.
email
=
data
[
'email'
];
User
.
is_active
=
data
[
'is_active'
];
User
.
is_superuser
=
data
[
'is_superuser'
];
User
.
role
=
data
[
'role'
];
// User.groups = data['groups'];
User
.
wechat
=
data
[
'wechat'
];
User
.
comment
=
data
[
'comment'
];
User
.
date_expired
=
data
[
'date_expired'
];
if
(
data
[
'phone'
])
{
User
.
phone
=
data
[
'phone'
].
toString
();
}
User
.
logined
=
data
[
'logined'
];
this
.
_logger
.
debug
(
User
);
this
.
_localStorage
.
set
(
'user'
,
data
[
'id'
]);
},
err
=>
{
// this._logger.error(err);
User
.
logined
=
false
;
window
.
location
.
href
=
document
.
location
.
origin
+
'/users/login?next='
+
document
.
location
.
pathname
+
document
.
location
.
search
;
// this._router.navigate(['login']);
},
// () => {
// if (User.logined) {
// if (document.location.pathname === '/login') {
// this._router.navigate(['']);
// } else {
// this._router.navigate([document.location.pathname]);
// }
// } else {
// this._router.navigate(['login']);
// }
// jQuery('angular2').show();
// }
);
}
}
}
}
else
{
...
...
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