update settings import paths and module name
This commit is contained in:
Vendored
+1
-1
@@ -2,7 +2,7 @@
|
||||
|
||||
# Comment to be posted to on PRs that don't update documentation
|
||||
updateDocsComment: >
|
||||
Thanks for opening this pull request! The maintainers of this repository would appreciate it if you would create a [changelog](https://github.com/owncloud/ocis-settings/blob/master/changelog/README.md) item based on your changes.
|
||||
Thanks for opening this pull request! The maintainers of this repository would appreciate it if you would create a [changelog](https://github.com/owncloud/ocis/settings/blob/master/changelog/README.md) item based on your changes.
|
||||
updateDocsWhiteList:
|
||||
- Tests-only
|
||||
- tests-only
|
||||
|
||||
+70
-70
@@ -2,83 +2,83 @@
|
||||
|
||||
The following sections list the changes in ocis-settings unreleased.
|
||||
|
||||
[unreleased]: https://github.com/owncloud/ocis-settings/compare/v0.3.1...master
|
||||
[unreleased]: https://github.com/owncloud/ocis/settings/compare/v0.3.1...master
|
||||
|
||||
## Summary
|
||||
|
||||
* Bugfix - Fix loading and saving system scoped values: [#66](https://github.com/owncloud/ocis-settings/pull/66)
|
||||
* Bugfix - Complete input validation: [#66](https://github.com/owncloud/ocis-settings/pull/66)
|
||||
* Change - Add filter option for bundle ids in ListBundles and ListRoles: [#59](https://github.com/owncloud/ocis-settings/pull/59)
|
||||
* Change - Reuse roleIDs from the metadata context: [#69](https://github.com/owncloud/ocis-settings/pull/69)
|
||||
* Change - Update ocis-pkg/v2: [#72](https://github.com/owncloud/ocis-settings/pull/72)
|
||||
* Bugfix - Fix loading and saving system scoped values: [#66](https://github.com/owncloud/ocis/settings/pull/66)
|
||||
* Bugfix - Complete input validation: [#66](https://github.com/owncloud/ocis/settings/pull/66)
|
||||
* Change - Add filter option for bundle ids in ListBundles and ListRoles: [#59](https://github.com/owncloud/ocis/settings/pull/59)
|
||||
* Change - Reuse roleIDs from the metadata context: [#69](https://github.com/owncloud/ocis/settings/pull/69)
|
||||
* Change - Update ocis-pkg/v2: [#72](https://github.com/owncloud/ocis/settings/pull/72)
|
||||
|
||||
## Details
|
||||
|
||||
* Bugfix - Fix loading and saving system scoped values: [#66](https://github.com/owncloud/ocis-settings/pull/66)
|
||||
* Bugfix - Fix loading and saving system scoped values: [#66](https://github.com/owncloud/ocis/settings/pull/66)
|
||||
|
||||
We fixed loading and saving system scoped values. Those are now saved without an account uuid,
|
||||
so that the value can be loaded by other accounts as well.
|
||||
|
||||
https://github.com/owncloud/ocis-settings/pull/66
|
||||
https://github.com/owncloud/ocis/settings/pull/66
|
||||
|
||||
|
||||
* Bugfix - Complete input validation: [#66](https://github.com/owncloud/ocis-settings/pull/66)
|
||||
* Bugfix - Complete input validation: [#66](https://github.com/owncloud/ocis/settings/pull/66)
|
||||
|
||||
There was one handler function without input validation. We implemented the input validation
|
||||
for `ValueService.ReadValueByUniqueIdentifiers`.
|
||||
|
||||
https://github.com/owncloud/ocis-settings/pull/66
|
||||
https://github.com/owncloud/ocis/settings/pull/66
|
||||
|
||||
|
||||
* Change - Add filter option for bundle ids in ListBundles and ListRoles: [#59](https://github.com/owncloud/ocis-settings/pull/59)
|
||||
* Change - Add filter option for bundle ids in ListBundles and ListRoles: [#59](https://github.com/owncloud/ocis/settings/pull/59)
|
||||
|
||||
We added bundle ids as filter option for ListBundles and ListRoles and a new endpoint for
|
||||
fetching a permission by ID.
|
||||
|
||||
https://github.com/owncloud/ocis-settings/pull/59
|
||||
https://github.com/owncloud/ocis/settings/pull/59
|
||||
|
||||
|
||||
* Change - Reuse roleIDs from the metadata context: [#69](https://github.com/owncloud/ocis-settings/pull/69)
|
||||
* Change - Reuse roleIDs from the metadata context: [#69](https://github.com/owncloud/ocis/settings/pull/69)
|
||||
|
||||
The roleIDs of the authenticated user are coming in from the metadata context. Since we decided
|
||||
to move the role assignments over to the accounts service we need to start trusting those
|
||||
roleIDs from the metadata context instead of reloading them from disk on each request.
|
||||
|
||||
https://github.com/owncloud/ocis-settings/pull/69
|
||||
https://github.com/owncloud/ocis/settings/pull/69
|
||||
|
||||
|
||||
* Change - Update ocis-pkg/v2: [#72](https://github.com/owncloud/ocis-settings/pull/72)
|
||||
* Change - Update ocis-pkg/v2: [#72](https://github.com/owncloud/ocis/settings/pull/72)
|
||||
|
||||
The helper we used from ocis-pkg for extracting roleIDs from the metadata context has moved to
|
||||
another package, so we needed to update as well.
|
||||
|
||||
https://github.com/owncloud/ocis-settings/pull/72
|
||||
https://github.com/owncloud/ocis/settings/pull/72
|
||||
https://github.com/owncloud/ocis-pkg/pull/60
|
||||
|
||||
# Changelog for [0.3.1] (2020-08-27)
|
||||
|
||||
The following sections list the changes in ocis-settings 0.3.1.
|
||||
|
||||
[0.3.1]: https://github.com/owncloud/ocis-settings/compare/v0.3.0...v0.3.1
|
||||
[0.3.1]: https://github.com/owncloud/ocis/settings/compare/v0.3.0...v0.3.1
|
||||
|
||||
## Summary
|
||||
|
||||
* Bugfix - Fix fetching bundles in settings UI: [#61](https://github.com/owncloud/ocis-settings/pull/61)
|
||||
* Bugfix - Fix fetching bundles in settings UI: [#61](https://github.com/owncloud/ocis/settings/pull/61)
|
||||
|
||||
## Details
|
||||
|
||||
* Bugfix - Fix fetching bundles in settings UI: [#61](https://github.com/owncloud/ocis-settings/pull/61)
|
||||
* Bugfix - Fix fetching bundles in settings UI: [#61](https://github.com/owncloud/ocis/settings/pull/61)
|
||||
|
||||
We fixed the settings UI to use the changed API endpoint `BundleService.ListBundles`
|
||||
properly.
|
||||
|
||||
https://github.com/owncloud/ocis-settings/pull/61
|
||||
https://github.com/owncloud/ocis/settings/pull/61
|
||||
|
||||
# Changelog for [0.3.0] (2020-08-26)
|
||||
|
||||
The following sections list the changes in ocis-settings 0.3.0.
|
||||
|
||||
[0.3.0]: https://github.com/owncloud/ocis-settings/compare/v0.2.0...v0.3.0
|
||||
[0.3.0]: https://github.com/owncloud/ocis/settings/compare/v0.2.0...v0.3.0
|
||||
|
||||
## Summary
|
||||
|
||||
@@ -93,19 +93,19 @@ The following sections list the changes in ocis-settings 0.3.0.
|
||||
to the user when their role doesn't have appropriate permissions.
|
||||
|
||||
https://github.com/owncloud/product/issues/99
|
||||
https://github.com/owncloud/ocis-settings/pull/48
|
||||
https://github.com/owncloud/ocis/settings/pull/48
|
||||
|
||||
# Changelog for [0.2.0] (2020-08-20)
|
||||
|
||||
The following sections list the changes in ocis-settings 0.2.0.
|
||||
|
||||
[0.2.0]: https://github.com/owncloud/ocis-settings/compare/v0.1.0...v0.2.0
|
||||
[0.2.0]: https://github.com/owncloud/ocis/settings/compare/v0.1.0...v0.2.0
|
||||
|
||||
## Summary
|
||||
|
||||
* Change - Add role service: [#110](https://github.com/owncloud/product/issues/110)
|
||||
* Change - Rename endpoints and message types: [#36](https://github.com/owncloud/ocis-settings/issues/36)
|
||||
* Change - Use UUIDs instead of alphanumeric identifiers: [#46](https://github.com/owncloud/ocis-settings/pull/46)
|
||||
* Change - Rename endpoints and message types: [#36](https://github.com/owncloud/ocis/settings/issues/36)
|
||||
* Change - Use UUIDs instead of alphanumeric identifiers: [#46](https://github.com/owncloud/ocis/settings/pull/46)
|
||||
|
||||
## Details
|
||||
|
||||
@@ -114,67 +114,67 @@ The following sections list the changes in ocis-settings 0.2.0.
|
||||
We added service endpoints for registering roles and maintaining permissions.
|
||||
|
||||
https://github.com/owncloud/product/issues/110
|
||||
https://github.com/owncloud/ocis-settings/issues/10
|
||||
https://github.com/owncloud/ocis-settings/pull/47
|
||||
https://github.com/owncloud/ocis/settings/issues/10
|
||||
https://github.com/owncloud/ocis/settings/pull/47
|
||||
|
||||
|
||||
* Change - Rename endpoints and message types: [#36](https://github.com/owncloud/ocis-settings/issues/36)
|
||||
* Change - Rename endpoints and message types: [#36](https://github.com/owncloud/ocis/settings/issues/36)
|
||||
|
||||
We decided to rename endpoints and message types to be less verbose. Specifically,
|
||||
`SettingsBundle` became `Bundle`, `Setting` (inside a bundle) kept its name and
|
||||
`SettingsValue` became `Value`.
|
||||
|
||||
https://github.com/owncloud/ocis-settings/issues/36
|
||||
https://github.com/owncloud/ocis-settings/issues/32
|
||||
https://github.com/owncloud/ocis-settings/pull/46
|
||||
https://github.com/owncloud/ocis/settings/issues/36
|
||||
https://github.com/owncloud/ocis/settings/issues/32
|
||||
https://github.com/owncloud/ocis/settings/pull/46
|
||||
|
||||
|
||||
* Change - Use UUIDs instead of alphanumeric identifiers: [#46](https://github.com/owncloud/ocis-settings/pull/46)
|
||||
* Change - Use UUIDs instead of alphanumeric identifiers: [#46](https://github.com/owncloud/ocis/settings/pull/46)
|
||||
|
||||
`Bundles`, `Settings` and `Values` were identified by a set of alphanumeric identifiers so
|
||||
far. We switched to UUIDs in order to achieve a flat file hierarchy on disk. Referencing the
|
||||
respective entities by their alphanumeric identifiers (as used in UI code) is still
|
||||
supported.
|
||||
|
||||
https://github.com/owncloud/ocis-settings/pull/46
|
||||
https://github.com/owncloud/ocis/settings/pull/46
|
||||
|
||||
# Changelog for [0.1.0] (2020-08-17)
|
||||
|
||||
The following sections list the changes in ocis-settings 0.1.0.
|
||||
|
||||
[0.1.0]: https://github.com/owncloud/ocis-settings/compare/6fdbbd7e8eb39f18ada1a8a3c45a1c925e239889...v0.1.0
|
||||
[0.1.0]: https://github.com/owncloud/ocis/settings/compare/6fdbbd7e8eb39f18ada1a8a3c45a1c925e239889...v0.1.0
|
||||
|
||||
## Summary
|
||||
|
||||
* Bugfix - Adjust UUID validation to be more tolerant: [#41](https://github.com/owncloud/ocis-settings/issues/41)
|
||||
* Bugfix - Fix runtime error when type asserting on nil value: [#38](https://github.com/owncloud/ocis-settings/pull/38)
|
||||
* Bugfix - Adjust UUID validation to be more tolerant: [#41](https://github.com/owncloud/ocis/settings/issues/41)
|
||||
* Bugfix - Fix runtime error when type asserting on nil value: [#38](https://github.com/owncloud/ocis/settings/pull/38)
|
||||
* Bugfix - Fix multiple submits on string and number form elements: [#745](https://github.com/owncloud/owncloud-design-system/issues/745)
|
||||
* Bugfix - Build docker images with alpine:latest instead of alpine:edge: [#39](https://github.com/owncloud/ocis-settings/pull/39)
|
||||
* Change - Dynamically add navItems for extensions with settings bundles: [#25](https://github.com/owncloud/ocis-settings/pull/25)
|
||||
* Change - Introduce input validation: [#22](https://github.com/owncloud/ocis-settings/pull/22)
|
||||
* Change - Use account uuid from x-access-token: [#14](https://github.com/owncloud/ocis-settings/pull/14)
|
||||
* Change - Use server config variable from ocis-web: [#34](https://github.com/owncloud/ocis-settings/pull/34)
|
||||
* Enhancement - Remove paths from Makefile: [#33](https://github.com/owncloud/ocis-settings/pull/33)
|
||||
* Enhancement - Extend the docs: [#11](https://github.com/owncloud/ocis-settings/issues/11)
|
||||
* Enhancement - Update ocis-pkg/v2: [#42](https://github.com/owncloud/ocis-settings/pull/42)
|
||||
* Bugfix - Build docker images with alpine:latest instead of alpine:edge: [#39](https://github.com/owncloud/ocis/settings/pull/39)
|
||||
* Change - Dynamically add navItems for extensions with settings bundles: [#25](https://github.com/owncloud/ocis/settings/pull/25)
|
||||
* Change - Introduce input validation: [#22](https://github.com/owncloud/ocis/settings/pull/22)
|
||||
* Change - Use account uuid from x-access-token: [#14](https://github.com/owncloud/ocis/settings/pull/14)
|
||||
* Change - Use server config variable from ocis-web: [#34](https://github.com/owncloud/ocis/settings/pull/34)
|
||||
* Enhancement - Remove paths from Makefile: [#33](https://github.com/owncloud/ocis/settings/pull/33)
|
||||
* Enhancement - Extend the docs: [#11](https://github.com/owncloud/ocis/settings/issues/11)
|
||||
* Enhancement - Update ocis-pkg/v2: [#42](https://github.com/owncloud/ocis/settings/pull/42)
|
||||
|
||||
## Details
|
||||
|
||||
* Bugfix - Adjust UUID validation to be more tolerant: [#41](https://github.com/owncloud/ocis-settings/issues/41)
|
||||
* Bugfix - Adjust UUID validation to be more tolerant: [#41](https://github.com/owncloud/ocis/settings/issues/41)
|
||||
|
||||
The UUID now allows any alphanumeric character and "-", "_", ".", "+" and "@" which can also
|
||||
allow regular user names.
|
||||
|
||||
https://github.com/owncloud/ocis-settings/issues/41
|
||||
https://github.com/owncloud/ocis/settings/issues/41
|
||||
|
||||
|
||||
* Bugfix - Fix runtime error when type asserting on nil value: [#38](https://github.com/owncloud/ocis-settings/pull/38)
|
||||
* Bugfix - Fix runtime error when type asserting on nil value: [#38](https://github.com/owncloud/ocis/settings/pull/38)
|
||||
|
||||
Fixed the case where an account UUID present in the context is nil, and type asserting it as a
|
||||
string would produce a runtime error.
|
||||
|
||||
https://github.com/owncloud/ocis-settings/issues/37
|
||||
https://github.com/owncloud/ocis-settings/pull/38
|
||||
https://github.com/owncloud/ocis/settings/issues/37
|
||||
https://github.com/owncloud/ocis/settings/pull/38
|
||||
|
||||
|
||||
* Bugfix - Fix multiple submits on string and number form elements: [#745](https://github.com/owncloud/owncloud-design-system/issues/745)
|
||||
@@ -185,74 +185,74 @@ The following sections list the changes in ocis-settings 0.1.0.
|
||||
|
||||
https://github.com/owncloud/owncloud-design-system/issues/745
|
||||
https://github.com/owncloud/owncloud-design-system/pull/768
|
||||
https://github.com/owncloud/ocis-settings/pulls/31
|
||||
https://github.com/owncloud/ocis/settings/pulls/31
|
||||
|
||||
|
||||
* Bugfix - Build docker images with alpine:latest instead of alpine:edge: [#39](https://github.com/owncloud/ocis-settings/pull/39)
|
||||
* Bugfix - Build docker images with alpine:latest instead of alpine:edge: [#39](https://github.com/owncloud/ocis/settings/pull/39)
|
||||
|
||||
ARM builds were failing when built on alpine:edge, so we switched to alpine:latest instead.
|
||||
|
||||
https://github.com/owncloud/ocis-settings/pull/39
|
||||
https://github.com/owncloud/ocis/settings/pull/39
|
||||
|
||||
|
||||
* Change - Dynamically add navItems for extensions with settings bundles: [#25](https://github.com/owncloud/ocis-settings/pull/25)
|
||||
* Change - Dynamically add navItems for extensions with settings bundles: [#25](https://github.com/owncloud/ocis/settings/pull/25)
|
||||
|
||||
We now make use of a new feature in ocis-web-core, allowing us to add navItems not only through
|
||||
configuration, but also after app initialization. With this we now have navItems available
|
||||
for all extensions within the settings ui, that have at least one settings bundle registered.
|
||||
|
||||
https://github.com/owncloud/ocis-settings/pull/25
|
||||
https://github.com/owncloud/ocis/settings/pull/25
|
||||
|
||||
|
||||
* Change - Introduce input validation: [#22](https://github.com/owncloud/ocis-settings/pull/22)
|
||||
* Change - Introduce input validation: [#22](https://github.com/owncloud/ocis/settings/pull/22)
|
||||
|
||||
We set up input validation, starting with enforcing alphanumeric identifier values and UUID
|
||||
format on account uuids. As a result, traversal into parent folders is not possible anymore. We
|
||||
also made sure that get and list requests are side effect free, i.e. not creating any folders.
|
||||
|
||||
https://github.com/owncloud/ocis-settings/issues/15
|
||||
https://github.com/owncloud/ocis-settings/issues/16
|
||||
https://github.com/owncloud/ocis-settings/issues/19
|
||||
https://github.com/owncloud/ocis-settings/pull/22
|
||||
https://github.com/owncloud/ocis/settings/issues/15
|
||||
https://github.com/owncloud/ocis/settings/issues/16
|
||||
https://github.com/owncloud/ocis/settings/issues/19
|
||||
https://github.com/owncloud/ocis/settings/pull/22
|
||||
|
||||
|
||||
* Change - Use account uuid from x-access-token: [#14](https://github.com/owncloud/ocis-settings/pull/14)
|
||||
* Change - Use account uuid from x-access-token: [#14](https://github.com/owncloud/ocis/settings/pull/14)
|
||||
|
||||
We are now using an ocis-pkg middleware for extracting the account uuid of the authenticated
|
||||
user from the `x-access-token` of the http request header and inject it into the Identifier
|
||||
protobuf messages wherever possible. This allows us to use `me` instead of an actual account
|
||||
uuid, when the request comes through the proxy.
|
||||
|
||||
https://github.com/owncloud/ocis-settings/pull/14
|
||||
https://github.com/owncloud/ocis/settings/pull/14
|
||||
|
||||
|
||||
* Change - Use server config variable from ocis-web: [#34](https://github.com/owncloud/ocis-settings/pull/34)
|
||||
* Change - Use server config variable from ocis-web: [#34](https://github.com/owncloud/ocis/settings/pull/34)
|
||||
|
||||
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
|
||||
https://github.com/owncloud/ocis/settings/pull/34
|
||||
|
||||
|
||||
* Enhancement - Remove paths from Makefile: [#33](https://github.com/owncloud/ocis-settings/pull/33)
|
||||
* Enhancement - Remove paths from Makefile: [#33](https://github.com/owncloud/ocis/settings/pull/33)
|
||||
|
||||
We have a variable for the proto files path in our Makefile, but were not using it. Changed the
|
||||
Makefile to use the PROTO_SRC variable where possible.
|
||||
|
||||
https://github.com/owncloud/ocis-settings/pull/33
|
||||
https://github.com/owncloud/ocis/settings/pull/33
|
||||
|
||||
|
||||
* Enhancement - Extend the docs: [#11](https://github.com/owncloud/ocis-settings/issues/11)
|
||||
* Enhancement - Extend the docs: [#11](https://github.com/owncloud/ocis/settings/issues/11)
|
||||
|
||||
We have extended the documentation by adding a chapter about settings values.
|
||||
|
||||
https://github.com/owncloud/ocis-settings/issues/11
|
||||
https://github.com/owncloud/ocis-settings/pulls/28
|
||||
https://github.com/owncloud/ocis/settings/issues/11
|
||||
https://github.com/owncloud/ocis/settings/pulls/28
|
||||
|
||||
|
||||
* Enhancement - Update ocis-pkg/v2: [#42](https://github.com/owncloud/ocis-settings/pull/42)
|
||||
* Enhancement - Update ocis-pkg/v2: [#42](https://github.com/owncloud/ocis/settings/pull/42)
|
||||
|
||||
Update to ocis-pkg/v2 v2.2.2-0.20200812103920-db41b5a3d14d
|
||||
|
||||
https://github.com/owncloud/ocis-settings/pull/42
|
||||
https://github.com/owncloud/ocis/settings/pull/42
|
||||
|
||||
|
||||
@@ -3,4 +3,4 @@ Bugfix: Adjust UUID validation to be more tolerant
|
||||
The UUID now allows any alphanumeric character and "-", "_", ".", "+" and "@" which
|
||||
can also allow regular user names.
|
||||
|
||||
https://github.com/owncloud/ocis-settings/issues/41
|
||||
https://github.com/owncloud/ocis/settings/issues/41
|
||||
|
||||
@@ -3,4 +3,4 @@ Enhancement: Remove paths from Makefile
|
||||
We have a variable for the proto files path in our Makefile, but were not using
|
||||
it. Changed the Makefile to use the PROTO_SRC variable where possible.
|
||||
|
||||
https://github.com/owncloud/ocis-settings/pull/33
|
||||
https://github.com/owncloud/ocis/settings/pull/33
|
||||
|
||||
@@ -2,5 +2,5 @@ Enhancement: Extend the docs
|
||||
|
||||
We have extended the documentation by adding a chapter about settings values.
|
||||
|
||||
https://github.com/owncloud/ocis-settings/issues/11
|
||||
https://github.com/owncloud/ocis-settings/pulls/28
|
||||
https://github.com/owncloud/ocis/settings/issues/11
|
||||
https://github.com/owncloud/ocis/settings/pulls/28
|
||||
|
||||
@@ -5,4 +5,4 @@ navItems not only through configuration, but also after app initialization.
|
||||
With this we now have navItems available for all extensions within the
|
||||
settings ui, that have at least one settings bundle registered.
|
||||
|
||||
https://github.com/owncloud/ocis-settings/pull/25
|
||||
https://github.com/owncloud/ocis/settings/pull/25
|
||||
|
||||
@@ -2,5 +2,5 @@ Bugfix: Fix runtime error when type asserting on nil value
|
||||
|
||||
Fixed the case where an account UUID present in the context is nil, and type asserting it as a string would produce a runtime error.
|
||||
|
||||
https://github.com/owncloud/ocis-settings/pull/38
|
||||
https://github.com/owncloud/ocis-settings/issues/37
|
||||
https://github.com/owncloud/ocis/settings/pull/38
|
||||
https://github.com/owncloud/ocis/settings/issues/37
|
||||
|
||||
@@ -4,7 +4,7 @@ We set up input validation, starting with enforcing alphanumeric identifier valu
|
||||
format on account uuids. As a result, traversal into parent folders is not possible anymore.
|
||||
We also made sure that get and list requests are side effect free, i.e. not creating any folders.
|
||||
|
||||
https://github.com/owncloud/ocis-settings/pull/22
|
||||
https://github.com/owncloud/ocis-settings/issues/15
|
||||
https://github.com/owncloud/ocis-settings/issues/16
|
||||
https://github.com/owncloud/ocis-settings/issues/19
|
||||
https://github.com/owncloud/ocis/settings/pull/22
|
||||
https://github.com/owncloud/ocis/settings/issues/15
|
||||
https://github.com/owncloud/ocis/settings/issues/16
|
||||
https://github.com/owncloud/ocis/settings/issues/19
|
||||
|
||||
@@ -2,4 +2,4 @@ Enhancement: Update ocis-pkg/v2
|
||||
|
||||
Update to ocis-pkg/v2 v2.2.2-0.20200812103920-db41b5a3d14d
|
||||
|
||||
https://github.com/owncloud/ocis-settings/pull/42
|
||||
https://github.com/owncloud/ocis/settings/pull/42
|
||||
|
||||
@@ -6,4 +6,4 @@ to the settings ui as well.
|
||||
|
||||
https://github.com/owncloud/owncloud-design-system/issues/745
|
||||
https://github.com/owncloud/owncloud-design-system/pull/768
|
||||
https://github.com/owncloud/ocis-settings/pulls/31
|
||||
https://github.com/owncloud/ocis/settings/pulls/31
|
||||
|
||||
@@ -5,4 +5,4 @@ authenticated user from the `x-access-token` of the http request header and inje
|
||||
it into the Identifier protobuf messages wherever possible. This allows us to use
|
||||
`me` instead of an actual account uuid, when the request comes through the proxy.
|
||||
|
||||
https://github.com/owncloud/ocis-settings/pull/14
|
||||
https://github.com/owncloud/ocis/settings/pull/14
|
||||
|
||||
@@ -2,4 +2,4 @@ Bugfix: build docker images with alpine:latest instead of alpine:edge
|
||||
|
||||
ARM builds were failing when built on alpine:edge, so we switched to alpine:latest instead.
|
||||
|
||||
https://github.com/owncloud/ocis-settings/pull/39
|
||||
https://github.com/owncloud/ocis/settings/pull/39
|
||||
|
||||
@@ -2,4 +2,4 @@ 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
|
||||
https://github.com/owncloud/ocis/settings/pull/34
|
||||
|
||||
@@ -3,5 +3,5 @@ Change: Add role service
|
||||
We added service endpoints for registering roles and maintaining permissions.
|
||||
|
||||
https://github.com/owncloud/product/issues/110
|
||||
https://github.com/owncloud/ocis-settings/issues/10
|
||||
https://github.com/owncloud/ocis-settings/pull/47
|
||||
https://github.com/owncloud/ocis/settings/issues/10
|
||||
https://github.com/owncloud/ocis/settings/pull/47
|
||||
|
||||
@@ -3,6 +3,6 @@ Change: Rename endpoints and message types
|
||||
We decided to rename endpoints and message types to be less verbose. Specifically, `SettingsBundle` became `Bundle`,
|
||||
`Setting` (inside a bundle) kept its name and `SettingsValue` became `Value`.
|
||||
|
||||
https://github.com/owncloud/ocis-settings/issues/36
|
||||
https://github.com/owncloud/ocis-settings/issues/32
|
||||
https://github.com/owncloud/ocis-settings/pull/46
|
||||
https://github.com/owncloud/ocis/settings/issues/36
|
||||
https://github.com/owncloud/ocis/settings/issues/32
|
||||
https://github.com/owncloud/ocis/settings/pull/46
|
||||
|
||||
@@ -4,4 +4,4 @@ Change: Use UUIDs instead of alphanumeric identifiers
|
||||
in order to achieve a flat file hierarchy on disk. Referencing the respective entities by their alphanumeric
|
||||
identifiers (as used in UI code) is still supported.
|
||||
|
||||
https://github.com/owncloud/ocis-settings/pull/46
|
||||
https://github.com/owncloud/ocis/settings/pull/46
|
||||
|
||||
@@ -3,4 +3,4 @@ Change: Filter settings by permissions
|
||||
`BundleService.GetBundle` and `BundleService.ListBundles` are now filtered by READ permissions in the role of the authenticated user. This prevents settings from being visible to the user when their role doesn't have appropriate permissions.
|
||||
|
||||
https://github.com/owncloud/product/issues/99
|
||||
https://github.com/owncloud/ocis-settings/pull/48
|
||||
https://github.com/owncloud/ocis/settings/pull/48
|
||||
|
||||
@@ -2,5 +2,5 @@ Bugfix: Fix fetching bundles in settings UI
|
||||
|
||||
We fixed the settings UI to use the changed API endpoint `BundleService.ListBundles` properly.
|
||||
|
||||
https://github.com/owncloud/ocis-settings/pull/61
|
||||
https://github.com/owncloud/ocis/settings/pull/61
|
||||
|
||||
|
||||
@@ -10,17 +10,17 @@ The following sections list the changes in ocis-settings {{ .Version }}.
|
||||
{{ if ne (len $allVersions) $next -}}
|
||||
{{ $previousVersion := (index $allVersions $next).Version -}}
|
||||
{{ if eq .Version "unreleased" -}}
|
||||
[{{ .Version }}]: https://github.com/owncloud/ocis-settings/compare/v{{ $previousVersion }}...master
|
||||
[{{ .Version }}]: https://github.com/owncloud/ocis/settings/compare/v{{ $previousVersion }}...master
|
||||
|
||||
{{ else -}}
|
||||
[{{ .Version }}]: https://github.com/owncloud/ocis-settings/compare/v{{ $previousVersion }}...v{{ .Version }}
|
||||
[{{ .Version }}]: https://github.com/owncloud/ocis/settings/compare/v{{ $previousVersion }}...v{{ .Version }}
|
||||
|
||||
{{ end -}}
|
||||
{{ end -}}
|
||||
|
||||
{{- /* last version managed by calens, end of the loop */ -}}
|
||||
{{ if eq .Version "0.1.0" -}}
|
||||
[{{ .Version }}]: https://github.com/owncloud/ocis-settings/compare/6fdbbd7e8eb39f18ada1a8a3c45a1c925e239889...v{{ .Version }}
|
||||
[{{ .Version }}]: https://github.com/owncloud/ocis/settings/compare/6fdbbd7e8eb39f18ada1a8a3c45a1c925e239889...v{{ .Version }}
|
||||
|
||||
{{ end -}}
|
||||
{{ else -}}
|
||||
|
||||
@@ -7,5 +7,5 @@ The text in the paragraphs is written in past tense. The last section is a list
|
||||
of issue URLs, PR URLs and other URLs. The first issue ID (or the first PR ID,
|
||||
in case there aren't any issue links) is used as the primary ID.
|
||||
|
||||
https://github.com/owncloud/ocis-settings/issues/1234
|
||||
https://github.com/owncloud/ocis-settings/pull/55555
|
||||
https://github.com/owncloud/ocis/settings/issues/1234
|
||||
https://github.com/owncloud/ocis/settings/pull/55555
|
||||
|
||||
@@ -2,5 +2,5 @@ Change: Add filter option for bundle ids in ListBundles and ListRoles
|
||||
|
||||
We added bundle ids as filter option for ListBundles and ListRoles and a new endpoint for fetching a permission by ID.
|
||||
|
||||
https://github.com/owncloud/ocis-settings/pull/59
|
||||
https://github.com/owncloud/ocis/settings/pull/59
|
||||
|
||||
|
||||
@@ -3,5 +3,5 @@ Bugfix: Fix loading and saving system scoped values
|
||||
We fixed loading and saving system scoped values. Those are now saved without an account uuid, so that the value
|
||||
can be loaded by other accounts as well.
|
||||
|
||||
https://github.com/owncloud/ocis-settings/pull/66
|
||||
https://github.com/owncloud/ocis/settings/pull/66
|
||||
|
||||
|
||||
@@ -2,5 +2,5 @@ Bugfix: Complete input validation
|
||||
|
||||
There was one handler function without input validation. We implemented the input validation for `ValueService.ReadValueByUniqueIdentifiers`.
|
||||
|
||||
https://github.com/owncloud/ocis-settings/pull/66
|
||||
https://github.com/owncloud/ocis/settings/pull/66
|
||||
|
||||
|
||||
@@ -2,5 +2,5 @@ Change: Reuse roleIDs from the metadata context
|
||||
|
||||
The roleIDs of the authenticated user are coming in from the metadata context. Since we decided to move the role assignments over to the accounts service we need to start trusting those roleIDs from the metadata context instead of reloading them from disk on each request.
|
||||
|
||||
https://github.com/owncloud/ocis-settings/pull/69
|
||||
https://github.com/owncloud/ocis/settings/pull/69
|
||||
|
||||
|
||||
@@ -3,5 +3,5 @@ Change: Update ocis-pkg/v2
|
||||
The helper we used from ocis-pkg for extracting roleIDs from the metadata context has moved to another package, so we needed
|
||||
to update as well.
|
||||
|
||||
https://github.com/owncloud/ocis-settings/pull/72
|
||||
https://github.com/owncloud/ocis/settings/pull/72
|
||||
https://github.com/owncloud/ocis-pkg/pull/60
|
||||
|
||||
@@ -3,7 +3,7 @@ package main
|
||||
import (
|
||||
"os"
|
||||
|
||||
"github.com/owncloud/ocis-settings/pkg/command"
|
||||
"github.com/owncloud/ocis/settings/pkg/command"
|
||||
)
|
||||
|
||||
func main() {
|
||||
|
||||
@@ -149,7 +149,7 @@ If you prefer to configure the service with commandline flags you can see the av
|
||||
|
||||
### Configuration file
|
||||
|
||||
So far we support the file formats `JSON` and `YAML`, if you want to get a full example configuration just take a look at [our repository](https://github.com/owncloud/ocis-settings/tree/master/config), there you can always see the latest configuration format. These example configurations include all available options and the default values. The configuration file will be automatically loaded if it's placed at `/etc/ocis/settings.yml`, `${HOME}/.ocis/settings.yml` or `$(pwd)/config/settings.yml`.
|
||||
So far we support the file formats `JSON` and `YAML`, if you want to get a full example configuration just take a look at [our repository](https://github.com/owncloud/ocis/settings/tree/master/config), there you can always see the latest configuration format. These example configurations include all available options and the default values. The configuration file will be automatically loaded if it's placed at `/etc/ocis/settings.yml`, `${HOME}/.ocis/settings.yml` or `$(pwd)/config/settings.yml`.
|
||||
|
||||
## Usage
|
||||
|
||||
|
||||
@@ -7,4 +7,4 @@ geekdocEditPath: edit/master/docs
|
||||
geekdocFilePath: license.md
|
||||
---
|
||||
|
||||
This project is licensed under the [Apache 2.0](https://github.com/owncloud/ocis-settings/blob/master/LICENSE) license. For the license of the used libraries you have to check the respective sources.
|
||||
This project is licensed under the [Apache 2.0](https://github.com/owncloud/ocis/settings/blob/master/LICENSE) license. For the license of the used libraries you have to check the respective sources.
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
module github.com/owncloud/ocis-settings
|
||||
module github.com/owncloud/ocis/settings
|
||||
|
||||
go 1.13
|
||||
|
||||
|
||||
@@ -769,6 +769,7 @@ github.com/owncloud/ocis-pkg/v2 v2.4.1-0.20200828095914-d3b859484b2b h1:PRw0b4ab
|
||||
github.com/owncloud/ocis-pkg/v2 v2.4.1-0.20200828095914-d3b859484b2b/go.mod h1:WdcVM54z0X7aQzS8eyGl7S5sjEMVBtLpfpzsPX3Z+Pw=
|
||||
github.com/owncloud/ocis-pkg/v2 v2.4.1-0.20200902134813-1e87c6173ada h1:iVknnuT/z8QCAeBpHEcbI/AiQ9FOBvF5aOAFT3TIM+I=
|
||||
github.com/owncloud/ocis-pkg/v2 v2.4.1-0.20200902134813-1e87c6173ada/go.mod h1:WdcVM54z0X7aQzS8eyGl7S5sjEMVBtLpfpzsPX3Z+Pw=
|
||||
github.com/owncloud/ocis-settings v0.3.2-0.20200828091056-47af10a0e872 h1:VGWM/eLIxXY6BJLDuzpdjSVa73Dj5S8pfUtT9Sb5Ono=
|
||||
github.com/owncloud/ocis-settings v0.3.2-0.20200828091056-47af10a0e872/go.mod h1:vRge9QDkOsc6j76gPBmZs1Z5uOPrV4DIkZCgZCEFwBA=
|
||||
github.com/oxtoacart/bpool v0.0.0-20190530202638-03653db5a59c h1:rp5dCmg/yLR3mgFuSOe4oEnDDmGLROTvMragMUXpTQw=
|
||||
github.com/oxtoacart/bpool v0.0.0-20190530202638-03653db5a59c/go.mod h1:X07ZCGwUbLaax7L0S3Tw4hpejzu63ZrrQiUe6W0hcy0=
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
"author": "ownCloud GmbH <devops@owncloud.com>",
|
||||
"repository": "https://github.com/owncloud/ocis-settings.git",
|
||||
"bugs": {
|
||||
"url": "https://github.com/owncloud/ocis-settings/issues",
|
||||
"url": "https://github.com/owncloud/ocis/settings/issues",
|
||||
"email": "support@owncloud.com"
|
||||
},
|
||||
"scripts": {
|
||||
|
||||
@@ -6,7 +6,7 @@ import (
|
||||
"path/filepath"
|
||||
|
||||
"github.com/owncloud/ocis-pkg/v2/log"
|
||||
"github.com/owncloud/ocis-settings/pkg/config"
|
||||
"github.com/owncloud/ocis/settings/pkg/config"
|
||||
|
||||
// Fake the import to make the dep tree happy.
|
||||
_ "golang.org/x/net/context"
|
||||
|
||||
@@ -2,7 +2,7 @@ package assets
|
||||
|
||||
import (
|
||||
"github.com/owncloud/ocis-pkg/v2/log"
|
||||
"github.com/owncloud/ocis-settings/pkg/config"
|
||||
"github.com/owncloud/ocis/settings/pkg/config"
|
||||
)
|
||||
|
||||
// Option defines a single option function.
|
||||
|
||||
@@ -5,8 +5,8 @@ import (
|
||||
"net/http"
|
||||
|
||||
"github.com/micro/cli/v2"
|
||||
"github.com/owncloud/ocis-settings/pkg/config"
|
||||
"github.com/owncloud/ocis-settings/pkg/flagset"
|
||||
"github.com/owncloud/ocis/settings/pkg/config"
|
||||
"github.com/owncloud/ocis/settings/pkg/flagset"
|
||||
)
|
||||
|
||||
// Health is the entrypoint for the health command.
|
||||
|
||||
@@ -6,9 +6,9 @@ import (
|
||||
|
||||
"github.com/micro/cli/v2"
|
||||
"github.com/owncloud/ocis-pkg/v2/log"
|
||||
"github.com/owncloud/ocis-settings/pkg/config"
|
||||
"github.com/owncloud/ocis-settings/pkg/flagset"
|
||||
"github.com/owncloud/ocis-settings/pkg/version"
|
||||
"github.com/owncloud/ocis/settings/pkg/config"
|
||||
"github.com/owncloud/ocis/settings/pkg/flagset"
|
||||
"github.com/owncloud/ocis/settings/pkg/version"
|
||||
"github.com/spf13/viper"
|
||||
)
|
||||
|
||||
|
||||
@@ -14,11 +14,11 @@ import (
|
||||
"github.com/oklog/run"
|
||||
openzipkin "github.com/openzipkin/zipkin-go"
|
||||
zipkinhttp "github.com/openzipkin/zipkin-go/reporter/http"
|
||||
"github.com/owncloud/ocis-settings/pkg/config"
|
||||
"github.com/owncloud/ocis-settings/pkg/flagset"
|
||||
"github.com/owncloud/ocis-settings/pkg/server/debug"
|
||||
"github.com/owncloud/ocis-settings/pkg/server/grpc"
|
||||
"github.com/owncloud/ocis-settings/pkg/server/http"
|
||||
"github.com/owncloud/ocis/settings/pkg/config"
|
||||
"github.com/owncloud/ocis/settings/pkg/flagset"
|
||||
"github.com/owncloud/ocis/settings/pkg/server/debug"
|
||||
"github.com/owncloud/ocis/settings/pkg/server/grpc"
|
||||
"github.com/owncloud/ocis/settings/pkg/server/http"
|
||||
"go.opencensus.io/stats/view"
|
||||
"go.opencensus.io/trace"
|
||||
)
|
||||
|
||||
@@ -2,7 +2,7 @@ package flagset
|
||||
|
||||
import (
|
||||
"github.com/micro/cli/v2"
|
||||
"github.com/owncloud/ocis-settings/pkg/config"
|
||||
"github.com/owncloud/ocis/settings/pkg/config"
|
||||
)
|
||||
|
||||
// RootWithConfig applies cfg to the root flagset
|
||||
|
||||
@@ -14,10 +14,10 @@ import (
|
||||
ocislog "github.com/owncloud/ocis-pkg/v2/log"
|
||||
"github.com/owncloud/ocis-pkg/v2/middleware"
|
||||
"github.com/owncloud/ocis-pkg/v2/service/grpc"
|
||||
"github.com/owncloud/ocis-settings/pkg/config"
|
||||
"github.com/owncloud/ocis-settings/pkg/proto/v0"
|
||||
svc "github.com/owncloud/ocis-settings/pkg/service/v0"
|
||||
store "github.com/owncloud/ocis-settings/pkg/store/filesystem"
|
||||
"github.com/owncloud/ocis/settings/pkg/config"
|
||||
"github.com/owncloud/ocis/settings/pkg/proto/v0"
|
||||
svc "github.com/owncloud/ocis/settings/pkg/service/v0"
|
||||
store "github.com/owncloud/ocis/settings/pkg/store/filesystem"
|
||||
"github.com/stretchr/testify/assert"
|
||||
)
|
||||
|
||||
@@ -448,17 +448,17 @@ func TestSaveGetIntValue(t *testing.T) {
|
||||
{
|
||||
name: "negative",
|
||||
value: proto.Value_IntValue{IntValue: -42},
|
||||
// https://github.com/owncloud/ocis-settings/issues/57
|
||||
// https://github.com/owncloud/ocis/settings/issues/57
|
||||
},
|
||||
{
|
||||
name: "less than Min",
|
||||
value: proto.Value_IntValue{IntValue: 0},
|
||||
// https://github.com/owncloud/ocis-settings/issues/57
|
||||
// https://github.com/owncloud/ocis/settings/issues/57
|
||||
},
|
||||
{
|
||||
name: "more than Max",
|
||||
value: proto.Value_IntValue{IntValue: 128},
|
||||
// https://github.com/owncloud/ocis-settings/issues/57
|
||||
// https://github.com/owncloud/ocis/settings/issues/57
|
||||
},
|
||||
}
|
||||
for _, tt := range tests {
|
||||
@@ -500,7 +500,7 @@ func TestSaveGetIntValue(t *testing.T) {
|
||||
|
||||
/**
|
||||
try to save a wrong type of the value
|
||||
https://github.com/owncloud/ocis-settings/issues/57
|
||||
https://github.com/owncloud/ocis/settings/issues/57
|
||||
*/
|
||||
func TestSaveGetIntValueIntoString(t *testing.T) {
|
||||
teardown := setup()
|
||||
@@ -536,7 +536,7 @@ func TestSaveGetIntValueIntoString(t *testing.T) {
|
||||
assert.Equal(t, "forty two", getValueResponse.Value.Value.GetStringValue())
|
||||
}
|
||||
|
||||
// https://github.com/owncloud/ocis-settings/issues/18
|
||||
// https://github.com/owncloud/ocis/settings/issues/18
|
||||
func TestSaveBundleWithInvalidSettings(t *testing.T) {
|
||||
var tests = []proto.Setting{
|
||||
{
|
||||
@@ -745,7 +745,7 @@ func TestSaveBundleWithInvalidSettings(t *testing.T) {
|
||||
}
|
||||
}
|
||||
|
||||
// https://github.com/owncloud/ocis-settings/issues/19
|
||||
// https://github.com/owncloud/ocis/settings/issues/19
|
||||
func TestGetBundleNoSideEffectsOnDisk(t *testing.T) {
|
||||
teardown := setup()
|
||||
defer teardown()
|
||||
|
||||
@@ -18,7 +18,7 @@ option (grpc.gateway.protoc_gen_swagger.options.openapiv2_swagger) = {
|
||||
};
|
||||
license: {
|
||||
name: "Apache-2.0";
|
||||
url: "https://github.com/owncloud/ocis-settings/blob/master/LICENSE";
|
||||
url: "https://github.com/owncloud/ocis/settings/blob/master/LICENSE";
|
||||
};
|
||||
};
|
||||
schemes: HTTP;
|
||||
|
||||
@@ -10,7 +10,7 @@
|
||||
},
|
||||
"license": {
|
||||
"name": "Apache-2.0",
|
||||
"url": "https://github.com/owncloud/ocis-settings/blob/master/LICENSE"
|
||||
"url": "https://github.com/owncloud/ocis/settings/blob/master/LICENSE"
|
||||
}
|
||||
},
|
||||
"schemes": [
|
||||
|
||||
@@ -4,7 +4,7 @@ import (
|
||||
"context"
|
||||
|
||||
"github.com/owncloud/ocis-pkg/v2/log"
|
||||
"github.com/owncloud/ocis-settings/pkg/config"
|
||||
"github.com/owncloud/ocis/settings/pkg/config"
|
||||
)
|
||||
|
||||
// Option defines a single option function.
|
||||
|
||||
@@ -5,8 +5,8 @@ import (
|
||||
"net/http"
|
||||
|
||||
"github.com/owncloud/ocis-pkg/v2/service/debug"
|
||||
"github.com/owncloud/ocis-settings/pkg/config"
|
||||
"github.com/owncloud/ocis-settings/pkg/version"
|
||||
"github.com/owncloud/ocis/settings/pkg/config"
|
||||
"github.com/owncloud/ocis/settings/pkg/version"
|
||||
)
|
||||
|
||||
// Server initializes the debug service and server.
|
||||
|
||||
@@ -5,8 +5,8 @@ import (
|
||||
|
||||
"github.com/micro/cli/v2"
|
||||
"github.com/owncloud/ocis-pkg/v2/log"
|
||||
"github.com/owncloud/ocis-settings/pkg/config"
|
||||
"github.com/owncloud/ocis-settings/pkg/metrics"
|
||||
"github.com/owncloud/ocis/settings/pkg/config"
|
||||
"github.com/owncloud/ocis/settings/pkg/metrics"
|
||||
)
|
||||
|
||||
// Option defines a single option function.
|
||||
|
||||
@@ -2,9 +2,9 @@ package grpc
|
||||
|
||||
import (
|
||||
"github.com/owncloud/ocis-pkg/v2/service/grpc"
|
||||
"github.com/owncloud/ocis-settings/pkg/proto/v0"
|
||||
svc "github.com/owncloud/ocis-settings/pkg/service/v0"
|
||||
"github.com/owncloud/ocis-settings/pkg/version"
|
||||
"github.com/owncloud/ocis/settings/pkg/proto/v0"
|
||||
svc "github.com/owncloud/ocis/settings/pkg/service/v0"
|
||||
"github.com/owncloud/ocis/settings/pkg/version"
|
||||
)
|
||||
|
||||
// Server initializes a new go-micro service ready to run
|
||||
|
||||
@@ -5,8 +5,8 @@ import (
|
||||
|
||||
"github.com/micro/cli/v2"
|
||||
"github.com/owncloud/ocis-pkg/v2/log"
|
||||
"github.com/owncloud/ocis-settings/pkg/config"
|
||||
"github.com/owncloud/ocis-settings/pkg/metrics"
|
||||
"github.com/owncloud/ocis/settings/pkg/config"
|
||||
"github.com/owncloud/ocis/settings/pkg/metrics"
|
||||
)
|
||||
|
||||
// Option defines a single option function.
|
||||
|
||||
@@ -5,10 +5,10 @@ import (
|
||||
"github.com/owncloud/ocis-pkg/v2/account"
|
||||
"github.com/owncloud/ocis-pkg/v2/middleware"
|
||||
"github.com/owncloud/ocis-pkg/v2/service/http"
|
||||
"github.com/owncloud/ocis-settings/pkg/assets"
|
||||
"github.com/owncloud/ocis-settings/pkg/proto/v0"
|
||||
svc "github.com/owncloud/ocis-settings/pkg/service/v0"
|
||||
"github.com/owncloud/ocis-settings/pkg/version"
|
||||
"github.com/owncloud/ocis/settings/pkg/assets"
|
||||
"github.com/owncloud/ocis/settings/pkg/proto/v0"
|
||||
svc "github.com/owncloud/ocis/settings/pkg/service/v0"
|
||||
"github.com/owncloud/ocis/settings/pkg/version"
|
||||
)
|
||||
|
||||
// Server initializes the http service and server.
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
package svc
|
||||
|
||||
import (
|
||||
"github.com/owncloud/ocis-settings/pkg/metrics"
|
||||
"github.com/owncloud/ocis/settings/pkg/metrics"
|
||||
)
|
||||
|
||||
// NewInstrument returns a service that instruments metrics.
|
||||
|
||||
@@ -4,7 +4,7 @@ import (
|
||||
"net/http"
|
||||
|
||||
"github.com/owncloud/ocis-pkg/v2/log"
|
||||
"github.com/owncloud/ocis-settings/pkg/config"
|
||||
"github.com/owncloud/ocis/settings/pkg/config"
|
||||
)
|
||||
|
||||
// Option defines a single option function.
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package svc
|
||||
|
||||
import "github.com/owncloud/ocis-settings/pkg/proto/v0"
|
||||
import "github.com/owncloud/ocis/settings/pkg/proto/v0"
|
||||
|
||||
func (g Service) hasPermission(
|
||||
roleIDs []string,
|
||||
|
||||
@@ -10,10 +10,10 @@ import (
|
||||
"github.com/owncloud/ocis-pkg/v2/log"
|
||||
"github.com/owncloud/ocis-pkg/v2/middleware"
|
||||
"github.com/owncloud/ocis-pkg/v2/roles"
|
||||
"github.com/owncloud/ocis-settings/pkg/config"
|
||||
"github.com/owncloud/ocis-settings/pkg/proto/v0"
|
||||
"github.com/owncloud/ocis-settings/pkg/settings"
|
||||
store "github.com/owncloud/ocis-settings/pkg/store/filesystem"
|
||||
"github.com/owncloud/ocis/settings/pkg/config"
|
||||
"github.com/owncloud/ocis/settings/pkg/proto/v0"
|
||||
"github.com/owncloud/ocis/settings/pkg/settings"
|
||||
store "github.com/owncloud/ocis/settings/pkg/store/filesystem"
|
||||
)
|
||||
|
||||
// Service represents a service.
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package svc
|
||||
|
||||
import settings "github.com/owncloud/ocis-settings/pkg/proto/v0"
|
||||
import settings "github.com/owncloud/ocis/settings/pkg/proto/v0"
|
||||
|
||||
const (
|
||||
// BundleUUIDRoleAdmin represents the admin role
|
||||
|
||||
@@ -5,7 +5,7 @@ import (
|
||||
|
||||
validation "github.com/go-ozzo/ozzo-validation/v4"
|
||||
"github.com/go-ozzo/ozzo-validation/v4/is"
|
||||
"github.com/owncloud/ocis-settings/pkg/proto/v0"
|
||||
"github.com/owncloud/ocis/settings/pkg/proto/v0"
|
||||
)
|
||||
|
||||
var (
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
package settings
|
||||
|
||||
import (
|
||||
"github.com/owncloud/ocis-settings/pkg/config"
|
||||
"github.com/owncloud/ocis-settings/pkg/proto/v0"
|
||||
"github.com/owncloud/ocis/settings/pkg/config"
|
||||
"github.com/owncloud/ocis/settings/pkg/proto/v0"
|
||||
)
|
||||
|
||||
var (
|
||||
|
||||
@@ -7,7 +7,7 @@ import (
|
||||
"path/filepath"
|
||||
|
||||
"github.com/gofrs/uuid"
|
||||
"github.com/owncloud/ocis-settings/pkg/proto/v0"
|
||||
"github.com/owncloud/ocis/settings/pkg/proto/v0"
|
||||
)
|
||||
|
||||
// ListRoleAssignments loads and returns all role assignments matching the given assignment identifier.
|
||||
|
||||
@@ -8,7 +8,7 @@ import (
|
||||
"testing"
|
||||
|
||||
olog "github.com/owncloud/ocis-pkg/v2/log"
|
||||
"github.com/owncloud/ocis-settings/pkg/proto/v0"
|
||||
"github.com/owncloud/ocis/settings/pkg/proto/v0"
|
||||
"github.com/stretchr/testify/assert"
|
||||
)
|
||||
|
||||
|
||||
@@ -8,7 +8,7 @@ import (
|
||||
"sync"
|
||||
|
||||
"github.com/gofrs/uuid"
|
||||
"github.com/owncloud/ocis-settings/pkg/proto/v0"
|
||||
"github.com/owncloud/ocis/settings/pkg/proto/v0"
|
||||
)
|
||||
|
||||
var m = &sync.RWMutex{}
|
||||
|
||||
@@ -4,7 +4,7 @@ import (
|
||||
"testing"
|
||||
|
||||
olog "github.com/owncloud/ocis-pkg/v2/log"
|
||||
"github.com/owncloud/ocis-settings/pkg/proto/v0"
|
||||
"github.com/owncloud/ocis/settings/pkg/proto/v0"
|
||||
"github.com/stretchr/testify/assert"
|
||||
)
|
||||
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
package store
|
||||
|
||||
import (
|
||||
"github.com/owncloud/ocis-settings/pkg/proto/v0"
|
||||
"github.com/owncloud/ocis-settings/pkg/util"
|
||||
"github.com/owncloud/ocis/settings/pkg/proto/v0"
|
||||
"github.com/owncloud/ocis/settings/pkg/util"
|
||||
)
|
||||
|
||||
// ListPermissionsByResource collects all permissions from the provided roleIDs that match the requested resource
|
||||
|
||||
@@ -5,8 +5,8 @@ import (
|
||||
"os"
|
||||
|
||||
olog "github.com/owncloud/ocis-pkg/v2/log"
|
||||
"github.com/owncloud/ocis-settings/pkg/config"
|
||||
"github.com/owncloud/ocis-settings/pkg/settings"
|
||||
"github.com/owncloud/ocis/settings/pkg/config"
|
||||
"github.com/owncloud/ocis/settings/pkg/settings"
|
||||
)
|
||||
|
||||
var (
|
||||
|
||||
@@ -7,7 +7,7 @@ import (
|
||||
"path/filepath"
|
||||
|
||||
"github.com/gofrs/uuid"
|
||||
"github.com/owncloud/ocis-settings/pkg/proto/v0"
|
||||
"github.com/owncloud/ocis/settings/pkg/proto/v0"
|
||||
)
|
||||
|
||||
// ListValues reads all values that match the given bundleId and accountUUID.
|
||||
|
||||
@@ -4,7 +4,7 @@ import (
|
||||
"testing"
|
||||
|
||||
olog "github.com/owncloud/ocis-pkg/v2/log"
|
||||
"github.com/owncloud/ocis-settings/pkg/proto/v0"
|
||||
"github.com/owncloud/ocis/settings/pkg/proto/v0"
|
||||
"github.com/stretchr/testify/assert"
|
||||
)
|
||||
|
||||
|
||||
@@ -2,5 +2,5 @@ package store
|
||||
|
||||
import (
|
||||
// init filesystem store
|
||||
_ "github.com/owncloud/ocis-settings/pkg/store/filesystem"
|
||||
_ "github.com/owncloud/ocis/settings/pkg/store/filesystem"
|
||||
)
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
package util
|
||||
|
||||
import "github.com/owncloud/ocis-settings/pkg/proto/v0"
|
||||
import "github.com/owncloud/ocis/settings/pkg/proto/v0"
|
||||
|
||||
const (
|
||||
// ResourceIDAll declares on a resource that it matches any id
|
||||
|
||||
@@ -3,7 +3,7 @@ package util
|
||||
import (
|
||||
"testing"
|
||||
|
||||
"github.com/owncloud/ocis-settings/pkg/proto/v0"
|
||||
"github.com/owncloud/ocis/settings/pkg/proto/v0"
|
||||
"gotest.tools/assert"
|
||||
)
|
||||
|
||||
|
||||
@@ -86,7 +86,7 @@ export default {
|
||||
* TODO:
|
||||
* a) set up a map with possible extensions and icons?
|
||||
* or b) let extensions register app info like displayName + icon?
|
||||
* https://github.com/owncloud/ocis-settings/issues/27
|
||||
* https://github.com/owncloud/ocis/settings/issues/27
|
||||
*/
|
||||
const navItem = {
|
||||
name: this.getExtensionName(extension),
|
||||
|
||||
Reference in New Issue
Block a user