Merge pull request #34 from owncloud/use-phoenix-server-url

Author: refs

changelog/unreleased/use-server-config.md

@@ -0,0 +1,5 @@
+Change: Use server config variable from ocis-web
+
+We are not providing an api url anymore but use the server url from ocis-web config instead. This still - as before - requires that ocis-proxy is in place for routing requests to ocis-settings.
+
+https://github.com/owncloud/ocis-settings/pull/34

package.json

@@ -59,9 +59,11 @@
     "> 1%",
     "not dead"
   ],
+  "peerDependencies": {
+    "owncloud-design-system": "^1.7.0"
+  },
   "dependencies": {
     "lodash": "^4.17.15",
-    "owncloud-design-system": "^1.6.0",
     "vuex": "^3.2.0"
   }
 }

pkg/assets/embed.go

@@ -161,7 +161,7 @@ func Server(cfg *config.Config) *cli.Command {
 
 				gr.Add(server.Run, func(_ error) {
 					logger.Info().
-						Str("server", "http").
+						Str("server", "grpc").
 						Msg("Shutting down server")
 
 					cancel()

pkg/command/server.go

@@ -46,7 +46,7 @@ func Server(opts ...Option) http.Service {
 	)
 
 	mux.Use(middleware.Version(
-		"settings",
+		options.Name,
 		version.String,
 	))
 

pkg/server/http/server.go

@@ -12,10 +12,7 @@ const appInfo = {
   id: 'settings',
   icon: 'application',
   isFileEditor: false,
-  extensions: [],
-  config: {
-    url: 'https://localhost:9200'
-  }
+  extensions: []
 }
 
 const routes = [

ui/app.js

@@ -48,6 +48,7 @@ const mutations = {
 }
 
 const actions = {
+  // Used by ocis-web.
   loadConfig ({ commit }, config) {
     commit('LOAD_CONFIG', config)
   },
@@ -60,7 +61,7 @@ const actions = {
   async fetchSettingsBundles ({ commit, dispatch, getters, rootGetters }) {
     injectAuthToken(rootGetters)
     const response = await BundleService_ListSettingsBundles({
-      $domain: getters.config.url,
+      $domain: rootGetters.configuration.server,
       body: {}
     })
     if (response.status === 201) {
@@ -100,7 +101,7 @@ const actions = {
   async saveSettingsValue ({ commit, dispatch, getters, rootGetters }, payload) {
     injectAuthToken(rootGetters)
     const response = await ValueService_SaveSettingsValue({
-      $domain: getters.config.url,
+      $domain: rootGetters.configuration.server,
       body: {
         settingsValue: payload
       }