Added Auth service

Author: Dean Sofer

modules/App.js

@@ -1,4 +1,4 @@
-var module = angular.module('App', ['ui.router', 'App.Authentication', 'App.Guest']);
+var module = angular.module('App', ['ui.router', 'App.Auth', 'App.Guest']);
 
 module.config(function($urlRouterProvider) {
 

modules/App.scss

@@ -1,4 +1,4 @@
-// Authentication/Authenticated.html
+// Auth/Authenticated.html
 .breadcrumbs {
   > span {
     &:after {

modules/Auth/Auth.js

@@ -0,0 +1,23 @@
+var module = angular.module('App.Auth', ['ui.router', 'ui.bootstrap']);
+
+module.factory('Auth', ($q, $http) => {
+  /**
+   * Auth
+   */
+  return {
+    /**
+     * Retrieves the currently logged in user
+     * @returns {Promise<User>}
+     */
+    checkCredentials() {
+      return $http.get('/api/session');
+    },
+    /**
+     * @param {UserObject} user
+     * @param {boolean} rememberMe
+     */
+    login(user, rememberMe = false) {
+      return $http.post('/api/session', user);
+    }
+  }
+});

modules/Authentication/Authenticated.html renamed to modules/Auth/Authenticated.html

@@ -1,24 +1,24 @@
 /*
-Authentication Module
+Auth Module
 =====================
 
 Most of the actual app is located under here. This abstract module primarily tackles authenticating the user
 */
 
-var module = angular.module('App.Authenticated', ['ui.router']);
+var module = angular.module('App.Auth');
 
 module.config(function($stateProvider) {
   $stateProvider.state('authenticated', {
     templateUrl: 'modules/Authenticated/Authenticated.html',
     abstract: true,
     resolve: {
-      user: (User, Authentication, $state, $q) => {
-        return Authentication.checkCredentials()
+      user: (User, Auth, $state, $q) =>
+        Auth.checkCredentials()
           .then(
             (response) => new User(response.data),
             // must return a rejected promise in order to stay in rejected-mode
             (error) => $q.reject($state.go('login'))
-          );
+          )
       },
       // layout variable for breadcrumb nav (populated by children)
       breadcrumbs: () => []

modules/Authentication/Authenticated.js renamed to modules/Auth/Authenticated.js

@@ -9,7 +9,7 @@ $modal is part of ui.bootstrap
 // Tracks the previous location and allows you to redirect back to that location
 var previousLocation;
 
-var module = angular.module('App.Login', ['ui.router', 'ui.bootstrap']);
+var module = angular.module('App.Auth');
 
 module.config(function($stateProvider) {
   $stateProvider.state('login', {
@@ -25,7 +25,7 @@ module.config(function($stateProvider) {
         };
       },
       modal: ($modal) => $modal.open({
-        templateUrl: 'modules/Authentication/Login.html',
+        templateUrl: 'modules/Auth/Login.html',
         controller: 'Login',
       })
     },
@@ -42,11 +42,11 @@ module.run(function($rootScope, $location) {
   });
 });
 
-module.controller('Login', ($scope, UserObject, Authentication, user, redirect) => {
+module.controller('Login', ($scope, UserObject, Auth, user, redirect) => {
   $scope.user = user;
 
   $scope.login = () => {
-    Authentication.login($scope.user, $scope.rememberMe)
+    Auth.login($scope.user, $scope.rememberMe)
       .then( redirect, (response) => $scope.error = response);
   };
 });

modules/Authentication/Login.html renamed to modules/Auth/Login.html

@@ -23,23 +23,23 @@ module.config(function($stateProvider) {
     url: '/projects', // /intro/projects
     views: {
       'modal@': { // The $modal service places HTML at the top of the document. I know, it's weird.
-        templateUrl: 'modules/Intro/projects.html'
+        templateUrl: 'modules/Intro/Projects.html'
       }
     },
   });
   $stateProvider.state( 'intro.tasks', {
     url: '/tasks', // /intro/tasks
     views: {
       'modal@': { // The $modal service places HTML at the top of the document. I know, it's weird.
-        templateUrl: 'modules/Intro/tasks.html'
+        templateUrl: 'modules/Intro/Tasks.html'
       }
     },
   });
   $stateProvider.state( 'intro.done', {
     url: '/done', // /intro/done
     views: {
       'modal@': { // The $modal service places HTML at the top of the document. I know, it's weird.
-        templateUrl: 'modules/Intro/done.html'
+        templateUrl: 'modules/Intro/Done.html'
       }
     },
   });

modules/Authentication/Login.js renamed to modules/Auth/Login.js

@@ -14,10 +14,10 @@ module.config( ($stateProvider) => {
       tasks: (Task, project) => Task.list(project.id)
     },
     // breadcrumbs resolved in authenticated state
-    onEnter: function(breadcrumbs) {
+    onEnter(breadcrumbs) {
       breadcrumbs.push({ label: 'Tasks', sref: 'tasks' });
     },
-    onExit: function(breadcrumbs) {
+    onExit(breadcrumbs) {
       breadcrumbs.pop();
     }
   });
@@ -30,10 +30,10 @@ module.config( ($stateProvider) => {
     templateUrl: 'modules/Task/Form.html',
     controller: 'TaskForm',
     // breadcrumbs resolved in authenticated state
-    onEnter: function(breadcrumbs) {
+    onEnter(breadcrumbs) {
       breadcrumbs.push({ label: 'New', sref: 'tasks.new' });
     },
-    onExit: function(breadcrumbs) {
+    onExit(breadcrumbs) {
       breadcrumbs.pop();
     }
   });
@@ -54,11 +54,11 @@ module.config( ($stateProvider) => {
     resolve: {
       task: (project, $stateParams) => project.getTask($stateParams.taskId)
     },
-    onEnter: function(task, breadcrumbs) {
+    onEnter(task, breadcrumbs) {
       task.open();
       breadcrumbs.push({ label: task.name, sref: 'task' });
     },
-    onExit: function(task, breadcrumbs) {
+    onExit(task, breadcrumbs) {
       task.close();
       breadcrumbs.pop();
     }

modules/Intro/Intro.js

@@ -14,23 +14,22 @@ module.factory( 'Task', (BaseObject, $http) => {
 
     /**
      * Creates a new task
-     * 
+     *
      * @note Demonstrates how to have the create wait until uploading is complete
      *   Normally you might have to wait until the attachment is done before enabling
      *   submission of the form, but this way allows the user to submit before uploading
      *   is complete and makes it easy to show loading spinners.
-     * 
+     *
      *   You could check either the `task.saving`, `task.creating`, or `task.uploading`
      *   properties for truthy value when the user tries to navigate away from the page.
-     * 
+     *
      * @returns {Promise}
      */
     create() {
       // wraps `this.uploading` in a promise that resolves immediately if it is `null` or waits for the promise
       return this.cache('creating', () =>
         $q.when(this.uploading)
           .then( () => $http.post('/api/tasks', this) ) // uploading callback
-          .then( response => Object.assign(this, response.data) ) // creating callback
       );
     }
 
@@ -44,19 +43,18 @@ module.factory( 'Task', (BaseObject, $http) => {
       return this.cache('updating', () =>
         $q.when(this.uploading)
           .then( () => $http.put(`/api/tasks/${this.id}`, this) ) // uploading callback
-          .then( response => Object.assign(this, response.data) ) // creating callback
       );
     }
-    
+
     /**
      * Allow you to upload attachments to tasks
-     * 
+     *
      * @note Added to demonstrate clean ways to have 1 method wait for another method to finish
      * @param {mixed} attachment
      * @returns {Promise}
      */
     upload(attachment) {
-      return this.cache('uploading', () => 
+      return this.cache('uploading', () =>
         $http.post(`/api/attachments`, attachment)
           .then( response => this.attachments = response.data )
       );