Registration & Reset password

.travis.yml

@@ -1,4 +1,5 @@
 language: php
+sudo: false
 
 php:
   - 5.5
@@ -8,26 +9,28 @@ mysql:
   username: root
   encoding: utf8
 
+# install php packages required for running a web server from drush on php 5.3
+addons:
+  apt:
+    packages:
+    - php5-cgi
+    - php5-mysql
+
 before_install:
-  - sudo apt-get update > /dev/null
   - composer self-update
 
   # Install Grunt and Bower.
-  - npm install -g grunt-cli bower
+  - npm install -g yo bower grunt-cli casperjs
 
   # Install Sass and Compass for Grunt to work.
   - gem install compass
 
 install:
-  # install php packages required for running a web server from drush on php 5.3
-  - sudo apt-get install -y --force-yes php5-cgi php5-mysql
-
   # Install Drush.
   - export PATH="$HOME/.composer/vendor/bin:$PATH"
   - composer global require drush/drush:6.*
   - phpenv rehash
 
-  - npm install -g yo bower grunt-cli casperjs
   - npm install
 
   # Test the Yeoman generator.
@@ -37,12 +40,6 @@ install:
   - npm link
 
 before_script:
-  # Create display.
-  - export DISPLAY=:99.0
-  - sh -e /etc/init.d/xvfb start
-
-  # Run PhantomJs.
-  - phantomjs --webdriver=4444 > ~/phantomjs.log 2>&1 &
 
   - mkdir $TRAVIS_BUILD_DIR/../build
   - cd $TRAVIS_BUILD_DIR/../build
@@ -53,6 +50,7 @@ before_script:
 
   # Configure client.
   - cd client
+  - bower install
   - cp config.travis.json config.json
   - grunt serve > ~/grunt.log 2>&1 &
   - cd ..
@@ -63,12 +61,19 @@ before_script:
   # Start a web server on port 8080, run in the background; wait for
   # initialization.
   - drush @site runserver 127.0.0.1:8080 &
