From 4c12bed11b5175946c3515dfebdca03ee8fce5a7 Mon Sep 17 00:00:00 2001 From: "A.Unger" Date: Fri, 18 Sep 2020 12:33:35 +0200 Subject: [PATCH] update dependencies and import paths --- accounts/.github/config.yml | 2 +- accounts/CHANGELOG.md | 214 +++++++++--------- .../changelog/0.1.0_2020-03-18/inital-release | 2 +- .../changelog/0.1.0_2020-03-18/self-config.md | 2 +- .../0.1.1_2020-04-29/configurable-log.md | 2 +- .../add-cli-user-management.md | 2 +- .../0.2.0_2020-08-19/add-write-mutexes.md | 2 +- .../align-project-structure.md | 2 +- .../change-grpc-error-messages.md | 6 +- .../0.2.0_2020-08-19/enable_accounts.md | 2 +- .../0.2.0_2020-08-19/fix-account-group-id.md | 2 +- .../0.2.0_2020-08-19/fix-index-mapping.md | 2 +- .../0.2.0_2020-08-19/fix-indexing.md | 4 +- .../0.2.0_2020-08-19/fix-int-queries.md | 4 +- .../0.2.0_2020-08-19/fix-segfault.md | 2 +- .../changelog/0.2.0_2020-08-19/fix-update.md | 2 +- .../0.2.0_2020-08-19/pass-correct-logger.md | 6 +- .../remove-timezone-setting.md | 2 +- .../0.2.0_2020-08-19/tighten-screws.md | 2 +- .../0.2.0_2020-08-19/update-accounts-api.md | 2 +- .../0.2.0_2020-08-19/use-alpine-latest.md | 2 +- .../0.2.0_2020-08-19/user-listing-ui.md | 2 +- .../adapt-to-settings-data-model.md | 2 +- ...d-language-permissions-to-default-roles.md | 2 +- .../0.3.0_2020-08-20/atomic-requests.md | 2 +- .../0.3.0_2020-08-20/fix-prefix-query.md | 2 +- .../0.4.0_2020-08-20/select-role-in-ui.md | 2 +- .../0.4.1_2020-08-27/new-settings-api | 2 +- accounts/changelog/CHANGELOG.tmpl | 6 +- accounts/changelog/TEMPLATE | 4 +- .../changelog/unreleased/add-create-form.md | 2 +- .../changelog/unreleased/add-delete-action.md | 2 +- .../unreleased/add-enable-disable-ui.md | 2 +- .../unreleased/builtin-regular-users.md | 2 +- .../unreleased/fix-role-service-grpc.md | 2 +- .../unreleased/improve-accounts-ui.md | 2 +- .../changelog/unreleased/new-admin-user.md | 2 +- .../unreleased/single-service-handler.md | 4 +- .../unreleased/unique-account-fields | 2 +- .../changelog/unreleased/use-roles-cache.md | 2 +- .../changelog/unreleased/use-roles-manager.md | 2 +- accounts/cmd/ocis-accounts/main.go | 2 +- accounts/docs/getting-started.md | 2 +- accounts/go.mod | 4 +- accounts/package.json | 2 +- accounts/pkg/assets/assets.go | 2 +- accounts/pkg/assets/option.go | 2 +- accounts/pkg/command/add_account.go | 6 +- accounts/pkg/command/inspect_account.go | 6 +- accounts/pkg/command/list_accounts.go | 6 +- accounts/pkg/command/remove_account.go | 6 +- accounts/pkg/command/root.go | 6 +- accounts/pkg/command/server.go | 12 +- accounts/pkg/command/update_account.go | 6 +- accounts/pkg/flagset/flagset.go | 4 +- .../pkg/proto/v0/accounts.pb.micro_test.go | 24 +- accounts/pkg/server/grpc/option.go | 6 +- accounts/pkg/server/grpc/server.go | 2 +- accounts/pkg/server/http/option.go | 6 +- accounts/pkg/server/http/server.go | 6 +- accounts/pkg/service/v0/accounts.go | 4 +- .../service/v0/accounts_permission_test.go | 14 +- accounts/pkg/service/v0/groups.go | 4 +- accounts/pkg/service/v0/option.go | 2 +- accounts/pkg/service/v0/service.go | 4 +- accounts/sonar-project.properties | 2 +- go.mod | 9 +- go.sum | 2 + 68 files changed, 233 insertions(+), 232 deletions(-) diff --git a/accounts/.github/config.yml b/accounts/.github/config.yml index 4bd8b5f18..d39920e20 100644 --- a/accounts/.github/config.yml +++ b/accounts/.github/config.yml @@ -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-accounts/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/accounts/blob/master/changelog/README.md) item based on your changes. updateDocsWhiteList: - Tests-only - tests-only diff --git a/accounts/CHANGELOG.md b/accounts/CHANGELOG.md index 3a2db6df8..165548afe 100644 --- a/accounts/CHANGELOG.md +++ b/accounts/CHANGELOG.md @@ -2,17 +2,17 @@ The following sections list the changes in ocis-accounts unreleased. -[unreleased]: https://github.com/owncloud/ocis-accounts/compare/v0.4.1...master +[unreleased]: https://github.com/owncloud/ocis/accounts/compare/v0.4.1...master ## Summary -* Bugfix - Initialize roleService client in GRPC server: [#114](https://github.com/owncloud/ocis-accounts/pull/114) +* Bugfix - Initialize roleService client in GRPC server: [#114](https://github.com/owncloud/ocis/accounts/pull/114) * Bugfix - Cleanup separated indices in memory: [#224](https://github.com/owncloud/product/issues/224) -* Bugfix - Don't create account if id/mail/username already taken: [#123](https://github.com/owncloud/ocis-accounts/pull/123) -* Change - Set user role on builtin users: [#102](https://github.com/owncloud/ocis-accounts/pull/102) -* Change - Add new builtin admin user: [#102](https://github.com/owncloud/ocis-accounts/pull/102) -* Change - We make use of the roles cache to enforce permission checks: [#100](https://github.com/owncloud/ocis-accounts/pull/100) -* Change - We make use of the roles manager to enforce permission checks: [#108](https://github.com/owncloud/ocis-accounts/pull/108) +* Bugfix - Don't create account if id/mail/username already taken: [#123](https://github.com/owncloud/ocis/accounts/pull/123) +* Change - Set user role on builtin users: [#102](https://github.com/owncloud/ocis/accounts/pull/102) +* Change - Add new builtin admin user: [#102](https://github.com/owncloud/ocis/accounts/pull/102) +* Change - We make use of the roles cache to enforce permission checks: [#100](https://github.com/owncloud/ocis/accounts/pull/100) +* Change - We make use of the roles manager to enforce permission checks: [#108](https://github.com/owncloud/ocis/accounts/pull/108) * Enhancement - Add create account form: [#148](https://github.com/owncloud/product/issues/148) * Enhancement - Add delete accounts action: [#148](https://github.com/owncloud/product/issues/148) * Enhancement - Add enable/disable capabilities to the WebUI: [#118](https://github.com/owncloud/product/issues/118) @@ -20,12 +20,12 @@ The following sections list the changes in ocis-accounts unreleased. ## Details -* Bugfix - Initialize roleService client in GRPC server: [#114](https://github.com/owncloud/ocis-accounts/pull/114) +* Bugfix - Initialize roleService client in GRPC server: [#114](https://github.com/owncloud/ocis/accounts/pull/114) We fixed the initialization of the GRPC server by also providing a roleService client and a roleManager instance. - https://github.com/owncloud/ocis-accounts/pull/114 + https://github.com/owncloud/ocis/accounts/pull/114 * Bugfix - Cleanup separated indices in memory: [#224](https://github.com/owncloud/product/issues/224) @@ -39,47 +39,47 @@ The following sections list the changes in ocis-accounts unreleased. restart. https://github.com/owncloud/product/issues/224 - https://github.com/owncloud/ocis-accounts/pull/117 - https://github.com/owncloud/ocis-accounts/pull/118 + https://github.com/owncloud/ocis/accounts/pull/117 + https://github.com/owncloud/ocis/accounts/pull/118 -* Bugfix - Don't create account if id/mail/username already taken: [#123](https://github.com/owncloud/ocis-accounts/pull/123) +* Bugfix - Don't create account if id/mail/username already taken: [#123](https://github.com/owncloud/ocis/accounts/pull/123) We don't allow anymore to create a new account if the provided id/mail/username is already taken. - https://github.com/owncloud/ocis-accounts/pull/123 + https://github.com/owncloud/ocis/accounts/pull/123 -* Change - Set user role on builtin users: [#102](https://github.com/owncloud/ocis-accounts/pull/102) +* Change - Set user role on builtin users: [#102](https://github.com/owncloud/ocis/accounts/pull/102) We now set the default `user` role on our builtin users. - https://github.com/owncloud/ocis-accounts/pull/102 + https://github.com/owncloud/ocis/accounts/pull/102 -* Change - Add new builtin admin user: [#102](https://github.com/owncloud/ocis-accounts/pull/102) +* Change - Add new builtin admin user: [#102](https://github.com/owncloud/ocis/accounts/pull/102) We added a new builtin user `moss` and assigned the admin role. - https://github.com/owncloud/ocis-accounts/pull/102 + https://github.com/owncloud/ocis/accounts/pull/102 -* Change - We make use of the roles cache to enforce permission checks: [#100](https://github.com/owncloud/ocis-accounts/pull/100) +* Change - We make use of the roles cache to enforce permission checks: [#100](https://github.com/owncloud/ocis/accounts/pull/100) The roles cache and its cache update middleware are used to make permission checks possible. The permission checks take place in the accounts handler. - https://github.com/owncloud/ocis-accounts/pull/100 + https://github.com/owncloud/ocis/accounts/pull/100 -* Change - We make use of the roles manager to enforce permission checks: [#108](https://github.com/owncloud/ocis-accounts/pull/108) +* Change - We make use of the roles manager to enforce permission checks: [#108](https://github.com/owncloud/ocis/accounts/pull/108) The roles cache and its cache update middleware have been replaced with a roles manager in ocis-pkg/v2. We've switched over to the new roles manager implementation, to prepare for permission checks on grpc requests as well. - https://github.com/owncloud/ocis-accounts/pull/108 + https://github.com/owncloud/ocis/accounts/pull/108 https://github.com/owncloud/ocis-pkg/pull/60 @@ -88,7 +88,7 @@ The following sections list the changes in ocis-accounts unreleased. We've added a form to create new users above the accounts list. https://github.com/owncloud/product/issues/148 - https://github.com/owncloud/ocis-accounts/pull/115 + https://github.com/owncloud/ocis/accounts/pull/115 * Enhancement - Add delete accounts action: [#148](https://github.com/owncloud/product/issues/148) @@ -96,7 +96,7 @@ The following sections list the changes in ocis-accounts unreleased. We've added an action into the actions dropdown to enable admins to delete users. https://github.com/owncloud/product/issues/148 - https://github.com/owncloud/ocis-accounts/pull/115 + https://github.com/owncloud/ocis/accounts/pull/115 * Enhancement - Add enable/disable capabilities to the WebUI: [#118](https://github.com/owncloud/product/issues/118) @@ -105,7 +105,7 @@ The following sections list the changes in ocis-accounts unreleased. accounts. https://github.com/owncloud/product/issues/118 - https://github.com/owncloud/ocis-accounts/pull/109 + https://github.com/owncloud/ocis/accounts/pull/109 * Enhancement - Improve visual appearance of accounts UI: [#222](https://github.com/owncloud/product/issues/222) @@ -116,26 +116,26 @@ The following sections list the changes in ocis-accounts unreleased. user deletion and removed the uid and gid columns. https://github.com/owncloud/product/issues/222 - https://github.com/owncloud/ocis-accounts/pull/116 + https://github.com/owncloud/ocis/accounts/pull/116 # Changelog for [0.4.1] (2020-08-27) The following sections list the changes in ocis-accounts 0.4.1. -[0.4.1]: https://github.com/owncloud/ocis-accounts/compare/v0.3.0...v0.4.1 +[0.4.1]: https://github.com/owncloud/ocis/accounts/compare/v0.3.0...v0.4.1 ## Summary -* Bugfix - Adapting to new settings API for fetching roles: [#96](https://github.com/owncloud/ocis-accounts/pull/96) +* Bugfix - Adapting to new settings API for fetching roles: [#96](https://github.com/owncloud/ocis/accounts/pull/96) * Change - Create account api-call implicitly adds "default-user" role: [#173](https://github.com/owncloud/product/issues/173) ## Details -* Bugfix - Adapting to new settings API for fetching roles: [#96](https://github.com/owncloud/ocis-accounts/pull/96) +* Bugfix - Adapting to new settings API for fetching roles: [#96](https://github.com/owncloud/ocis/accounts/pull/96) We fixed the usage of the ocis-settings endpoint for fetching roles. - https://github.com/owncloud/ocis-accounts/pull/96 + https://github.com/owncloud/ocis/accounts/pull/96 * Change - Create account api-call implicitly adds "default-user" role: [#173](https://github.com/owncloud/product/issues/173) @@ -148,53 +148,53 @@ The following sections list the changes in ocis-accounts 0.4.1. The following sections list the changes in ocis-accounts 0.3.0. -[0.3.0]: https://github.com/owncloud/ocis-accounts/compare/v0.4.0...v0.3.0 +[0.3.0]: https://github.com/owncloud/ocis/accounts/compare/v0.4.0...v0.3.0 ## Summary -* Bugfix - Atomic Requests: [#82](https://github.com/owncloud/ocis-accounts/pull/82) -* Bugfix - Unescape value for prefix query: [#76](https://github.com/owncloud/ocis-accounts/pull/76) -* Change - Adapt to new ocis-settings data model: [#87](https://github.com/owncloud/ocis-accounts/pull/87) -* Change - Add permissions for language to default roles: [#88](https://github.com/owncloud/ocis-accounts/pull/88) +* Bugfix - Atomic Requests: [#82](https://github.com/owncloud/ocis/accounts/pull/82) +* Bugfix - Unescape value for prefix query: [#76](https://github.com/owncloud/ocis/accounts/pull/76) +* Change - Adapt to new ocis-settings data model: [#87](https://github.com/owncloud/ocis/accounts/pull/87) +* Change - Add permissions for language to default roles: [#88](https://github.com/owncloud/ocis/accounts/pull/88) ## Details -* Bugfix - Atomic Requests: [#82](https://github.com/owncloud/ocis-accounts/pull/82) +* Bugfix - Atomic Requests: [#82](https://github.com/owncloud/ocis/accounts/pull/82) Operations on the file system level are now atomic. This happens only on the provisioning API. - https://github.com/owncloud/ocis-accounts/pull/82 + https://github.com/owncloud/ocis/accounts/pull/82 -* Bugfix - Unescape value for prefix query: [#76](https://github.com/owncloud/ocis-accounts/pull/76) +* Bugfix - Unescape value for prefix query: [#76](https://github.com/owncloud/ocis/accounts/pull/76) Prefix queries also need to unescape token values like `'some ''ol string'` to `some 'ol string` before using it in a prefix query - https://github.com/owncloud/ocis-accounts/pull/76 + https://github.com/owncloud/ocis/accounts/pull/76 -* Change - Adapt to new ocis-settings data model: [#87](https://github.com/owncloud/ocis-accounts/pull/87) +* Change - Adapt to new ocis-settings data model: [#87](https://github.com/owncloud/ocis/accounts/pull/87) Ocis-settings introduced UUIDs and less verbose endpoint and message type names. This PR adjusts ocis-accounts accordingly. - https://github.com/owncloud/ocis-accounts/pull/87 + https://github.com/owncloud/ocis/accounts/pull/87 https://github.com/owncloud/ocis-settings/pull/46 -* Change - Add permissions for language to default roles: [#88](https://github.com/owncloud/ocis-accounts/pull/88) +* Change - Add permissions for language to default roles: [#88](https://github.com/owncloud/ocis/accounts/pull/88) Ocis-settings has default roles and exposes the respective bundle uuids. We now added permissions for reading/writing the preferred language to the default roles. - https://github.com/owncloud/ocis-accounts/pull/88 + https://github.com/owncloud/ocis/accounts/pull/88 # Changelog for [0.4.0] (2020-08-20) The following sections list the changes in ocis-accounts 0.4.0. -[0.4.0]: https://github.com/owncloud/ocis-accounts/compare/v0.2.0...v0.4.0 +[0.4.0]: https://github.com/owncloud/ocis/accounts/compare/v0.2.0...v0.4.0 ## Summary @@ -208,37 +208,37 @@ The following sections list the changes in ocis-accounts 0.4.0. this doesn't require account management permissions. https://github.com/owncloud/product/issues/103 - https://github.com/owncloud/ocis-accounts/pull/89 + https://github.com/owncloud/ocis/accounts/pull/89 # Changelog for [0.2.0] (2020-08-19) The following sections list the changes in ocis-accounts 0.2.0. -[0.2.0]: https://github.com/owncloud/ocis-accounts/compare/v0.1.1...v0.2.0 +[0.2.0]: https://github.com/owncloud/ocis/accounts/compare/v0.1.1...v0.2.0 ## Summary -* Bugfix - Add write mutexes: [#71](https://github.com/owncloud/ocis-accounts/pull/71) -* Bugfix - Fix the accountId and groupId mismatch in DeleteGroup Method: [#60](https://github.com/owncloud/ocis-accounts/pull/60) -* Bugfix - Fix index mapping: [#73](https://github.com/owncloud/ocis-accounts/issues/73) +* Bugfix - Add write mutexes: [#71](https://github.com/owncloud/ocis/accounts/pull/71) +* Bugfix - Fix the accountId and groupId mismatch in DeleteGroup Method: [#60](https://github.com/owncloud/ocis/accounts/pull/60) +* Bugfix - Fix index mapping: [#73](https://github.com/owncloud/ocis/accounts/issues/73) * Bugfix - Use NewNumericRangeInclusiveQuery for numeric literals: [#28](https://github.com/owncloud/ocis-glauth/issues/28) -* Bugfix - Prevent segfault when no password is set: [#65](https://github.com/owncloud/ocis-accounts/pull/65) -* Bugfix - Update account return value not used: [#70](https://github.com/owncloud/ocis-accounts/pull/70) -* Bugfix - Build docker images with alpine:latest instead of alpine:edge: [#64](https://github.com/owncloud/ocis-accounts/pull/64) -* Change - Align structure of this extension with other extensions: [#51](https://github.com/owncloud/ocis-accounts/pull/51) -* Change - Change api errors: [#11](https://github.com/owncloud/ocis-accounts/issues/11) -* Change - Enable accounts on creation: [#43](https://github.com/owncloud/ocis-accounts/issues/43) -* Change - Fix index update on create/update: [#57](https://github.com/owncloud/ocis-accounts/issues/57) -* Change - Pass around the correct logger throughout the code: [#41](https://github.com/owncloud/ocis-accounts/issues/41) -* Change - Remove timezone setting: [#33](https://github.com/owncloud/ocis-accounts/pull/33) -* Change - Tighten screws on usernames and email addresses: [#65](https://github.com/owncloud/ocis-accounts/pull/65) -* Enhancement - Add early version of cli tools for user-management: [#69](https://github.com/owncloud/ocis-accounts/pull/69) -* Enhancement - Update accounts API: [#30](https://github.com/owncloud/ocis-accounts/pull/30) -* Enhancement - Add simple user listing UI: [#51](https://github.com/owncloud/ocis-accounts/pull/51) +* Bugfix - Prevent segfault when no password is set: [#65](https://github.com/owncloud/ocis/accounts/pull/65) +* Bugfix - Update account return value not used: [#70](https://github.com/owncloud/ocis/accounts/pull/70) +* Bugfix - Build docker images with alpine:latest instead of alpine:edge: [#64](https://github.com/owncloud/ocis/accounts/pull/64) +* Change - Align structure of this extension with other extensions: [#51](https://github.com/owncloud/ocis/accounts/pull/51) +* Change - Change api errors: [#11](https://github.com/owncloud/ocis/accounts/issues/11) +* Change - Enable accounts on creation: [#43](https://github.com/owncloud/ocis/accounts/issues/43) +* Change - Fix index update on create/update: [#57](https://github.com/owncloud/ocis/accounts/issues/57) +* Change - Pass around the correct logger throughout the code: [#41](https://github.com/owncloud/ocis/accounts/issues/41) +* Change - Remove timezone setting: [#33](https://github.com/owncloud/ocis/accounts/pull/33) +* Change - Tighten screws on usernames and email addresses: [#65](https://github.com/owncloud/ocis/accounts/pull/65) +* Enhancement - Add early version of cli tools for user-management: [#69](https://github.com/owncloud/ocis/accounts/pull/69) +* Enhancement - Update accounts API: [#30](https://github.com/owncloud/ocis/accounts/pull/30) +* Enhancement - Add simple user listing UI: [#51](https://github.com/owncloud/ocis/accounts/pull/51) ## Details -* Bugfix - Add write mutexes: [#71](https://github.com/owncloud/ocis-accounts/pull/71) +* Bugfix - Add write mutexes: [#71](https://github.com/owncloud/ocis/accounts/pull/71) Concurrent account or groups writes would corrupt the json file on disk, because the different goroutines would be treated as a single thread from the os. We introduce a mutex for account and @@ -246,26 +246,26 @@ The following sections list the changes in ocis-accounts 0.2.0. further improved by using a concurrent map of mutexes with a mutex per account / group. PR welcome. - https://github.com/owncloud/ocis-accounts/pull/71 + https://github.com/owncloud/ocis/accounts/pull/71 -* Bugfix - Fix the accountId and groupId mismatch in DeleteGroup Method: [#60](https://github.com/owncloud/ocis-accounts/pull/60) +* Bugfix - Fix the accountId and groupId mismatch in DeleteGroup Method: [#60](https://github.com/owncloud/ocis/accounts/pull/60) We've fixed a bug in deleting the groups. The accountId and GroupId were swapped when removing the member from a group after deleting the group. - https://github.com/owncloud/ocis-accounts/pull/60 + https://github.com/owncloud/ocis/accounts/pull/60 -* Bugfix - Fix index mapping: [#73](https://github.com/owncloud/ocis-accounts/issues/73) +* Bugfix - Fix index mapping: [#73](https://github.com/owncloud/ocis/accounts/issues/73) The index mapping was not being used because we were not using the right blevesearch TypeField, leading to username like properties like `preferred_name` and `on_premises_sam_account_name` to be case sensitive. - https://github.com/owncloud/ocis-accounts/issues/73 + https://github.com/owncloud/ocis/accounts/issues/73 * Bugfix - Use NewNumericRangeInclusiveQuery for numeric literals: [#28](https://github.com/owncloud/ocis-glauth/issues/28) @@ -278,83 +278,83 @@ The following sections list the changes in ocis-accounts 0.2.0. numeric literal and use the NewNumericRangeInclusiveQuery instead of a TermQuery. https://github.com/owncloud/ocis-glauth/issues/28 - https://github.com/owncloud/ocis-accounts/pull/68 + https://github.com/owncloud/ocis/accounts/pull/68 https://github.com/owncloud/ocis-glauth/pull/29 -* Bugfix - Prevent segfault when no password is set: [#65](https://github.com/owncloud/ocis-accounts/pull/65) +* Bugfix - Prevent segfault when no password is set: [#65](https://github.com/owncloud/ocis/accounts/pull/65) Passwords are stored in a dedicated child struct of an account. We fixed several segfault conditions where the methods would try to unset a password when that child struct was not existing. - https://github.com/owncloud/ocis-accounts/pull/65 + https://github.com/owncloud/ocis/accounts/pull/65 -* Bugfix - Update account return value not used: [#70](https://github.com/owncloud/ocis-accounts/pull/70) +* Bugfix - Update account return value not used: [#70](https://github.com/owncloud/ocis/accounts/pull/70) In order to return a value using the micro go code we need to override the `out` value. - https://github.com/owncloud/ocis-accounts/pull/70 + https://github.com/owncloud/ocis/accounts/pull/70 -* Bugfix - Build docker images with alpine:latest instead of alpine:edge: [#64](https://github.com/owncloud/ocis-accounts/pull/64) +* Bugfix - Build docker images with alpine:latest instead of alpine:edge: [#64](https://github.com/owncloud/ocis/accounts/pull/64) ARM builds were failing when built on alpine:edge, so we switched to alpine:latest instead. - https://github.com/owncloud/ocis-accounts/pull/64 + https://github.com/owncloud/ocis/accounts/pull/64 -* Change - Align structure of this extension with other extensions: [#51](https://github.com/owncloud/ocis-accounts/pull/51) +* Change - Align structure of this extension with other extensions: [#51](https://github.com/owncloud/ocis/accounts/pull/51) We aim to have a similar project structure for all our ocis extensions. This extension was different with regard to the structure of the server command and naming of some flag names. - https://github.com/owncloud/ocis-accounts/pull/51 + https://github.com/owncloud/ocis/accounts/pull/51 -* Change - Change api errors: [#11](https://github.com/owncloud/ocis-accounts/issues/11) +* Change - Change api errors: [#11](https://github.com/owncloud/ocis/accounts/issues/11) Replaced the plain golang errors with the error model from the micro framework. - https://github.com/owncloud/ocis-accounts/issues/11 + https://github.com/owncloud/ocis/accounts/issues/11 -* Change - Enable accounts on creation: [#43](https://github.com/owncloud/ocis-accounts/issues/43) +* Change - Enable accounts on creation: [#43](https://github.com/owncloud/ocis/accounts/issues/43) Accounts have been created with the account_enabled flag set to false. Now when they are created accounts will be enabled per default. - https://github.com/owncloud/ocis-accounts/issues/43 + https://github.com/owncloud/ocis/accounts/issues/43 -* Change - Fix index update on create/update: [#57](https://github.com/owncloud/ocis-accounts/issues/57) +* Change - Fix index update on create/update: [#57](https://github.com/owncloud/ocis/accounts/issues/57) We fixed a bug in creating/updating accounts and groups, that caused new entities not to show up in list queries. - https://github.com/owncloud/ocis-accounts/issues/57 - https://github.com/owncloud/ocis-accounts/pull/59 + https://github.com/owncloud/ocis/accounts/issues/57 + https://github.com/owncloud/ocis/accounts/pull/59 -* Change - Pass around the correct logger throughout the code: [#41](https://github.com/owncloud/ocis-accounts/issues/41) +* Change - Pass around the correct logger throughout the code: [#41](https://github.com/owncloud/ocis/accounts/issues/41) Pass around the logger to have consistent log formatting, log level, etc. - https://github.com/owncloud/ocis-accounts/issues/41 - https://github.com/owncloud/ocis-accounts/pull/48 + https://github.com/owncloud/ocis/accounts/issues/41 + https://github.com/owncloud/ocis/accounts/pull/48 -* Change - Remove timezone setting: [#33](https://github.com/owncloud/ocis-accounts/pull/33) +* Change - Remove timezone setting: [#33](https://github.com/owncloud/ocis/accounts/pull/33) We had a timezone setting in our profile settings bundle. As we're not dealing with a timezone yet it would be confusing for the user to have a timezone setting available. We removed it, until we have a timezone implementation available in ocis-web. - https://github.com/owncloud/ocis-accounts/pull/33 + https://github.com/owncloud/ocis/accounts/pull/33 -* Change - Tighten screws on usernames and email addresses: [#65](https://github.com/owncloud/ocis-accounts/pull/65) +* Change - Tighten screws on usernames and email addresses: [#65](https://github.com/owncloud/ocis/accounts/pull/65) In order to match accounts to the OIDC claims we currently rely on the email address or username to be present. We force both to match the [W3C recommended @@ -362,10 +362,10 @@ The following sections list the changes in ocis-accounts 0.2.0. with usernames having to start with a character or `_`. This allows the username to be presented and used in ACLs when integrating the os with the glauth LDAP service of ocis. - https://github.com/owncloud/ocis-accounts/pull/65 + https://github.com/owncloud/ocis/accounts/pull/65 -* Enhancement - Add early version of cli tools for user-management: [#69](https://github.com/owncloud/ocis-accounts/pull/69) +* Enhancement - Add early version of cli tools for user-management: [#69](https://github.com/owncloud/ocis/accounts/pull/69) Following commands are available: @@ -379,66 +379,66 @@ The following sections list the changes in ocis-accounts 0.2.0. development stage. https://github.com/owncloud/product/issues/115 - https://github.com/owncloud/ocis-accounts/pull/69 + https://github.com/owncloud/ocis/accounts/pull/69 -* Enhancement - Update accounts API: [#30](https://github.com/owncloud/ocis-accounts/pull/30) +* Enhancement - Update accounts API: [#30](https://github.com/owncloud/ocis/accounts/pull/30) We updated the api to allow fetching users not onyl by UUID, but also by identity (OpenID issuer and subject) email, username and optionally a password. - https://github.com/owncloud/ocis-accounts/pull/30 + https://github.com/owncloud/ocis/accounts/pull/30 -* Enhancement - Add simple user listing UI: [#51](https://github.com/owncloud/ocis-accounts/pull/51) +* Enhancement - Add simple user listing UI: [#51](https://github.com/owncloud/ocis/accounts/pull/51) We added an extension for ocis-web that shows a simple list of all existing users. - https://github.com/owncloud/ocis-accounts/pull/51 + https://github.com/owncloud/ocis/accounts/pull/51 # Changelog for [0.1.1] (2020-04-29) The following sections list the changes in ocis-accounts 0.1.1. -[0.1.1]: https://github.com/owncloud/ocis-accounts/compare/v0.1.0...v0.1.1 +[0.1.1]: https://github.com/owncloud/ocis/accounts/compare/v0.1.0...v0.1.1 ## Summary -* Enhancement - Logging is configurable: [#24](https://github.com/owncloud/ocis-accounts/pull/24) +* Enhancement - Logging is configurable: [#24](https://github.com/owncloud/ocis/accounts/pull/24) ## Details -* Enhancement - Logging is configurable: [#24](https://github.com/owncloud/ocis-accounts/pull/24) +* Enhancement - Logging is configurable: [#24](https://github.com/owncloud/ocis/accounts/pull/24) ACCOUNTS_LOG_* env-vars or cli-flags can be used for logging configuration. See --help for more details. - https://github.com/owncloud/ocis-accounts/pull/24 + https://github.com/owncloud/ocis/accounts/pull/24 # Changelog for [0.1.0] (2020-03-18) The following sections list the changes in ocis-accounts 0.1.0. -[0.1.0]: https://github.com/owncloud/ocis-accounts/compare/500e303cb544ed93d84153f01219d77eeee44929...v0.1.0 +[0.1.0]: https://github.com/owncloud/ocis/accounts/compare/500e303cb544ed93d84153f01219d77eeee44929...v0.1.0 ## Summary -* Change - Initial release of basic version: [#1](https://github.com/owncloud/ocis-accounts/issues/1) -* Enhancement - Configuration: [#15](https://github.com/owncloud/ocis-accounts/pull/15) +* Change - Initial release of basic version: [#1](https://github.com/owncloud/ocis/accounts/issues/1) +* Enhancement - Configuration: [#15](https://github.com/owncloud/ocis/accounts/pull/15) ## Details -* Change - Initial release of basic version: [#1](https://github.com/owncloud/ocis-accounts/issues/1) +* Change - Initial release of basic version: [#1](https://github.com/owncloud/ocis/accounts/issues/1) Just prepared an initial basic version. - https://github.com/owncloud/ocis-accounts/issues/1 + https://github.com/owncloud/ocis/accounts/issues/1 -* Enhancement - Configuration: [#15](https://github.com/owncloud/ocis-accounts/pull/15) +* Enhancement - Configuration: [#15](https://github.com/owncloud/ocis/accounts/pull/15) Extensions should be responsible of configuring themselves. We use Viper for config loading from default paths. Environment variables **WILL** take precedence over config files. - https://github.com/owncloud/ocis-accounts/pull/15 + https://github.com/owncloud/ocis/accounts/pull/15 diff --git a/accounts/changelog/0.1.0_2020-03-18/inital-release b/accounts/changelog/0.1.0_2020-03-18/inital-release index 6515244f2..62ae19da3 100644 --- a/accounts/changelog/0.1.0_2020-03-18/inital-release +++ b/accounts/changelog/0.1.0_2020-03-18/inital-release @@ -2,4 +2,4 @@ Change: Initial release of basic version Just prepared an initial basic version. -https://github.com/owncloud/ocis-accounts/issues/1 \ No newline at end of file +https://github.com/owncloud/ocis/accounts/issues/1 diff --git a/accounts/changelog/0.1.0_2020-03-18/self-config.md b/accounts/changelog/0.1.0_2020-03-18/self-config.md index f3b7ccdc9..2363b7b35 100644 --- a/accounts/changelog/0.1.0_2020-03-18/self-config.md +++ b/accounts/changelog/0.1.0_2020-03-18/self-config.md @@ -2,4 +2,4 @@ Enhancement: Configuration Extensions should be responsible of configuring themselves. We use Viper for config loading from default paths. Environment variables **WILL** take precedence over config files. -https://github.com/owncloud/ocis-accounts/pull/15 +https://github.com/owncloud/ocis/accounts/pull/15 diff --git a/accounts/changelog/0.1.1_2020-04-29/configurable-log.md b/accounts/changelog/0.1.1_2020-04-29/configurable-log.md index 41a4d5e46..bd51052a1 100644 --- a/accounts/changelog/0.1.1_2020-04-29/configurable-log.md +++ b/accounts/changelog/0.1.1_2020-04-29/configurable-log.md @@ -2,4 +2,4 @@ Enhancement: Logging is configurable ACCOUNTS_LOG_* env-vars or cli-flags can be used for logging configuration. See --help for more details. -https://github.com/owncloud/ocis-accounts/pull/24 +https://github.com/owncloud/ocis/accounts/pull/24 diff --git a/accounts/changelog/0.2.0_2020-08-19/add-cli-user-management.md b/accounts/changelog/0.2.0_2020-08-19/add-cli-user-management.md index f86123aa6..19b4fca56 100644 --- a/accounts/changelog/0.2.0_2020-08-19/add-cli-user-management.md +++ b/accounts/changelog/0.2.0_2020-08-19/add-cli-user-management.md @@ -13,5 +13,5 @@ See --help for details. Note that not all account-attributes have an effect yet. This is due to ocis being in an early development stage. -https://github.com/owncloud/ocis-accounts/pull/69 +https://github.com/owncloud/ocis/accounts/pull/69 https://github.com/owncloud/product/issues/115 diff --git a/accounts/changelog/0.2.0_2020-08-19/add-write-mutexes.md b/accounts/changelog/0.2.0_2020-08-19/add-write-mutexes.md index ec16003a1..86a53127c 100644 --- a/accounts/changelog/0.2.0_2020-08-19/add-write-mutexes.md +++ b/accounts/changelog/0.2.0_2020-08-19/add-write-mutexes.md @@ -2,4 +2,4 @@ Bugfix: Add write mutexes Concurrent account or groups writes would corrupt the json file on disk, because the different goroutines would be treated as a single thread from the os. We introduce a mutex for account and group file writes each. This locks the update frequency for all accounts/groups and could be further improved by using a concurrent map of mutexes with a mutex per account / group. PR welcome. -https://github.com/owncloud/ocis-accounts/pull/71 \ No newline at end of file +https://github.com/owncloud/ocis/accounts/pull/71 diff --git a/accounts/changelog/0.2.0_2020-08-19/align-project-structure.md b/accounts/changelog/0.2.0_2020-08-19/align-project-structure.md index da0e28fa8..db1f6a86a 100644 --- a/accounts/changelog/0.2.0_2020-08-19/align-project-structure.md +++ b/accounts/changelog/0.2.0_2020-08-19/align-project-structure.md @@ -2,4 +2,4 @@ Change: Align structure of this extension with other extensions We aim to have a similar project structure for all our ocis extensions. This extension was different with regard to the structure of the server command and naming of some flag names. -https://github.com/owncloud/ocis-accounts/pull/51 +https://github.com/owncloud/ocis/accounts/pull/51 diff --git a/accounts/changelog/0.2.0_2020-08-19/change-grpc-error-messages.md b/accounts/changelog/0.2.0_2020-08-19/change-grpc-error-messages.md index 2be7b44fa..6d42a79fc 100644 --- a/accounts/changelog/0.2.0_2020-08-19/change-grpc-error-messages.md +++ b/accounts/changelog/0.2.0_2020-08-19/change-grpc-error-messages.md @@ -1,6 +1,6 @@ -Change: change api errors +Change: change api errors -Replaced the plain golang errors with the error model from the micro framework. +Replaced the plain golang errors with the error model from the micro framework. -https://github.com/owncloud/ocis-accounts/issues/11 +https://github.com/owncloud/ocis/accounts/issues/11 diff --git a/accounts/changelog/0.2.0_2020-08-19/enable_accounts.md b/accounts/changelog/0.2.0_2020-08-19/enable_accounts.md index 81db1ca00..67eee43dc 100644 --- a/accounts/changelog/0.2.0_2020-08-19/enable_accounts.md +++ b/accounts/changelog/0.2.0_2020-08-19/enable_accounts.md @@ -3,4 +3,4 @@ Change: Enable accounts on creation Accounts have been created with the account_enabled flag set to false. Now when they are created accounts will be enabled per default. -https://github.com/owncloud/ocis-accounts/issues/43 +https://github.com/owncloud/ocis/accounts/issues/43 diff --git a/accounts/changelog/0.2.0_2020-08-19/fix-account-group-id.md b/accounts/changelog/0.2.0_2020-08-19/fix-account-group-id.md index 81a1dc4c0..379f6917f 100644 --- a/accounts/changelog/0.2.0_2020-08-19/fix-account-group-id.md +++ b/accounts/changelog/0.2.0_2020-08-19/fix-account-group-id.md @@ -5,4 +5,4 @@ We've fixed a bug in deleting the groups. The accountId and GroupId were swapped when removing the member from a group after deleting the group. -https://github.com/owncloud/ocis-accounts/pull/60 +https://github.com/owncloud/ocis/accounts/pull/60 diff --git a/accounts/changelog/0.2.0_2020-08-19/fix-index-mapping.md b/accounts/changelog/0.2.0_2020-08-19/fix-index-mapping.md index aff6ada10..816dd1af4 100644 --- a/accounts/changelog/0.2.0_2020-08-19/fix-index-mapping.md +++ b/accounts/changelog/0.2.0_2020-08-19/fix-index-mapping.md @@ -2,4 +2,4 @@ Bugfix: Fix index mapping The index mapping was not being used because we were not using the right blevesearch TypeField, leading to username like properties like `preferred_name` and `on_premises_sam_account_name` to be case sensitive. -https://github.com/owncloud/ocis-accounts/issues/73 +https://github.com/owncloud/ocis/accounts/issues/73 diff --git a/accounts/changelog/0.2.0_2020-08-19/fix-indexing.md b/accounts/changelog/0.2.0_2020-08-19/fix-indexing.md index 01ebab8a7..140716636 100644 --- a/accounts/changelog/0.2.0_2020-08-19/fix-indexing.md +++ b/accounts/changelog/0.2.0_2020-08-19/fix-indexing.md @@ -2,5 +2,5 @@ Change: Fix index update on create/update We fixed a bug in creating/updating accounts and groups, that caused new entities not to show up in list queries. -https://github.com/owncloud/ocis-accounts/issues/57 -https://github.com/owncloud/ocis-accounts/pull/59 +https://github.com/owncloud/ocis/accounts/issues/57 +https://github.com/owncloud/ocis/accounts/pull/59 diff --git a/accounts/changelog/0.2.0_2020-08-19/fix-int-queries.md b/accounts/changelog/0.2.0_2020-08-19/fix-int-queries.md index 7a2325810..ae8b7c520 100644 --- a/accounts/changelog/0.2.0_2020-08-19/fix-int-queries.md +++ b/accounts/changelog/0.2.0_2020-08-19/fix-int-queries.md @@ -3,5 +3,5 @@ Bugfix: use NewNumericRangeInclusiveQuery for numeric literals Some LDAP properties like `uidnumber` and `gidnumber` are numeric. When an OS tries to look up a user it will not only try to lookup the user by username, but also by the `uidnumber`: `(&(objectclass=posixAccount)(uidnumber=20000))`. The accounts backend for glauth was sending that as a string query `uid_number eq '20000'` and has been changed to send it as `uid_number eq 20000`. The removed quotes allow the parser in ocis-accounts to identify the numeric literal and use the NewNumericRangeInclusiveQuery instead of a TermQuery. https://github.com/owncloud/ocis-glauth/issues/28 -https://github.com/owncloud/ocis-accounts/pull/68 -https://github.com/owncloud/ocis-glauth/pull/29 \ No newline at end of file +https://github.com/owncloud/ocis/accounts/pull/68 +https://github.com/owncloud/ocis-glauth/pull/29 diff --git a/accounts/changelog/0.2.0_2020-08-19/fix-segfault.md b/accounts/changelog/0.2.0_2020-08-19/fix-segfault.md index 2ba5e1362..57b224a60 100644 --- a/accounts/changelog/0.2.0_2020-08-19/fix-segfault.md +++ b/accounts/changelog/0.2.0_2020-08-19/fix-segfault.md @@ -2,4 +2,4 @@ Bugfix: Prevent segfault when no password is set Passwords are stored in a dedicated child struct of an account. We fixed several segfault conditions where the methods would try to unset a password when that child struct was not existing. -https://github.com/owncloud/ocis-accounts/pull/65 +https://github.com/owncloud/ocis/accounts/pull/65 diff --git a/accounts/changelog/0.2.0_2020-08-19/fix-update.md b/accounts/changelog/0.2.0_2020-08-19/fix-update.md index ff652259e..b35978b62 100644 --- a/accounts/changelog/0.2.0_2020-08-19/fix-update.md +++ b/accounts/changelog/0.2.0_2020-08-19/fix-update.md @@ -2,4 +2,4 @@ Bugfix: Update account return value not used In order to return a value using the micro go code we need to override the `out` value. -https://github.com/owncloud/ocis-accounts/pull/70 +https://github.com/owncloud/ocis/accounts/pull/70 diff --git a/accounts/changelog/0.2.0_2020-08-19/pass-correct-logger.md b/accounts/changelog/0.2.0_2020-08-19/pass-correct-logger.md index 049ad7604..114b8e7a7 100644 --- a/accounts/changelog/0.2.0_2020-08-19/pass-correct-logger.md +++ b/accounts/changelog/0.2.0_2020-08-19/pass-correct-logger.md @@ -1,6 +1,6 @@ -Change: pass around the correct logger throughout the code +Change: pass around the correct logger throughout the code Pass around the logger to have consistent log formatting, log level, etc. -https://github.com/owncloud/ocis-accounts/issues/41 -https://github.com/owncloud/ocis-accounts/pull/48 +https://github.com/owncloud/ocis/accounts/issues/41 +https://github.com/owncloud/ocis/accounts/pull/48 diff --git a/accounts/changelog/0.2.0_2020-08-19/remove-timezone-setting.md b/accounts/changelog/0.2.0_2020-08-19/remove-timezone-setting.md index d46f57d06..25483afca 100644 --- a/accounts/changelog/0.2.0_2020-08-19/remove-timezone-setting.md +++ b/accounts/changelog/0.2.0_2020-08-19/remove-timezone-setting.md @@ -4,4 +4,4 @@ We had a timezone setting in our profile settings bundle. As we're not dealing w it would be confusing for the user to have a timezone setting available. We removed it, until we have a timezone implementation available in ocis-web. -https://github.com/owncloud/ocis-accounts/pull/33 +https://github.com/owncloud/ocis/accounts/pull/33 diff --git a/accounts/changelog/0.2.0_2020-08-19/tighten-screws.md b/accounts/changelog/0.2.0_2020-08-19/tighten-screws.md index 00d9185e9..90171b04d 100644 --- a/accounts/changelog/0.2.0_2020-08-19/tighten-screws.md +++ b/accounts/changelog/0.2.0_2020-08-19/tighten-screws.md @@ -2,4 +2,4 @@ Change: Tighten screws on usernames and email addresses In order to match accounts to the OIDC claims we currently rely on the email address or username to be present. We force both to match the [W3C recommended regex](https://www.w3.org/TR/2016/REC-html51-20161101/sec-forms.html#valid-e-mail-address) with usernames having to start with a character or `_`. This allows the username to be presented and used in ACLs when integrating the os with the glauth LDAP service of ocis. -https://github.com/owncloud/ocis-accounts/pull/65 +https://github.com/owncloud/ocis/accounts/pull/65 diff --git a/accounts/changelog/0.2.0_2020-08-19/update-accounts-api.md b/accounts/changelog/0.2.0_2020-08-19/update-accounts-api.md index 55993cf88..d3cc3a154 100644 --- a/accounts/changelog/0.2.0_2020-08-19/update-accounts-api.md +++ b/accounts/changelog/0.2.0_2020-08-19/update-accounts-api.md @@ -2,4 +2,4 @@ Enhancement: Update accounts API We updated the api to allow fetching users not onyl by UUID, but also by identity (OpenID issuer and subject) email, username and optionally a password. -https://github.com/owncloud/ocis-accounts/pull/30 +https://github.com/owncloud/ocis/accounts/pull/30 diff --git a/accounts/changelog/0.2.0_2020-08-19/use-alpine-latest.md b/accounts/changelog/0.2.0_2020-08-19/use-alpine-latest.md index 54ae7714d..7ea076b61 100644 --- a/accounts/changelog/0.2.0_2020-08-19/use-alpine-latest.md +++ b/accounts/changelog/0.2.0_2020-08-19/use-alpine-latest.md @@ -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-accounts/pull/64 +https://github.com/owncloud/ocis/accounts/pull/64 diff --git a/accounts/changelog/0.2.0_2020-08-19/user-listing-ui.md b/accounts/changelog/0.2.0_2020-08-19/user-listing-ui.md index 36e353093..51e6e98f1 100644 --- a/accounts/changelog/0.2.0_2020-08-19/user-listing-ui.md +++ b/accounts/changelog/0.2.0_2020-08-19/user-listing-ui.md @@ -2,4 +2,4 @@ Enhancement: Add simple user listing UI We added an extension for ocis-web that shows a simple list of all existing users. -https://github.com/owncloud/ocis-accounts/pull/51 +https://github.com/owncloud/ocis/accounts/pull/51 diff --git a/accounts/changelog/0.3.0_2020-08-20/adapt-to-settings-data-model.md b/accounts/changelog/0.3.0_2020-08-20/adapt-to-settings-data-model.md index defc3568c..16c4ac980 100644 --- a/accounts/changelog/0.3.0_2020-08-20/adapt-to-settings-data-model.md +++ b/accounts/changelog/0.3.0_2020-08-20/adapt-to-settings-data-model.md @@ -2,5 +2,5 @@ Change: Adapt to new ocis-settings data model ocis-settings introduced UUIDs and less verbose endpoint and message type names. This PR adjusts ocis-accounts accordingly. -https://github.com/owncloud/ocis-accounts/pull/87 +https://github.com/owncloud/ocis/accounts/pull/87 https://github.com/owncloud/ocis-settings/pull/46 diff --git a/accounts/changelog/0.3.0_2020-08-20/add-language-permissions-to-default-roles.md b/accounts/changelog/0.3.0_2020-08-20/add-language-permissions-to-default-roles.md index 55a2a81fc..f937e30f2 100644 --- a/accounts/changelog/0.3.0_2020-08-20/add-language-permissions-to-default-roles.md +++ b/accounts/changelog/0.3.0_2020-08-20/add-language-permissions-to-default-roles.md @@ -3,4 +3,4 @@ Change: Add permissions for language to default roles ocis-settings has default roles and exposes the respective bundle uuids. We now added permissions for reading/writing the preferred language to the default roles. -https://github.com/owncloud/ocis-accounts/pull/88 +https://github.com/owncloud/ocis/accounts/pull/88 diff --git a/accounts/changelog/0.3.0_2020-08-20/atomic-requests.md b/accounts/changelog/0.3.0_2020-08-20/atomic-requests.md index 38ae9d6a8..cc6dd3b72 100644 --- a/accounts/changelog/0.3.0_2020-08-20/atomic-requests.md +++ b/accounts/changelog/0.3.0_2020-08-20/atomic-requests.md @@ -2,4 +2,4 @@ Bugfix: Atomic Requests Operations on the file system level are now atomic. This happens only on the provisioning API. -https://github.com/owncloud/ocis-accounts/pull/82 +https://github.com/owncloud/ocis/accounts/pull/82 diff --git a/accounts/changelog/0.3.0_2020-08-20/fix-prefix-query.md b/accounts/changelog/0.3.0_2020-08-20/fix-prefix-query.md index e38676126..b2a7509ff 100644 --- a/accounts/changelog/0.3.0_2020-08-20/fix-prefix-query.md +++ b/accounts/changelog/0.3.0_2020-08-20/fix-prefix-query.md @@ -2,4 +2,4 @@ Bugfix: Unescape value for prefix query Prefix queries also need to unescape token values like `'some ''ol string'` to `some 'ol string` before using it in a prefix query -https://github.com/owncloud/ocis-accounts/pull/76 \ No newline at end of file +https://github.com/owncloud/ocis/accounts/pull/76 diff --git a/accounts/changelog/0.4.0_2020-08-20/select-role-in-ui.md b/accounts/changelog/0.4.0_2020-08-20/select-role-in-ui.md index 12bbe7a99..82530b726 100644 --- a/accounts/changelog/0.4.0_2020-08-20/select-role-in-ui.md +++ b/accounts/changelog/0.4.0_2020-08-20/select-role-in-ui.md @@ -4,4 +4,4 @@ We added a role selection dropdown for each account in the accounts UI. As a fir require account management permissions. https://github.com/owncloud/product/issues/103 -https://github.com/owncloud/ocis-accounts/pull/89 +https://github.com/owncloud/ocis/accounts/pull/89 diff --git a/accounts/changelog/0.4.1_2020-08-27/new-settings-api b/accounts/changelog/0.4.1_2020-08-27/new-settings-api index 72835a366..d635f39de 100644 --- a/accounts/changelog/0.4.1_2020-08-27/new-settings-api +++ b/accounts/changelog/0.4.1_2020-08-27/new-settings-api @@ -2,4 +2,4 @@ Bugfix: Adapting to new settings API for fetching roles We fixed the usage of the ocis-settings endpoint for fetching roles. -https://github.com/owncloud/ocis-accounts/pull/96 +https://github.com/owncloud/ocis/accounts/pull/96 diff --git a/accounts/changelog/CHANGELOG.tmpl b/accounts/changelog/CHANGELOG.tmpl index e6cb0e44c..82ee41018 100644 --- a/accounts/changelog/CHANGELOG.tmpl +++ b/accounts/changelog/CHANGELOG.tmpl @@ -10,17 +10,17 @@ The following sections list the changes in ocis-accounts {{ .Version }}. {{ if ne (len $allVersions) $next -}} {{ $previousVersion := (index $allVersions $next).Version -}} {{ if eq .Version "unreleased" -}} -[{{ .Version }}]: https://github.com/owncloud/ocis-accounts/compare/v{{ $previousVersion }}...master +[{{ .Version }}]: https://github.com/owncloud/ocis/accounts/compare/v{{ $previousVersion }}...master {{ else -}} -[{{ .Version }}]: https://github.com/owncloud/ocis-accounts/compare/v{{ $previousVersion }}...v{{ .Version }} +[{{ .Version }}]: https://github.com/owncloud/ocis/accounts/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-accounts/compare/500e303cb544ed93d84153f01219d77eeee44929...v{{ .Version }} +[{{ .Version }}]: https://github.com/owncloud/ocis/accounts/compare/500e303cb544ed93d84153f01219d77eeee44929...v{{ .Version }} {{ end -}} {{ else -}} diff --git a/accounts/changelog/TEMPLATE b/accounts/changelog/TEMPLATE index 61f6c06dd..d7ddb6100 100644 --- a/accounts/changelog/TEMPLATE +++ b/accounts/changelog/TEMPLATE @@ -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-accounts/issues/1234 -https://github.com/owncloud/ocis-accounts/pull/55555 +https://github.com/owncloud/ocis/accounts/issues/1234 +https://github.com/owncloud/ocis/accounts/pull/55555 diff --git a/accounts/changelog/unreleased/add-create-form.md b/accounts/changelog/unreleased/add-create-form.md index 702cd4a08..790e4af9a 100644 --- a/accounts/changelog/unreleased/add-create-form.md +++ b/accounts/changelog/unreleased/add-create-form.md @@ -3,4 +3,4 @@ Enhancement: Add create account form We've added a form to create new users above the accounts list. https://github.com/owncloud/product/issues/148 -https://github.com/owncloud/ocis-accounts/pull/115 +https://github.com/owncloud/ocis/accounts/pull/115 diff --git a/accounts/changelog/unreleased/add-delete-action.md b/accounts/changelog/unreleased/add-delete-action.md index 19df8aec7..506975346 100644 --- a/accounts/changelog/unreleased/add-delete-action.md +++ b/accounts/changelog/unreleased/add-delete-action.md @@ -3,4 +3,4 @@ Enhancement: Add delete accounts action We've added an action into the actions dropdown to enable admins to delete users. https://github.com/owncloud/product/issues/148 -https://github.com/owncloud/ocis-accounts/pull/115 +https://github.com/owncloud/ocis/accounts/pull/115 diff --git a/accounts/changelog/unreleased/add-enable-disable-ui.md b/accounts/changelog/unreleased/add-enable-disable-ui.md index da84c1ab7..135be1242 100644 --- a/accounts/changelog/unreleased/add-enable-disable-ui.md +++ b/accounts/changelog/unreleased/add-enable-disable-ui.md @@ -3,4 +3,4 @@ Enhancement: Add enable/disable capabilities to the WebUI We've added batch actions into the accounts listing to provide options to enable and disable accounts. https://github.com/owncloud/product/issues/118 -https://github.com/owncloud/ocis-accounts/pull/109 +https://github.com/owncloud/ocis/accounts/pull/109 diff --git a/accounts/changelog/unreleased/builtin-regular-users.md b/accounts/changelog/unreleased/builtin-regular-users.md index 0a4b3481b..35451c76e 100644 --- a/accounts/changelog/unreleased/builtin-regular-users.md +++ b/accounts/changelog/unreleased/builtin-regular-users.md @@ -2,4 +2,4 @@ Change: Set user role on builtin users We now set the default `user` role on our builtin users. -https://github.com/owncloud/ocis-accounts/pull/102 +https://github.com/owncloud/ocis/accounts/pull/102 diff --git a/accounts/changelog/unreleased/fix-role-service-grpc.md b/accounts/changelog/unreleased/fix-role-service-grpc.md index f42655a1f..8cba20fe2 100644 --- a/accounts/changelog/unreleased/fix-role-service-grpc.md +++ b/accounts/changelog/unreleased/fix-role-service-grpc.md @@ -2,5 +2,5 @@ Bugfix: initialize roleService client in GRPC server We fixed the initialization of the GRPC server by also providing a roleService client and a roleManager instance. -https://github.com/owncloud/ocis-accounts/pull/114 +https://github.com/owncloud/ocis/accounts/pull/114 diff --git a/accounts/changelog/unreleased/improve-accounts-ui.md b/accounts/changelog/unreleased/improve-accounts-ui.md index 471de58bd..75831a7f0 100644 --- a/accounts/changelog/unreleased/improve-accounts-ui.md +++ b/accounts/changelog/unreleased/improve-accounts-ui.md @@ -3,4 +3,4 @@ Enhancement: Improve visual appearance of accounts UI We aligned the visual appearance of the accounts UI with default ocis-web apps (full width, style of batch actions), added icons to buttons, extracted the buttons from the batch actions dropdown into individual buttons, improved the wording added a confirmation widget for the user deletion and removed the uid and gid columns. https://github.com/owncloud/product/issues/222 -https://github.com/owncloud/ocis-accounts/pull/116 +https://github.com/owncloud/ocis/accounts/pull/116 diff --git a/accounts/changelog/unreleased/new-admin-user.md b/accounts/changelog/unreleased/new-admin-user.md index 1956038d8..d012f0e52 100644 --- a/accounts/changelog/unreleased/new-admin-user.md +++ b/accounts/changelog/unreleased/new-admin-user.md @@ -2,4 +2,4 @@ Change: Add new builtin admin user We added a new builtin user `moss` and assigned the admin role. -https://github.com/owncloud/ocis-accounts/pull/102 +https://github.com/owncloud/ocis/accounts/pull/102 diff --git a/accounts/changelog/unreleased/single-service-handler.md b/accounts/changelog/unreleased/single-service-handler.md index 7dff27c74..3478dfd7e 100644 --- a/accounts/changelog/unreleased/single-service-handler.md +++ b/accounts/changelog/unreleased/single-service-handler.md @@ -5,6 +5,6 @@ The accounts service was creating a bleve index instance in the service handler, This fixes a bug that accounts created through the web ui were not able to sign in until a service restart. https://github.com/owncloud/product/issues/224 -https://github.com/owncloud/ocis-accounts/pull/117 -https://github.com/owncloud/ocis-accounts/pull/118 +https://github.com/owncloud/ocis/accounts/pull/117 +https://github.com/owncloud/ocis/accounts/pull/118 diff --git a/accounts/changelog/unreleased/unique-account-fields b/accounts/changelog/unreleased/unique-account-fields index 13bd2586c..85adaa181 100644 --- a/accounts/changelog/unreleased/unique-account-fields +++ b/accounts/changelog/unreleased/unique-account-fields @@ -2,4 +2,4 @@ Bugfix: Don't create account if id/mail/username already taken We don't allow anymore to create a new account if the provided id/mail/username is already taken. -https://github.com/owncloud/ocis-accounts/pull/123 +https://github.com/owncloud/ocis/accounts/pull/123 diff --git a/accounts/changelog/unreleased/use-roles-cache.md b/accounts/changelog/unreleased/use-roles-cache.md index b492e705b..973fb90de 100644 --- a/accounts/changelog/unreleased/use-roles-cache.md +++ b/accounts/changelog/unreleased/use-roles-cache.md @@ -2,4 +2,4 @@ Change: We make use of the roles cache to enforce permission checks The roles cache and its cache update middleware are used to make permission checks possible. The permission checks take place in the accounts handler. -https://github.com/owncloud/ocis-accounts/pull/100 +https://github.com/owncloud/ocis/accounts/pull/100 diff --git a/accounts/changelog/unreleased/use-roles-manager.md b/accounts/changelog/unreleased/use-roles-manager.md index 3b3f68842..4db8736cf 100644 --- a/accounts/changelog/unreleased/use-roles-manager.md +++ b/accounts/changelog/unreleased/use-roles-manager.md @@ -3,5 +3,5 @@ Change: We make use of the roles manager to enforce permission checks The roles cache and its cache update middleware have been replaced with a roles manager in ocis-pkg/v2. We've switched over to the new roles manager implementation, to prepare for permission checks on grpc requests as well. -https://github.com/owncloud/ocis-accounts/pull/108 +https://github.com/owncloud/ocis/accounts/pull/108 https://github.com/owncloud/ocis-pkg/pull/60 diff --git a/accounts/cmd/ocis-accounts/main.go b/accounts/cmd/ocis-accounts/main.go index 2e6f5b663..6fa3f4128 100644 --- a/accounts/cmd/ocis-accounts/main.go +++ b/accounts/cmd/ocis-accounts/main.go @@ -3,7 +3,7 @@ package main import ( "os" - "github.com/owncloud/ocis-accounts/pkg/command" + "github.com/owncloud/ocis/accounts/pkg/command" ) func main() { diff --git a/accounts/docs/getting-started.md b/accounts/docs/getting-started.md index 2bae880f1..d389b843c 100644 --- a/accounts/docs/getting-started.md +++ b/accounts/docs/getting-started.md @@ -46,7 +46,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-accounts/tree/master/pkg/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/accounts.yml`, `${HOME}/.ocis/accounts.yml` or `$(pwd)/config/accounts.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/accounts/tree/master/pkg/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/accounts.yml`, `${HOME}/.ocis/accounts.yml` or `$(pwd)/config/accounts.yml`. ## Usage diff --git a/accounts/go.mod b/accounts/go.mod index 2d26c3918..a102c4564 100644 --- a/accounts/go.mod +++ b/accounts/go.mod @@ -1,4 +1,4 @@ -module github.com/owncloud/ocis-accounts +module github.com/owncloud/ocis/accounts go 1.13 @@ -21,7 +21,7 @@ require ( github.com/rs/zerolog v1.19.0 github.com/spf13/viper v1.7.0 github.com/stretchr/testify v1.6.1 - github.com/tredoe/osutil v1.0.5 + golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a golang.org/x/net v0.0.0-20200822124328-c89045814202 google.golang.org/genproto v0.0.0-20200624020401-64a14ca9d1ad google.golang.org/protobuf v1.25.0 diff --git a/accounts/package.json b/accounts/package.json index 13785cc44..14963cb99 100644 --- a/accounts/package.json +++ b/accounts/package.json @@ -8,7 +8,7 @@ "author": "ownCloud GmbH ", "repository": "https://github.com/owncloud/ocis-accounts.git", "bugs": { - "url": "https://github.com/owncloud/ocis-accounts/issues", + "url": "https://github.com/owncloud/ocis/accounts/issues", "email": "support@owncloud.com" }, "scripts": { diff --git a/accounts/pkg/assets/assets.go b/accounts/pkg/assets/assets.go index c4e1efa08..dfd3d1774 100644 --- a/accounts/pkg/assets/assets.go +++ b/accounts/pkg/assets/assets.go @@ -5,7 +5,7 @@ import ( "os" "path" - "github.com/owncloud/ocis-accounts/pkg/config" + "github.com/owncloud/ocis/accounts/pkg/config" "github.com/owncloud/ocis-pkg/v2/log" // Fake the import to make the dep tree happy. diff --git a/accounts/pkg/assets/option.go b/accounts/pkg/assets/option.go index 8dca9c43e..cab6cc505 100644 --- a/accounts/pkg/assets/option.go +++ b/accounts/pkg/assets/option.go @@ -1,7 +1,7 @@ package assets import ( - "github.com/owncloud/ocis-accounts/pkg/config" + "github.com/owncloud/ocis/accounts/pkg/config" "github.com/owncloud/ocis-pkg/v2/log" ) diff --git a/accounts/pkg/command/add_account.go b/accounts/pkg/command/add_account.go index 1e38ada77..25b341fed 100644 --- a/accounts/pkg/command/add_account.go +++ b/accounts/pkg/command/add_account.go @@ -4,9 +4,9 @@ import ( "fmt" "github.com/micro/cli/v2" "github.com/micro/go-micro/v2/client/grpc" - "github.com/owncloud/ocis-accounts/pkg/config" - "github.com/owncloud/ocis-accounts/pkg/flagset" - accounts "github.com/owncloud/ocis-accounts/pkg/proto/v0" + "github.com/owncloud/ocis/accounts/pkg/config" + "github.com/owncloud/ocis/accounts/pkg/flagset" + accounts "github.com/owncloud/ocis/accounts/pkg/proto/v0" ) // AddAccount command creates a new account diff --git a/accounts/pkg/command/inspect_account.go b/accounts/pkg/command/inspect_account.go index 4fd2c1924..849ea0289 100644 --- a/accounts/pkg/command/inspect_account.go +++ b/accounts/pkg/command/inspect_account.go @@ -5,9 +5,9 @@ import ( "github.com/micro/cli/v2" "github.com/micro/go-micro/v2/client/grpc" tw "github.com/olekukonko/tablewriter" - "github.com/owncloud/ocis-accounts/pkg/config" - "github.com/owncloud/ocis-accounts/pkg/flagset" - accounts "github.com/owncloud/ocis-accounts/pkg/proto/v0" + "github.com/owncloud/ocis/accounts/pkg/config" + "github.com/owncloud/ocis/accounts/pkg/flagset" + accounts "github.com/owncloud/ocis/accounts/pkg/proto/v0" "os" "strconv" ) diff --git a/accounts/pkg/command/list_accounts.go b/accounts/pkg/command/list_accounts.go index c38796150..b6b69b249 100644 --- a/accounts/pkg/command/list_accounts.go +++ b/accounts/pkg/command/list_accounts.go @@ -5,9 +5,9 @@ import ( "github.com/micro/cli/v2" "github.com/micro/go-micro/v2/client/grpc" tw "github.com/olekukonko/tablewriter" - "github.com/owncloud/ocis-accounts/pkg/config" - "github.com/owncloud/ocis-accounts/pkg/flagset" - accounts "github.com/owncloud/ocis-accounts/pkg/proto/v0" + "github.com/owncloud/ocis/accounts/pkg/config" + "github.com/owncloud/ocis/accounts/pkg/flagset" + accounts "github.com/owncloud/ocis/accounts/pkg/proto/v0" "os" "strconv" ) diff --git a/accounts/pkg/command/remove_account.go b/accounts/pkg/command/remove_account.go index b141e2bef..32cacd7fa 100644 --- a/accounts/pkg/command/remove_account.go +++ b/accounts/pkg/command/remove_account.go @@ -4,9 +4,9 @@ import ( "fmt" "github.com/micro/cli/v2" "github.com/micro/go-micro/v2/client/grpc" - "github.com/owncloud/ocis-accounts/pkg/config" - "github.com/owncloud/ocis-accounts/pkg/flagset" - accounts "github.com/owncloud/ocis-accounts/pkg/proto/v0" + "github.com/owncloud/ocis/accounts/pkg/config" + "github.com/owncloud/ocis/accounts/pkg/flagset" + accounts "github.com/owncloud/ocis/accounts/pkg/proto/v0" "os" ) diff --git a/accounts/pkg/command/root.go b/accounts/pkg/command/root.go index de9802ab0..bd3ed9492 100644 --- a/accounts/pkg/command/root.go +++ b/accounts/pkg/command/root.go @@ -4,11 +4,11 @@ import ( "os" "strings" - "github.com/owncloud/ocis-accounts/pkg/flagset" + "github.com/owncloud/ocis/accounts/pkg/flagset" "github.com/micro/cli/v2" - "github.com/owncloud/ocis-accounts/pkg/config" - "github.com/owncloud/ocis-accounts/pkg/version" + "github.com/owncloud/ocis/accounts/pkg/config" + "github.com/owncloud/ocis/accounts/pkg/version" "github.com/owncloud/ocis-pkg/v2/log" "github.com/spf13/viper" ) diff --git a/accounts/pkg/command/server.go b/accounts/pkg/command/server.go index cea54cf3c..c5bc96c56 100644 --- a/accounts/pkg/command/server.go +++ b/accounts/pkg/command/server.go @@ -8,12 +8,12 @@ import ( "github.com/micro/cli/v2" "github.com/oklog/run" - "github.com/owncloud/ocis-accounts/pkg/config" - "github.com/owncloud/ocis-accounts/pkg/flagset" - "github.com/owncloud/ocis-accounts/pkg/metrics" - "github.com/owncloud/ocis-accounts/pkg/server/grpc" - "github.com/owncloud/ocis-accounts/pkg/server/http" - svc "github.com/owncloud/ocis-accounts/pkg/service/v0" + "github.com/owncloud/ocis/accounts/pkg/config" + "github.com/owncloud/ocis/accounts/pkg/flagset" + "github.com/owncloud/ocis/accounts/pkg/metrics" + "github.com/owncloud/ocis/accounts/pkg/server/grpc" + "github.com/owncloud/ocis/accounts/pkg/server/http" + svc "github.com/owncloud/ocis/accounts/pkg/service/v0" ) // Server is the entry point for the server command. diff --git a/accounts/pkg/command/update_account.go b/accounts/pkg/command/update_account.go index ead11f2ca..7c867aeba 100644 --- a/accounts/pkg/command/update_account.go +++ b/accounts/pkg/command/update_account.go @@ -5,9 +5,9 @@ import ( "fmt" "github.com/micro/cli/v2" "github.com/micro/go-micro/v2/client/grpc" - "github.com/owncloud/ocis-accounts/pkg/config" - "github.com/owncloud/ocis-accounts/pkg/flagset" - accounts "github.com/owncloud/ocis-accounts/pkg/proto/v0" + "github.com/owncloud/ocis/accounts/pkg/config" + "github.com/owncloud/ocis/accounts/pkg/flagset" + accounts "github.com/owncloud/ocis/accounts/pkg/proto/v0" "google.golang.org/genproto/protobuf/field_mask" ) diff --git a/accounts/pkg/flagset/flagset.go b/accounts/pkg/flagset/flagset.go index 86989c8b6..4e0b41212 100644 --- a/accounts/pkg/flagset/flagset.go +++ b/accounts/pkg/flagset/flagset.go @@ -2,8 +2,8 @@ package flagset import ( "github.com/micro/cli/v2" - "github.com/owncloud/ocis-accounts/pkg/config" - accounts "github.com/owncloud/ocis-accounts/pkg/proto/v0" + "github.com/owncloud/ocis/accounts/pkg/config" + accounts "github.com/owncloud/ocis/accounts/pkg/proto/v0" ) // RootWithConfig applies cfg to the root flagset diff --git a/accounts/pkg/proto/v0/accounts.pb.micro_test.go b/accounts/pkg/proto/v0/accounts.pb.micro_test.go index 70bd50397..0333cdb21 100644 --- a/accounts/pkg/proto/v0/accounts.pb.micro_test.go +++ b/accounts/pkg/proto/v0/accounts.pb.micro_test.go @@ -12,10 +12,10 @@ import ( "github.com/golang/protobuf/ptypes/empty" "github.com/micro/go-micro/v2/client" merrors "github.com/micro/go-micro/v2/errors" - "github.com/owncloud/ocis-accounts/pkg/command" - "github.com/owncloud/ocis-accounts/pkg/config" - "github.com/owncloud/ocis-accounts/pkg/proto/v0" - svc "github.com/owncloud/ocis-accounts/pkg/service/v0" + "github.com/owncloud/ocis/accounts/pkg/command" + "github.com/owncloud/ocis/accounts/pkg/config" + "github.com/owncloud/ocis/accounts/pkg/proto/v0" + svc "github.com/owncloud/ocis/accounts/pkg/service/v0" "github.com/owncloud/ocis-pkg/v2/service/grpc" settings "github.com/owncloud/ocis-settings/pkg/proto/v0" "github.com/stretchr/testify/assert" @@ -389,7 +389,7 @@ func deleteGroup(t *testing.T, id string) (*empty.Empty, error) { return res, err } -// https://github.com/owncloud/ocis-accounts/issues/61 +// https://github.com/owncloud/ocis/accounts/issues/61 func TestCreateAccount(t *testing.T) { resp, err := createAccount(t, "user1") @@ -421,7 +421,7 @@ func TestCreateExistingUser(t *testing.T) { } // All tests fail after running this -// https://github.com/owncloud/ocis-accounts/issues/62 +// https://github.com/owncloud/ocis/accounts/issues/62 func TestCreateAccountInvalidUserName(t *testing.T) { resp, err := listAccounts(t) @@ -502,7 +502,7 @@ func TestUpdateAccount(t *testing.T) { UidNumber: 1000, GidNumber: 1000, // No email validation - // https://github.com/owncloud/ocis-accounts/issues/77 + // https://github.com/owncloud/ocis/accounts/issues/77 Mail: "1.2@3.c_@", }, }, @@ -723,7 +723,7 @@ func TestGetGroups(t *testing.T) { cleanUp(t) } -// https://github.com/owncloud/ocis-accounts/issues/61 +// https://github.com/owncloud/ocis/accounts/issues/61 func TestCreateGroup(t *testing.T) { group := &proto.Group{Id: "2d58e5ec-842e-498b-8800-61f2ec6f911f", GidNumber: 30042, OnPremisesSamAccountName: "quantum-group", DisplayName: "Quantum Group", Members: []*proto.Account{ {Id: "4c510ada-c86b-4815-8820-42cdf82c3d51"}, // einstein @@ -854,7 +854,7 @@ func TestUpdateGroup(t *testing.T) { cleanUp(t) } -// https://github.com/owncloud/ocis-accounts/issues/61 +// https://github.com/owncloud/ocis/accounts/issues/61 func TestAddMember(t *testing.T) { grp1 := getTestGroups("grp1") account := getAccount("user1") @@ -884,7 +884,7 @@ func TestAddMember(t *testing.T) { cleanUp(t) } -// https://github.com/owncloud/ocis-accounts/issues/62 +// https://github.com/owncloud/ocis/accounts/issues/62 func TestAddMemberAlreadyInGroup(t *testing.T) { grp1 := getTestGroups("grp1") account := getAccount("user1") @@ -961,7 +961,7 @@ func addMemberToGroup(t *testing.T, groupId, memberId string) (*proto.Group, err return res, err } -// https://github.com/owncloud/ocis-accounts/issues/61 +// https://github.com/owncloud/ocis/accounts/issues/61 func TestRemoveMember(t *testing.T) { grp1 := getTestGroups("grp1") account := getAccount("user1") @@ -1021,7 +1021,7 @@ func TestRemoveMemberNonExistingUser(t *testing.T) { cleanUp(t) } -// https://github.com/owncloud/ocis-accounts/issues/62 +// https://github.com/owncloud/ocis/accounts/issues/62 func TestRemoveMemberNotInGroup(t *testing.T) { grp1 := getTestGroups("grp1") account := getAccount("user1") diff --git a/accounts/pkg/server/grpc/option.go b/accounts/pkg/server/grpc/option.go index 7e6a5a52e..050ea2d1e 100644 --- a/accounts/pkg/server/grpc/option.go +++ b/accounts/pkg/server/grpc/option.go @@ -4,9 +4,9 @@ import ( "context" "github.com/micro/cli/v2" - "github.com/owncloud/ocis-accounts/pkg/config" - "github.com/owncloud/ocis-accounts/pkg/metrics" - svc "github.com/owncloud/ocis-accounts/pkg/service/v0" + "github.com/owncloud/ocis/accounts/pkg/config" + "github.com/owncloud/ocis/accounts/pkg/metrics" + svc "github.com/owncloud/ocis/accounts/pkg/service/v0" "github.com/owncloud/ocis-pkg/v2/log" ) diff --git a/accounts/pkg/server/grpc/server.go b/accounts/pkg/server/grpc/server.go index af5b0c602..e6dd28b14 100644 --- a/accounts/pkg/server/grpc/server.go +++ b/accounts/pkg/server/grpc/server.go @@ -1,7 +1,7 @@ package grpc import ( - "github.com/owncloud/ocis-accounts/pkg/proto/v0" + "github.com/owncloud/ocis/accounts/pkg/proto/v0" "github.com/owncloud/ocis-pkg/v2/service/grpc" ) diff --git a/accounts/pkg/server/http/option.go b/accounts/pkg/server/http/option.go index 069b0136e..e95bafe88 100644 --- a/accounts/pkg/server/http/option.go +++ b/accounts/pkg/server/http/option.go @@ -4,9 +4,9 @@ import ( "context" "github.com/micro/cli/v2" - "github.com/owncloud/ocis-accounts/pkg/config" - "github.com/owncloud/ocis-accounts/pkg/metrics" - svc "github.com/owncloud/ocis-accounts/pkg/service/v0" + "github.com/owncloud/ocis/accounts/pkg/config" + "github.com/owncloud/ocis/accounts/pkg/metrics" + svc "github.com/owncloud/ocis/accounts/pkg/service/v0" "github.com/owncloud/ocis-pkg/v2/log" ) diff --git a/accounts/pkg/server/http/server.go b/accounts/pkg/server/http/server.go index e931bcebc..9a2b6350d 100644 --- a/accounts/pkg/server/http/server.go +++ b/accounts/pkg/server/http/server.go @@ -2,9 +2,9 @@ package http import ( "github.com/go-chi/chi" - "github.com/owncloud/ocis-accounts/pkg/assets" - "github.com/owncloud/ocis-accounts/pkg/proto/v0" - "github.com/owncloud/ocis-accounts/pkg/version" + "github.com/owncloud/ocis/accounts/pkg/assets" + "github.com/owncloud/ocis/accounts/pkg/proto/v0" + "github.com/owncloud/ocis/accounts/pkg/version" "github.com/owncloud/ocis-pkg/v2/account" "github.com/owncloud/ocis-pkg/v2/middleware" "github.com/owncloud/ocis-pkg/v2/service/http" diff --git a/accounts/pkg/service/v0/accounts.go b/accounts/pkg/service/v0/accounts.go index fa45d34c5..55d716666 100644 --- a/accounts/pkg/service/v0/accounts.go +++ b/accounts/pkg/service/v0/accounts.go @@ -17,8 +17,8 @@ import ( "github.com/golang/protobuf/ptypes/empty" fieldmask_utils "github.com/mennanov/fieldmask-utils" merrors "github.com/micro/go-micro/v2/errors" - "github.com/owncloud/ocis-accounts/pkg/proto/v0" - "github.com/owncloud/ocis-accounts/pkg/provider" + "github.com/owncloud/ocis/accounts/pkg/proto/v0" + "github.com/owncloud/ocis/accounts/pkg/provider" "github.com/owncloud/ocis-pkg/v2/roles" settings "github.com/owncloud/ocis-settings/pkg/proto/v0" settings_svc "github.com/owncloud/ocis-settings/pkg/service/v0" diff --git a/accounts/pkg/service/v0/accounts_permission_test.go b/accounts/pkg/service/v0/accounts_permission_test.go index f93303eae..13dacb2c2 100644 --- a/accounts/pkg/service/v0/accounts_permission_test.go +++ b/accounts/pkg/service/v0/accounts_permission_test.go @@ -13,8 +13,8 @@ import ( "github.com/micro/go-micro/v2/client" merrors "github.com/micro/go-micro/v2/errors" "github.com/micro/go-micro/v2/metadata" - "github.com/owncloud/ocis-accounts/pkg/config" - "github.com/owncloud/ocis-accounts/pkg/proto/v0" + "github.com/owncloud/ocis/accounts/pkg/config" + "github.com/owncloud/ocis/accounts/pkg/proto/v0" olog "github.com/owncloud/ocis-pkg/v2/log" "github.com/owncloud/ocis-pkg/v2/middleware" "github.com/owncloud/ocis-pkg/v2/roles" @@ -68,7 +68,7 @@ func TestPermissionsListAccounts(t *testing.T) { query string permissionError error }{ - // TODO: remove this test when https://github.com/owncloud/ocis-accounts/pull/111 is merged + // TODO: remove this test when https://github.com/owncloud/ocis/accounts/pull/111 is merged // replace with two tests: // 1: "ListAccounts fails with 403 when roleIDs don't exist in context" // 2: "ListAccounts fails with 403 when ('no admin role in context' AND 'empty query')" @@ -115,7 +115,7 @@ func TestPermissionsListAccounts(t *testing.T) { } // TestPermissionsGetAccount checks permission handling on GetAccount -// TODO: remove this test function entirely, when https://github.com/owncloud/ocis-accounts/pull/111 is merged. GetAccount will not have permission checks for the time being. +// TODO: remove this test function entirely, when https://github.com/owncloud/ocis/accounts/pull/111 is merged. GetAccount will not have permission checks for the time being. func TestPermissionsGetAccount(t *testing.T) { var scenarios = []struct { name string @@ -166,7 +166,7 @@ func TestPermissionsCreateAccount(t *testing.T) { roleIDs []string permissionError error }{ - // TODO: remove this test when https://github.com/owncloud/ocis-accounts/pull/111 is merged + // TODO: remove this test when https://github.com/owncloud/ocis/accounts/pull/111 is merged // replace with two tests: // 1: "CreateAccount fails with 403 when roleIDs don't exist in context" // 2: "CreateAccount fails with 403 when no admin role in context" @@ -214,7 +214,7 @@ func TestPermissionsUpdateAccount(t *testing.T) { roleIDs []string permissionError error }{ - // TODO: remove this test when https://github.com/owncloud/ocis-accounts/pull/111 is merged + // TODO: remove this test when https://github.com/owncloud/ocis/accounts/pull/111 is merged // replace with two tests: // 1: "UpdateAccount fails with 403 when roleIDs don't exist in context" // 2: "UpdateAccount fails with 403 when no admin role in context" @@ -262,7 +262,7 @@ func TestPermissionsDeleteAccount(t *testing.T) { roleIDs []string permissionError error }{ - // TODO: remove this test when https://github.com/owncloud/ocis-accounts/pull/111 is merged + // TODO: remove this test when https://github.com/owncloud/ocis/accounts/pull/111 is merged // replace with two tests: // 1: "DeleteAccount fails with 403 when roleIDs don't exist in context" // 2: "DeleteAccount fails with 403 when no admin role in context" diff --git a/accounts/pkg/service/v0/groups.go b/accounts/pkg/service/v0/groups.go index 3201dce07..19727ad46 100644 --- a/accounts/pkg/service/v0/groups.go +++ b/accounts/pkg/service/v0/groups.go @@ -13,8 +13,8 @@ import ( "github.com/gofrs/uuid" "github.com/golang/protobuf/ptypes/empty" merrors "github.com/micro/go-micro/v2/errors" - "github.com/owncloud/ocis-accounts/pkg/proto/v0" - "github.com/owncloud/ocis-accounts/pkg/provider" + "github.com/owncloud/ocis/accounts/pkg/proto/v0" + "github.com/owncloud/ocis/accounts/pkg/provider" ) // accLock mutually exclude readers from writers on group files diff --git a/accounts/pkg/service/v0/option.go b/accounts/pkg/service/v0/option.go index d9bda3879..b4d19bbd5 100644 --- a/accounts/pkg/service/v0/option.go +++ b/accounts/pkg/service/v0/option.go @@ -1,7 +1,7 @@ package service import ( - "github.com/owncloud/ocis-accounts/pkg/config" + "github.com/owncloud/ocis/accounts/pkg/config" "github.com/owncloud/ocis-pkg/v2/log" "github.com/owncloud/ocis-pkg/v2/roles" settings "github.com/owncloud/ocis-settings/pkg/proto/v0" diff --git a/accounts/pkg/service/v0/service.go b/accounts/pkg/service/v0/service.go index ac7ce96e1..46f0b8955 100644 --- a/accounts/pkg/service/v0/service.go +++ b/accounts/pkg/service/v0/service.go @@ -19,8 +19,8 @@ import ( "github.com/blevesearch/bleve/analysis/token/lowercase" "github.com/blevesearch/bleve/analysis/tokenizer/unicode" mclient "github.com/micro/go-micro/v2/client" - "github.com/owncloud/ocis-accounts/pkg/config" - "github.com/owncloud/ocis-accounts/pkg/proto/v0" + "github.com/owncloud/ocis/accounts/pkg/config" + "github.com/owncloud/ocis/accounts/pkg/proto/v0" "github.com/owncloud/ocis-pkg/v2/log" "github.com/owncloud/ocis-pkg/v2/roles" settings "github.com/owncloud/ocis-settings/pkg/proto/v0" diff --git a/accounts/sonar-project.properties b/accounts/sonar-project.properties index f9be5326c..ab347e8d6 100644 --- a/accounts/sonar-project.properties +++ b/accounts/sonar-project.properties @@ -12,7 +12,7 @@ sonar.host.url=https://sonarcloud.io sonar.links.homepage=https://github.com/owncloud/ocis-accounts sonar.links.ci=https://cloud.drone.io/owncloud/ocis-accounts/ sonar.links.scm=https://github.com/owncloud/ocis-accounts -sonar.links.issue=https://github.com/owncloud/ocis-accounts/issues +sonar.links.issue=https://github.com/owncloud/ocis/accounts/issues # ===================================================== diff --git a/go.mod b/go.mod index 11bbeca18..07575a6cf 100644 --- a/go.mod +++ b/go.mod @@ -34,8 +34,7 @@ require ( golang.org/x/sys v0.0.0-20200916084744-dbad9cb7cb7a // indirect ) -replace google.golang.org/grpc => google.golang.org/grpc v1.26.0 - -replace github.com/lucas-clemente/quic-go v0.15.7 => github.com/lucas-clemente/quic-go v0.14.1 - -replace github.com/gomodule/redigo => github.com/gomodule/redigo v1.8.2 +replace ( + github.com/gomodule/redigo => github.com/gomodule/redigo v1.8.2 + google.golang.org/grpc => google.golang.org/grpc v1.26.0 +) diff --git a/go.sum b/go.sum index e7b04bee9..28a593ee1 100644 --- a/go.sum +++ b/go.sum @@ -166,6 +166,7 @@ github.com/aws/aws-sdk-go v1.33.19 h1:SMna0QLInNqm+nNL9tb7OVWTqSfNYSxrCa2adnyVth github.com/aws/aws-sdk-go v1.33.19/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0= github.com/aws/aws-sdk-go v1.34.2 h1:9vCknCdTAmmV4ht7lPuda7aJXzllXwEQyCMZKJHjBrM= github.com/aws/aws-sdk-go v1.34.2/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0= +github.com/aws/aws-sdk-go v1.34.12 h1:7UbBEYDUa4uW0YmRnOd806MS1yoJMcaodBWDzvBShAI= github.com/aws/aws-sdk-go v1.34.12/go.mod h1:5zCpMtNQVjRREroY7sYe8lOMRSxkhG6MZveU8YkpAk0= github.com/aws/aws-xray-sdk-go v0.9.4/go.mod h1:XtMKdBQfpVut+tJEwI7+dJFRxxRdxHDyVNp2tHXRq04= github.com/baiyubin/aliyun-sts-go-sdk v0.0.0-20180326062324-cfa1a18b161f/go.mod h1:AuiFmCCPBSrqvVMvuqFuk0qogytodnVFVSN5CeJB8Gc= @@ -324,6 +325,7 @@ github.com/cs3org/reva v1.1.1-0.20200819100654-dcbf0c8ea187 h1:ZyDXH+zy5KPOH5AM5 github.com/cs3org/reva v1.1.1-0.20200819100654-dcbf0c8ea187/go.mod h1:gkGtoun9QABW8k7jzAWWxB9jO64DJ1lreSzTucci/ok= github.com/cs3org/reva v1.2.1-0.20200826162318-c0f54e1f37ea h1:xVyJvR+GoaBrRJV6GnDflgm9bzkmjchCBBg0nMiHu6M= github.com/cs3org/reva v1.2.1-0.20200826162318-c0f54e1f37ea/go.mod h1:FvYB+UPpuPCw0hH42qHVR1R2atZyy69METZI/zEaST8= +github.com/cs3org/reva v1.2.1-0.20200911111727-51649e37df2d h1:vohUfrOZVrbbzt7JUICBDX8rjcedLbuEsmuOJtx8mWY= github.com/cs3org/reva v1.2.1-0.20200911111727-51649e37df2d/go.mod h1:Q1/JB40ZKtlhZUxz+ZqB/O/VlrnQX//NYdPPRPsP0UE= github.com/cznic/b v0.0.0-20181122101859-a26611c4d92d h1:SwD98825d6bdB+pEuTxWOXiSjBrHdOl/UVp75eI7JT8= github.com/cznic/b v0.0.0-20181122101859-a26611c4d92d/go.mod h1:URriBxXwVq5ijiJ12C7iIZqlA69nTlI+LgI6/pwftG8=