From 66e6df4e2af0ace0dbb3a7b22e350d818323278e Mon Sep 17 00:00:00 2001
From: Will Abson <will.abson@gmail.com>
Date: Fri, 3 Jun 2016 18:20:06 +0100
Subject: [PATCH] Use new API client in search

---
 ng2-components/ng2-alfresco-search/README.md    |  2 +-
 .../ng2-alfresco-search/demo/index.html         |  2 +-
 ng2-components/ng2-alfresco-search/package.json |  2 +-
 .../src/services/alfresco.service.ts            | 17 +++--------------
 4 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/ng2-components/ng2-alfresco-search/README.md b/ng2-components/ng2-alfresco-search/README.md
index bada1c4af8..91a4bf8635 100644
--- a/ng2-components/ng2-alfresco-search/README.md
+++ b/ng2-components/ng2-alfresco-search/README.md
@@ -210,7 +210,7 @@ Make sure your `systemjs.config` has the following configuration:
 You must also add the following dependency to your index.html:
 
 ```html
-<script src="node_modules/alfresco-core-rest-api/bundle.js"></script>
+<script src="node_modules/alfresco-js-api/bundle.js"></script>
 ```
 
 #### Style
diff --git a/ng2-components/ng2-alfresco-search/demo/index.html b/ng2-components/ng2-alfresco-search/demo/index.html
index 04401c5b55..ba3080f55e 100644
--- a/ng2-components/ng2-alfresco-search/demo/index.html
+++ b/ng2-components/ng2-alfresco-search/demo/index.html
@@ -21,7 +21,7 @@
     <script src="node_modules/angular2/bundles/angular2.dev.js"></script>
     <script src="node_modules/angular2/bundles/router.dev.js"></script>
     <script src="node_modules/angular2/bundles/http.dev.js"></script>
-    <script src="node_modules/alfresco-core-rest-api/bundle.js"></script>
+    <script src="node_modules/alfresco-js-api/bundle.js"></script>
 
     <script>
         System.config({
diff --git a/ng2-components/ng2-alfresco-search/package.json b/ng2-components/ng2-alfresco-search/package.json
index 7b57a85228..06f2b7b6c5 100644
--- a/ng2-components/ng2-alfresco-search/package.json
+++ b/ng2-components/ng2-alfresco-search/package.json
@@ -52,7 +52,7 @@
     "rxjs": "5.0.0-beta.2",
     "zone.js": "^0.6.12",
     "es6-module-loader": "^0.17.8",
-    "alfresco-core-rest-api": "^0.1.0"
+    "alfresco-js-api": "^0.1.0"
   },
   "peerDependencies": {
     "angular2": "2.0.0-beta.15"
diff --git a/ng2-components/ng2-alfresco-search/src/services/alfresco.service.ts b/ng2-components/ng2-alfresco-search/src/services/alfresco.service.ts
index 218f3b379d..c6583362ba 100644
--- a/ng2-components/ng2-alfresco-search/src/services/alfresco.service.ts
+++ b/ng2-components/ng2-alfresco-search/src/services/alfresco.service.ts
@@ -30,9 +30,11 @@ declare let AlfrescoApi: any;
 export class AlfrescoService {
 
     private _baseUrlPath: string = '/alfresco/api/-default-/public/alfresco/versions/1';
+    private _alfrescoClient;
 
     constructor(private http: Http,
                 private settings: AlfrescoSettingsService) {
+        this._alfrescoClient = AlfrescoApi.getClientWithTicket(this.getBaseUrl(), this.getAlfrescoTicket());
     }
 
     public getHost(): string {
@@ -47,21 +49,8 @@ export class AlfrescoService {
         return localStorage.getItem('token');
     }
 
-    private getAlfrescoClient() {
-        let defaultClient = new AlfrescoApi.ApiClient();
-        defaultClient.basePath = this.getBaseUrl();
-
-        // Configure HTTP basic authorization: basicAuth
-        let basicAuth = defaultClient.authentications['basicAuth'];
-        basicAuth.username = 'ROLE_TICKET';
-        basicAuth.password = this.getAlfrescoTicket();
-
-        return defaultClient;
-    }
-
     private getSearchNodesPromise(term: string) {
-        let alfrescoClient = this.getAlfrescoClient();
-        let apiInstance = new AlfrescoApi.SearchApi(alfrescoClient);
+        let apiInstance = new AlfrescoApi.Core.SearchApi(this._alfrescoClient);
         let nodeId = '-root-';
         let opts = {
             include: ['path'],