Parcourir la source

refactor: cleaned up some spotify action comments and permissions

Kristian Vos il y a 1 an
Parent
commit
e74a39ab02
2 fichiers modifiés avec 16 ajouts et 8 suppressions
  1. 4 4
      backend/logic/actions/spotify.js
  2. 12 4
      backend/logic/hooks/hasPermission.js

+ 4 - 4
backend/logic/actions/spotify.js

@@ -13,7 +13,7 @@ export default {
 	 * @returns {{status: string, data: object}}
 	 */
 	getTracksFromMediaSources: useHasPermission(
-		"admin.view.spotify",
+		"spotify.getTracksFromMediaSources",
 		function getTracksFromMediaSources(session, mediaSources, cb) {
 			SpotifyModule.runJob("GET_TRACKS_FROM_MEDIA_SOURCES", { mediaSources }, this)
 				.then(response => {
@@ -41,7 +41,7 @@ export default {
 	 *
 	 * @returns {{status: string, data: object}}
 	 */
-	getAlbumsFromIds: useHasPermission("admin.view.spotify", function getTracksFromMediaSources(session, albumIds, cb) {
+	getAlbumsFromIds: useHasPermission("spotify.getAlbumsFromIds", function getAlbumsFromIds(session, albumIds, cb) {
 		SpotifyModule.runJob("GET_ALBUMS_FROM_IDS", { albumIds }, this)
 			.then(albums => {
 				this.log("SUCCESS", "SPOTIFY_GET_ALBUMS_FROM_IDS", `Getting albums from ids was successful.`);
@@ -60,8 +60,8 @@ export default {
 	 * @returns {{status: string, data: object}}
 	 */
 	getArtistsFromIds: useHasPermission(
-		"admin.view.spotify",
-		function getTracksFromMediaSources(session, artistIds, cb) {
+		"spotify.getArtistsFromIds",
+		function getArtistsFromIds(session, artistIds, cb) {
 			SpotifyModule.runJob("GET_ARTISTS_FROM_IDS", { artistIds }, this)
 				.then(artists => {
 					this.log("SUCCESS", "SPOTIFY_GET_ARTISTS_FROM_IDS", `Getting artists from ids was successful.`);

+ 12 - 4
backend/logic/hooks/hasPermission.js

@@ -36,6 +36,7 @@ permissions.moderator = {
 	"admin.view.songs": true,
 	"admin.view.stations": true,
 	"admin.view.users": true,
+	"admin.view.youtubeChannels": true,
 	"admin.view.youtubeVideos": true,
 	"apis.searchDiscogs": true,
 	"news.create": true,
@@ -93,6 +94,7 @@ permissions.admin = {
 	"users.update.restricted": true,
 	"utils.getModules": true,
 	"youtube.getApiRequest": true,
+	"youtube.getMissingChannels": true,
 	"youtube.resetStoredApiRequests": true,
 	"youtube.removeStoredApiRequest": true,
 	"youtube.removeVideos": true
@@ -102,6 +104,7 @@ if (config.get("experimental.soundcloud")) {
 	permissions.moderator["admin.view.soundcloudTracks"] = true;
 	permissions.admin["admin.view.soundcloudTracks"] = true;
 
+	permissions.moderator["admin.view.soundcloud"] = true;
 	permissions.admin["admin.view.soundcloud"] = true;
 
 	permissions.admin["soundcloud.fetchNewApiKey"] = true;
@@ -113,12 +116,17 @@ if (config.get("experimental.soundcloud")) {
 }
 
 if (config.get("experimental.spotify")) {
-	permissions.moderator["admin.view.youtubeChannels"] = true;
-	permissions.admin["admin.view.youtubeChannels"] = true;
-
+	permissions.moderator["admin.view.spotify"] = true;
 	permissions.admin["admin.view.spotify"] = true;
 
-	permissions.admin["youtube.getMissingChannels"] = true;
+	permissions.moderator["spotify.getTracksFromMediaSources"] = true;
+	permissions.admin["spotify.getTracksFromMediaSources"] = true;
+
+	permissions.moderator["spotify.getAlbumsFromIds"] = true;
+	permissions.admin["spotify.getAlbumsFromIds"] = true;
+
+	permissions.moderator["spotify.getArtistsFromIds"] = true;
+	permissions.admin["spotify.getArtistsFromIds"] = true;
 }
 
 export const hasPermission = async (permission, session, stationId) => {