Add oauth2_CallbackPort

Gruntfile.js

@@ -2,7 +2,6 @@ module.exports = function (grunt) {
   grunt.loadNpmTasks('grunt-browserify');
   grunt.loadNpmTasks('grunt-contrib-watch');
   grunt.loadNpmTasks('grunt-git-authors');
-  grunt.loadNpmTasks('grunt-retire');
 
   grunt.initConfig({
 
@@ -24,16 +23,10 @@ module.exports = function (grunt) {
         files: ['client/*.coffee'],
         tasks: ['build']
       }
-    },
 
-    retire: {
-      node: ['.'],
-      options: {packageOnly: true}
     }
-
   });
 
-  grunt.registerTask('check', ['retire']);
   grunt.registerTask('build', ['browserify']);
   grunt.registerTask('default', ['build']);
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "wiki-security-passportjs",
-  "version": "0.5.0",
+  "version": "0.6.1",
   "description": "Security plugin for Federated Wiki, using passport.js",
   "author": "Paul Rodwell <paul.rodwell@btinternet.com> (http://rodwell.me)",
   "license": "MIT",
@@ -22,8 +22,7 @@
     "grunt": "^1.2.1",
     "grunt-browserify": "^6.0.0",
     "grunt-contrib-watch": "^1.0.0",
-    "grunt-git-authors": "^3.2.0",
-    "grunt-retire": "^1.0.8"
+    "grunt-git-authors": "^3.2.0"
   },
   "repository": {
     "type": "git",

server/social.coffee

@@ -53,6 +53,8 @@ module.exports = exports = (log, loga, argv) ->
       callbackHost = callbackHost + ":" + url.parse(argv.url).port
   else
     callbackHost = url.parse(argv.url).host
+    if argv.oauth2_CallbackPort?
+      callbackHost = callbackHost + ":" + argv.oauth2_CallbackPort
 
   ids = []