diff --git a/smp-angular/src/app/app.module.ts b/smp-angular/src/app/app.module.ts index 66e1ac195877aa27f74e1f80726176c78eb4d8fa..4562b3254151a4e926095361bd88a094f74a841a 100644 --- a/smp-angular/src/app/app.module.ts +++ b/smp-angular/src/app/app.module.ts @@ -72,6 +72,7 @@ import {ServicegroupMetadataDialogComponent} from "./servicegroup/servicegroup-m import {DomainDetailsDialogComponent} from "./domain/domain-details-dialog/domain-details-dialog.component"; import {UserDetailsDialogComponent} from "./user/user-details-dialog/user-details-dialog.component"; import {DownloadService} from "./download/download.service"; +import {TrustStoreService} from "./truststore/trustore.service"; export function extendedHttpClientFactory(xhrBackend: XHRBackend, requestOptions: RequestOptions, httpEventService: HttpEventService) { return new ExtendedHttpClient(xhrBackend, requestOptions, httpEventService); @@ -166,6 +167,7 @@ export function extendedHttpClientFactory(xhrBackend: XHRBackend, requestOptions DomibusInfoService, AlertService, DownloadService, + TrustStoreService, { provide: Http, useFactory: extendedHttpClientFactory, diff --git a/smp-angular/src/app/security/is-authorized.directive.ts b/smp-angular/src/app/security/is-authorized.directive.ts index e3b94f96014697286d59d3b71ff0a008e2bba26c..b53cccf91cebb83325274eb4c388e322fb560d17 100644 --- a/smp-angular/src/app/security/is-authorized.directive.ts +++ b/smp-angular/src/app/security/is-authorized.directive.ts @@ -2,8 +2,7 @@ import {Directive,ElementRef,Input} from '@angular/core'; import {SecurityService} from './security.service'; @Directive({ - selector:'[isAuthorized]', - providers:[] + selector:'[isAuthorized]' }) export class IsAuthorized { @Input('isAuthorized') role:string; diff --git a/smp-angular/src/app/truststore/truststore-upload/truststore-upload.component.ts b/smp-angular/src/app/truststore/truststore-upload/truststore-upload.component.ts index 174ecb445ee3c6282b8222f1871379a39e6369d7..a0f4a63735f021e21316c4a9110e59f86c21b4eb 100644 --- a/smp-angular/src/app/truststore/truststore-upload/truststore-upload.component.ts +++ b/smp-angular/src/app/truststore/truststore-upload/truststore-upload.component.ts @@ -8,7 +8,6 @@ import {isEmpty} from "rxjs/operator/isEmpty"; @Component({ selector: 'app-trustore-upload', templateUrl: './truststore-upload.component.html', - providers: [TrustStoreService] }) export class TrustStoreUploadComponent { @@ -20,7 +19,7 @@ export class TrustStoreUploadComponent { enableSubmit = false; constructor(public dialogRef: MdDialogRef<TrustStoreUploadComponent>, - private truststorService: TrustStoreService, private alertService: AlertService, + private trustStoreService: TrustStoreService, private alertService: AlertService, @Inject(MD_DIALOG_DATA) public data: any) { } @@ -30,7 +29,7 @@ export class TrustStoreUploadComponent { public submit() { let fi = this.fileInput.nativeElement; - this.truststorService.saveTrustStore(fi.files[0], this.password).subscribe(res => { + this.trustStoreService.saveTrustStore(fi.files[0], this.password).subscribe(res => { this.alertService.success(res.text(), false); this.onTruststoreUploaded.emit(); }, diff --git a/smp-angular/src/app/truststore/truststore.component.ts b/smp-angular/src/app/truststore/truststore.component.ts index 8f0e94f394a477e7ebd13b3fcadc4b9fe5ac2339..830b4d53ec78dfc4f9a71ad4d5fb21c741f6750a 100644 --- a/smp-angular/src/app/truststore/truststore.component.ts +++ b/smp-angular/src/app/truststore/truststore.component.ts @@ -15,8 +15,7 @@ import {AlertService} from "../alert/alert.service"; @Component({ selector: 'app-truststore', templateUrl: './truststore.component.html', - styleUrls: ['./truststore.component.css'], - providers: [TrustStoreService] + styleUrls: ['./truststore.component.css'] }) export class TruststoreComponent implements OnInit {