Merged changes

Author: Halceyon

.eslintrc.js

@@ -8,16 +8,11 @@ module.exports = {
   env: {
     browser: true,
   },
-  // https://github.com/vuejs/eslint-plugin-vue#priority-a-essential-error-prevention
-  // consider switching to `plugin:vue/strongly-recommended` or `plugin:vue/recommended` for stricter rules.
   extends: ['airbnb-base'],
-  // required to lint *.vue files
-  // check if imports actually resolve
-  // add your custom rules here
   rules: {
     "linebreak-style": "off",
+    "indent": ["error", 2],
     'max-len': ["error", { "code": 250 }],
-    // don't require .vue extension when importing
     'import/extensions': ['error', 'always', {
       js: 'never',
     }],
@@ -36,6 +31,6 @@ module.exports = {
       optionalDependencies: ['test/unit/index.js']
     }],
     // allow debugger during development
-    'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off'
+    'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off',
   }
 }

.travis.yml

@@ -7,7 +7,6 @@ notifications:
   email:
     on_success: always
     on_failure: change
-
 cache:
   directories:
     - node_modules
@@ -16,6 +15,8 @@ node_js:
 install:
   - npm install
   - npm install -g codecov
+before_script:
+  - npm prune
 script:
   - npm run lint
   - npm run test:cover
