48 Commits (438c76252abe2b2711a39f62ab79e4956ef757a1)

Author	SHA1	Message	Date
idafurjes	6c43eb0b4d	Split Create User (#50502) ... * Split Create User * Use new create user and User from package user * Add service to wire * Making create user work * Replace user from user pkg * One more * Move Insert to orguser Service/Store * Remove unnecessary conversion * Cleaunp * Fix Get User and add fakes * Fixing get org id for user logic, adding fakes and other adjustments * Add some tests for ourguser service and store * Fix insert org logic * Add comment about deprecation * Fix after merge with main * Move orguser service/store to org service/store * Remove orguser from wire * Unimplement new Create user and use User from pkg user * Fix wire generation * Fix lint * Fix lint - use only User and CrateUserCommand from user pkg * Remove User and CreateUserCommand from models * Fix lint 2	4 years ago
Karl Persson	5caf97be40	AccessControl: Replace IsEnterprise checks with license checks (#49572)	4 years ago
Gabriel MABILLE	7cb7290a3e	AccessControl: Enforce user check when enterprise accesscontrol is on (#49003) ... * AccessControl: Enforce user check when enterprise accesscontrol is on * Update the test not to fail enterprise build * Adding a log as suggested by Kalle Co-authored-by: Kalle Persson <kalle.persson@grafana.com> * Update log message Co-authored-by: Kalle Persson <kalle.persson@grafana.com>	4 years ago
Karl Persson	817cf52744	Access control: Allow users with permission to update team, dashboard and folder permissions to list users in OSS (#48275) ... * Remove banner when missing permissions to list users * For OSS allow users to list other users if they have permissions to write either team, dashboard or folder permissions	4 years ago
Ieva	a5672758d8	Access control: further reduce access control feature toggle checks (#48171) ... * reduce the usage of access control flag further by removing it from SQL store methods * fixing tests * fix another test * linting * remove AC feature toggle use from API keys * remove unneeded function	4 years ago
Ivana Huckova	4661c9ca47	Query history: Cleanup (#48303) ... * Query history: Clean up stale history after 14 days * Add unstarring sleanup * Add wraapping * Update sql for mysql database * Update * Remove fmt.Print * Refactor and simplify solution * Update pkg/services/queryhistory/database.go Co-authored-by: Emil Tullstedt <emil.tullstedt@grafana.com> * Adjust SQL to limit number of deleted queries * Add limit enforcmenet to cleanup * Change limit * Update Co-authored-by: Emil Tullstedt <emil.tullstedt@grafana.com>	4 years ago
Kat Yang	a4081aebb7	Chore: Remove x from Org User (#47850) ... * Chore: Remove x from org users * Chore: Remove x.Dialect() from org users * :poo: * Update pkg/services/sqlstore/org_users.go Co-authored-by: ying-jeanne <74549700+ying-jeanne@users.noreply.github.com> * Update pkg/services/sqlstore/org_users.go Co-authored-by: ying-jeanne <74549700+ying-jeanne@users.noreply.github.com> * Update pkg/services/sqlstore/org_users.go Co-authored-by: ying-jeanne <74549700+ying-jeanne@users.noreply.github.com> Co-authored-by: ying-jeanne <74549700+ying-jeanne@users.noreply.github.com>	4 years ago
Serge Zaitsev	18e93c7077	Chore: Remove bus (#47511) ... * Chore: Remove bus * remove unused const	4 years ago
Piotr Jamróz	8490fd77e3	Users: clean up OrgId when all user orgs are removed (#46003) ... * Clean up orgId when user organization is removed * Add a test for removing user org * Fix linting errors * Update comment * Fix linting errors * Make removing user org more explicit	4 years ago
Kat Yang	19be0b4170	Chore: Remove x from org users (#46848) ... * Chore: Remove x from org users * Chore: Remove x.Dialect() from org users	4 years ago
Karl Persson	7ab1ef8d6e	Access Control: Support other attributes than id for resource permissions (#46727) ... * Add option to set ResourceAttribute for a permissions service * Use prefix in access control sql filter to parse scopes * Use prefix in access control metadata to check access	4 years ago
Jguer	ef9fe26886	Service accounts: Split user and service account database (#46442) ... * ServiceAccounts: remove unused endpoint * ServiceAccounts: remove usage of getOrgUsers from service accounts * use dialect for boolean str true in delete * return service account results directly * Move Service Account Deletions to sa package Co-authored-by: Gabriel MABILLE <gamab@users.noreply.github.com> Co-authored-by: gamab <gabi.mabs@gmail.com> * Move service account methods to service accounts Co-authored-by: Gabriel MABILLE <gamab@users.noreply.github.com> Co-authored-by: gamab <gabi.mabs@gmail.com> * Service accounts should not interfere with users Co-authored-by: Gabriel MABILLE <gamab@users.noreply.github.com> * filter service accounts in user services * mispell fix * fix overextended lines Co-authored-by: Gabriel MABILLE <gamab@users.noreply.github.com> * fix variable Co-authored-by: Gabriel MABILLE <gamab@users.noreply.github.com> Co-authored-by: gamab <gabi.mabs@gmail.com>	4 years ago
Karl Persson	8688073564	Access control: Support filter on several actions (#46524) ... * Add support for several actions when creating a acccess control sql filter	4 years ago
J Guerreiro	e201b777c2	Service Accounts: small typo and dto fixes (#45677) ... * ServiceAccounts: respect js casing and small fixes to displayed values * ServiceAccounts: fix typos on service account * ServiceAccounts: fix missing orgID in service account * ServiceAccounts: Small fixes to dtos for profile * ServiceAccounts: use result org id * ServiceAccounts: return value is always nil	4 years ago
Gabriel MABILLE	178193c84b	AccessControl: Use an SQLFilter struct (#44887)	4 years ago
Jeremy Price	525d9d97a8	Fix crash on no service accounts (#44389) ... * Fix crash on no service accounts * Fix tests * Update org_users.go * Update org_users.go * linter, again * Update build.go * Update pkg/services/serviceaccounts/tests/common.go * fix: big D Co-authored-by: Eric Leijonmarck <eric.leijonmarck@gmail.com>	4 years ago
Karl Persson	bf63ccbe00	Access control: Rewrite access control SQL filter (#44488) ... * Rewrite access control sql filter	4 years ago
Ryan McKinley	5d66194ec5	FeatureFlags: define features outside settings.Cfg (take 3) (#44443)	4 years ago
Agnès Toulet	65bdb3a899	FeatureFlags: Revert managing feature flags outside of settings.Cfg (#44382) ... * Revert "FeatureToggles: register all enterprise feature toggles (#44336)" This reverts commit f53b3fb007. * Revert "FeatureFlags: manage feature flags outside of settings.Cfg (#43692)" This reverts commit f94c0decbd.	4 years ago
Ryan McKinley	f94c0decbd	FeatureFlags: manage feature flags outside of settings.Cfg (#43692)	4 years ago
J Guerreiro	7dab52869e	ServiceAccounts: Add detail view of service account (#44164) ... * ServiceAccounts: Add detail view of service account Co-authored-by: eleijonmarck <eric.leijonmarck@gmail.com> * ServiceAccount: Make detail view scopeID Co-authored-by: eleijonmarck <eric.leijonmarck@gmail.com> * ServiceAccount: fix lint error Co-authored-by: eleijonmarck <eric.leijonmarck@gmail.com> Co-authored-by: eleijonmarck <eric.leijonmarck@gmail.com>	4 years ago
Karl Persson	f999910dc6	Access control: Add access control sql filter to org user queries (#43961) ... * Add access control SQL filter to org user queries	4 years ago
Eric Leijonmarck	6409e761b5	List serviceaccounts (#43672) ... * Serviceaccounts: feat - tabview for serviceaccounts * WIP * feat: listing all service accounts * refactor: needed to remove showInvitees as not present in serviceaccounts * add token column in the list * add token to orgserviceaccount * Update pkg/services/serviceaccounts/api/api.go	4 years ago
idafurjes	7936c4c522	Rename AddHandlerCtx to AddHandler (#43557)	4 years ago
Eric Leijonmarck	9c11040c3e	Serviceaccounts: Filtering service accounts from user queries (#41410) ... * Add extra fields to OSS types to support enterprise * WIP service accounts * Update public/app/features/api-keys/ApiKeysForm.tsx Co-authored-by: Hugo Häggmark <hugo.haggmark@grafana.com> * Create a service account at the same time as the API key * Use service account credentials when accessing API with APIkey * Throw better error * Use Boolean for "create service account button" * Add GetRole to service, merge RoleDTO and Role structs This patch merges the identical OSS and Enterprise data structures, which improves the code for two reasons: 1. Makes switching between OSS and Enterprise easier 2. Reduces the chance of incompatibilities developing between the same functions in OSS and Enterprise * Start work cloning permissions onto service account * If API key is not linked to a service account, continue login as usual * Fallback to old auth if no service account linked to key * Commented * Add CloneUserToServiceAccount * Update mock.go * Put graphical bits behind a feature toggle * Start adding LinkAPIKeyToServiceAccount * Update pkg/models/user.go Co-authored-by: Eric Leijonmarck <eric.leijonmarck@gmail.com> * Update pkg/api/apikey.go Co-authored-by: Eric Leijonmarck <eric.leijonmarck@gmail.com> * Update pkg/api/apikey.go Co-authored-by: Eric Leijonmarck <eric.leijonmarck@gmail.com> * Finish LinkAPIKeyToServiceAccount * Update comment * Handle api key link error * Update pkg/services/sqlstore/apikey.go Co-authored-by: Emil Tullstedt <emil.tullstedt@grafana.com> * Feature toggle * Update pkg/services/accesscontrol/accesscontrol.go Co-authored-by: Ieva <ieva.vasiljeva@grafana.com> * Not needed (yet) * Better error messages for OSS accesscontrol * Set an invalid user id as default * ServiceAccountId should be string * Re-arrange field names * ServiceAccountId is integer * Update ossaccesscontrol.go * Linter * Remove fronend edits * Remove console log * Update ApiKeysForm.tsx * feat: add serviceaccount deletion * feat: make sure we do not accidently delete serviceaccount * feat: ServiceAccount Type * refactor: userDeletions function * refactor: serviceaccount deletions\ * refactor: error name and removed attribute for userDeletecommand * refactor:: remove serviceaccount type for now * WIP * add mocked function * Remove unnecessary db query, move to right place * Update pkg/services/accesscontrol/mock/mock.go Co-authored-by: Gabriel MABILLE <gamab@users.noreply.github.com> * Update pkg/services/accesscontrol/mock/mock.go Co-authored-by: Gabriel MABILLE <gamab@users.noreply.github.com> * Update pkg/services/accesscontrol/mock/mock.go Co-authored-by: Gabriel MABILLE <gamab@users.noreply.github.com> * Better error messages * Better and correcter error messages * add mocked function * refactor: move function call, add error msg * add IsServiceAccount and fix table * add service accounts package * WIP * WIP * working serviceaccountsapi registration * WIP tests * test * test working * test running for service * moved the error out of the models package * fixed own review * linting errors * Update pkg/services/serviceaccounts/database/database.go Co-authored-by: Jeremy Price <Jeremy.price@grafana.com> * tests running for api * WIP * WIP * removed unused secrets background svc * removed background svc for serviceaccount infavor or wire.go * serviceaccounts manager tests * wip * Filtering service accounts from the user queries in frontend * clean up * Update pkg/services/sqlstore/org_test.go * methods on same type should have same receiver * _ unused variable and comment * add additional join for results query * remove unused code * remove error fmt * refactor: change to only have false * no new variable to the left hand side * refactor: create serviceaccount cmd * dialect fix Co-authored-by: Jeremy Price <jeremy.price@grafana.com> Co-authored-by: Hugo Häggmark <hugo.haggmark@grafana.com> Co-authored-by: Emil Tullstedt <emil.tullstedt@grafana.com> Co-authored-by: Ieva <ieva.vasiljeva@grafana.com> Co-authored-by: Gabriel MABILLE <gamab@users.noreply.github.com>	4 years ago
idafurjes	65ebb04cf3	Chore: Add context to org users (#39526) ... * Add context to org users * Fix go lint * Roll back xorm refactor * Use WithTransactionalDbSession * Update sqlstore.go Fix typo * Update org_users.go Fix typo	4 years ago
idafurjes	f2fcf721eb	32540: Add org users with pagination (#33788) ... * Add model for search org user and add handler for dispatch * 32540_org_users_with_pagination: Add endpoint for search org users * 32540_org_users_with_pagination: Add test for org user search handler * 32540_org_users_with_pagination: fix indentation * 32540_org_users_with_pagination: Remove newline * 32540_org_users_with_pagination: Remove empty line * 32540_org_users_with_pagination: Fix indentation * Update pkg/api/org_users.go Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com> * Update pkg/api/org_users.go Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com> * Update pkg/models/org_user.go Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com> * Update pkg/api/org_users_test.go Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com> * Update pkg/api/org_users_test.go Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com> * 32540_org_users_with_pagination: Use hs.SQLStore.SearchOrgUsers instead of bus * Add model for search org user and add handler for dispatch * 32540_org_users_with_pagination: Add endpoint for search org users * 32540_org_users_with_pagination: Add test for org user search handler * 32540_org_users_with_pagination: fix indentation * 32540_org_users_with_pagination: Remove newline * 32540_org_users_with_pagination: Remove empty line * 32540_org_users_with_pagination: Fix indentation * Update pkg/api/org_users.go Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com> * Update pkg/api/org_users.go Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com> * Update pkg/models/org_user.go Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com> * Update pkg/api/org_users_test.go Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com> * Update pkg/api/org_users_test.go Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com> * 32540_org_users_with_pagination: Use hs.SQLStore.SearchOrgUsers instead of bus * 32540_org_users_with_pagination: Add test for the sqlstore * 32540_org_users_with_pagination: Fix sqlstore test * Update pkg/api/org_users.go Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com> * Update pkg/api/org_users_test.go Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com> * Update pkg/api/org_users_test.go Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com> * Update pkg/services/sqlstore/org_users.go Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com> * Update pkg/services/sqlstore/org_users.go Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com> * Update pkg/services/sqlstore/org_test.go Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com> * Update pkg/services/sqlstore/org_test.go Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com> * 32540: Fix search org users method * 32540: Fix sqlstore test * 32540: Fix go-lint Co-authored-by: Arve Knudsen <arve.knudsen@gmail.com>	5 years ago
Carl Bergquist	f9962eabff	chore: avoid aliasing imports in services (#22499)	6 years ago
Eric Leijonmarck	f05607d4c0	UserTableView: Show user name in table view (#18108) ... * refactor to multiple rows * added name for org user struct * added name getorgusers * added user name to tableview * made test pass * updated userMocks to user name field * added missing UsersTable snapshot * added name on teammembers page, be able to search query for name, login and email * added the updated snapshots * conform to same sorting as output form * conform to previous way of using it * sort first by login and after by email, as it was before	6 years ago
Marcus Efraimsson	f845a3b841	upgrade xorm packages to latest versions	7 years ago
Torkel Ödegaard	b671b9704f	changed property name to UserWasDeleted and added an assert for it	7 years ago
Torkel Ödegaard	9585dc7825	added the UserWasRemoved flag to make api aware of what happened to return correct message to UI	7 years ago
Torkel Ödegaard	5b5cb6622d	Remove user form org now completely removes the user from the system if the user is orphaned	7 years ago
Mario Trangoni	e85d0e8d6b	pkg/services/sqlstore: Fix sess.Id is deprecated: use ID instead. (megacheck) ... See, $ gometalinter --vendor --disable-all --enable=megacheck --disable=gotype --deadline 6m ./... | grep ID alert.go:193:15⚠️ sess.Id is deprecated: use ID instead (SA1019) (megacheck) alert.go:252:18⚠️ sess.Id is deprecated: use ID instead (SA1019) (megacheck) annotation.go:113:12⚠️ sess.Table("annotation").Id is deprecated: use ID instead (SA1019) (megacheck) org.go:136:24⚠️ sess.Id is deprecated: use ID instead (SA1019) (megacheck) org.go:169:16⚠️ sess.Id is deprecated: use ID instead (SA1019) (megacheck) org_users.go:24:21⚠️ sess.Id is deprecated: use ID instead (SA1019) (megacheck) org_users.go:88:12⚠️ sess.Id is deprecated: use ID instead (SA1019) (megacheck) org_users.go:141:21⚠️ sess.Id is deprecated: use ID instead (SA1019) (megacheck) plugin_setting.go:103:12⚠️ sess.Id is deprecated: use ID instead (SA1019) (megacheck) preferences.go:97:12⚠️ sess.Id is deprecated: use ID instead (SA1019) (megacheck) quota.go:119:17⚠️ sess.Id is deprecated: use ID instead (SA1019) (megacheck) quota.go:221:17⚠️ sess.Id is deprecated: use ID instead (SA1019) (megacheck) team.go:77:24⚠️ sess.Id is deprecated: use ID instead (SA1019) (megacheck) user.go:243:16⚠️ sess.Id is deprecated: use ID instead (SA1019) (megacheck) user.go:267:13⚠️ sess.Id is deprecated: use ID instead (SA1019) (megacheck) user.go:282:13⚠️ sess.Id is deprecated: use ID instead (SA1019) (megacheck) user.go:313:12⚠️ sess.Id is deprecated: use ID instead (SA1019) (megacheck) user.go:475:3⚠️ sess.Id is deprecated: use ID instead (SA1019) (megacheck) user.go:479:13⚠️ sess.Id is deprecated: use ID instead (SA1019) (megacheck) user.go:493:13⚠️ sess.Id is deprecated: use ID instead (SA1019) (megacheck)	7 years ago
Marcus Efraimsson	6d48d0a80c	set current org when adding/removing user to org ... To not get into a situation where a user has a current organization assign which he is not a member of we try to always make sure that a user has a valid current organization assigned.	8 years ago
Marcus Efraimsson	e1e0b5f951	teams: use orgId in all team and team member operations (#10862) ... Also fixes issue in org users tests for postgres	8 years ago
Marcus Efraimsson	a86f2fa34b	user picker should only include users from current org (#10845)	8 years ago
Alexander Zobnin	d8612380e9	refactor: rename User Groups to Teams	8 years ago
Torkel Ödegaard	e8a20643d6	feat: store last seen date for users and present in stats and user lists, closes #9007	9 years ago
Daniel Lee	9e7aa65fb7	WIP: clean up after user and org user delete	9 years ago
Torkel Ödegaard	359421b5e8	refactor: sqlstore inTransaction consolidated to one version, fixes #8376	9 years ago
Zdenek Styblik	5eceabf810	fix(): Check Organization exists before User is added (#5302) ... Commit adds a check whether Organization exists before User is added to the organization. Fixes #3151.	10 years ago
Torkel Ödegaard	6d6af09296	feat(invite): handling of existing org user case when inviting, #2353	11 years ago
Torkel Ödegaard	a8aab0cb2b	Worked on user administration page, a grafana server admin can now add and edit organization roles for any user, #2014	11 years ago
Torkel Ödegaard	e771d8e944	Organization: You can now update the organization user role directly (without removing and readding the organization user). Closes #1899	11 years ago
Torkel Ödegaard	f3f79792ab	account -> org table migration is starting to work, need to test mysql and postgres	11 years ago
Torkel Ödegaard	26e4809e2e	Big Backend Refatoring: Renamed Account -> Org	11 years ago