Merge branch 'develop'

.npmignore

@@ -1,2 +1,3 @@
-lib
-Gruntfile.js
+/Gruntfile.js
+src
+tests

package.json

@@ -8,7 +8,7 @@
     "type": "git",
     "url": "https://github.com/oauth-io/oauthd"
   },
-  "licenses": "AGPLv3",
+  "licenses": "Apache2",
   "main": "index.js",
   "engines": {
     "node": ">= 0.8.0"

providers/uber/conf.json

@@ -0,0 +1,30 @@
+{
+	"name": "Uber",
+	"desc": "Uber connects riders with safe, reliable, convenient transportation providers at a variety of price-points in cities around the world.",
+	"url": "https://login.uber.com/oauth",
+	"oauth2": {
+		"authorize": "/authorize",
+		"access_token": "/token",
+		"request": {
+			"url": "https://api.uber.com",
+			"cors": true
+		},
+		"refresh": "/token",
+		"parameters": {
+			"client_secret": "string",
+			"client_id": "string",
+			"scope": {
+				"values": {
+					"profile": "Access the basic profile information on a user's Uber account including their first name, email address, and profile picture.",
+					"history": "Pull trip data including the locations, times, and product type of a user's historical pickups and drop-offs."
+				}
+			}
+		}
+	},
+	"href": {
+		"keys": "https://login.uber.com/applications/new",
+		"docs": "https://developer.uber.com/v1/api-reference/",
+		"apps": "https://login.uber.com/applications",
+		"provider": "https://uber.com/"
+	}
+}

providers/uber/me.js

@@ -0,0 +1,14 @@
+var me = {
+
+    url: '/v1/me',
+    params: {},
+    fields: {
+        name: '=',
+        firstname: 'first_name',
+        lastname: 'last_name',
+        avatar: 'picture',
+        email: '=',
+    }
+};
+
+module.exports = me;

providers/uber/settings.json

@@ -0,0 +1,27 @@
+{
+    "settings": {
+        "createApp": {
+            "url": "https://login.uber.com/applications/new",
+        },
+        "copyingKey": {
+            "url": "https://login.uber.com/applications",
+        },
+        "install": {
+            "href": {
+                "provider": "https://uber.com/",
+                "docs": "https://developer.uber.com/v1/api-reference/"
+            }
+        },
+        "sample": {
+            "method": "get",
+            "url": "/v1/me"
+        },
+        "endpoints": {
+            "me": {
+                "method": "get",
+                "url": "/v1/me"
+            }
+        },
+        "jsfiddle": "http://jsfiddle.net/willjcksn/2hb6B/embedded/"
+    }
+}

providers/vk/conf.json

@@ -31,7 +31,7 @@
 			"scope": {
 				"separator": ",",
 				"values": {
-					"notify": "The user allows receiving notifications.",
+					"notify": "User allowed to send notifications to him/her.",
 					"friends": "Access to friends.",
 					"photos": "Access to photos.",
 					"audio": "Access to audio files.",
@@ -44,12 +44,12 @@
 					"questions": "Access to questions (outdated methods).",
 					"wall": "Access to standard and advanced methods for working with the wall.",
 					"groups": "Access to user groups",
-					"stats": "Access to statistics of user groups and applications where he/she is an administrator.",
 					"messages": "(for Standalone applications) Access to advanced methods for working with messages.",
-					"notifications": "Access to the notifications",
-					"stats": "Statistics access to the user's groups and applications",
-					"offline": "Access to API at any time from an external server.",
-					"ads": "Access to advanced methods for Ads API."
+					"email": "User e-mail access. Available only for sites.",
+					"notifications": "Access to notifications about answers to the user.",
+					"stats": "Access to statistics of user groups and applications where he/she is an administrator.",
+					"ads": "Access to advanced methods for Ads API.",
+					"offline": "Access to API at any time from an external server."
 				}
 			}
 		}

providers/zendesk/conf.json

@@ -0,0 +1,37 @@
+{
+	"name": "Zendesk",
+	"desc": "Zendesk is a beautiful, lightweight help desk solution. Use Zendesk's API to easily manage your users, enhance your support team's productivity and create seamless integrations.",
+	"url": "https://{subdomain}.zendesk.com/oauth",
+	"oauth2": {
+		"authorize": {
+			"url": "/authorizations/new",
+			"query": {
+				"client_id": "{client_id}",
+				"response_type": "code",
+				"redirect_uri": "{{callback}}",
+				"state": "{{state}}",
+				"scope": "{scope}"
+			}
+		},
+		"access_token": {
+			"url": "/tokens",
+			"extra": ["scope"]
+		},
+		"refresh": "/tokens",
+		"parameters": {
+			"subdomain": "string",
+			"client_secret": "string",
+			"client_id": "string",
+			"scope": {
+				"values": {
+					"read": "Read access on data.",
+					"write": "Write access on data."
+				}
+			}
+		}
+	},
+	"href": {
+		"docs": "http://developer.zendesk.com",
+		"provider": "http://zendesk.com/"
+	}
+}

providers/zendesk/settings.json

@@ -0,0 +1,14 @@
+{
+    "settings": {
+        "install": {
+            "href": {
+                "provider": "http://zendesk.com/",
+                "docs": "http://developer.zendesk.com"
+            }
+        },
+        "sample": {
+            "method": "get",
+            "url": "/api/v2/users/me"
+        }
+    }
+}

src/cli/plugins.coffee

@@ -321,7 +321,8 @@ module.exports = (args, options) ->
 
 		if args[0]?
 			console.log 'Unknown command: ' + args[0].yellow
-		@help()
+		if not options.help
+			@help()
 		return main_defer.promise