From 8b65d74a44875b408036659dc491cd8ad2fa6d34 Mon Sep 17 00:00:00 2001 From: Willy Kloucek Date: Fri, 6 Aug 2021 13:47:52 +0200 Subject: [PATCH 1/4] fix stop-recent-builds for forks --- .drone.star | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.drone.star b/.drone.star index b02abe72e3..c15157e40c 100644 --- a/.drone.star +++ b/.drone.star @@ -214,8 +214,6 @@ def checkForRecentBuilds(ctx): return pipelines def stopRecentBuilds(ctx): - repo_slug = ctx.build.source_repo if ctx.build.source_repo else ctx.repo.slug - return [{ "name": "stop-recent-builds", "image": "drone/cli:alpine", @@ -227,8 +225,8 @@ def stopRecentBuilds(ctx): }, }, "commands": [ - "drone build ls %s --status running > /drone/src/recentBuilds.txt" % repo_slug, - "drone build info %s ${DRONE_BUILD_NUMBER} > /drone/src/thisBuildInfo.txt" % repo_slug, + "drone build ls %s --status running > /drone/src/recentBuilds.txt" % ctx.repo.slug, + "drone build info %s ${DRONE_BUILD_NUMBER} > /drone/src/thisBuildInfo.txt" % ctx.repo.slug, "cd /drone/src && ./tests/acceptance/cancelBuilds.sh", ], "when": { From 10b9fee60ec7c0f6d96053f02b4977889f1e19b7 Mon Sep 17 00:00:00 2001 From: Ishank Arora Date: Fri, 6 Aug 2021 10:37:51 +0200 Subject: [PATCH 2/4] Specify primary user type for all accounts --- changelog/unreleased/accounts-user-type.md | 3 +++ proxy/pkg/user/backend/accounts.go | 1 + 2 files changed, 4 insertions(+) create mode 100644 changelog/unreleased/accounts-user-type.md diff --git a/changelog/unreleased/accounts-user-type.md b/changelog/unreleased/accounts-user-type.md new file mode 100644 index 0000000000..f18ab9b210 --- /dev/null +++ b/changelog/unreleased/accounts-user-type.md @@ -0,0 +1,3 @@ +Bugfix: Specify primary user type for all accounts + +https://github.com/owncloud/ocis/pull/2364 diff --git a/proxy/pkg/user/backend/accounts.go b/proxy/pkg/user/backend/accounts.go index 36241c4cbe..96b57fb5a0 100644 --- a/proxy/pkg/user/backend/accounts.go +++ b/proxy/pkg/user/backend/accounts.go @@ -144,6 +144,7 @@ func (a *accountsServiceBackend) accountToUser(account *accounts.Account) *cs3.U Id: &cs3.UserId{ OpaqueId: account.Id, Idp: a.OIDCIss, + Type: cs3.UserType_USER_TYPE_PRIMARY, // TODO: once we have support for other user types, this needs to be inferred }, Username: account.OnPremisesSamAccountName, DisplayName: account.DisplayName, From dc957c3722e86ceeef2637ad37809beedc0e9296 Mon Sep 17 00:00:00 2001 From: Willy Kloucek <34452982+wkloucek@users.noreply.github.com> Date: Fri, 6 Aug 2021 13:23:14 +0000 Subject: [PATCH 3/4] Automated changelog update [skip ci] --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index daf5c31b26..7910601b45 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ The following sections list the changes for unreleased. ## Summary +* Bugfix - Specify primary user type for all accounts: [#2364](https://github.com/owncloud/ocis/pull/2364) * Bugfix - Improve IDP Login Accessibility: [#5376](https://github.com/owncloud/web/issues/5376) * Bugfix - Forward basic auth to OpenID connect token authentication endpoint: [#2095](https://github.com/owncloud/ocis/issues/2095) * Bugfix - Log all requests in the proxy access log: [#2301](https://github.com/owncloud/ocis/pull/2301) @@ -19,6 +20,10 @@ The following sections list the changes for unreleased. ## Details +* Bugfix - Specify primary user type for all accounts: [#2364](https://github.com/owncloud/ocis/pull/2364) + + https://github.com/owncloud/ocis/pull/2364 + * Bugfix - Improve IDP Login Accessibility: [#5376](https://github.com/owncloud/web/issues/5376) We have addressed the feedback from the `a11y` audit and improved the IDP login screen From b74a0a6829ca4093c30a9b54cc17846a66fd4028 Mon Sep 17 00:00:00 2001 From: Phil Davis Date: Sat, 7 Aug 2021 08:53:29 +0545 Subject: [PATCH 4/4] Bump commit ids for tests --- .drone.env | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.drone.env b/.drone.env index e120af48fb..d1b966ab7e 100644 --- a/.drone.env +++ b/.drone.env @@ -1,7 +1,7 @@ # The test runner source for API tests -CORE_COMMITID=83a407af2fbabc6cd6bb2d6b9abfe62e85d2da64 +CORE_COMMITID=cf1259bdc261a8f94e59ced83232dfc662afdabc CORE_BRANCH=master # The test runner source for UI tests -WEB_COMMITID=f7d0073606a1ab91e5e7f41df7d649a241a3364e +WEB_COMMITID=9e3299e89bdb0ba885dda34efedff83868193535 WEB_BRANCH=master