MaDgiK-CITE
/
argos
13
0
Fork 0
Code Issues Pull Requests Projects Releases 3 Wiki Activity

Merge branch 'master' of gitlab.eudat.eu:dmp/OpenAIRE-EUDAT-DMP-service-pilot

This commit is contained in:
annampak 2017-11-02 11:22:50 +02:00
parent 0358126015 30e3aac428
commit 7e19087bb6
6 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dmp-frontend/src/app/app-routing.module.ts
View File

@ -11,10 +11,10 @@ import { MainSignInComponent } from './login/main-sign-in/main-sign-in.component
const appRoutes: Routes = [ const appRoutes: Routes = [
{ path: 'dynamic-form', component: DynamicFormComponent, canActivate: [AuthGuard] }, { path: 'dynamic-form', component: DynamicFormComponent, canActivate: [AuthGuard] },
{ path: 'login-page', component: MainSignInComponent}, { path: 'login', component: MainSignInComponent},
{ path: 'projects', component: ProjectsComponent}, { path: 'projects', component: ProjectsComponent},
{ path: 'dmps', component: DmpComponent}, { path: 'dmps', component: DmpComponent},
{ path: '', redirectTo: '/login-page', pathMatch: 'full' }, { path: '', redirectTo: '/login', pathMatch: 'full' },
{ path: '**', component: PageNotFoundComponent }, { path: '**', component: PageNotFoundComponent },
{ {
path: '', path: '',

4
dmp-frontend/src/app/app.component.ts
View File

@ -29,12 +29,12 @@ export class AppComponent {
login(){ login(){
//redirect to login page //redirect to login page
this.router.navigate(['/login-page'], { queryParams: { /*returnUrl: this.state.url*/ }}); this.router.navigate(['/login'], { queryParams: { /*returnUrl: this.state.url*/ }});
} }
logout(){ logout(){
this.tokenService.logout(); this.tokenService.logout();
this.router.navigate(['/login-page'], { queryParams: { /*returnUrl: this.state.url*/ }}); this.router.navigate(['/login'], { queryParams: { /*returnUrl: this.state.url*/ }});
} }

1
dmp-frontend/src/app/app.module.ts
View File

@ -18,7 +18,6 @@ import { TokenService, TokenProvider } from './services/login/token.service';
import { LocalStorageService } from 'ngx-webstorage'; import { LocalStorageService } from 'ngx-webstorage';
import { dataModelBuilder } from './services/dataModelBuilder.service'; import { dataModelBuilder } from './services/dataModelBuilder.service';
import { DynamicFormGroupComponent } from './form/dynamic-form-group/dynamic-form-group.component'; import { DynamicFormGroupComponent } from './form/dynamic-form-group/dynamic-form-group.component';
//import { LoginComponent } from './login/login-page';
import { AppRoutingModule } from './app-routing.module'; import { AppRoutingModule } from './app-routing.module';
import { AuthGuard } from './guards/auth.guard'; import { AuthGuard } from './guards/auth.guard';
import { PageNotFoundComponent } from './not-found.component'; import { PageNotFoundComponent } from './not-found.component';

2
dmp-frontend/src/app/guards/auth.guard.ts
View File

@ -13,7 +13,7 @@ export class AuthGuard implements CanActivate {
return true; return true;
} }
// not logged in so redirect to login page with the return url // not logged in so redirect to login page with the return url
this.router.navigate(['/login-page'], { queryParams: { returnUrl: state.url }}); this.router.navigate(['/login'], { queryParams: { returnUrl: state.url }});
return false; return false;
} }

2
dmp-frontend/src/app/services/interceptor.ts
View File

@ -21,7 +21,7 @@ export class GlobalInterceptor implements HttpInterceptor {
if (err instanceof HttpErrorResponse) { if (err instanceof HttpErrorResponse) {
if (err.status === 401) { if (err.status === 401) {
this.tokenService.logout(); this.tokenService.logout();
this.router.navigate(['/dmps'], { queryParams: { /*returnUrl: this.state.url*/ }}); this.router.navigate(['/login'], { queryParams: { /*returnUrl: this.state.url*/ }});
} }
} }
}); });

1
dmp-frontend/src/app/services/server.service.ts
View File

@ -6,7 +6,6 @@ import {dataModelBuilder} from '../../app/services/dataModelBuilder.service';
import { DatasetProfile } from '../entities/datasetprofile'; import { DatasetProfile } from '../entities/datasetprofile';
import {DataModel} from '../entities/DataModel'; import {DataModel} from '../entities/DataModel';
import {Project} from '../entities/model/project'; import {Project} from '../entities/model/project';
//import {LoginComponent} from '../../app/login/login-page';
import { TokenService, TokenProvider } from './login/token.service'; import { TokenService, TokenProvider } from './login/token.service';
import {RestBase} from './rest-base'; import {RestBase} from './rest-base';
import 'rxjs/Rx'; import 'rxjs/Rx';