-  - until netstat -an 2>/dev/null | grep '8080.*LISTEN'; do true; done
+  - until netstat -an 2>/dev/null | grep '8080.*LISTEN'; sleep 1; curl -I http://127.0.0.1:8080 ; do true; done
+
+script:
+  # Create display.
+  - export DISPLAY=:99.0
+  - sh -e /etc/init.d/xvfb start
+  - sleep 3 # give xvfb some time to start
 
   # Wait for Grunt to finish loading.
   - until $(curl --output /dev/null --silent --head --fail http://localhost:9000); do sleep 1; echo '.'; done
 
-script:
+  # Run PhantomJs.
+  - phantomjs --webdriver=4444 > ~/phantomjs.log 2>&1 &
 
   # Run Behat tests.
   - cd ./behat

app/templates/client/app/index.html

@@ -81,6 +81,9 @@ <h3>Login with demo / 1234</h3>
         <script src="scripts/controllers/companies.js"></script>
         <script src="scripts/controllers/events.js"></script>
         <script src="scripts/controllers/login.js"></script>
+        <script src="scripts/controllers/signup.js"></script>
+        <script src="scripts/controllers/forgot-password.js"></script>
+        <script src="scripts/controllers/reset-password.js"></script>
         <script src="scripts/services/auth.js"></script>
         <script src="scripts/services/utils.js"></script>
         <script src="scripts/services/events.js"></script>

app/templates/client/app/scripts/app.js

@@ -55,7 +55,44 @@ angular
       .state('login', {
         url: '/login',
         templateUrl: 'views/login.html',
-        controller: 'LoginCtrl'
+        controller: 'LoginCtrl',
+        resolve: {
+          emailVerified: function() {
+            return false;
+          }
+        }
+      })
+      .state('signup', {
+        url: '/signup',
+        templateUrl: 'views/signup.html',
+        controller: 'SignUpCtrl'
+      })
+      .state('verifyEmail', {
+        url: '/verify-email/{accessToken:string}',
+        templateUrl: 'views/login.html',
+        controller: 'LoginCtrl',
+        resolve: {
+          emailVerified: function($stateParams, Auth, Account) {
+            Auth.setAccessToken($stateParams.accessToken);
+            return Account.verifyEmail();
+          }
+        }
+      })
+      .state('forgotPassword', {
+        url: '/forgot-password',
+        templateUrl: 'views/forgot-password.html',
+        controller: 'ForgotPasswordCtrl'
+      })
+      .state('resetPassword', {
+        url: '/reset-password/{accessToken:string}',
+        templateUrl: 'views/reset-password.html',
+        controller: 'ResetPasswordCtrl',
+        onEnter: page403,
+        resolve: {
+          accessToken: function($stateParams, Auth) {
+            Auth.setAccessToken($stateParams.accessToken);
+          }
+        }
       })
       .state('dashboard', {
         abstract: true,
@@ -172,7 +209,7 @@ angular
 
         'response': function(result) {
           if (result.data.access_token) {
-            localStorageService.set('access_token', result.data.access_token);
+            Auth.setAccessToken(result.data.access_token);
           }
           return result;
         },

app/templates/client/app/scripts/controllers/forgot-password.js

@@ -0,0 +1,33 @@
+'use strict';
+
+/**
+ * @ngdoc function
+ * @name clientApp.controller:ForgotPasswordCtrl
+ * @description
+ * # ForgotPasswordCtrl
+ * Controller of the clientApp
+ */
+angular.module('clientApp')
+  .controller('ForgotPasswordCtrl', function ($scope, Auth) {
+
+    /**
+     * Send a password reset link.
+     */
+    $scope.forgotPassword = function() {
+      // Reset the error message for each request.
+      $scope.ErrorMsg = false;
+
+      Auth.resetPassword($scope.email).then(function () {
+          $scope.passwordResetSent = true;
+        },
+        function(response) {
+          $scope.ErrorMsg = response.data.title;
+
+          // Too many requests.
+          if (response.status == 429) {
+            $scope.ErrorMsg = response.statusText;
+            $scope.TooManyRequests = true;
+          }
+        });
+    };
+  });

app/templates/client/app/scripts/controllers/login.js

@@ -8,7 +8,9 @@
  * Controller of the clientApp
  */
 angular.module('clientApp')
-  .controller('LoginCtrl', function ($scope, Auth, $state) {
+  .controller('LoginCtrl', function ($scope, Auth, $state, emailVerified) {
+
+    $scope.emailVerified = emailVerified;
 
     // Will be FALSE during login GET period - will cause the login button to be
     // disabled.

app/templates/client/app/scripts/controllers/reset-password.js

@@ -0,0 +1,30 @@
+'use strict';
+
+/**
+ * @ngdoc function
+ * @name clientApp.controller:ResetPasswordCtrl
+ * @description
+ * # ResetPasswordCtrl
+ * Controller of the clientApp
+ */
+angular.module('clientApp')
+  .controller('ResetPasswordCtrl', function ($scope, Auth, Account) {
+
+    // Determine if password was reset successfully.
+    $scope.passwordSaved = false;
+
+    /**
+     * Setting the access token in the localStorage so we can get the account
+     * information and pull out the user ID from it to PATCH the user entity.
+     *
+     * @param password
+     *  The new password.
+     */
+    $scope.saveNewPassword = function(password) {
+      Account.get().then(function(user) {
+        Auth.savePassword(user.id, password).then(function() {
+          $scope.passwordSaved = true;
+        });
+      });
+    };
+  });

app/templates/client/app/scripts/controllers/signup.js

@@ -0,0 +1,39 @@
+'use strict';
+
+/**
+ * @ngdoc function
+ * @name clientApp.controller:SignUpCtrl
+ * @description
+ * # SignUpCtrl
+ * Controller of the clientApp
+ */
+angular.module('clientApp')
+  .controller('SignUpCtrl', function ($scope, Auth) {
+
+    // Reset the flags.
+    $scope.emailAvailable = true;
+    $scope.usernameAvailable = true;
+
+    /**
+     * Send a password reset link.
+     */
+    $scope.signUp = function(user) {
+      // Clear the error before each request.
+      $scope.signupError = undefined;
+
+      Auth.usersAvailability(user).then(function(response) {
+        $scope.usernameAvailable = response.data.data.available.name;
+        $scope.emailAvailable = response.data.data.available.mail;
+
+        if ($scope.emailAvailable && $scope.usernameAvailable) {
+          Auth.signUp(user).then(function() {
+            // User registered successfully.
+            $scope.signedUp = true;
+          }, function (response) {
+            // Error trying to register the user.
+            $scope.signupError = response.data.detail;
+          });
+        }
+      });
+    };
+  });

app/templates/client/app/scripts/services/account.js

@@ -8,7 +8,7 @@
  * Service in the clientApp.
  */
 angular.module('clientApp')
-  .service('Account', function ($q, $http, $timeout, Config, $rootScope, $log) {
+  .service('Account', function ($q, $http, $timeout, Config, $rootScope, Auth) {
 
     // A private cache key.
     var cache = {};
@@ -43,6 +43,24 @@ angular.module('clientApp')
       return deferred.promise;
     }
 
+    /**
+     * Verify a user.
+     *
+     * @returns {*}
+     */
+    this.verifyEmail = function() {
+      // After setting the access token in the local storage (in the state
+      // resolve), try to get the user account from the data, if succeed then
+      // change its status.
+      return getDataFromBackend().then(function(user) {
+        return $http({
+          method: 'PATCH',
+          url: Config.backend + '/api/v1.1/users/' + user.id,
+          data: {status: 1}
+        });
+      });
+    };
+
     /**
      * Save meters in cache, and broadcast en event to inform that the meters data changed.
      *

app/templates/client/app/scripts/services/auth.js

@@ -10,6 +10,15 @@
 angular.module('clientApp')
   .service('Auth', function ($injector, $rootScope, Utils, localStorageService, Config) {
 
+    /**
+     * An access token setter.
+     *
+     * @param accessToken
+     */
+    this.setAccessToken = function(accessToken) {
+      localStorageService.set('access_token', accessToken);
+    };
+
     /**
      * Login by calling the Drupal REST server.
      *
@@ -29,6 +38,69 @@ angular.module('clientApp')
       });
     };
 
+    /**
+     * Trigger a `reset password` action on the server for this email.
+     *
+     * @param email
+     *  The email of the user.
+     *
+     * @returns {*}
+     */
+    this.resetPassword = function(email) {
+      return $injector.get('$http')({
+        method: 'POST',
+        url: Config.backend + '/api/reset-password',
+        data: {email: email}
+      });
+    };
+
+    /**
+     * Save new password for a user.
+     *
+     * @param uid
+     *  User id.
+     * @param password
+     *  A new password to set.
+     *
+     * @returns {*}
+     */
+    this.savePassword = function(uid, password) {
+      return $injector.get('$http')({
+        method: 'PATCH',
+        url: Config.backend + '/api/v1.1/users/' + uid,
+        data: {password: password}
+      });
+    };
+
+    /**
+     * Checks users availability.
+     *
+     * @param user
+     * @returns {*}
+     */
+    this.usersAvailability = function(user) {
+      var params = 'name=' + user.name + '&mail=' + user.mail;
+
+      return $injector.get('$http')({
+        method: 'GET',
+        url: Config.backend + '/api/users-availability?' + params
+      });
+    };
+
+    /**
+     * Sign Up new user.
+     *
+     * @param data
+     * @returns {*}
+     */
+    this.signUp = function(data) {
+      return $injector.get('$http')({
+        method: 'POST',
+        url: Config.backend + '/api/v1.1/users',
+        data: data
+      });
+    };
+
     /**
      * Logout current user.
      *

app/templates/client/app/styles/main.scss

@@ -12,3 +12,7 @@
   min-height: 500px;
 }
 
+.vertical-space {
+  margin-top: 15px;
+  margin-bottom: 15px;
+}