Skip to content

L
luna
Unverified Commit f5e276a8 authored by liuzheng712's avatar liuzheng712
Browse files
Options

feat: bypass login check

parent 4df64223
Hide whitespace changes
Inline Side-by-side
Showing with 54 additions and 50 deletions
src/app/app.service.ts
View file @ f5e276a8
......@@ -264,7 +264,7 @@ export class AppService implements OnInit {
checklogin() {
this._logger.log('service.ts:AppService,checklogin');
if (DataStore.Path) {
if (DataStore.Path['name'] === 'FOF' || DataStore.Path['name'] === 'Forgot') {
if (document.location.pathname === '/luna/connect') {
} else {
if (User.logined) {
if (document.location.pathname === '/login') {
......@@ -273,53 +273,51 @@ export class AppService implements OnInit {
this._router.navigate([document.location.pathname]);
}
// jQuery('angular2').show();
} else if (document.location.pathname === '/luna/connect') {
User.logined = true;
} else {
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();
// }
.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 {
} else {
this._router.navigate(['FOF']);
// jQuery('angular2').show();
}
......
src/app/elements/nav/nav.component.ts
View file @ f5e276a8
......@@ -39,12 +39,6 @@ export class ElementNavComponent implements OnInit {
}
ngOnInit() {
this.ChangeLanWarningDialog = this._dialog.open(
ChangLanWarningDialogComponent,
{
height: '200px',
width: '300px',
});
}
click(event) {
......@@ -105,6 +99,12 @@ export class ElementNavComponent implements OnInit {
break;
}
case 'English': {
this.ChangeLanWarningDialog = this._dialog.open(
ChangLanWarningDialogComponent,
{
height: '200px',
width: '300px',
});
this.ChangeLanWarningDialog.afterClosed().subscribe(
result => {
if (result) {
......@@ -114,6 +114,12 @@ export class ElementNavComponent implements OnInit {
break;
}
case 'Chinese': {
this.ChangeLanWarningDialog = this._dialog.open(
ChangLanWarningDialogComponent,
{
height: '200px',
width: '300px',
});
this.ChangeLanWarningDialog.afterClosed().subscribe(
result => {
if (result) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment