用 github id 取代 accesstoken 来确定唯一用户

bocar · Dec 24, 2013 · 72b8245 · 72b8245
1 parent da311a8
commit 72b8245
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/controllers/github.js b/controllers/github.js
@@ -4,15 +4,16 @@ var Models = require('../models');
 var User = Models.User;
 
 exports.callback = function (req, res, next) {
-  User.findOne({githubAccessToken: req.user.accessToken}, function (err, user) {
+  var profile = req.user;
+  User.findOne({githubId: profile.id}, function (err, user) {
     if (err) {
       return next(err);
     }
     if (user) {
       sign.gen_session(user, res);
       return res.redirect('/');
     } else {
-      req.session.profile = req.user;
+      req.session.profile = profile;
       return res.redirect('/auth/github/new');
     }
   });
@@ -32,7 +33,7 @@ exports.create = function (req, res, next) {
       pass: profile.accessToken,
       email: profile.emails[0].value,
       avatar: profile._json.avatar_url,
-      githubAccessToken: profile.accessToken,
+      githubId: profile.id,
     });
     user.save(function (err) {
       if (err) {
@@ -50,7 +51,7 @@ exports.create = function (req, res, next) {
         if (!user) {
           return res.render('sign/signin', { error: '账号名或密码错误。' });
         }
-        user.githubAccessToken = profile.accessToken;
+        user.githubId = profile.id;
         user.save(function (err) {
           if (err) {
             return next(err);

diff --git a/models/user.js b/models/user.js
@@ -14,7 +14,7 @@ var UserSchema = new Schema({
   profile: { type: String },
   weibo: { type: String },
   avatar: { type: String },
-  githubAccessToken: { type: String },
+  githubId: { type: String, unique: true },
 
   score: { type: Number, default: 0 },
   topic_count: { type: Number, default: 0 },