Update module

.circleci/config.yml

@@ -1,30 +1,38 @@
-# Javascript Node CircleCI 2.0 configuration file
-#
-# Check https://circleci.com/docs/2.0/language-javascript/ for more details
-#
 version: 2
 jobs:
   build:
     docker:
-      # specify the version you desire here
-      - image: circleci/node:8.4
-
+      - image: circleci/node
     steps:
+      # Checkout repository
       - checkout
 
-      # Download and cache dependencies
+      # Restore cache
       - restore_cache:
-          keys:
-          - v1-dependencies-{{ checksum "package.json" }}
-          # fallback to using the latest cache if no exact match is found
-          - v1-dependencies-
+          key: yarn-cache-{{ checksum "yarn.lock" }}
 
-      - run: yarn install
+      # Install dependencies
+      - run:
+          name: Install Dependencies
+          command: NODE_ENV=dev yarn
 
+      # Keep cache
       - save_cache:
+          key: yarn-cache-{{ checksum "yarn.lock" }}
           paths:
-            - node_modules
-          key: v1-dependencies-{{ checksum "package.json" }}
+            - "node_modules"
+
+      # Lint
+      - run:
+          name: Lint
+          command: yarn lint
+
+      # Tests
+      - run:
+          name: Tests
+          command: yarn jest
 
-      # run tests!
-      - run: yarn test
+      # Coverage
+      - run:
+          name: Coverage
+          command: yarn codecov

.eslintignore

@@ -0,0 +1,8 @@
+# Common
+node_modules
+dist
+.nuxt
+coverage
+
+# Plugin
+lib/plugin.js

.eslintrc.js

@@ -1,6 +1,7 @@
 module.exports = {
   root: true,
   parserOptions: {
+    parser: 'babel-eslint',
     sourceType: 'module'
   },
   env: {
@@ -24,7 +25,6 @@ module.exports = {
     'no-console': 2
   },
   globals: {
-    'jest/globals': true,
-    jasmine: true
+    'jest/globals': true
   }
 }

.gitignore

@@ -4,6 +4,6 @@ node_modules
 *.log*
 .nuxt
 .vscode
-.DS_STORE
+.DS_Store
 coverage
-dist
+dist

README.md

@@ -18,10 +18,10 @@
 
     // With options
     ['nuxt-csrf', {
-      sessionName: 'myCSRFSession', 
+      sessionName: 'myCSRFSession',
       secretKey: process.env.SECRET_KEY,
       headerName: 'X-MY-CSRF-HEADER'
     }],
  ]
 }
-```
+```

babel.config.js

@@ -0,0 +1,12 @@
+module.exports = {
+  presets: [
+    [
+      '@babel/preset-env', {
+        targets: {
+          esmodules: true,
+          node: 'current'
+        }
+      }
+    ]
+  ]
+}

test/fixture/nuxt.config.js → example/nuxt.config.js

