diff --git a/.drone.star b/.drone.star index f0e0ed4..5da5e35 100644 --- a/.drone.star +++ b/.drone.star @@ -1,7 +1,7 @@ def main(ctx): before = [ testing(ctx), - UITests(ctx, 'account-management-permission-checks', '9c24a3388e80f373f094c2b122594039c167c318', 'master', '2e1af4c27f21439ead1e3358f9690e9ffa7eb75a') + UITests(ctx, 'account-management-permission-checks', 'cbc3ac599589db685ed2f007df6e979c00bdcf29', 'master', '2e1af4c27f21439ead1e3358f9690e9ffa7eb75a') ] stages = [ diff --git a/changelog/unreleased/roleids-helper-moved-package.md b/changelog/unreleased/roleids-helper-moved-package.md new file mode 100644 index 0000000..0a4177a --- /dev/null +++ b/changelog/unreleased/roleids-helper-moved-package.md @@ -0,0 +1,7 @@ +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-pkg/pull/60 diff --git a/go.mod b/go.mod index 41dee49..c723e82 100644 --- a/go.mod +++ b/go.mod @@ -18,7 +18,7 @@ require ( github.com/mitchellh/gox v1.0.1 github.com/oklog/run v1.0.0 github.com/openzipkin/zipkin-go v0.2.2 - github.com/owncloud/ocis-pkg/v2 v2.4.1-0.20200828095914-d3b859484b2b + github.com/owncloud/ocis-pkg/v2 v2.4.1-0.20200902134813-1e87c6173ada github.com/restic/calens v0.2.0 github.com/spf13/viper v1.6.3 github.com/stretchr/testify v1.6.1 diff --git a/go.sum b/go.sum index 9d46519..5514070 100644 --- a/go.sum +++ b/go.sum @@ -767,6 +767,8 @@ github.com/owncloud/ocis-pkg/v2 v2.4.0 h1:/3ZOd4txtwjiNKJA9iLT9BjrJw5YgHSX13fQR4 github.com/owncloud/ocis-pkg/v2 v2.4.0/go.mod h1:FSzIvhx9HcZcq4jgNaDowNvM7PTX/XCyoMvyfzidUpE= github.com/owncloud/ocis-pkg/v2 v2.4.1-0.20200828095914-d3b859484b2b h1:PRw0b4abdrDKloh417qPsS5lkB/bjJ3Rc4txzHx/hBg= 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/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= diff --git a/pkg/service/v0/service.go b/pkg/service/v0/service.go index 49eb86a..cbba22c 100644 --- a/pkg/service/v0/service.go +++ b/pkg/service/v0/service.go @@ -9,6 +9,7 @@ import ( "github.com/micro/go-micro/v2/metadata" "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" @@ -361,7 +362,7 @@ func getValidatedAccountUUID(c context.Context, accountUUID string) string { // getRoleIDs extracts the roleIDs of the authenticated user from the context. func (g Service) getRoleIDs(c context.Context) []string { - if ownRoleIDs, ok := middleware.ReadRoleIDsFromContext(c); ok { + if ownRoleIDs, ok := roles.ReadRoleIDsFromContext(c); ok { return ownRoleIDs } return []string{}