diff --git a/lib/core/login/components/login.component.html b/lib/core/login/components/login.component.html index ec1e968403..2fe61bba22 100644 --- a/lib/core/login/components/login.component.html +++ b/lib/core/login/components/login.component.html @@ -1,4 +1,4 @@ -
+
diff --git a/lib/core/login/components/login.component.ts b/lib/core/login/components/login.component.ts index 315ea91888..be8d1ee084 100644 --- a/lib/core/login/components/login.component.ts +++ b/lib/core/login/components/login.component.ts @@ -35,6 +35,7 @@ import { AppConfigValues } from '../../app-config/app-config.service'; import { OauthConfigModel } from '../../models/oauth-config.model'; +import { DomSanitizer } from '@angular/platform-browser'; enum LoginSteps { Landing = 0, @@ -142,7 +143,8 @@ export class LoginComponent implements OnInit { private appConfig: AppConfigService, private userPreferences: UserPreferencesService, private location: Location, - private route: ActivatedRoute + private route: ActivatedRoute, + private sanitizer: DomSanitizer ) { this.initFormError(); this.initFormFieldsMessages(); @@ -349,6 +351,10 @@ export class LoginComponent implements OnInit { event.target.value = event.target.value.trim(); } + getBackgroundUrlImageUrl() { + return this.sanitizer.bypassSecurityTrustStyle(`url(${this.backgroundImageUrl})`); + } + /** * Default formError values */ diff --git a/lib/core/services/sites.service.spec.ts b/lib/core/services/sites.service.spec.ts index 61c4ce2cf6..c18ca0cd3f 100644 --- a/lib/core/services/sites.service.spec.ts +++ b/lib/core/services/sites.service.spec.ts @@ -106,38 +106,4 @@ describe('Sites service', () => { }); }); - it('deleteSite should perform a call against the server', (done) => { - service.deleteSite('fake-site-id').subscribe(() => { - expect(jasmine.Ajax.requests.mostRecent().method).toBe('DELETE'); - expect(jasmine.Ajax.requests.mostRecent().url) - .toContain('alfresco/api/-default-/public/alfresco/versions/1/sites/fake-site-id'); - done(); - }); - - jasmine.Ajax.requests.mostRecent().respondWith({ - status: 204 - }); - }); - - it('getSites catch errors call', (done) => { - service.getSites().subscribe(() => { - }, () => { - done(); - }); - - jasmine.Ajax.requests.mostRecent().respondWith({ - status: 403 - }); - }); - - it('getSite catch errors call', (done) => { - service.getSite('error-id').subscribe(() => { - }, () => { - done(); - }); - - jasmine.Ajax.requests.mostRecent().respondWith({ - status: 403 - }); - }); });