@@ -1,11 +1,15 @@
+const { resolve } = require('path')
+
 module.exports = {
+  rootDir: resolve(__dirname, '..'),
+  buildDir: resolve(__dirname, '.nuxt'),
   srcDir: __dirname,
   dev: false,
   render: {
     resourceHints: false
   },
   modules: [
-    '@@'
+    { handler: require('../') }
   ],
   csrf: {
     sessionName: 'nuxtSession',

example/store/csrf.js

@@ -0,0 +1,3 @@
+export const state = () => ({
+  token: ""
+})

jest.config.js

@@ -0,0 +1,14 @@
+module.exports = {
+  testEnvironment: 'node',
+  collectCoverage: false,
+  moduleNameMapper: {
+    '^~/(.*)$': '<rootDir>/lib/$1',
+    '^~~$': '<rootDir>',
+    '^@@$': '<rootDir>',
+    '^@/(.*)$': '<rootDir>/example/$1'
+  },
+  transform: {
+    "^.+\\.js$": "<rootDir>/node_modules/babel-jest",
+    ".*\\.(vue)$": "<rootDir>/node_modules/vue-jest"
+  }
+}

lib/module.js

@@ -1,15 +1,18 @@
 const { resolve } = require('path')
 const serverMiddleware = require('./server-middleware')
 
-module.exports = async function module (moduleOptions) {
-  const options = Object.assign({}, moduleOptions, this.options.csrf)
+module.exports = async function (moduleOptions) {
+  const options = {
+    ...this.options['csrf'],
+    ...moduleOptions
+  }
 
   // Setup middleware
   this.addServerMiddleware(serverMiddleware(options))
 
   // Setup store
   this.addPlugin({
-    src: resolve(__dirname, '../templates/plugin.js'),
+    src: resolve(__dirname, './plugin.js'),
     fileName: 'nuxt-csrf.js',
     options
   })
@@ -19,3 +22,5 @@ module.exports = async function module (moduleOptions) {
   this.options.router.middleware = this.options.router.middleware || []
   this.options.router.middleware.push('csrf')
 }
+
+module.exports.meta = require('../package.json')

lib/plugin.js

@@ -0,0 +1,19 @@
+import middleware from '@/.nuxt/middleware'
+
+const moduleName = 'csrf'
+
+export default async function (context) {
+  const initStore = context => {
+    if (process.client) return
+    context.store.registerModule(moduleName, {
+      namespaced: true,
+      state: {
+        token: (context.req && context.req.csrfToken)
+      }
+    })
+  }
+
+  middleware.csrf = async context => {
+    initStore(context)
+  }
+}

lib/server-middleware.js

@@ -13,33 +13,35 @@ const createError = (code, message, original) => {
 const tokens = new Tokens()
 const safeMethods = /GET|HEAD|OPTIONS|TRACE/i
 
-function CSRFSession({ sessionName, secretKey, headerName = 'x-csrf-token' }) {
-  this.sessionName = sessionName
-  this.secretKey = secretKey
-  this.headerName = headerName
-}
-
-CSRFSession.prototype.createSession = (req, res) => {
-  const session = sessions({
-    cookieName: this.sessionName,
-    secret: this.secretKey,
-    duration: 60 * 60 * 1000 // 60 mins
-  })
-  return new Promise(resolve => session(req, res, resolve))
-}
-
-CSRFSession.prototype.initCSRF = async (req, res) => {
-  await this.createSession(req, res, this.sessionName)
-  const secret = req[this.sessionName].csrfSecret || await tokens.secret()
-  req.csrfToken = tokens.create(secret)
-  req[this.sessionName].csrfSecret = secret
-  return secret
-}
-
-CSRFSession.prototype.verify = (req) => {
-  const token = req.headers[this.headerName]
-  const { csrfSecret: secret } = req[this.sessionName]
-  return tokens.verify(secret, token)
+class CSRFSession {
+  constructor ({ sessionName, secretKey, headerName = 'x-csrf-token' }) {
+    this.sessionName = sessionName
+    this.secretKey = secretKey
+    this.headerName = headerName
+  }
+
+  createSession (req, res) {
+    const session = sessions({
+      cookieName: this.sessionName,
+      secret: this.secretKey,
+      duration: 60 * 60 * 1000 // 60 mins
+    })
+    return new Promise(resolve => session(req, res, resolve))
+  }
+
+  async initCSRF (req, res) {
+    await this.createSession(req, res, this.sessionName)
+    const secret = req[this.sessionName].csrfSecret || await tokens.secret()
+    req.csrfToken = tokens.create(secret)
+    req[this.sessionName].csrfSecret = secret
+    return secret
+  }
+
+  verify (req) {
+    const token = req.headers[this.headerName]
+    const { csrfSecret: secret } = req[this.sessionName]
+    return tokens.verify(secret, token)
+  }
 }
 
 module.exports = options => async (req, res, next) => {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "nuxt-csrf",
-  "version": "0.0.0",
+  "version": "1.0.0",
   "description": "Add some good old CSRF to your Nuxt app",
   "license": "MIT",
   "contributors": [
@@ -14,30 +14,39 @@
     "access": "public"
   },
   "scripts": {
+    "dev": "nuxt example",
     "lint": "eslint lib test",
-    "test": "npm run lint && jest",
+    "test": "jest",
     "release": "standard-version && git push --follow-tags && npm publish"
   },
-  "eslintIgnore": [
-    "lib/templates/*.*"
-  ],
   "files": [
     "lib"
   ],
-  "jest": {
-    "testEnvironment": "node",
-    "coverageDirectory": "./coverage/",
-    "collectCoverage": true,
-    "collectCoverageFrom": [
-      "lib",
-      "test"
-    ]
-  },
   "dependencies": {
     "client-sessions": "^0.8.0",
     "csrf": "^3.0.6"
   },
   "devDependencies": {
-    "nuxt-module-builder": "latest"
+    "@babel/core": "latest",
+    "@babel/preset-env": "latest",
+    "@nuxtjs/eslint-config": "latest",
+    "babel-eslint": "latest",
+    "babel-jest": "latest",
+    "codecov": "latest",
+    "eslint": "latest",
+    "eslint-config-standard": "latest",
+    "eslint-plugin-import": "latest",
+    "eslint-plugin-jest": "latest",
+    "eslint-plugin-node": "latest",
+    "eslint-plugin-promise": "latest",
+    "eslint-plugin-standard": "latest",
+    "eslint-plugin-vue": "latest",
+    "get-port": "latest",
+    "jest": "latest",
+    "node-fetch": "^2.3.0",
+    "nuxt-edge": "^2.6.0-25901287.3eec1152",
+    "request": "latest",
+    "standard-version": "latest",
+    "vue-jest": "latest"
   }
 }

renovate.json

@@ -0,0 +1,5 @@
+{
+  "extends": [
+    "@nuxtjs"
+  ]
+}