diff --git a/conf/configuration.go b/conf/configuration.go
index 98ca5f26..c7a0f4ca 100644
--- a/conf/configuration.go
+++ b/conf/configuration.go
@@ -52,6 +52,7 @@ type configOptions struct {
EnableFavourites bool
EnableStarRating bool
EnableUserEditing bool
+ EnableSharing bool
DefaultTheme string
DefaultLanguage string
DefaultUIVolume int
@@ -78,7 +79,6 @@ type configOptions struct {
DevAutoCreateAdminPassword string
DevAutoLoginUsername string
DevActivityPanel bool
- DevEnableShare bool
DevSidebarPlaylists bool
DevEnableBufferedScrobble bool
DevShowArtistPage bool
@@ -282,7 +282,7 @@ func init() {
viper.SetDefault("devautocreateadminpassword", "")
viper.SetDefault("devautologinusername", "")
viper.SetDefault("devactivitypanel", true)
- viper.SetDefault("devenableshare", false)
+ viper.SetDefault("enablesharing", false)
viper.SetDefault("devenablebufferedscrobble", true)
viper.SetDefault("devsidebarplaylists", true)
viper.SetDefault("devshowartistpage", true)
diff --git a/server/nativeapi/native_api.go b/server/nativeapi/native_api.go
index 8caa2d56..f3a58cf0 100644
--- a/server/nativeapi/native_api.go
+++ b/server/nativeapi/native_api.go
@@ -45,7 +45,7 @@ func (n *Router) routes() http.Handler {
n.R(r, "/playlist", model.Playlist{}, true)
n.R(r, "/transcoding", model.Transcoding{}, conf.Server.EnableTranscodingConfig)
n.R(r, "/radio", model.Radio{}, true)
- if conf.Server.DevEnableShare {
+ if conf.Server.EnableSharing {
n.RX(r, "/share", n.share.NewRepository, true)
}
diff --git a/server/public/public_endpoints.go b/server/public/public_endpoints.go
index 34361b13..440fa7b1 100644
--- a/server/public/public_endpoints.go
+++ b/server/public/public_endpoints.go
@@ -38,7 +38,7 @@ func (p *Router) routes() http.Handler {
r.Group(func(r chi.Router) {
r.Use(server.URLParamsMiddleware)
r.HandleFunc("/img/{id}", p.handleImages)
- if conf.Server.DevEnableShare {
+ if conf.Server.EnableSharing {
r.HandleFunc("/s/{id}", p.handleStream)
r.HandleFunc("/{id}", p.handleShares)
r.HandleFunc("/", p.handleShares)
diff --git a/server/serve_index.go b/server/serve_index.go
index e521edd4..196a2de3 100644
--- a/server/serve_index.go
+++ b/server/serve_index.go
@@ -56,7 +56,7 @@ func serveIndex(ds model.DataStore, fs fs.FS, shareInfo *model.Share) http.Handl
"losslessFormats": strings.ToUpper(strings.Join(consts.LosslessFormats, ",")),
"devActivityPanel": conf.Server.DevActivityPanel,
"enableUserEditing": conf.Server.EnableUserEditing,
- "devEnableShare": conf.Server.DevEnableShare,
+ "enableSharing": conf.Server.EnableSharing,
"devSidebarPlaylists": conf.Server.DevSidebarPlaylists,
"lastFMEnabled": conf.Server.LastFM.Enabled,
"lastFMApiKey": conf.Server.LastFM.ApiKey,
diff --git a/server/serve_index_test.go b/server/serve_index_test.go
index a714c83c..6908be9f 100644
--- a/server/serve_index_test.go
+++ b/server/serve_index_test.go
@@ -224,14 +224,14 @@ var _ = Describe("serveIndex", func() {
Expect(config).To(HaveKeyWithValue("enableUserEditing", true))
})
- It("sets the devEnableShare", func() {
+ It("sets the enableSharing", func() {
r := httptest.NewRequest("GET", "/index.html", nil)
w := httptest.NewRecorder()
serveIndex(ds, fs, nil)(w, r)
config := extractAppConfig(w.Body.String())
- Expect(config).To(HaveKeyWithValue("devEnableShare", false))
+ Expect(config).To(HaveKeyWithValue("enableSharing", false))
})
It("sets the defaultDownsamplingFormat", func() {
diff --git a/server/subsonic/api.go b/server/subsonic/api.go
index 6e3429a3..400ec260 100644
--- a/server/subsonic/api.go
+++ b/server/subsonic/api.go
@@ -163,7 +163,7 @@ func (api *Router) routes() http.Handler {
h(r, "getInternetRadioStations", api.GetInternetRadios)
h(r, "updateInternetRadioStation", api.UpdateInternetRadio)
})
- if conf.Server.DevEnableShare {
+ if conf.Server.EnableSharing {
r.Group(func(r chi.Router) {
h(r, "getShares", api.GetShares)
h(r, "createShare", api.CreateShare)
diff --git a/server/subsonic/users.go b/server/subsonic/users.go
index eeda13de..8018fd43 100644
--- a/server/subsonic/users.go
+++ b/server/subsonic/users.go
@@ -22,7 +22,7 @@ func (api *Router) GetUser(r *http.Request) (*responses.Subsonic, error) {
response.User.StreamRole = true
response.User.ScrobblingEnabled = true
response.User.DownloadRole = conf.Server.EnableDownloads
- response.User.ShareRole = conf.Server.DevEnableShare
+ response.User.ShareRole = conf.Server.EnableSharing
return response, nil
}
@@ -38,7 +38,7 @@ func (api *Router) GetUsers(r *http.Request) (*responses.Subsonic, error) {
user.StreamRole = true
user.ScrobblingEnabled = true
user.DownloadRole = conf.Server.EnableDownloads
- user.ShareRole = conf.Server.DevEnableShare
+ user.ShareRole = conf.Server.EnableSharing
response := newResponse()
response.Users = &responses.Users{User: []responses.User{user}}
return response, nil
diff --git a/ui/src/App.js b/ui/src/App.js
index 33e72bf6..6a876afe 100644
--- a/ui/src/App.js
+++ b/ui/src/App.js
@@ -110,7 +110,7 @@ const Admin = (props) => {
name="radio"
{...(permissions === 'admin' ? radio.admin : radio.all)}
/>,
- config.devEnableShare && ,
+ config.enableSharing && ,
{
}
const AppWithHotkeys = () => {
- if (config.devEnableShare && shareInfo) {
+ if (config.enableSharing && shareInfo) {
return
}
return (
diff --git a/ui/src/album/AlbumActions.js b/ui/src/album/AlbumActions.js
index 6084a623..c7f20f7c 100644
--- a/ui/src/album/AlbumActions.js
+++ b/ui/src/album/AlbumActions.js
@@ -108,7 +108,7 @@ const AlbumActions = ({
>
- {config.devEnableShare && (
+ {config.enableSharing && (
diff --git a/ui/src/common/ContextMenus.js b/ui/src/common/ContextMenus.js
index 14f95238..ac22d860 100644
--- a/ui/src/common/ContextMenus.js
+++ b/ui/src/common/ContextMenus.js
@@ -81,7 +81,7 @@ const ContextMenu = ({
action: (data, ids) => dispatch(openAddToPlaylist({ selectedIds: ids })),
},
share: {
- enabled: config.devEnableShare,
+ enabled: config.enableSharing,
needData: false,
label: translate('ra.action.share'),
action: (record) => {
diff --git a/ui/src/common/SongBulkActions.js b/ui/src/common/SongBulkActions.js
index 8218139b..9210bb02 100644
--- a/ui/src/common/SongBulkActions.js
+++ b/ui/src/common/SongBulkActions.js
@@ -44,7 +44,7 @@ export const SongBulkActions = (props) => {
icon={}
className={classes.button}
/>
- {config.devEnableShare && (
+ {config.enableSharing && (
)}
diff --git a/ui/src/common/SongContextMenu.js b/ui/src/common/SongContextMenu.js
index ef5d3e0f..c49611be 100644
--- a/ui/src/common/SongContextMenu.js
+++ b/ui/src/common/SongContextMenu.js
@@ -65,7 +65,7 @@ export const SongContextMenu = ({
),
},
share: {
- enabled: config.devEnableShare,
+ enabled: config.enableSharing,
label: translate('ra.action.share'),
action: (record) => {
dispatch(openShareMenu([record.id], 'song', record.title))
diff --git a/ui/src/config.js b/ui/src/config.js
index 8b9a65e6..da24ba3f 100644
--- a/ui/src/config.js
+++ b/ui/src/config.js
@@ -20,7 +20,7 @@ const defaultConfig = {
defaultLanguage: '',
defaultUIVolume: 100,
enableUserEditing: true,
- devEnableShare: true,
+ enableSharing: true,
devSidebarPlaylists: true,
lastFMEnabled: true,
lastFMApiKey: '9b94a5515ea66b2da3ec03c12300327e',
diff --git a/ui/src/playlist/PlaylistActions.js b/ui/src/playlist/PlaylistActions.js
index 8bf3bcdc..d98596c3 100644
--- a/ui/src/playlist/PlaylistActions.js
+++ b/ui/src/playlist/PlaylistActions.js
@@ -139,7 +139,7 @@ const PlaylistActions = ({ className, ids, data, record, ...rest }) => {
>
- {config.devEnableShare && (
+ {config.enableSharing && (