Re-implemented authentication modal

deployd · Jul 17, 2012 · 3324be3 · 3324be3
1 parent de9a662
commit 3324be3
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 12 deletions.
diff --git a/public/js/app/app.js b/public/js/app/app.js
@@ -6,6 +6,7 @@ var App = Backbone.Model.extend({
   defaults: {
       appName: 'My App'
     , appUrl: ''
+    , authKey: true
     , resourceType: ''
     , files: undefined
   }
@@ -16,15 +17,15 @@ var App = Backbone.Model.extend({
     this.on('change:authKey', function() {
       var authKey = this.get('authKey');
       if (authKey) {
-        $.cookie('DPDAuthKey', authKey, {expires: 7});
+        $.cookie('DPDAuthKey', authKey, {expires: 31});
       } else {
         $.cookie('DPDAuthKey', null);
       }
     }, this);
 
     this.set({
         appUrl: location.protocol + '//' + location.host
-      , authKey: $.cookie('DPDAuthKey')
+      , authKey: $.cookie('DPDAuthKey') || true
     });
     this.setDocLink();
   }

diff --git a/public/js/app/backbone-utils.js b/public/js/app/backbone-utils.js
@@ -42,7 +42,7 @@ Backbone.sync = function(method, model, options) {
   }
 
   options.headers = {
-    'dpd-ssh-key': true
+    'dpd-ssh-key': app.get('authKey') || true
   };
 
   options.url = options.url || url;

diff --git a/public/js/app/view/app-view.js b/public/js/app/view/app-view.js
@@ -27,20 +27,20 @@ define(function(require, exports, module) {
 
     this.authenticate();
     this.resources.fetch();
-    // app.on('change:authKey', this.authenticate, this);
+    app.on('change:authKey', this.authenticate, this);
     this.resources.on('reset', this.initRender, this);
     this.resources.on('error', this.modal.showError, this.modal);
   }
 
   , authenticate: function() {
 
-    this.resources.fetch();  
+    // this.resources.fetch();  
 
-    // if (app.get('authKey')) {
-    //   this.resources.fetch();  
-    // } else {
-    //   this.modal.show();
-    // }
+    if (app.get('authKey')) {
+      this.resources.fetch();  
+    } else {
+      this.modal.show();
+    }
 
   }
 

diff --git a/views/templates/auth-modal.ejs b/views/templates/auth-modal.ejs
@@ -2,8 +2,8 @@
   <h3>Deployd Dashboard</h3>
 </div>
 <div class="modal-body">
-  <div class="alert alert-error key-error hide">Your auth key is invalid. You can generate a new key with the <code>dpd key</code> command.</div>
-  <p>Authenticate with your deployd app:</p>
+  <div class="alert alert-info">If you don't know your key, use <code>dpd remote</code> to authenticate.</div>
+  <p>Authenticate with your deployd dashboard:</p>
   <form>
       <label>Authentication key: <textarea class="full-width" rows="6" name="key"></textarea></label>
   </form>