Merge pull request #54 from dirkcuys/master

Update postgres example

Author: mjsalinger

examples/postgresql/index.js

@@ -5,7 +5,7 @@
 
 var bodyParser = require('body-parser');
 var express = require('express');
-var oauthServer = require('oauth2-server');
+var oauthServer = require('express-oauth-server');
 var render = require('co-views')('views');
 var util = require('util');
 
@@ -74,7 +74,7 @@ app.post('/login', function(req, res) {
 });
 
 // Get secret.
-app.get('/secret', app.oauth.authorize(), function(req, res) {
+app.get('/secret', app.oauth.authenticate(), function(req, res) {
   // Will require a valid access_token.
   res.send('Secret area');
 });

examples/postgresql/model.js

@@ -16,9 +16,9 @@ module.exports.getAccessToken = function(bearerToken) {
 
       return {
         accessToken: token.access_token,
-        clientId: token.client_id,
+        client: {id: token.client_id},
         expires: token.expires,
-        userId: token.userId
+        user: {id: token.userId}, // could be any object
       };
     });
 };
@@ -38,7 +38,8 @@ module.exports.getClient = function *(clientId, clientSecret) {
 
       return {
         clientId: oAuthClient.client_id,
-        clientSecret: oAuthClient.client_secret
+        clientSecret: oAuthClient.client_secret,
+        grants: ['password'], // the list of OAuth2 grant types that should be allowed
       };
     });
 };
@@ -78,6 +79,6 @@ module.exports.saveAccessToken = function *(token, client, user) {
     token.refreshTokenExpiresOn,
     user.id
   ]).then(function(result) {
-    return result.rowCount ? result.rows[0] : false;
+    return result.rowCount ? result.rows[0] : false; // TODO return object with client: {id: clientId} and user: {id: userId} defined
   });
 };