fixed broken calls. Not actually working though

JavaScriptKC · Mar 11, 2012 · 204552b · 204552b
1 parent 50418fc
commit 204552b
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 6 deletions.
diff --git a/app.coffee b/app.coffee
@@ -35,9 +35,6 @@ controllers.site.use app
 controllers.code.use app
 controllers.event.use app
 
-app.get '/generate', bitly.generate, (req, res) ->
-  res.render 'layout', res.data
-
 app.listen port
 
 console.log 'server listening on port ' + port
diff --git a/collections/users.coffee b/collections/users.coffee
@@ -2,6 +2,9 @@ StoredCollection = require '../data/storedCollection'
 
 class Users extends StoredCollection
   constructor: () -> super
+
+  find_by_service: (provider, id, callback) ->
+    @find { provider: provider, id: id }, callback
 
   find: () ->
     if arguments.length is 1

diff --git a/config/strategies.coffee b/config/strategies.coffee
@@ -1,7 +1,7 @@
 url = require 'url'
 GitHubStrategy = require('passport-github').Strategy
 TwitterStrategy = require('passport-twitter').Strategy
-user = require '../models/user'
+Users = require '../collections/users'
 
 TWITTER_CONSUMER_KEY = process.env.TWITTER_CONSUMER_KEY || 'notvalidkey'
 TWITTER_CONSUMER_SECRET = process.env.TWITTER_CONSUMER_SECRET || 'notvalidkey'
@@ -11,11 +11,14 @@ GITHUB_CLIENT_ID = process.env.GITHUB_CLIENT_ID || 'notvalidkey'
 GITHUB_CLIENT_SECRET = process.env.GITHUB_CLIENT_SECRET || 'notvalidkey'
 GITHUB_CALLBACK_URL = url.resolve process.env.CALLBACK_BASE_URL, '/auth/github/callback'
 
+
 twitterDone = (accessToken, tokenSecret, profile, callback) ->
-  user.find_by_service 'twitter', profile.id, callback
+  users = new Users()
+  users.find_by_service 'twitter', profile.id, callback
 
 githubDone = (accessToken, tokenSecret, profile, callback) ->
-  user.find_by_service 'github', profile.id, callback
+  users = new Users()
+  users.find_by_service 'github', profile.id, callback
 
 twitter = new TwitterStrategy
   consumerKey: TWITTER_CONSUMER_KEY