Add public mode for box auth

Author: SamyPesse

client/core/app.js

@@ -3,8 +3,9 @@ define([
     'utils/url',
     'core/box',
     'core/session',
-    'core/addons'
-], function (hr, url, box, session, addons) {
+    'core/addons',
+    'core/box'
+], function (hr, url, box, session, addons, box) {
 
     // Define base application
     var Application = hr.Application.extend({
@@ -23,7 +24,6 @@ define([
         // Constructor
         initialize: function() {
             Application.__super__.initialize.apply(this, arguments);
-            this.isAuth = false;
 
             box.on("status", function(state) {
                 this.$(".codebox-connexion-alert").toggle(!state);
@@ -37,7 +37,6 @@ define([
             return {
                 'email': queries.email || hr.Storage.get("email"),
                 'token': queries.token || hr.Storage.get("token"),
-                'isAuth': this.isAuth
             };
         },
 
@@ -50,7 +49,7 @@ define([
 
             if (email && password) {
                 this.doLogin(email, password, true);
-            } else if (this.isAuth) {
+            } else if (box.isAuth()) {
                 addons.loadAll().then(function() {
                     that.$(".codebox-loading-alert").remove();
 
@@ -73,14 +72,18 @@ define([
             var password = this.$(".login-box #login-token").val();
             var tosave = this.$(".login-box #login-save").is(":checked");
 
-            this.doLogin(email, password, tosave).fail(function() {
-                that.$(".login-box .form-group").addClass("has-error");
-            });
+            this.doLogin(email, password, tosave);
         },
 
         // Do login
         doLogin: function(email, password, tosave) {
             var that = this;
+
+            // If no password: generate a random one
+            if (!password) {
+                password = Math.random().toString(36).substring(8);
+            }
+
             return session.start(email, password).then(function() {
                 if (tosave) {
                     hr.Storage.set("email", email);
@@ -89,9 +92,9 @@ define([
                     hr.Storage.set("email", "");
                     hr.Storage.set("token", "");
                 }
-
-                that.isAuth = true;
                 that.render();
+            }).fail(function() {
+                that.$(".login-box .form-group").addClass("has-error");
             });
         }
     });

client/core/box.js

@@ -16,9 +16,6 @@ define([
     box.on("box:users:remove", function(e) {
         collaborators.remove(collaborators.getById(e.data.userId));
     });
-    box.on("set", function() {
-        collaborators.getCollaborators();
-    })
 
     // Search for files
     search.handler({

client/core/session.js

@@ -19,6 +19,11 @@ define([
     });
 
     return {
+        // Prepare session
+        prepare: function() {
+            return box.status();
+        },
+
         // Start session
         start: function(email, token) {
             var that = this;
@@ -27,11 +32,12 @@ define([
                 'email': email,
                 'token': token
             }, user).then(function() {
+                console.log("auth succeed");
                 // Get installed addons
                 return addons.getInstalled();
             }).then(function() {
-                // Return box status
-                return box.status();
+                // Get collaborators
+                return collaborators.getCollaborators();
             });
         }
     };

client/main.js

@@ -3,10 +3,11 @@ require([
     "hr/hr",
     "hr/args",
     "core/app",
+    "core/session",
     "config",
     'views/views',
     'resources/resources',
-], function(_, hr, args, app, config) {
+], function(_, hr, args, app, session, config) {
     // Configure hr
     hr.configure(args);
 
@@ -17,5 +18,7 @@ require([
         }
     });
 
-    app.run();
+    session.prepare().then(function() {
+        app.run();
+    });
 });

client/models/box.js

@@ -15,6 +15,7 @@ define([
             'uptime': 0,
             'mtime': 0,
             'collaborators': 0,
+            'auth': false
         },
 
         /*
@@ -110,10 +111,21 @@ define([
 
             return api.rpc("/auth/join", authInfo).then(function(info) {
                 that.user.set(info);
+                that.set("auth", true);
                 return Q(info);
+            }, function(err) {
+                that.set("auth", false);
+                return Q.reject(err);
             });
         },
 
+        /*
+         *  test if logged to the box
+         */
+        isAuth: function() {
+            return this.get("auth", false);
+        },
+
         /*
          *  Get box status
          */

client/resources/templates/main.html

@@ -1,4 +1,4 @@
-<% if (isAuth) { %>
+<% if (session.box.isAuth()) { %>
 <div id="codebox">
 	<!-- Lateral bar -->
 	<%= view.component("layout.lateralbar", {}, "lateralbar") %>
@@ -37,10 +37,15 @@ <h4 class="modal-title">Connexion Error</h4>
 				<form role="form">
 					<div class="form-group">
 						<input type="email" class="form-control" id="login-email" placeholder="Enter email" value="<%- email %>">
+						<% if (session.box.get("public")) { %>
+						<p class="help-block">This box is public, please enter an email to log in.</p>
+						<% } %>
 					</div>
+					<% if (!session.box.get("public")) { %>
 					<div class="form-group">
 						<input type="password" class="form-control" id="login-token" placeholder="Enter token" value="<%- token %>">
 					</div>
+					<% } %>
 					<div class="checkbox">
 						<label>
 							<input type="checkbox" id="login-save" checked> Remember me

core/cb.core/main.js

@@ -12,7 +12,11 @@ function setup(options, imports, register) {
     var title = options.title;
     var rootPath = options.root || path.resolve(__dirname, '..', '..');
 
-    var workspace = new Workspace(title, rootPath, events);
+    var workspace = new Workspace({
+        'root': rootPath,
+        'title': title,
+        'public': options.public
+    }, events);
 
     register(null, {
         "workspace": workspace

core/cb.core/workspace.js

@@ -8,18 +8,29 @@ var User = require('./user').User;
 var qfail = require('../utils').qfail;
 
 
-function Workspace(name, root, events, id) {
+function Workspace(options, events) {
+    options = _.defaults({}, options, {
+        'id': uuid.v4(),
+        'secret': uuid.v4(),
+        'name': 'codebox',
+        'public': true,
+        'root': "./"
+    });
+
     // Public ID of workspace (ok to share)
-    this.id = id || uuid.v4();
+    this.id = options.id;
 
     // Secret token used for securing cookies, sessions ...
-    this.secret = uuid.v4();
+    this.secret = options.secret;
 
     // Name
-    this.name = name || "project";
+    this.name = options.name;
+
+    // Public
+    this.public = options.public;
 
     // Base folder
-    this.root = root;
+    this.root = options.root;
 
     // Mapping of directories
     this._users = {};

core/cb.rpc.auth/service.js

@@ -12,6 +12,8 @@ function AuthRPCService(workspace, hooks) {
 AuthRPCService.prototype.join = function(args, meta) {
 	var that = this;
 
+    meta.req.session.userId = null;
+    
 	return this.hooks.use("auth", {
 		'email': args.email,
 		'token': args.token

core/cb.rpc.box/service.js

@@ -13,9 +13,10 @@ BoxRPCService.prototype.status = function(args, meta) {
     return Q({
         'status': "ok",
         'name': this.workspace.name,
+        'public': this.workspace.public,
         'uptime': process.uptime(),
         'mtime': this.workspace.mtime,
-        'collaborators': this.workspace.userCount(),
+        'collaborators': this.workspace.userCount()
     });
 };