@@ -24,12 +25,7 @@ after_success:
   - npm run coveralls
   - bash <(curl -s https://codecov.io/bash)
   - npm run publish:docs
-before_deploy:
-  - cd dist
-deploy:
-  provider: npm
-  email: [email protected]
-  skip_cleanup: true
-  api_key: $NPM_TOKEN
-  on:
-    branch: master
+  - npm run semantic-release
+branches:
+  except:
+    - /^v\d+\.\d+\.\d+$/

CHANGELOG.md

@@ -1,38 +1,3 @@
-## Babel Starter Kit Change Log
+## Change Log
 
 All notable changes to this project will be documented in this file.
-
-### [Unreleased][unreleased]
-
-- Allow to execute tests in a browser environment (PLANNED)
-
-### [v1.2.0] - 2016-05-04
-
-- Add `tools/build.js` script
-- Build source files into `dist` folder
-- Update npm modules
-- Publish as CommonJS, ES2015 and UMD via [Rollup](http://rollupjs.org/). See `tools/build.js`.
-
-### [v1.1.2] - 2016-04-03
-
-- Add `npm run test:watch` npm script for running tests in watch mode
-- Add a recipe: Testing with `mocha` and `jsdom` 
-- Add a recipe: Throwing errors with FB's `invariant` (`fbjs`) library
-- Update `eslint` and `babel-eslint` npm modules to the latest versions
-- Update unit test code sample
-- Add [CONTRIBUTING.md](CONTRIBUTING.md) and [CHANGELOG.md](CHANGELOG.md) files
-
-### [v1.1.0] - 2016-03-31
-
-- Add code coverage in unit tests with [Istanbul](https://github.com/gotwarlost/istanbul) and [Coveralls](https://coveralls.io/) [#8](https://github.com/kriasoft/babel-starter-kit/pull/8)
-
-### [v1.0.0] - 2016-03-30
-
-- Clean up the code and `package.json` file, update project dependencies
-- Integrate [Easystatic](https://easystatic.com) that generates a static site from the `docs/*.md` files
-
-[unreleased]: https://github.com/kriasoft/babel-starter-kit/compare/v1.2.0...HEAD
-[v1.2.0]: https://github.com/kriasoft/babel-starter-kit/compare/v1.1.2...v1.2.0
-[v1.1.2]: https://github.com/kriasoft/babel-starter-kit/compare/v1.1.0...v1.1.2
-[v1.1.0]: https://github.com/kriasoft/babel-starter-kit/compare/v1.0.0...v1.1.0
-[v1.0.0]: https://github.com/kriasoft/babel-starter-kit/compare/v0.1.1...v1.0.0

CONTRIBUTING.md

@@ -1,5 +1,7 @@
 # aspnet-auth
-[![GitHub license](https://img.shields.io/badge/license-MIT-blue.svg)](https://github.com/facebook/react/blob/master/LICENSE) [![codecov](https://codecov.io/gh/Halceyon/aspnet-auth/branch/master/graph/badge.svg)](https://codecov.io/gh/Halceyon/aspnet-auth) [![Build Status](https://travis-ci.org/Halceyon/aspnet-auth.svg?branch=master)](https://travis-ci.org/Halceyon/aspnet-auth) [![npm](https://img.shields.io/npm/dm/aspnet-auth.svg)](https://npm-stat.com/charts.html?package=aspnet-auth) [![npm](https://img.shields.io/npm/v/aspnet-auth.svg)](https://www.npmjs.com/package/aspnet-auth) [![Average time to resolve an issue](http://isitmaintained.com/badge/resolution/Halceyon/aspnet-auth.svg)](http://isitmaintained.com/project/Halceyon/aspnet-auth "Average time to resolve an issue") [![Percentage of issues still open](http://isitmaintained.com/badge/open/Halceyon/aspnet-auth.svg)](http://isitmaintained.com/project/Halceyon/aspnet-auth "Percentage of issues still open") 
+
+[![Greenkeeper badge](https://badges.greenkeeper.io/Halceyon/aspnet-auth.svg)](https://greenkeeper.io/)
+[![GitHub license](https://img.shields.io/badge/license-MIT-blue.svg)](https://github.com/Halceyon/aspnet-auth/blob/master/LICENSE.txt) [![codecov](https://codecov.io/gh/Halceyon/aspnet-auth/branch/master/graph/badge.svg)](https://codecov.io/gh/Halceyon/aspnet-auth) [![Build Status](https://travis-ci.org/Halceyon/aspnet-auth.svg?branch=master)](https://travis-ci.org/Halceyon/aspnet-auth) [![npm](https://img.shields.io/npm/dm/aspnet-auth.svg)](https://npm-stat.com/charts.html?package=aspnet-auth) [![npm](https://img.shields.io/npm/v/aspnet-auth.svg)](https://www.npmjs.com/package/aspnet-auth) [![Average time to resolve an issue](http://isitmaintained.com/badge/resolution/Halceyon/aspnet-auth.svg)](http://isitmaintained.com/project/Halceyon/aspnet-auth "Average time to resolve an issue") [![Percentage of issues still open](http://isitmaintained.com/badge/open/Halceyon/aspnet-auth.svg)](http://isitmaintained.com/project/Halceyon/aspnet-auth "Percentage of issues still open") 
 
 A standalone lightweight javascript library for authenticating with ASP.NET OWIN site.
 
@@ -32,7 +34,7 @@ const aspnetAuth = new AspnetAuth({
 
 **register**
 ```js
-aspnetAuth.register('[email protected]', 'SomePassword', 'SomePassword').then((result) => {
+aspnetAuth.register('[email protected]', 'SomePassword').then((result) => {
   // returns result.status = 200 on success
   done();
 })

README.md

@@ -1,7 +1,7 @@
 {
   "name": "aspnet-auth",
   "version": "1.0.1",
-  "description": "A standalone lightweight javascript library for authenticating with ASP.NET OWIN site.",
+  "description": "A standalone promise-based javascript library for authenticating with ASP.NET OWIN site.",
   "author": "Craig Pretorius <[email protected]>",
   "homepage": "https://halceyon.github.io/aspnet-auth",
   "repository": "Halceyon/aspnet-auth",
@@ -10,8 +10,8 @@
   ],
   "license": "MIT",
   "keywords": [],
-  "main": "aspnet-auth.js",
-  "jsnext:main": "aspnet-auth.es.js",
+  "main": "dist/aspnet-auth.js",
+  "jsnext:main": "dist/aspnet-auth.es.js",
   "babel": {
     "presets": [
       "latest",
@@ -26,7 +26,7 @@
     "extends": "airbnb-base"
   },
   "dependencies": {
-    "axios": "^0.17.1",
+    "axios": "^0.18.0",
     "babel-runtime": "^6.11.6",
     "browser-cookies": "^1.2.0",
     "qs": "^6.5.1",
@@ -35,39 +35,43 @@
   "devDependencies": {
     "babel-cli": "^6.16.0",
     "babel-core": "^6.17.0",
-    "babel-eslint": "^7.2.3",
+    "babel-eslint": "^8.2.2",
     "babel-plugin-transform-runtime": "^6.15.0",
     "babel-preset-latest": "^6.16.0",
     "babel-preset-stage-0": "^6.16.0",
     "babel-register": "^6.16.3",
     "chai": "^4.0.0-canary.1",
-    "coveralls": "^2.11.14",
-    "del": "^2.2.2",
+    "coveralls": "^3.0.0",
+    "del": "^3.0.0",
     "easystatic": "^0.1.12",
-    "eslint": "^3.8.0",
-    "eslint-config-airbnb-base": "^10.0.1",
+    "eslint": "^4.18.1",
+    "eslint-config-airbnb-base": "^12.1.0",
     "eslint-plugin-import": "^2.2.0",
     "faker": "^4.1.0",
     "istanbul": "^1.1.0-alpha.1",
     "json-stable-stringify": "^1.0.1",
     "json-stringify-safe": "^5.0.1",
-    "mocha": "^3.1.2",
+    "mocha": "^5.0.1",
     "parse-json": "^4.0.0",
-    "rollup": "^0.36.3",
-    "rollup-plugin-babel": "^2.6.1",
+    "rollup": "^0.56.2",
+    "rollup-plugin-babel": "^3.0.3",
     "semantic-release": "^12.4.1",
-    "sinon": "^2.0.0-pre.3",
-    "sinon-stub-promise": "^4.0.0"
+    "sinon": "^4.4.1",
+    "sinon-stub-promise": "^4.0.0",
+    "travis-deploy-once": "^4.3.4"
   },
   "scripts": {
     "lint": "eslint src test tools",
+    "lint-fix": "eslint src test tools --fix",
     "test": "mocha --compilers js:babel-register",
     "test:watch": "mocha --compilers js:babel-register --reporter min --watch",
     "test:cover": "babel-node ./node_modules/istanbul/lib/cli.js cover ./node_modules/mocha/bin/_mocha",
     "coveralls": "type ./coverage/lcov.info | coveralls",
     "build": "node tools/build",
     "prepublish": "npm run build",
     "publish:docs": "easystatic deploy docs --repo Halceyon/aspnet-auth",
-    "dev": "easystatic start docs"
+    "dev": "easystatic start docs",
+    "travis-deploy-once": "travis-deploy-once",
+    "semantic-release": "semantic-release"
   }
 }

package.json

@@ -14,7 +14,6 @@ const qs = require('qs');
 const stringify = require('json-stable-stringify');
 
 class AspnetAuth {
-
   constructor(options) {
     const defaults = {
       url: '',
@@ -63,13 +62,12 @@ class AspnetAuth {
       client_id: this.options.client_id,
       client_secret: this.options.client_secret,
       grant_type: 'password',
-    }),
-    )
-    .then((response) => {
-      this.saveAuth(response.data);
-      this.fillAuth();
-      return response;
-    });
+    }))
+      .then((response) => {
+        this.saveAuth(response.data);
+        this.fillAuth();
+        return response;
+      });
   }
 
   loginExternal(tokenRequest) {

src/AspnetAuth.js

@@ -12,6 +12,6 @@
     ],
     "no-unused-expressions": "off",
     "padded-blocks": "off",
-    "no-console": "off",
+    "no-console": "off"
   }
 }

test/.eslintrc

@@ -102,13 +102,13 @@ describe('AspnetAuth', () => {
     aspnetAuth.loginExternal({
       token: '',
     })
-    .then((response) => {
-      done();
-      expect(response.data.access_token).to.eq('175f0a68e51a420eb27ec707a53cce70');
-    })
-    .catch((err) => {
-      console.log(err);
-    });
+      .then((response) => {
+        done();
+        expect(response.data.access_token).to.eq('175f0a68e51a420eb27ec707a53cce70');
+      })
+      .catch((err) => {
+        console.log(err);
+      });
 
     axios.get.restore();
   });