From a6e55069ecd30be3e2c8932af4fe5a7529a78942 Mon Sep 17 00:00:00 2001 From: nicgirault Date: Wed, 17 Feb 2016 00:13:20 +0100 Subject: [PATCH] Fixes #8 --- bower.json | 2 +- dist/angular-trello-api-client-min.js | 2 +- dist/angular-trello-api-client.js | 2 +- package.json | 8 ++++---- src/provider.coffee | 1 + 5 files changed, 8 insertions(+), 7 deletions(-) diff --git a/bower.json b/bower.json index e3cc25d..0c46d9f 100644 --- a/bower.json +++ b/bower.json @@ -2,7 +2,7 @@ "name": "angular-trello-api-client", "main": "dist/angular-trello-api-client.js", "homepage": "https://github.com/nicgirault/angular-trello-api-client", - "version": "2.1.0", + "version": "2.1.1", "authors": [ "nicgirault " ], diff --git a/dist/angular-trello-api-client-min.js b/dist/angular-trello-api-client-min.js index 8f362df..34b5633 100644 --- a/dist/angular-trello-api-client-min.js +++ b/dist/angular-trello-api-client-min.js @@ -1 +1 @@ -angular.module("trello-api-client",["satellizer"]),angular.module("trello-api-client").constant("TrelloClientConfig",{key:null,appName:null,authEndpoint:"https://trello.com",apiEndpoint:"https://api.trello.com",intentEndpoint:"https://trello.com",version:1,tokenExpiration:"never",scope:["read","write","account"],localStorageTokenName:"trello_token",returnUrl:window.location.origin}),angular.module("trello-api-client").factory("TrelloInterceptor",["$q","SatellizerShared","TrelloClientConfig",function(e,t,n){return{request:function(e){var t;return e.trelloRequest?(t=localStorage.getItem(n.localStorageTokenName),null!=t&&(null==e.params&&(e.params={}),e.params.key=n.key,e.params.token=t),e):e},responseError:function(t){return e.reject(t)}}}]).config(["$httpProvider",function(e){return e.interceptors.push("TrelloInterceptor")}]),angular.module("trello-api-client").provider("TrelloClient",function(e,t){this.init=function(n){return null!=n?(angular.extend(t,n),e.httpInterceptor=function(e){return!1},e.oauth2({name:t.appName,key:t.key,returnUrl:t.returnUrl,authorizationEndpoint:t.authEndpoint+"/"+t.version+"/authorize",defaultUrlParams:["response_type","key","return_url","expiration","scope","name"],requiredUrlParams:null,optionalUrlParams:null,scope:t.scope,scopeDelimiter:",",type:"redirect",popupOptions:t.popupOptions,responseType:"token",expiration:t.tokenExpiration})):void 0},this.$get=function(e,n,r,o,l){var a,i,u,p,c,s,m;for(i=t.apiEndpoint+"/"+t.version,a={},a.authenticate=function(){return o.authenticate(t.appName).then(function(e){return localStorage.setItem(t.localStorageTokenName,e.token),e})},m=["get","post","put","delete"],u=function(e){return a[e]=function(r,o){var a;return null==o&&(o={}),o.trelloRequest=!0,a=l.defer(),null==localStorage.getItem(t.localStorageTokenName)?a.reject("Not authenticated"):n[e](i+r,o).then(function(e){return a.resolve(e)}),a.promise}},p=0,c=m.length;c>p;p++)s=m[p],u(s);return a}}); \ No newline at end of file +angular.module("trello-api-client",["satellizer"]),angular.module("trello-api-client").constant("TrelloClientConfig",{key:null,appName:null,authEndpoint:"https://trello.com",apiEndpoint:"https://api.trello.com",intentEndpoint:"https://trello.com",version:1,tokenExpiration:"never",scope:["read","write","account"],localStorageTokenName:"trello_token",returnUrl:window.location.origin}),angular.module("trello-api-client").factory("TrelloInterceptor",["$q","SatellizerShared","TrelloClientConfig",function(e,t,n){return{request:function(e){var t;return e.trelloRequest?(t=localStorage.getItem(n.localStorageTokenName),null!=t&&(null==e.params&&(e.params={}),e.params.key=n.key,e.params.token=t),e):e},responseError:function(t){return e.reject(t)}}}]).config(["$httpProvider",function(e){return e.interceptors.push("TrelloInterceptor")}]),angular.module("trello-api-client").provider("TrelloClient",function(e,t){this.init=function(n){return null!=n?(angular.extend(t,n),e.httpInterceptor=function(e){return!1},e.oauth2({name:t.appName,key:t.key,returnUrl:t.returnUrl,authorizationEndpoint:t.authEndpoint+"/"+t.version+"/authorize",defaultUrlParams:["response_type","key","return_url","expiration","scope","name"],requiredUrlParams:null,optionalUrlParams:null,scope:t.scope,scopeDelimiter:",",type:"redirect",popupOptions:t.popupOptions,responseType:"token",expiration:t.tokenExpiration})):void 0},this.$get=function(e,n,r,o,l){var a,i,u,p,c,s,m;for(i=t.apiEndpoint+"/"+t.version,a={},a.authenticate=function(){return o.authenticate(t.appName).then(function(e){return localStorage.setItem(t.localStorageTokenName,e.token),e})},m=["get","post","put","delete"],u=function(e){return a[e]=function(r,o){var a;return null==o&&(o={}),o.trelloRequest=!0,a=l.defer(),null==localStorage.getItem(t.localStorageTokenName)?a.reject("Not authenticated"):n[e](i+r,o).then(function(e){return a.resolve(e)})["catch"](a.reject),a.promise}},p=0,c=m.length;c>p;p++)s=m[p],u(s);return a}}); \ No newline at end of file diff --git a/dist/angular-trello-api-client.js b/dist/angular-trello-api-client.js index 2f362e4..ac00613 100644 --- a/dist/angular-trello-api-client.js +++ b/dist/angular-trello-api-client.js @@ -91,7 +91,7 @@ angular.module('trello-api-client').provider('TrelloClient', function($authProvi } else { $http[method](baseURL + endpoint, config).then(function(response) { return deferred.resolve(response); - }); + })["catch"](deferred.reject); } return deferred.promise; }; diff --git a/package.json b/package.json index b3d8659..3aa0847 100644 --- a/package.json +++ b/package.json @@ -1,14 +1,14 @@ { "name": "angular-trello-api-client", - "version": "2.1.0", + "version": "2.1.1", "description": "", "main": "gulpfile.js", "dependencies": { - "gulp-concat": "^2.6.0" + "gulp-concat": "2.6.0" }, "devDependencies": { - "gulp": "^3.9.0", - "gulp-coffee": "^2.3.1", + "gulp": "3.9.0", + "gulp-coffee": "2.3.1", "gulp-minify": "0.0.5" }, "scripts": { diff --git a/src/provider.coffee b/src/provider.coffee index f6c3d58..14c95ad 100644 --- a/src/provider.coffee +++ b/src/provider.coffee @@ -41,6 +41,7 @@ angular.module 'trello-api-client' $http[method] baseURL + endpoint, config .then (response) -> deferred.resolve response + .catch deferred.reject deferred.promise