Merge pull request #25 from seegno/feature/replace-ipcookies-with-ngcookies

Replace ipCookie with ngCookies

Author: ruipenso

README.md

@@ -17,7 +17,7 @@ Choose your preferred method:
 ###### 1. Download `angular-oauth2` dependencies.
 
 * [angular](https://github.com/angular/angular.js)
-* [angular-cookie](https://github.com/ivpusic/angular-cookie)
+* [angular-cookies](https://github.com/angular/bower-angular-cookies)
 * [query-string](https://github.com/sindresorhus/query-string)
 
 If you're using `bower` they will be automatically downloaded upon installing this library.
@@ -26,7 +26,7 @@ If you're using `bower` they will be automatically downloaded upon installing th
 
 ```html
 <script src="<VENDOR_FOLDER>/angular/angular.min.js"></script>
-<script src="<VENDOR_FOLDER>/angular-cookie/dist/angular-cookie.min.js"></script>
+<script src="<VENDOR_FOLDER>/angular-cookies/angular-cookies.min.js"></script>
 <script src="<VENDOR_FOLDER>/query-string/query-string.min.js"></script>
 <script src="<VENDOR_FOLDER>/angular-oauth2/dist/angular-oauth2.min.js"></script>
 ```
@@ -146,7 +146,8 @@ OAuth.revokeToken()
 
 #### OAuthTokenProvider
 
-`OAuthTokenProvider` uses [angular-cookie](https://github.com/ivpusic/angular-cookie) to store the cookies. Check the [available options](https://github.com/ivpusic/angular-cookie#options).
+`OAuthTokenProvider` uses [angular-cookies](https://github.com/angular/bower-angular-cookies) to store the cookies. Check the [available options](https://code.angularjs.org/1.4.0/docs/api/ngCookies/service/$cookies).
+**BREAKING CHANGE**: `angular-oauth2` requires angular 1.4 or above in order to store cookies with additional options.
 
 Configuration defaults:
 

bower.json

@@ -23,8 +23,8 @@
     "test"
   ],
   "dependencies": {
-    "angular": "^1.3.9",
-    "angular-cookie": "^4.0.6",
+    "angular": "^1.4.0",
+    "angular-cookies": "^1.4.0",
     "query-string": "^1.0.0"
   }
 }

karma.conf.js

@@ -9,7 +9,7 @@ module.exports = function(config) {
     browsers: ['Chrome'],
     files: [
       'bower_components/angular/angular.js',
-      'bower_components/angular-cookie/angular-cookie.js',
+      'bower_components/angular-cookies/angular-cookies.js',
       'bower_components/query-string/query-string.js',
       'node_modules/lodash/dist/lodash.js',
       'node_modules/angular-mocks/angular-mocks.js',

package.json

@@ -47,7 +47,7 @@
   },
   "browser": {
     "angular": "./bower_components/angular/angular.js",
-    "angular-cookie": "./bower_components/angular-cookie/angular-cookie.js",
+    "angular-cookies": "./bower_components/angular-cookies/angular-cookies.js",
     "query-string": "./bower_components/query-string/query-string.js"
   },
   "browserify-shim": {

src/angular-oauth2.js

@@ -8,10 +8,10 @@ import OAuthProvider from './providers/oauth-provider';
 import OAuthTokenProvider from './providers/oauth-token-provider';
 import oauthConfig from './config/oauth-config';
 import oauthInterceptor from './interceptors/oauth-interceptor';
-import 'angular-cookie';
+import 'angular-cookies';
 
 var ngModule = angular.module('angular-oauth2', [
-    'ipCookie'
+    'ngCookies'
   ])
   .config(oauthConfig)
   .factory('oauthInterceptor', oauthInterceptor)

src/providers/oauth-token-provider.js

@@ -41,23 +41,23 @@ function OAuthTokenProvider() {
    * @ngInject
    */
 
-  this.$get = function(ipCookie) {
+  this.$get = function($cookies) {
     class OAuthToken {
 
       /**
        * Set token.
        */
 
       setToken(data) {
-        return ipCookie(config.name, data, config.options);
+        return $cookies.putObject(config.name, data, config.options);
       }
 
       /**
        * Get token.
        */
 
       getToken() {
-        return ipCookie(config.name);
+        return $cookies.getObject(config.name);
       }
 
       /**
@@ -101,7 +101,7 @@ function OAuthTokenProvider() {
        */
 
       removeToken() {
-        return ipCookie.remove(config.name, angular.copy(config.options));
+        return $cookies.remove(config.name, config.options);
       }
     }
 

test/mocks/angular-cookies.mock.js

@@ -4,24 +4,20 @@
  */
 
 angular.module('angular-cookies.mock', [])
-  .factory('ipCookie', function() {
-    return (function () {
-      var cookie;
+  .provider('$cookies', function() {
+    this.$get = function() {
+      var cookieStore = {};
 
-      function cookieFun(key, value, options) {
-        if (undefined !== value) {
-          cookie = value;
+      return {
+        getObject: function(key) {
+          return cookieStore[key];
+        },
+        putObject: function(key, value, options) {
+          cookieStore[key] = value;
+        },
+        remove: function(key) {
+          delete cookieStore[key];
         }
-
-        return cookie;
       }
-
-      cookieFun.remove = function(key, options) {
-        cookie = undefined;
-
-        return;
-      };
-
-      return cookieFun;
-    }());
+    }
   });