Merge pull request #399 from Alfresco/development

3.1.0

Author: eromano

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alfresco/js-api",
-  "version": "3.0.0",
+  "version": "3.1.0",
   "description": "JavaScript client library for the Alfresco REST API",
   "author": "Alfresco Software, Ltd.",
   "main": "index.js",

src/api/content-rest-api/api/webscript.api.ts

@@ -48,7 +48,7 @@ export class WebscriptApi extends BaseApi {
      *
      * @returns {Promise} A promise that is resolved return the webScript data and {error} if rejected.
      */
-    executeWebScript(httpMethod: string, scriptPath: string, scriptArgs: string, contextRoot: string, servicePath: string, postBody?: any): Promise<any> {
+    executeWebScript(httpMethod: string, scriptPath: string, scriptArgs?: any, contextRoot?: string, servicePath?: string, postBody?: any): Promise<any> {
         contextRoot = contextRoot || 'alfresco';
         servicePath = servicePath || 'service';
         postBody = postBody || null;

src/api/gs-classification-rest-api/api/defaultClassificationValues.api.ts

@@ -17,7 +17,7 @@
 
 import { DeclassificationDate } from '../model/declassificationDate';
 import { BaseApi } from './base.api';
-import { DateAlfresco } from '../../../../dist/src/api/content-rest-api/model/dateAlfresco';
+import { DateAlfresco } from '../../../../src/api/content-rest-api/model/dateAlfresco';
 
 /**
 * Defaultclassificationvalues service.

src/api/gs-classification-rest-api/model/declassificationDate.ts

@@ -15,6 +15,6 @@
 * limitations under the License.
 */
 
-import { DateAlfresco } from '../../../../dist/src/api/content-rest-api/model/dateAlfresco';
+import { DateAlfresco } from '../../../../src/api/content-rest-api/model/dateAlfresco';
 
 export type DeclassificationDate = DateAlfresco;

src/authentication/oauth2Auth.ts

@@ -159,11 +159,14 @@ export class Oauth2Auth extends AlfrescoApiClient {
                     this.emit('discovery', this.discovery);
                     this.storage.setItem('discovery', JSON.stringify(this.discovery));
                     resolve(discovery);
-                },     (error) => {
+                }, (error) => {
+                    this.emit('error', error);
+                    this.storage.removeItem('discovery');
                     reject(error.error);
                 });
             } else {
                 this.emit('discovery', this.discovery);
+                this.storage.setItem('discovery', JSON.stringify(this.discovery));
                 resolve(this.discovery);
             }
         });
@@ -192,7 +195,7 @@ export class Oauth2Auth extends AlfrescoApiClient {
                         this.emit('jwks', jwks);
                         this.storage.setItem('jwks', JSON.stringify(jwks));
                         resolve(jwks);
-                    },     (error) => {
+                    }, (error) => {
                         reject(error.error);
                     });
                 } else {
@@ -236,7 +239,7 @@ export class Oauth2Auth extends AlfrescoApiClient {
                         this.silentRefresh();
                         resolve(accessToken);
                     }
-                },                                 (error) => {
+                }, (error) => {
                     reject('Validation JWT error' + error);
                 });
             } else {
@@ -520,7 +523,7 @@ export class Oauth2Auth extends AlfrescoApiClient {
         setTimeout(() => {
             this.destroyIframe();
             this.createIframe();
-        },         this.config.oauth2.refreshTokenTimeout);
+        }, this.config.oauth2.refreshTokenTimeout);
     }
 
     removeHashFromSilentIframe() {
@@ -577,11 +580,8 @@ export class Oauth2Auth extends AlfrescoApiClient {
     grantPasswordLogin(username: string, password: string, resolve: any, reject: any) {
         let postBody = {}, pathParams = {}, queryParams = {};
 
-        let authHeader = this.basicAuth(this.authentications.basicAuth.username, this.authentications.basicAuth.password);
-
         let headerParams = {
-            'Content-Type': 'application/x-www-form-urlencoded',
-            'Authorization': authHeader
+            'Content-Type': 'application/x-www-form-urlencoded'
         };
 
         let formParams = {
@@ -606,7 +606,7 @@ export class Oauth2Auth extends AlfrescoApiClient {
                 resolve(data);
             },
             (error) => {
-                if (error.error.status === 401) {
+                if (error.error && error.error.status === 401) {
                     this.emit('unauthorized');
                 }
                 this.emit('error');