Update id service with master

services/id.webmaker.org/.gitignore

@@ -6,3 +6,4 @@ public/tests/mocha*
 .env
 npm-debug*
 newrelic_agent.log
+package-lock.json

services/id.webmaker.org/.travis.yml

@@ -1,11 +1,12 @@
+dist: trusty
 language: node_js
 node_js:
-- '4.6'
+- '4'
 sudo: false
 cache:
   directories:
   - node_modules
 addons:
-  postgresql: "9.4"
+  postgresql: "9.6"
 before_script:
   - psql -c 'create database webmaker_oauth_test' -U postgres

services/id.webmaker.org/README.md

@@ -17,7 +17,6 @@
 1. Fork and clone this repository
 2. Navigate to the directory of the repository, e.g. `cd id.webmaker.org`
 3. `npm install` to install dependencies
-4. Set configuration variables, by default `cp sample.env .env` or `copy sample.env .env` on Windows
 5. `npm start`
 6. Navigate your browser to [`http://localhost:1234`](http://localhost:1234)
 
@@ -67,4 +66,4 @@ You can configure the following environment variables:
 
 ## Using OAuth2
 
-For information on creating an OAuth2 application that relies on this server, see [`docs/oauth.md`](https://github.com/mozilla/id.webmaker.org/blob/develop/docs/oauth.md).
+For information on creating an OAuth2 application that relies on this server, see [`docs/oauth.md`](docs/oauth.md).

services/id.webmaker.org/appveyor.yml

@@ -0,0 +1,32 @@
+version: "{build}"
+
+environment:
+  nodejs_version: "4"
+  DATABASE_URL: postgres://postgres:Password12!@localhost:5432/webmaker_oauth_test
+
+services:
+  - postgresql
+
+install:
+  - ps: Install-Product node $env:nodejs_version
+  - npm install
+
+before_test:
+  - SET PGUSER=postgres
+  - SET PGPASSWORD=Password12!
+  - PATH=C:\Program Files\PostgreSQL\9.6\bin\;%PATH%
+  - createdb webmaker_oauth_test
+
+test_script:
+  - node --version
+  - npm --version
+  - npm test
+
+build: off
+
+branches:
+
+  only:
+    - master
+
+clone_depth: 1

services/id.webmaker.org/package.json

@@ -14,6 +14,7 @@
     "jshint": "jshint -c node_modules/mofo-style/linters/.jshintrc lib test web webpack.config.js",
     "jsbeautify": "js-beautify lib test web *.js -r",
     "lint": "npm run jshint && npm run jscs",
+    "preinstall": "node scripts/ensure-env",
     "postinstall": "node scripts/build",
     "test:setup": "npm run test:droptables && npm run test:createtables && npm run test:insertdata",
     "test:droptables": "node scripts/drop-tables",
@@ -69,7 +70,6 @@
     "joi": "6.0.8",
     "jsx-loader": "0.12.2",
     "less": "1.7.5",
-    "newrelic": "1.20.1",
     "pass-test": "1.0.3",
     "pg": "4.3.0",
     "react": "0.12.2",
@@ -90,7 +90,7 @@
     "jscs": "1.11.3",
     "jshint": "2.6.3",
     "json-loader": "0.5.1",
-    "lab": "5.5.0",
+    "lab": "13.1.0",
     "less": "2.4.0",
     "mocha": "2.2.1",
     "mocha-phantomjs": "3.6.0",
@@ -100,6 +100,6 @@
     "phantomjs": "1.9.7-14"
   },
   "engines": {
-    "node": "^4.6.0"
+    "node": "^4.8.4"
   }
 }