mirror of
https://github.com/grafana/grafana.git
synced 2024-11-26 19:00:54 -06:00
6dbb6408d4
* Add extra fields to OSS types to support enterprise * Create a service account at the same time as the API key * Use service account credentials when accessing API with APIkey * 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 * 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 * Add CloneUserToServiceAccount * Adding LinkAPIKeyToServiceAccount * Handle api key link error * Better error messages for OSS accesscontrol * Set an invalid user id as default * Re-arrange field names * ServiceAccountId is integer * Better error messages Co-authored-by: Hugo Häggmark <hugo.haggmark@grafana.com> Co-authored-by: Eric Leijonmarck <eric.leijonmarck@gmail.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> |
||
|---|---|---|
| .. | ||
| middleware | ||
| mock | ||
| ossaccesscontrol | ||
| accesscontrol.go | ||
| errors.go | ||
| evaluator_test.go | ||
| evaluator.go | ||
| models.go | ||
| roles_test.go | ||
| roles.go | ||
| scope.go | ||
| scoperesolution_test.go | ||
| scoperesolution.go | ||