*fixed auth

vikasaditya · Apr 12, 2012 · a1612f6 · a1612f6
1 parent e675e7d
commit a1612f6
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 6 deletions.
diff --git a/examples/login-example/app.js b/examples/login-example/app.js
@@ -22,6 +22,7 @@ app.configure(function () {
     app.register('.js', jqtpl.express);
     app.use(express.cookieParser());
     app.use(express.bodyParser());
+    app.use(express.query());
     app.use(express.session({ secret:'big fat secret' }));
     app.use(express.methodOverride());
     app.use(bobamo.express({mongoose:mongoose, plugin:'passport', authModel:User}, express))

diff --git a/plugins/generator/views/main.js b/plugins/generator/views/main.js
@@ -14,7 +14,10 @@ require.config({
    'jquery-editors':'libs/backbone-forms/src/jquery-ui-editors',
    'bootstrap':'libs/bootstrap/js',
     templates: '../templates',
-    tpl: '../tpl'
+{{each(k,j) pluginManager.pluginNames()}}
+    ${j}:'${baseUrl}${j}',
+{{/each}}
+    tpl: '../tpl',
   }
 
 });

diff --git a/plugins/passport/passport.js b/plugins/passport/passport.js
@@ -63,8 +63,9 @@ PassportPlugin.prototype.filters = function () {
         res.redirect(this.baseUrl);
     }.bind(this));
 
-   [this.baseUrl + '/rest/*'].forEach(function (v) {
-        this.app.all(v, this.ensureAuthenticated.bind(this));
+    [this.baseUrl + '/rest/*'].concat(this.options.restrict).forEach(function (v) {
+        if (v)
+            this.app.all(v, this.ensureAuthenticated.bind(this));
     }, this);
-
+    PluginApi.prototype.filters.apply(this, arguments);
 }
diff --git a/...ins/static/public/js/views/login/login.js → ...s/passport/public/js/views/login/login.js b/...ins/static/public/js/views/login/login.js → ...s/passport/public/js/views/login/login.js
@@ -1,4 +1,4 @@
-define(['Backbone', 'jquery', 'underscore', 'text!tpl/login.html'], function (Backbone, $, _, loginTmpl) {
+define(['Backbone', 'jquery', 'underscore', 'text!passport/tpl/login.html'], function (Backbone, $, _, loginTmpl) {
 
     var LoginView = Backbone.View.extend({
         el:        '#content',

diff --git a/plugins/static/public/tpl/login.html → plugins/passport/public/tpl/login.html b/plugins/static/public/tpl/login.html → plugins/passport/public/tpl/login.html
diff --git a/plugins/static/public/favicon.ico b/plugins/static/public/favicon.ico
diff --git a/plugins/static/public/js/router.js b/plugins/static/public/js/router.js
@@ -16,7 +16,7 @@ define([
         doLogin:function(actions){
             console.log('doLogin', arguments);
             var self = this;
-            return require(['views/login/login'], function (View) {
+            return require(['passport/js/views/login/login'], function (View) {
                 new View({router:self}).render('/'+(actions ? actions.indexOf('login') > -1 ? '/home'  : actions : '/home'));
             });
         },