web

services/web/Makefile

@@ -41,9 +41,9 @@ pull-assets:
 
 ############ licenses ############
 .PHONY: ci-node-check-licenses
-ci-node-check-licenses: # ownCloud Web does the check on it's own
+ci-node-check-licenses: # OpenCloud Web does the check on it's own
 
 .PHONY: ci-node-save-licenses
 ci-node-save-licenses:
 	@mkdir -p ../../third-party-licenses/node/web
-	@curl --fail -slL -o- https://github.com/owncloud/web/releases/download/$(WEB_ASSETS_VERSION)/third-party-licenses.tar.gz | tar xzf - -C ../../third-party-licenses/node/web
+	@curl --fail -slL -o- https://github.com/opencloud-eu/web/releases/download/$(WEB_ASSETS_VERSION)/third-party-licenses.tar.gz | tar xzf - -C ../../third-party-licenses/node/web

services/web/README.md

@@ -1,6 +1,6 @@
 # Web
 
-The web service embeds and serves the static files for the [Infinite Scale Web Client](https://github.com/owncloud/web).
+The web service embeds and serves the static files for the [OpenCloud Web Client](https://github.com/opencloud-eu/web).
 Note that clients will respond with a connection error if the web service is not available.
 
 The web service also provides a minimal API for branding functionality like changing the logo shown.
@@ -9,7 +9,7 @@ The web service also provides a minimal API for branding functionality like chan
 
 If you want to use your custom compiled web client assets instead of the embedded ones,
 then you can do that by setting the `WEB_ASSET_PATH` variable to point to your compiled files.
-See [ownCloud Web / Getting Started](https://owncloud.dev/clients/web/getting-started/) and [ownCloud Web / Setup with oCIS](https://owncloud.dev/clients/web/backend-ocis/) for more details.
+See [OpenCloud Web / Getting Started](https://docs.opencloud.eu/clients/web/getting-started/) and [OpenCloud Web / Setup with OpenCloud](https://docs.opencloud.eu/clients/web/backend-opencloud/) for more details.
 
 ## Web UI Configuration
 
@@ -25,14 +25,14 @@ for more details.
 ### Web UI Config File
 
 When defined via the `WEB_UI_CONFIG_FILE` environment variable, the configuration of the web UI can be made
-with a [json based](https://github.com/owncloud/web/tree/master/config) file.
+with a [json based](https://github.com/opencloud-eu/web/tree/master/config) file.
 
 ### Embedding Web
 
 Web can be consumed by another application in a stripped down version called “Embed mode”.
 This mode is supposed to be used in the context of selecting or sharing resources.
 
-For more details see the developer documentation [ownCloud Web / Embed Mode](https://owncloud.dev/clients/web/embed-mode/).
+For more details see the developer documentation [OpenCloud Web / Embed Mode](https://docs.opencloud.eu/clients/web/embed-mode/).
 See the environment variables: `WEB_OPTION_MODE` and `WEB_OPTION_EMBED_TARGET` to configure the embedded mode.
 
 ## Web Apps
@@ -46,7 +46,7 @@ and does not support injection of dynamic web applications (custom dynamic backe
 ### Loading Themes
 
 Web themes are loaded, if added in the Infinite Scale source code, at build-time from
-`<ocis_repo>/services/web/assets/themes`.
+`<opencloud_repo>/services/web/assets/themes`.
 This cannot be manipulated at runtime.
 
 Additionally, the administrator can provide custom themes by storing it in the path defined by the environment
@@ -58,17 +58,17 @@ This can be done by setting the `WEB_UI_THEME_PATH` environment variable.
 The final theme is composed of the built-in and the custom theme provided by the
 administrator via `WEB_ASSET_THEMES_PATH` and `WEB_UI_THEME_PATH`.
 
-For example, Infinite Scale by default contains a built-in ownCloud theme.
+For example, OpenCloud by default contains a built-in OpenCloud theme.
 If the administrator provides a custom theme via the `WEB_ASSET_THEMES_PATH` directory like,
-`WEB_ASSET_THEMES_PATH/owncloud/themes.json`, this one will be used instead of the built-in one.
+`WEB_ASSET_THEMES_PATH/opencloud/themes.json`, this one will be used instead of the built-in one.
 
 Some theme keys are mandatory, like the `common.shareRoles` settings.
 Such mandatory keys are injected automatically at runtime if not provided.
 
 ### Loading Applications
 
 Web applications are loaded, if added in the Infinite Scale source code, at build-time from
-`<ocis_repo>/services/web/assets/apps`. This cannot be manipulated at runtime.
+`<opencloud_repo>/services/web/assets/apps`. This cannot be manipulated at runtime.
 
 Additionally, the administrator can provide custom applications by storing them in the path defined by the environment
 variable `WEB_ASSET_APPS_PATH`.

services/web/pkg/command/root.go

@@ -26,7 +26,7 @@ func GetCommands(cfg *config.Config) cli.Commands {
 func Execute(cfg *config.Config) error {
 	app := clihelper.DefaultApp(&cli.App{
 		Name:     "web",
-		Usage:    "Serve ownCloud Web for oCIS",
+		Usage:    "Serve Web for OpenCloud",
 		Commands: GetCommands(cfg),
 	})
 

services/web/pkg/config/config.go

@@ -19,7 +19,7 @@ type Config struct {
 	HTTP HTTP `yaml:"http"`
 
 	Asset Asset  `yaml:"asset"`
-	File  string `yaml:"file" env:"WEB_UI_CONFIG_FILE" desc:"Read the ownCloud Web json based configuration from this path/file. The config file takes precedence over WEB_OPTION_xxx environment variables. See the text description for more details." introductionVersion:"pre5.0"`
+	File  string `yaml:"file" env:"WEB_UI_CONFIG_FILE" desc:"Read the OpenCloud Web json based configuration from this path/file. The config file takes precedence over WEB_OPTION_xxx environment variables. See the text description for more details." introductionVersion:"pre5.0"`
 	Web   Web    `yaml:"web"`
 	Apps  map[string]App
 
@@ -31,30 +31,30 @@ type Config struct {
 
 // Asset defines the available asset configuration.
 type Asset struct {
-	CorePath   string `yaml:"core_path" env:"WEB_ASSET_CORE_PATH" desc:"Serve ownCloud Web assets from a path on the filesystem instead of the builtin assets. If not defined, the root directory derives from $OC_BASE_DATA_PATH/web/assets/core" introductionVersion:"6.0.0"`
-	ThemesPath string `yaml:"themes_path" env:"OC_ASSET_THEMES_PATH;WEB_ASSET_THEMES_PATH" desc:"Serve ownCloud themes from a path on the filesystem instead of the builtin assets. If not defined, the root directory derives from $OC_BASE_DATA_PATH/web/assets/themes" introductionVersion:"6.0.0"`
-	AppsPath   string `yaml:"apps_path" env:"WEB_ASSET_APPS_PATH" desc:"Serve ownCloud Web apps assets from a path on the filesystem instead of the builtin assets. If not defined, the root directory derives from $OC_BASE_DATA_PATH/web/assets/apps" introductionVersion:"6.0.0"`
+	CorePath   string `yaml:"core_path" env:"WEB_ASSET_CORE_PATH" desc:"Serve OpenCloud Web assets from a path on the filesystem instead of the builtin assets. If not defined, the root directory derives from $OC_BASE_DATA_PATH/web/assets/core" introductionVersion:"6.0.0"`
+	ThemesPath string `yaml:"themes_path" env:"OC_ASSET_THEMES_PATH;WEB_ASSET_THEMES_PATH" desc:"Serve OpenCloud themes from a path on the filesystem instead of the builtin assets. If not defined, the root directory derives from $OC_BASE_DATA_PATH/web/assets/themes" introductionVersion:"6.0.0"`
+	AppsPath   string `yaml:"apps_path" env:"WEB_ASSET_APPS_PATH" desc:"Serve OpenCloud Web apps assets from a path on the filesystem instead of the builtin assets. If not defined, the root directory derives from $OC_BASE_DATA_PATH/web/assets/apps" introductionVersion:"6.0.0"`
 }
 
-// CustomStyle references additional css to be loaded into ownCloud Web.
+// CustomStyle references additional css to be loaded into OpenCloud Web.
 type CustomStyle struct {
 	Href string `json:"href" yaml:"href"`
 }
 
-// CustomScript references an additional script to be loaded into ownCloud Web.
+// CustomScript references an additional script to be loaded into OpenCloud Web.
 type CustomScript struct {
 	Src   string `json:"src" yaml:"src"`
 	Async bool   `json:"async,omitempty" yaml:"async"`
 }
 
-// CustomTranslation references a json file for overwriting translations in ownCloud Web.
+// CustomTranslation references a json file for overwriting translations in OpenCloud Web.
 type CustomTranslation struct {
 	Url string `json:"url" yaml:"url"`
 }
 
 // WebConfig defines the available web configuration for a dynamically rendered config.json.
 type WebConfig struct {
-	Server        string              `json:"server,omitempty" yaml:"server" env:"OC_URL;WEB_UI_CONFIG_SERVER" desc:"URL, where the oCIS APIs are reachable for ownCloud Web." introductionVersion:"pre5.0"`
+	Server        string              `json:"server,omitempty" yaml:"server" env:"OC_URL;WEB_UI_CONFIG_SERVER" desc:"URL, where the OpenCloud APIs are reachable for OpenCloud Web." introductionVersion:"pre5.0"`
 	Theme         string              `json:"theme,omitempty" yaml:"-"`
 	OpenIDConnect OIDC                `json:"openIdConnect,omitempty" yaml:"oidc"`
 	Apps          []string            `json:"apps" yaml:"apps"`
@@ -68,9 +68,9 @@ type WebConfig struct {
 
 // OIDC defines the available oidc configuration
 type OIDC struct {
-	MetadataURL           string `json:"metadata_url,omitempty" yaml:"metadata_url" env:"WEB_OIDC_METADATA_URL" desc:"URL for the OIDC well-known configuration endpoint. Defaults to the oCIS API URL + '/.well-known/openid-configuration'." introductionVersion:"pre5.0"`
+	MetadataURL           string `json:"metadata_url,omitempty" yaml:"metadata_url" env:"WEB_OIDC_METADATA_URL" desc:"URL for the OIDC well-known configuration endpoint. Defaults to the OpenCloud API URL + '/.well-known/openid-configuration'." introductionVersion:"pre5.0"`
 	Authority             string `json:"authority,omitempty" yaml:"authority" env:"OC_URL;OC_OIDC_ISSUER;WEB_OIDC_AUTHORITY" desc:"URL of the OIDC issuer. It defaults to URL of the builtin IDP." introductionVersion:"pre5.0"`
-	ClientID              string `json:"client_id,omitempty" yaml:"client_id" env:"OC_OIDC_CLIENT_ID;WEB_OIDC_CLIENT_ID" desc:"The OIDC client ID which ownCloud Web uses. This client needs to be set up in your IDP. Note that this setting has no effect when using the builtin IDP." introductionVersion:"pre5.0"`
+	ClientID              string `json:"client_id,omitempty" yaml:"client_id" env:"OC_OIDC_CLIENT_ID;WEB_OIDC_CLIENT_ID" desc:"The OIDC client ID which OpenCloud Web uses. This client needs to be set up in your IDP. Note that this setting has no effect when using the builtin IDP." introductionVersion:"pre5.0"`
 	ResponseType          string `json:"response_type,omitempty" yaml:"response_type" env:"WEB_OIDC_RESPONSE_TYPE" desc:"The OIDC response type to use for authentication." introductionVersion:"pre5.0"`
 	Scope                 string `json:"scope,omitempty" yaml:"scope" env:"WEB_OIDC_SCOPE" desc:"OIDC scopes to request during authentication to authorize access to user details. Defaults to 'openid profile email'. Values are separated by blank. More example values but not limited to are 'address' or 'phone' etc." introductionVersion:"pre5.0"`
 	PostLogoutRedirectURI string `json:"post_logout_redirect_uri,omitempty" yaml:"post_logout_redirect_uri" env:"WEB_OIDC_POST_LOGOUT_REDIRECT_URI" desc:"This value needs to point to a valid and reachable web page. The web client will trigger a redirect to that page directly after the logout action. The default value is empty and redirects to the login page." introductionVersion:"pre5.0"`

services/web/pkg/config/http.go

@@ -8,7 +8,7 @@ type HTTP struct {
 	TLS       shared.HTTPServiceTLS `yaml:"tls"`
 	Namespace string                `yaml:"-"`
 	Root      string                `yaml:"root" env:"WEB_HTTP_ROOT" desc:"Subdirectory that serves as the root for this HTTP service." introductionVersion:"pre5.0"`
-	CacheTTL  int                   `yaml:"cache_ttl" env:"WEB_CACHE_TTL" desc:"Cache policy in seconds for ownCloud Web assets." introductionVersion:"pre5.0"`
+	CacheTTL  int                   `yaml:"cache_ttl" env:"WEB_CACHE_TTL" desc:"Cache policy in seconds for OpenCloud Web assets." introductionVersion:"pre5.0"`
 	CORS      CORS                  `yaml:"cors"`
 }
 

services/web/pkg/config/options.go

@@ -4,7 +4,7 @@ package config
 type Options struct {
 	OpenAppsInTab          bool                `json:"openAppsInTab,omitempty" yaml:"openAppsInTab" env:"WEB_OPTION_OPEN_APPS_IN_TAB" desc:"Configures whether apps and extensions should generally open in a new tab. Defaults to false." introductionVersion:"pre5.0"`
 	AccountEditLink        *AccountEditLink    `json:"accountEditLink,omitempty" yaml:"accountEditLink"`
-	DisableFeedbackLink    bool                `json:"disableFeedbackLink,omitempty" yaml:"disableFeedbackLink" env:"WEB_OPTION_DISABLE_FEEDBACK_LINK" desc:"Set this option to 'true' to disable the feedback link in the top bar. Keeping it enabled by setting the value to 'false' or with the absence of the option, allows ownCloud to get feedback from your user base through a dedicated survey website." introductionVersion:"pre5.0"`
+	DisableFeedbackLink    bool                `json:"disableFeedbackLink,omitempty" yaml:"disableFeedbackLink" env:"WEB_OPTION_DISABLE_FEEDBACK_LINK" desc:"Set this option to 'true' to disable the feedback link in the top bar. Keeping it enabled by setting the value to 'false' or with the absence of the option, allows OpenCloud to get feedback from your user base through a dedicated survey website." introductionVersion:"pre5.0"`
 	FeedbackLink           *FeedbackLink       `json:"feedbackLink,omitempty" yaml:"feedbackLink"`
 	RunningOnEOS           bool                `json:"runningOnEos,omitempty" yaml:"runningOnEos" env:"WEB_OPTION_RUNNING_ON_EOS" desc:"Set this option to 'true' if running on an EOS storage backend (https://eos-web.web.cern.ch/eos-web/) to enable its specific features. Defaults to 'false'." introductionVersion:"pre5.0"`
 	CernFeatures           bool                `json:"cernFeatures,omitempty" yaml:"cernFeatures"`
@@ -14,7 +14,7 @@ type Options struct {
 	LogoutURL              string              `json:"logoutUrl,omitempty" yaml:"logoutUrl" env:"WEB_OPTION_LOGOUT_URL" desc:"Adds a link to the user's profile page to point him to an external page, where he can manage his session and devices. This is helpful when an external IdP is used. This option is disabled by default." introductionVersion:"pre5.0"`
 	LoginURL               string              `json:"loginUrl,omitempty" yaml:"loginUrl" env:"WEB_OPTION_LOGIN_URL" desc:"Specifies the target URL to the login page. This is helpful when an external IdP is used. This option is disabled by default. Example URL like: https://www.myidp.com/login." introductionVersion:"5.0"`
 	TokenStorageLocal      bool                `json:"tokenStorageLocal" yaml:"tokenStorageLocal" env:"WEB_OPTION_TOKEN_STORAGE_LOCAL" desc:"Specifies whether the access token will be stored in the local storage when set to 'true' or in the session storage when set to 'false'. If stored in the local storage, login state will be persisted across multiple browser tabs, means no additional logins are required." introductionVersion:"pre5.0"`
-	DisabledExtensions     []string            `json:"disabledExtensions,omitempty" yaml:"disabledExtensions" env:"WEB_OPTION_DISABLED_EXTENSIONS" desc:"A list to disable specific Web extensions identified by their ID. The ID can e.g. be taken from the 'index.ts' file of the web extension. Example: 'com.github.owncloud.web.files.search,com.github.owncloud.web.files.print'. See the Environment Variable Types description for more details." introductionVersion:"5.0"`
+	DisabledExtensions     []string            `json:"disabledExtensions,omitempty" yaml:"disabledExtensions" env:"WEB_OPTION_DISABLED_EXTENSIONS" desc:"A list to disable specific Web extensions identified by their ID. The ID can e.g. be taken from the 'index.ts' file of the web extension. Example: 'com.github.opencloud-eu.web.files.search,com.github.opencloud-eu.web.files.print'. See the Environment Variable Types description for more details." introductionVersion:"5.0"`
 	Embed                  *Embed              `json:"embed,omitempty" yaml:"embed"`
 	UserListRequiresFilter bool                `json:"userListRequiresFilter,omitempty" yaml:"userListRequiresFilter" env:"WEB_OPTION_USER_LIST_REQUIRES_FILTER" desc:"Defines whether one or more filters must be set in order to list users in the Web admin settings. Set this option to 'true' if running in an environment with a lot of users and listing all users could slow down performance. Defaults to 'false'." introductionVersion:"5.0"`
 	ConcurrentRequests     *ConcurrentRequests `json:"concurrentRequests,omitempty" yaml:"concurrentRequests"`
@@ -27,9 +27,9 @@ type AccountEditLink struct {
 
 // FeedbackLink are the feedback link options
 type FeedbackLink struct {
-	Href        string `json:"href,omitempty" yaml:"href" env:"WEB_OPTION_FEEDBACKLINK_HREF" desc:"Set a target URL for the feedback link. Make sure to prepend it with 'http(s)://'. Defaults to 'https://owncloud.com/web-design-feedback'." introductionVersion:"pre5.0"`
-	AriaLabel   string `json:"ariaLabel,omitempty" yaml:"ariaLabel" env:"WEB_OPTION_FEEDBACKLINK_ARIALABEL" desc:"Since the feedback link only has an icon, a screen reader accessible label can be set. The text defaults to 'ownCloud feedback survey'." introductionVersion:"pre5.0"`
-	Description string `json:"description,omitempty" yaml:"description" env:"WEB_OPTION_FEEDBACKLINK_DESCRIPTION" desc:"For feedbacks, provide any description you want to see as tooltip and as accessible description. Defaults to 'Provide your feedback: We'd like to improve the web design and would be happy to hear your feedback. Thank you! Your ownCloud team'." introductionVersion:"pre5.0"`
+	Href        string `json:"href,omitempty" yaml:"href" env:"WEB_OPTION_FEEDBACKLINK_HREF" desc:"Set a target URL for the feedback link. Make sure to prepend it with 'http(s)://'. Defaults to 'https://opencloud.eu/web-design-feedback'." introductionVersion:"pre5.0"`
+	AriaLabel   string `json:"ariaLabel,omitempty" yaml:"ariaLabel" env:"WEB_OPTION_FEEDBACKLINK_ARIALABEL" desc:"Since the feedback link only has an icon, a screen reader accessible label can be set. The text defaults to 'OpenCloud feedback survey'." introductionVersion:"pre5.0"`
+	Description string `json:"description,omitempty" yaml:"description" env:"WEB_OPTION_FEEDBACKLINK_DESCRIPTION" desc:"For feedbacks, provide any description you want to see as tooltip and as accessible description. Defaults to 'Provide your feedback: We'd like to improve the web design and would be happy to hear your feedback. Thank you! Your OpenCloud team'." introductionVersion:"pre5.0"`
 }
 
 // Upload are the upload options

services/web/pkg/server/http/server.go

@@ -75,13 +75,14 @@ func Server(opts ...Option) (http.Service, error) {
 		fsx.NewBasePathFs(fsx.NewOsFs(), options.Config.Asset.ThemesPath),
 		fsx.NewBasePathFs(fsx.FromIOFS(web.Assets), "assets/themes"),
 	)
-	// oCis is Apache licensed, and the ownCloud branding is AGPLv3.
-	// we are not allowed to have the ownCloud branding as part of the oCIS repository,
+	// OpenCloud is Apache licensed, and the ownCloud branding is AGPLv3.
+	// we are not allowed to have the ownCloud branding as part of the OpenCloud repository,
 	// as workaround we layer the embedded core fs on top of the theme fs to provide the ownCloud branding.
 	// each asset that is part of the embedded core fs (coreFS secondary fs)
 	// is downloaded at build time from the ownCloud web repository,
 	// web is licensed under AGPLv3 too, and is allowed to contain the ownCloud branding.
 	// themeFS = themeFS.Primary (rw) < themeFS.Secondary (ro) < coreFS.Secondary (ro)
+	// FIXME can we get rid of this layering or do we need it for the fonts?
 	themeFS = fsx.NewFallbackFS(
 		themeFS,
 		fsx.NewBasePathFs(coreFS.Secondary(), "themes"),

services/web/pkg/theme/service.go

@@ -95,7 +95,7 @@ func (s Service) Get(w http.ResponseWriter, r *http.Request) {
 	}
 }
 
-// LogoUpload implements the endpoint to upload a custom logo for the oCIS instance.
+// LogoUpload implements the endpoint to upload a custom logo for the OpenCloud instance.
 func (s Service) LogoUpload(w http.ResponseWriter, r *http.Request) {
 	gatewayClient, err := s.gatewaySelector.Next()
 	if err != nil {