spec compliance wip

app/assets/javascripts/app/frontend/controllers/editor.js

@@ -66,25 +66,25 @@ angular.module('app.frontend')
   .controller('EditorCtrl', function ($sce, $timeout, apiController, markdownRenderer, $rootScope) {
 
     this.demoNotes = [
-      {name: "Live print a file with tail", content: "tail -f log/production.log"},
-      {name: "Create SSH tunnel", content: "ssh -i .ssh/key.pem -N -L 3306:example.com:3306 ec2-user@example.com"},
-      {name: "List of processes running on port", content: "lsof -i:8080"},
-      {name: "Set ENV from file", content: "export $(cat .envfile | xargs)"},
-      {name: "Find process by name", content: "ps -ax | grep <application name>"},
-      {name: "NPM install without sudo", content: "sudo chown -R $(whoami) ~/.npm"},
-      {name: "Email validation regex", content: "^[a-zA-Z0-9_.+-]+@[a-zA-Z0-9-]+\.[a-zA-Z0-9-.]+$"},
-      {name: "Ruby generate 256 bit key", content: "Digest::SHA256.hexdigest(SecureRandom.random_bytes(32))"},
-      {name: "Mac add user to user group", content: "sudo dseditgroup -o edit -a USERNAME -t user GROUPNAME"},
-      {name: "Kill Mac OS System Apache", content: "sudo launchctl unload -w /System/Library/LaunchDaemons/org.apache.httpd.plist"},
-      {name: "Docker run with mount binding and port", content: "docker run -v /home/vagrant/www/app:/var/www/app -p 8080:80 -d kpi/s3"},
-      {name: "MySQL grant privileges", content: "GRANT [type of permission] ON [database name].[table name] TO ‘[username]’@'%’;"},
-      {name: "MySQL list users", content: "SELECT User FROM mysql.user;"},
+      {title: "Live print a file with tail", content: "tail -f log/production.log"},
+      {title: "Create SSH tunnel", content: "ssh -i .ssh/key.pem -N -L 3306:example.com:3306 ec2-user@example.com"},
+      {title: "List of processes running on port", content: "lsof -i:8080"},
+      {title: "Set ENV from file", content: "export $(cat .envfile | xargs)"},
+      {title: "Find process by name", content: "ps -ax | grep <application name>"},
+      {title: "NPM install without sudo", content: "sudo chown -R $(whoami) ~/.npm"},
+      {title: "Email validation regex", content: "^[a-zA-Z0-9_.+-]+@[a-zA-Z0-9-]+\.[a-zA-Z0-9-.]+$"},
+      {title: "Ruby generate 256 bit key", content: "Digest::SHA256.hexdigest(SecureRandom.random_bytes(32))"},
+      {title: "Mac add user to user group", content: "sudo dseditgroup -o edit -a USERNAME -t user GROUPNAME"},
+      {title: "Kill Mac OS System Apache", content: "sudo launchctl unload -w /System/Library/LaunchDaemons/org.apache.httpd.plist"},
+      {title: "Docker run with mount binding and port", content: "docker run -v /home/vagrant/www/app:/var/www/app -p 8080:80 -d kpi/s3"},
+      {title: "MySQL grant privileges", content: "GRANT [type of permission] ON [database name].[table name] TO ‘[username]’@'%’;"},
+      {title: "MySQL list users", content: "SELECT User FROM mysql.user;"},
     ];
 
     this.showSampler = !this.user.id && this.user.filteredNotes().length == 0;
 
     this.demoNoteNames = _.map(this.demoNotes, function(note){
-      return note.name;
+      return note.title;
     });
 
     this.currentDemoContent = {text: null};
@@ -94,7 +94,7 @@ angular.module('app.frontend')
     }.bind(this)
 
     this.callback = function(index) {
-      this.currentDemoContent.text = this.demoNotes[index].content;
+      this.currentDemoContent.text = this.demoNotes[index].text;
     }.bind(this)
 
     this.contentCallback = function(index) {
@@ -102,7 +102,7 @@ angular.module('app.frontend')
 
     this.setNote = function(note, oldNote) {
       this.editorMode = 'edit';
-      if(note.content.length == 0) {
+      if(note.text.length == 0) {
         this.focusTitle(100);
       }
 
@@ -138,7 +138,7 @@ angular.module('app.frontend')
     }
 
     this.renderedContent = function() {
-      return markdownRenderer.renderHtml(markdownRenderer.renderedContentForText(this.note.content));
+      return markdownRenderer.renderHtml(markdownRenderer.renderedContentForText(this.note.text));
     }
 
     var statusTimeout;

app/assets/javascripts/app/frontend/controllers/header.js

@@ -13,9 +13,9 @@ angular.module('app.frontend')
       bindToController: true,
 
       link:function(scope, elem, attrs, ctrl) {
-        scope.$on('auth:login-success', function(event, user) {
-          ctrl.onAuthSuccess(user);
-        });
+        // scope.$on('auth:login-success', function(event, user) {
+          // ctrl.onAuthSuccess(user);
+        // });
 
         scope.$on('auth:validation-success', function(ev) {
           setTimeout(function(){
@@ -45,9 +45,8 @@ angular.module('app.frontend')
 
     this.signOutPressed = function() {
       this.showAccountMenu = false;
-      $auth.signOut();
       this.logout()();
-      apiController.clearGk();
+      apiController.signout();
       window.location.reload();
     }
 
@@ -55,48 +54,15 @@ angular.module('app.frontend')
       this.passwordChangeData.status = "Generating New Keys...";
 
       $timeout(function(){
-        var current_keys = Neeto.crypto.generateEncryptionKeysForUser(this.passwordChangeData.current_password, this.user.email);
-        var new_keys = Neeto.crypto.generateEncryptionKeysForUser(this.passwordChangeData.new_password, this.user.email);
-        // var new_pw_conf_keys = Neeto.crypto.generateEncryptionKeysForUser(this.passwordChangeData.new_password_confirmation, this.user.email);
-
-        var data = {};
-        data.current_password = current_keys.pw;
-        data.password = new_keys.pw;
-        data.password_confirmation = new_keys.pw;
-
-        var user = this.user;
-
-        if(data.password == data.password_confirmation) {
-          $auth.updatePassword(data)
-          .then(function(response) {
-            this.showNewPasswordForm = false;
-            if(user.local_encryption_enabled) {
-              // reencrypt data with new gk
-              apiController.reencryptAllNotesAndSave(user, new_keys.gk, current_keys.gk, function(success){
-                if(success) {
-                  apiController.setGk(new_keys.gk);
-                  alert("Your password has been changed and your data re-encrypted.");
-                } else {
-                  // rollback password
-                  $auth.updatePassword({current_password: new_keys.pw, password: current_keys.pw, password_confirmation: current_keys.pw })
-                  .then(function(response){
-                    alert("There was an error changing your password. Your password has been rolled back.");
-                    window.location.reload();
-                  })
-                }
-              });
-            } else {
-              alert("Your password has been changed.");
-            }
-          }.bind(this))
-          .catch(function(response){
-            this.showNewPasswordForm = false;
-            alert("There was an error changing your password. Please try again.");
-          }.bind(this))
-
-        } else {
+        if(data.password != data.password_confirmation) {
           alert("Your new password does not match its confirmation.");
+          return;
         }
+
+        apiController.changePassword(this.user, this.passwordChangeData.current_password, this.passwordChangeData.new_password, function(response){
+
+        })
+
       }.bind(this))
 
     }
@@ -116,17 +82,14 @@ angular.module('app.frontend')
     this.loginSubmitPressed = function() {
       this.loginData.status = "Generating Login Keys...";
       $timeout(function(){
-        var keys = Neeto.crypto.generateEncryptionKeysForUser(this.loginData.user_password, this.loginData.email);
-        var data = {password: keys.pw, email: this.loginData.email};
-
-        apiController.setGk(keys.gk);
-        $auth.submitLogin(data)
-        .then(function(response){
-
-        })
-        .catch(function(response){
-          this.loginData.status = response.errors[0];
-        }.bind(this))
+        apiController.login(this.loginData.email, this.loginData.user_password, function(response){
+          console.log("login response", response);
+          if(response.errors) {
+            this.loginData.status = response.errors[0];
+          } else {
+            this.onAuthSuccess(response.user);
+          }
+        }.bind(this));
       }.bind(this))
     }
 
@@ -134,18 +97,12 @@ angular.module('app.frontend')
       this.loginData.status = "Generating Account Keys...";
 
       $timeout(function(){
-        var keys = Neeto.crypto.generateEncryptionKeysForUser(this.loginData.user_password, this.loginData.email);
-        var data = {password: keys.pw, email: this.loginData.email};
-
-        apiController.setGk(keys.gk);
-
-        $auth.submitRegistration(data)
-        .then(function(response) {
-          $auth.user.id = response.data.data.id;
-          this.onAuthSuccess($auth.user);
-        }.bind(this))
-        .catch(function(response) {
-          this.loginData.status = response.data.errors.full_messages[0];
+        apiController.register(this.loginData.email, this.loginData.user_password, function(response){
+          if(response.errors) {
+            this.loginData.status = response.errors[0];
+          } else {
+            this.onAuthSuccess(response.user);
+          }
         }.bind(this));
       }.bind(this))
     }

app/assets/javascripts/app/frontend/controllers/home.js

@@ -23,16 +23,16 @@ angular.module('app.frontend')
       $scope.groups = groups;
     }
 
-    $auth.validateUser()
-      .then(function () {
-        $scope.defaultUser = new User($auth.user);
+    apiController.getCurrentUser(function(response){
+      console.log("get current response", response);
+      if(response && !response.errors) {
+        $scope.defaultUser = new User(response.plain());
         $rootScope.title = "Notes — Neeto";
         onUserSet();
-
-      })
-      .catch(function () {
+      } else {
         $scope.defaultUser = new User(apiController.localUser());
         onUserSet();
+      }
     });
 
     /*

app/assets/javascripts/app/frontend/controllers/notes.js

@@ -145,8 +145,8 @@ angular.module('app.frontend')
     }
 
     this.createNewNote = function() {
-      var name = "New Note" + (this.notes ? (" " + (this.notes.length + 1)) : "");
-      this.newNote = new Note({name: name, content: '', dummy: true});
+      var title = "New Note" + (this.notes ? (" " + (this.notes.length + 1)) : "");
+      this.newNote = new Note({title: title, content: '', dummy: true});
       this.newNote.shared_via_group = this.group.presentation && this.group.presentation.enabled;
       this.selectNote(this.newNote);
       this.addNew()(this.newNote);
@@ -158,7 +158,7 @@ angular.module('app.frontend')
       if(this.noteFilter.text.length == 0) {
         note.visible = true;
       } else {
-        note.visible = note.name.toLowerCase().includes(this.noteFilter.text) || note.content.toLowerCase().includes(this.noteFilter.text);
+        note.visible = note.title.toLowerCase().includes(this.noteFilter.text) || note.text.toLowerCase().includes(this.noteFilter.text);
       }
       return note.visible;
     }.bind(this)