only display delete option if track was added by current user

thisissoon · Aug 4, 2015 · b89d9bd · b89d9bd
1 parent 6c18ad1
commit b89d9bd
Show file tree

Hide file tree

Showing 8 changed files with 101 additions and 8 deletions.
diff --git a/app/index.html b/app/index.html
@@ -98,6 +98,7 @@
     <script src="js/auth/spotify.js"></script>
     <script src="js/auth/controllers/LoginGoogleCtrl.js"></script>
     <script src="js/auth/controllers/LoginSpotifyCtrl.js"></script>
+    <script src="js/auth/services/GoogleAuthService.js"></script>
     <script src="js/auth/services/SpotifyAuthService.js"></script>
 
     <script src="js/alert/alert.js"></script>

diff --git a/app/js/api/factories/UsersResource.js b/app/js/api/factories/UsersResource.js
@@ -27,6 +27,10 @@ angular.module("FM.api.UsersResource",[
                 id: "@id"
             },
             {
+                current: {
+                    method: "GET",
+                    url: env.FM_API_SERVER_ADDRESS + "users" + "/:id/authenticated"
+                },
                 stats: {
                     method: "GET",
                     url: env.FM_API_SERVER_ADDRESS + "users" + "/:id/stats"

diff --git a/app/js/auth/controllers/LoginGoogleCtrl.js b/app/js/auth/controllers/LoginGoogleCtrl.js
@@ -6,6 +6,7 @@
  * @author SOON_
  */
 angular.module("FM.auth.LoginGoogleCtrl", [
+    "FM.auth.GoogleAuthService",
     "FM.alert",
     "satellizer",
     "FM.api.ERRORS"
@@ -20,15 +21,17 @@ angular.module("FM.auth.LoginGoogleCtrl", [
     "$auth",
     "ERRORS",
     "AlertService",
+    "GoogleAuthService",
     /**
      * @constructor
      * @param {Object}  $scope
      * @param {Service} $route
-     * @param {Service} $auth         satellizer $auth service
-     * @param {Object}  ERRORS        error message copy
-     * @param {Object}  AlertService  Service which displays errors in the player
+     * @param {Service} $auth             satellizer $auth service
+     * @param {Object}  ERRORS            error message copy
+     * @param {Object}  AlertService      Service which displays errors in the player
+     * @param {Object}  GoogleAuthService Stores google auth data
      */
-    function ($scope, $route, $auth, ERRORS, AlertService) {
+    function ($scope, $route, $auth, ERRORS, AlertService, GoogleAuthService) {
 
         /**
          * Authenticate with google oauth
@@ -37,7 +40,10 @@ angular.module("FM.auth.LoginGoogleCtrl", [
         $scope.authenticate = function authenticate() {
 
             $auth.authenticate("google")
-                .then($route.reload)
+                .then(function(){
+                    GoogleAuthService.loadUser();
+                    $route.reload();
+                })
                 .catch(function (error){
                     // Satellizer returns an error if there is no token, parse the error to get the original API response
                     var response = JSON.parse(error.message.match(/\{.*\}/));

diff --git a/app/js/auth/google.js b/app/js/auth/google.js
@@ -8,6 +8,7 @@
  */
 angular.module("FM.auth.google", [
     "FM.auth.LoginGoogleCtrl",
+    "FM.auth.GoogleAuthService",
     "config",
     "satellizer"
 ])
@@ -42,7 +43,8 @@ angular.module("FM.auth.google", [
 .run([
     "$rootScope",
     "$auth",
-    function ($rootScope, $auth){
+    "GoogleAuthService",
+    function ($rootScope, $auth, GoogleAuthService){
 
         /**
          * Set isAuthenticatedGoogle if token exists
@@ -52,5 +54,9 @@ angular.module("FM.auth.google", [
             return Boolean($auth.getToken());
         };
 
+        if ($rootScope.isAuthenticatedGoogle()){
+            GoogleAuthService.loadUser();
+        }
+
     }
 ]);
diff --git a/app/js/auth/services/GoogleAuthService.js b/app/js/auth/services/GoogleAuthService.js
@@ -0,0 +1,58 @@
+"use strict";
+/**
+ * Authentication service for google login
+ * @module FM.auth.GoogleAuthService
+ * @author SOON_
+ */
+angular.module("FM.auth.GoogleAuthService", [
+    "FM.api.UsersResource",
+    "satellizer"
+])
+/**
+ * @class GoogleAuthService
+ * @param {Service} $q
+ * @param {Factory} UsersResource
+ */
+.service("GoogleAuthService", [
+    "$rootScope",
+    "$q",
+    "$auth",
+    "UsersResource",
+    function ($rootScope, $q, $auth, UsersResource){
+
+        /**
+         * @private
+         * @property user
+         * @type {Object}
+         */
+        var user = null;
+
+        /**
+         * @public
+         * @method loadUser
+         * @return {Promise} The current user object
+         */
+        this.loadUser = function loadUser() {
+            var deferred = $q.defer();
+
+            UsersResource.current().$promise
+                .then(function (response) {
+                    user = response;
+                    deferred.resolve(response);
+                })
+                .catch(deferred.reject);
+
+            return deferred.promise;
+        };
+
+        /**
+         * @public
+         * @method getUser
+         * @return {Object} The current user object
+         */
+        this.getUser = function getUser() {
+            return user;
+        };
+
+    }
+]);
diff --git a/app/js/player/directives/track.js b/app/js/player/directives/track.js
@@ -8,6 +8,7 @@
 angular.module("FM.player.trackDirective", [
     "FM.player.removeLeadingZeros",
     "FM.api.PlayerQueueResource",
+    "FM.auth.GoogleAuthService",
     "ui.bootstrap.popover",
     "template/popover/popover-template.html",
     "template/popover/popover.html",
@@ -21,7 +22,8 @@ angular.module("FM.player.trackDirective", [
  */
 .directive("fmTrack",[
     "PlayerQueueResource",
-    function (PlayerQueueResource){
+    "GoogleAuthService",
+    function (PlayerQueueResource, GoogleAuthService){
         return {
             restrict: "EA",
             scope: {
@@ -35,6 +37,21 @@ angular.module("FM.player.trackDirective", [
             templateUrl: "partials/track.html",
             link: function($scope){
 
+                /**
+                 * @property currentUser
+                 * @type {Object}
+                 */
+                $scope.currentUser = GoogleAuthService.getUser();
+
+                /**
+                 * Whether the track has been added by the current user
+                 * @property addedByCurrent
+                 * @type {Boolean}
+                 */
+                $scope.addedByCurrent = ($scope.currentUser && $scope.user && $scope.currentUser.id && $scope.user.id ) ?
+                                        ($scope.currentUser.id === $scope.user.id) :
+                                        false;
+
                 /**
                  * Remove track from queue
                  * @method removeTrack

diff --git a/app/partials/track.html b/app/partials/track.html
@@ -45,7 +45,7 @@
     </a>
     <ul class="dropdown-menu" role="menu">
         <li><a href ng-click="addToPlaylist(track)">Add to playlist</a></li>
-        <li><a href ng-click="removeTrack(id)" ng-if="id" class="option-delete">Delete from queue</a></li>
+        <li><a href ng-click="removeTrack(id)" ng-if="id && addedByCurrent" class="option-delete">Delete from queue</a></li>
     </ul>
 </div>
 

diff --git a/scripts.json b/scripts.json
@@ -28,6 +28,7 @@
         "./app/js/auth/spotify.js",
         "./app/js/auth/controllers/LoginGoogleCtrl.js",
         "./app/js/auth/controllers/LoginSpotifyCtrl.js",
+        "./app/js/auth/services/GoogleAuthService.js",
         "./app/js/auth/services/SpotifyAuthService.js",
 
         "./app/js/alert/alert.js",