From 0574fbd7380b55fe65dbfa972ab2fc31e00cf284 Mon Sep 17 00:00:00 2001 From: Benedikt Kulmann Date: Sat, 24 Oct 2020 06:04:54 +0200 Subject: [PATCH] Introduce admin:admin. webUI tests are hardcoded to that. --- .drone.star | 6 ------ accounts/pkg/service/v0/service.go | 17 +++++++++++++++++ docs/ocis/getting-started.md | 3 ++- 3 files changed, 19 insertions(+), 7 deletions(-) diff --git a/.drone.star b/.drone.star index 7443b0b00..f0b3f75a2 100644 --- a/.drone.star +++ b/.drone.star @@ -363,8 +363,6 @@ def localApiTests(ctx, coreBranch = 'master', coreCommit = '', storage = 'ownclo 'TEST_OCIS':'true', 'BEHAT_FILTER_TAGS': '~@skipOnOcis-%s-Storage' % ('OC' if storage == 'owncloud' else 'OCIS'), 'PATH_TO_CORE': '/srv/app/testrunner', - 'ADMIN_USERNAME': 'moss', - 'ADMIN_PASSWORD': 'vista', }, 'commands': [ 'cd ocis', @@ -422,8 +420,6 @@ def coreApiTests(ctx, coreBranch = 'master', coreCommit = '', part_number = 1, n 'DIVIDE_INTO_NUM_PARTS': number_of_parts, 'RUN_PART': part_number, 'EXPECTED_FAILURES_FILE': '/drone/src/ocis/tests/acceptance/expected-failures-on-%s-storage.txt' % (storage.upper()), - 'ADMIN_USERNAME': 'moss', - 'ADMIN_PASSWORD': 'vista', }, 'commands': [ 'cd /srv/app/testrunner', @@ -489,8 +485,6 @@ def uiTestPipeline(suiteName, phoenixBranch = 'master', phoenixCommit = '', stor 'LOCAL_UPLOAD_DIR': '/uploads', 'NODE_TLS_REJECT_UNAUTHORIZED': 0, 'TEST_PATHS': paths, - 'ADMIN_USERNAME': 'moss', - 'ADMIN_PASSWORD': 'vista', }, 'commands': [ 'git clone -b master --depth=1 https://github.com/owncloud/testing.git /srv/app/testing', diff --git a/accounts/pkg/service/v0/service.go b/accounts/pkg/service/v0/service.go index 45d4db237..5176ddbfb 100644 --- a/accounts/pkg/service/v0/service.go +++ b/accounts/pkg/service/v0/service.go @@ -218,6 +218,22 @@ func (s Service) createDefaultAccounts() (err error) { {Id: "509a9dcd-bb37-4f4f-a01a-19dca27d9cfa"}, // users }, }, + { + Id: "ddc2004c-0977-11eb-9d3f-a793888cd0f8", + PreferredName: "admin", + OnPremisesSamAccountName: "admin", + Mail: "admin@example.org", + DisplayName: "Admin", + UidNumber: 20004, + GidNumber: 30000, + PasswordProfile: &proto.PasswordProfile{ + Password: "$6$rounds=95551$/bdqsmiGleA20kAS$rCAvHV7wjaHVF5nEVAnpW7mugRqcnPmdU4UPqhSroE74gXFxNGZflCF.ZyHwocDwgAw3uLkqsCzB1h5bXBjYB0", + }, + AccountEnabled: true, + MemberOf: []*proto.Group{ + {Id: "509a9dcd-bb37-4f4f-a01a-19dca27d9cfa"}, // users + }, + }, // technical users for kopano and reva { Id: "820ba2a1-3f54-4538-80a4-2d73007e30bf", @@ -293,6 +309,7 @@ func (s Service) createDefaultAccounts() (err error) { assignRoleToUser("058bff95-6708-4fe5-91e4-9ea3d377588b", settings_svc.BundleUUIDRoleAdmin, s.RoleService, s.log) for _, accountID := range []string{ "058bff95-6708-4fe5-91e4-9ea3d377588b", //moss + "ddc2004c-0977-11eb-9d3f-a793888cd0f8", //admin } { assignRoleToUser(accountID, settings_svc.BundleUUIDRoleAdmin, s.RoleService, s.log) } diff --git a/docs/ocis/getting-started.md b/docs/ocis/getting-started.md index 2f10e3e70..d3c14b70c 100644 --- a/docs/ocis/getting-started.md +++ b/docs/ocis/getting-started.md @@ -91,9 +91,10 @@ marie:radioactivity richard:superfluidity ``` -There is an admin demo account: +There are admin demo accounts: ```console moss:vista +admin:admin ``` ## Runtime