Token search changes

lib/sky-pages-module-generator.js

@@ -29,10 +29,13 @@ function getSource(skyAppConfig) {
   let runtimeImports = [
     'SkyAppBootstrapper',
     'SkyAppConfig',
-    'SkyAppWindowRef'
+    'SkyAppWindowRef',
+    'SkyAuthTokenProvider'
   ];
+
   let runtimeProviders = [
     'SkyAppWindowRef',
+    'SkyAuthTokenProvider',
     `{
       provide: SkyAppConfig,
       useValue: ${skyAppConfigAsString}
@@ -44,7 +47,7 @@ function getSource(skyAppConfig) {
     runtimeProviders.push(`{
       provide: SkyAuthHttp,
       useClass: SkyAuthHttp,
-      deps: [XHRBackend, RequestOptions, SkyAppWindowRef]
+      deps: [XHRBackend, RequestOptions, SkyAppWindowRef, SkyAuthTokenProvider]
     }`);
   }
 

package.json

@@ -39,7 +39,7 @@
     "@angular/platform-browser": "2.4.8",
     "@angular/platform-browser-dynamic": "2.4.8",
     "@angular/router": "3.4.8",
-    "@blackbaud/auth-client": "1.1.0",
+    "@blackbaud/auth-client": "1.2.0",
     "@blackbaud/help-client": "blackbaud/help-client",
     "@ngtools/webpack": "1.2.1",
     "@types/jasmine": "2.5.40",

runtime/auth-http.spec.ts

@@ -7,6 +7,7 @@ import { BBAuth } from '@blackbaud/auth-client';
 import { SkyAuthHttp } from './auth-http';
 
 import { SkyAppWindowRef } from './window-ref';
+import { SkyAuthTokenProvider } from './auth-token-provider';
 
 describe('SkyAuthHttp', () => {
 
@@ -16,6 +17,7 @@ describe('SkyAuthHttp', () => {
   function setupInjector(windowLocationSearch: string) {
 
     const injector = ReflectiveInjector.resolveAndCreate([
+      SkyAuthTokenProvider,
       {
         provide: ConnectionBackend,
         useClass: MockBackend

runtime/auth-http.ts

@@ -19,15 +19,16 @@ import 'rxjs/add/operator/mergeMap';
 
 import { SkyAppWindowRef } from '@blackbaud/skyux-builder/runtime/window-ref';
 
-import { BBAuth } from '@blackbaud/auth-client';
+import { SkyAuthTokenProvider } from '@blackbaud/skyux-builder/runtime/auth-token-provider';
 
 @Injectable()
 export class SkyAuthHttp extends Http {
 
   constructor(
     backend: ConnectionBackend,
     defaultOptions: RequestOptions,
-    private windowRef: SkyAppWindowRef
+    private windowRef: SkyAppWindowRef,
+    private authTokenProvider: SkyAuthTokenProvider
   ) {
     super(backend, defaultOptions);
   }
@@ -36,7 +37,7 @@ export class SkyAuthHttp extends Http {
     url: string | Request,
     options?: RequestOptionsArgs
   ): Observable<Response> {
-    return Observable.fromPromise(BBAuth.getToken())
+    return Observable.fromPromise(this.authTokenProvider.getToken())
       .flatMap((token: string) => {
         let authOptions: Request | RequestOptionsArgs;
 

runtime/auth-token-provider.spec.ts

@@ -0,0 +1,22 @@
+import { BBAuth } from '@blackbaud/auth-client';
+
+import { SkyAuthTokenProvider } from './auth-token-provider';
+
+describe('Auth token provider', () => {
+
+  it('should call BBAuth.getToken and add return its promise', (done) => {
+    const expectedToken = 'my-fake-token';
+
+    spyOn(BBAuth, 'getToken')
+      .and
+      .returnValue(Promise.resolve(expectedToken));
+
+    const provider = new SkyAuthTokenProvider();
+
+    provider.getToken().then((token: string) => {
+      expect(token).toBe(expectedToken);
+      done();
+    });
+  });
+
+});

runtime/auth-token-provider.ts

@@ -0,0 +1,9 @@
+import { BBAuth } from '@blackbaud/auth-client';
+
+export class SkyAuthTokenProvider {
+
+  public getToken(): Promise<string> {
+    return BBAuth.getToken();
+  }
+
+}

runtime/index.ts

@@ -1,4 +1,6 @@
 export * from './auth-http';
+export * from './auth-token-provider';
 export * from './bootstrapper';
 export * from './config';
+export * from './search-results-provider';
 export * from './window-ref';

runtime/search-results-provider.ts

@@ -0,0 +1,5 @@
+export abstract class SkyAppSearchResultsProvider {
+
+  public abstract getSearchResults(searchArgs: { searchText: string }): Promise<any>;
+
+}

src/app/app.component.ts

@@ -1,6 +1,7 @@
 import {
   Component,
-  OnInit
+  OnInit,
+  Optional
 } from '@angular/core';
 
 import {
@@ -16,12 +17,17 @@ import {
   BBOmnibar,
   BBOmnibarConfig,
   BBOmnibarNavigation,
-  BBOmnibarNavigationItem
+  BBOmnibarNavigationItem,
+  BBOmnibarSearchArgs
 } from '@blackbaud/auth-client';
 
 import { BBHelp } from '@blackbaud/help-client';
 
-import { SkyAppConfig, SkyAppWindowRef } from '@blackbaud/skyux-builder/runtime';
+import {
+  SkyAppConfig,
+  SkyAppSearchResultsProvider,
+  SkyAppWindowRef
+} from '@blackbaud/skyux-builder/runtime';
 
 require('style!@blackbaud/skyux/dist/css/sky.css');
 require('style!./app.component.scss');
@@ -34,7 +40,8 @@ export class AppComponent implements OnInit {
   constructor(
     private router: Router,
     private windowRef: SkyAppWindowRef,
-    private config: SkyAppConfig
+    private config: SkyAppConfig,
+    @Optional() private searchProvider?: SkyAppSearchResultsProvider
   ) { }
 
   public ngOnInit() {
@@ -58,6 +65,14 @@ export class AppComponent implements OnInit {
     omnibarConfig.svcId = urlSearchParams.get('svcid');
   }
 
+  private setOnSearch(omnibarConfig: BBOmnibarConfig) {
+    if (this.searchProvider) {
+      omnibarConfig.onSearch = (searchArgs: BBOmnibarSearchArgs) => {
+        return this.searchProvider.getSearchResults(searchArgs);
+      };
+    }
+  }
+
   private setNav(omnibarConfig: BBOmnibarConfig) {
     const baseUrl =
       (
@@ -114,6 +129,7 @@ export class AppComponent implements OnInit {
 
       this.setParamsFromQS(omnibarConfig);
       this.setNav(omnibarConfig);
+      this.setOnSearch(omnibarConfig);
 
       BBOmnibar.load(omnibarConfig);
     }

test/sky-pages-module-generator.spec.js

@@ -78,7 +78,7 @@ describe('SKY UX Builder module generator', () => {
     const expectedProvider = `{
       provide: SkyAuthHttp,
       useClass: SkyAuthHttp,
-      deps: [XHRBackend, RequestOptions, SkyAppWindowRef]
+      deps: [XHRBackend, RequestOptions, SkyAppWindowRef, SkyAuthTokenProvider]
     }`;
 
     let source = generator.getSource({