Merge branch 'master' into bpenkov/cli-config-theme-import-fix

templates/angular/igx-ts/custom-templates/crm-grid/files/src/app/__path__/__name__.component.scss

@@ -56,12 +56,6 @@ $summary-theme: igx-grid-summary-theme(
 
   @include igx-input-group($search-theme);
 
-  $filtering-theme: igx-grid-filtering-theme(
-    $palette: $crm-grid-palette,
-    $toggle-active-background: igx-color($crm-grid-palette, "secondary", 500)
-  );
-
-  @include igx-grid-filtering($filtering-theme);
 
   // grid theme
   $crm-grid-theme: igx-grid-theme(

templates/angular/igx-ts/projects/side-nav-auth/files/src/app/authentication/auth.guard.spec.ts

@@ -0,0 +1,34 @@
+import { AuthGuard } from './auth.guard';
+
+describe('AuthGuard', () =>  {
+    let mockRouter, mockUserService: any;
+    beforeEach(() => {
+        mockRouter = {
+            navigate: () => {}
+        };
+        mockUserService = {
+            currentUser: true
+        };
+    });
+
+    it('Should properly initialize', () => {
+        const authGuard = new AuthGuard(mockRouter, mockUserService);
+        expect(authGuard).toBeDefined();
+    });
+
+    it(`Should properly call 'canActivate'`, () => {
+        const authGuard = new AuthGuard(mockRouter, mockUserService);
+        const mockSpy = jasmine.createSpy('mockSpy');
+        expect(authGuard.canActivate(<any>mockSpy, <any>mockSpy)).toEqual(true);
+    });
+    it(`Should properly call 'canActivate'`, () => {
+        const authGuard = new AuthGuard(mockRouter, mockUserService);
+        const mockSpy = jasmine.createSpy('mockSpy');
+        mockUserService.currentUser = false;
+        spyOn(mockRouter, 'navigate');
+        expect(authGuard.canActivate(<any>mockSpy, <any>{ url: 'test'})).toEqual(false);
+        expect(mockRouter.navigate).toHaveBeenCalled();
+        expect(mockRouter.navigate).toHaveBeenCalledWith([''], { queryParams: { returnUrl: 'test' } });
+    });
+});
+

templates/angular/igx-ts/projects/side-nav-auth/files/src/app/authentication/login-bar/login-bar.component.spec.ts

@@ -1,7 +1,7 @@
 import { Component } from '@angular/core';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
-import { NoopAnimationsModule } from '@angular/platform-browser/animations';
+import { NoopAnimationsModule, BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { Router } from '@angular/router';
 import { RouterTestingModule } from '@angular/router/testing';
 
@@ -19,6 +19,8 @@ import {
 import { LoginDialogComponent } from '../login-dialog/login-dialog.component';
 import { LoginBarComponent } from './login-bar.component';
 import { UserService } from '../services/user.service';
+import { AuthModule } from 'angular-auth-oidc-client';
+import { ExternalAuthService } from '../services/external-auth.service';
 
 @Component({
   selector: 'app-login-dialog',
@@ -34,13 +36,19 @@ describe('LoginBarComponent', () => {
   class TestUserServSpy {
     logout() {}
     get currentUser() { return null; }
+    clearCurrentUser() { return null; }
+  }
+
+  class TestAuthService {
+    logout() {}
   }
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
       imports: [
         RouterTestingModule,
         NoopAnimationsModule,
+        AuthModule.forRoot(),
         IgxButtonModule,
         IgxToggleModule,
         IgxIconModule,
@@ -51,7 +59,8 @@ describe('LoginBarComponent', () => {
       ],
       declarations: [ LoginBarComponent, TestLoginDialogComponent ],
       providers: [
-        { provide: UserService, useClass: TestUserServSpy }
+        { provide: UserService, useClass: TestUserServSpy },
+        { provide: ExternalAuthService, useClass: TestAuthService }
       ]
     })
     .compileComponents();
@@ -108,16 +117,19 @@ describe('LoginBarComponent', () => {
 
   it('should handle user menu items', async () => {
     const userServ = TestBed.get(UserService);
+    const authServ = TestBed.get(ExternalAuthService);
     const router: Router = TestBed.get(Router);
     spyOn(router, 'navigate');
-    spyOn(userServ, 'logout');
+    spyOn(userServ, 'clearCurrentUser');
+    spyOn(authServ, 'logout');
 
     component.igxDropDown.open();
     component.igxDropDown.setSelectedItem(0);
     expect(router.navigate).toHaveBeenCalledWith(['/profile']);
 
     component.igxDropDown.setSelectedItem(1);
     expect(router.navigate).toHaveBeenCalledWith(['/home']);
-    expect(userServ.logout).toHaveBeenCalled();
+    expect(userServ.clearCurrentUser).toHaveBeenCalled();
+    expect(authServ.logout).toHaveBeenCalled();
   });
 });

templates/angular/igx-ts/projects/side-nav-auth/files/src/app/authentication/login/login.component.spec.ts

@@ -11,6 +11,7 @@ import { LoginComponent } from './login.component';
 import { ExternalAuthService, ExternalAuthProvider } from '../services/external-auth.service';
 import { AuthenticationService } from '../services/authentication.service';
 import { UserService } from '../services/user.service';
+import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 
 describe('LoginComponent', () => {
   let component: LoginComponent;
@@ -21,7 +22,8 @@ describe('LoginComponent', () => {
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      imports: [ ReactiveFormsModule, RouterTestingModule, IgxInputGroupModule, IgxButtonModule, IgxIconModule, IgxRippleModule ],
+      imports: [ ReactiveFormsModule, RouterTestingModule, NoopAnimationsModule,
+        IgxInputGroupModule, IgxButtonModule, IgxIconModule, IgxRippleModule ],
       declarations: [ LoginComponent ],
       providers: [
         { provide: ExternalAuthService, useValue: extAuthSpy },

templates/angular/igx-ts/projects/side-nav-auth/files/src/app/authentication/providers/facebook-provider.ts

@@ -21,7 +21,6 @@ export class FacebookProvider implements AuthProvider {
 
     public login() {
         this.config();
-        const self = this;
         FB.login((response) => {
             if (response.authResponse) {
                 FB.api(
@@ -36,7 +35,7 @@ export class FacebookProvider implements AuthProvider {
                             picture: newResponse.picture,
                             externalToken: FB.getAuthResponse()['accessToken']
                         };
-                        self.router.navigate([this.externalStsConfig.redirect_url]);
+                        this.router.navigate([this.externalStsConfig.redirect_url]);
                     });
             } else {
                 console.log('User cancelled login or did not fully authorize.');