6abe99efd6
* initial passwordless client * passwordless login page * Working basic e2e flow * Add todo comments * Improve the passwordless login flow * improved passwordless login, backend for passwordless signup * add expiration to emails * update email templates & render username & name fields on signup * improve email templates * change login page text while awaiting passwordless code * fix merge conflicts * use claims.TypeUser * add initial passwordless tests * better error messages * simplified error name * remove completed TODOs * linting & minor test improvements & rename passwordless routes * more linting fixes * move code generation to its own func, use locationService to get query params * fix ampersand in email templates & use passwordless api routes in LoginCtrl * txt emails more closely match html email copy * move passwordless auth behind experimental feature toggle * fix PasswordlessLogin property failing typecheck * make update-workspace * user correct placeholder * Update emails/templates/passwordless_verify_existing_user.txt Co-authored-by: Dan Cech <dcech@grafana.com> * Update emails/templates/passwordless_verify_existing_user.mjml Co-authored-by: Dan Cech <dcech@grafana.com> * Update emails/templates/passwordless_verify_new_user.txt Co-authored-by: Dan Cech <dcech@grafana.com> * Update emails/templates/passwordless_verify_new_user.txt Co-authored-by: Dan Cech <dcech@grafana.com> * Update emails/templates/passwordless_verify_new_user.mjml Co-authored-by: Dan Cech <dcech@grafana.com> * use & in email templates * Update emails/templates/passwordless_verify_existing_user.txt Co-authored-by: Dan Cech <dcech@grafana.com> * remove IP address validation * struct for passwordless settings * revert go.work.sum changes * mock locationService.getSearch in failing test --------- Co-authored-by: Mihaly Gyongyosi <mgyongyosi@users.noreply.github.com> Co-authored-by: Dan Cech <dcech@grafana.com> |
||
---|---|---|
.. | ||
apierrors | ||
avatar | ||
datasource | ||
dtos | ||
frontendlogging | ||
pluginproxy | ||
response | ||
routing | ||
static | ||
webassets | ||
accesscontrol.go | ||
admin_encryption.go | ||
admin_provisioning_test.go | ||
admin_provisioning.go | ||
admin_test.go | ||
admin_users_test.go | ||
admin_users.go | ||
admin.go | ||
alerting.go | ||
annotations_test.go | ||
annotations.go | ||
api_test.go | ||
api.go | ||
apikey.go | ||
basic_auth_test.go | ||
basic_auth.go | ||
common_test.go | ||
dashboard_permission_test.go | ||
dashboard_permission.go | ||
dashboard_snapshot_test.go | ||
dashboard_snapshot.go | ||
dashboard_test.go | ||
dashboard.go | ||
dataproxy.go | ||
datasources_test.go | ||
datasources.go | ||
ds_query_test.go | ||
ds_query.go | ||
fakes.go | ||
folder_bench_test.go | ||
folder_permission_test.go | ||
folder_permission.go | ||
folder_test.go | ||
folder.go | ||
frontend_logging_test.go | ||
frontend_logging.go | ||
frontend_metrics.go | ||
frontendsettings_test.go | ||
frontendsettings.go | ||
grafana_com_proxy.go | ||
health_test.go | ||
health.go | ||
http_server_test.go | ||
http_server.go | ||
index.go | ||
login_oauth_test.go | ||
login_oauth.go | ||
login_test.go | ||
login.go | ||
org_invite_test.go | ||
org_invite.go | ||
org_test.go | ||
org_users_test.go | ||
org_users.go | ||
org.go | ||
password.go | ||
playlist.go | ||
plugin_checks_test.go | ||
plugin_checks.go | ||
plugin_dashboards_test.go | ||
plugin_dashboards.go | ||
plugin_metrics_test.go | ||
plugin_metrics.go | ||
plugin_proxy_test.go | ||
plugin_proxy.go | ||
plugin_resource_test.go | ||
plugin_resource.go | ||
plugins_test.go | ||
plugins.go | ||
preferences_test.go | ||
preferences.go | ||
quota_test.go | ||
quota.go | ||
README.md | ||
render.go | ||
search.go | ||
short_url_test.go | ||
short_url.go | ||
signup.go | ||
swagger_responses.go | ||
swagger_tags.json | ||
swagger.go | ||
user_test.go | ||
user_token_test.go | ||
user_token.go | ||
user.go | ||
utils.go |
OpenAPI specifications
Since version 8.4, HTTP API details are specified using OpenAPI v2. Starting from version 9.1, there is also an OpenAPI v3 specification (generated by the v2 one using this script).
OpenAPI annotations
The OpenAPI v2 specification is generated automatically from the annotated Go code using go-swagger which scans the source code for annotation rules. Refer to this getting started guide for getting familiar with the toolkit.
Developers modifying the HTTP API endpoints need to make sure to add the necessary annotations so that their changes are reflected into the generated specifications.
Example of endpoint annotation
The following route defines a PATCH
endpoint under the /serviceaccounts/{serviceAccountId}
path with tag service_accounts
(used for grouping together several routes) and operation ID updateServiceAccount
(used for uniquely identifying routes and associate parameters and response with them).
// swagger:route PATCH /serviceaccounts/{serviceAccountId} service_accounts updateServiceAccount
//
// # Update service account
//
// Required permissions (See note in the [introduction](https://grafana.com/docs/grafana/latest/developers/http_api/serviceaccount/#service-account-api) for an explanation):
// action: `serviceaccounts:write` scope: `serviceaccounts:id:1` (single service account)
//
// Responses:
// 200: updateServiceAccountResponse
// 400: badRequestError
// 401: unauthorisedError
// 403: forbiddenError
// 404: notFoundError
// 500: internalServerError
The go-swagger
can discover such annotations by scanning any code imported by pkg/server
but by convention we place the endpoint annotations above the endpoint definition.
Example of endpoint parameters
The following struct defines the route parameters for the updateServiceAccount
endpoint. The route expects:
- a path parameter denoting the service account identifier and
- a body parameter with the new values for the specific service account
// swagger:parameters updateServiceAccount
type UpdateServiceAccountParams struct {
// in:path
ServiceAccountId int64 `json:"serviceAccountId"`
// in:body
Body serviceaccounts.UpdateServiceAccountForm
}
Example of endpoint response
The following struct defines the response for the updateServiceAccount
endpoint in case of a successful 200
response.
// swagger:response updateServiceAccountResponse
type UpdateServiceAccountResponse struct {
// in:body
Body struct {
Message string `json:"message"`
ID int64 `json:"id"`
Name string `json:"name"`
ServiceAccount *serviceaccounts.ServiceAccountProfileDTO `json:"serviceaccount"`
}
}
OpenAPI generation
Developers can re-create the OpenAPI v2 and v3 specifications using the following command:
make swagger-clean && make openapi3-gen
They can observe its output into the public/api-merged.json
and public/openapi3.json
files.
Finally, they can browser and try out both the OpenAPI v2 and v3 via the Swagger UI editor (served by the grafana server) by navigating to /swagger
.
If there are any issues generating the specifications (e.g., diff containing unrelated changes to your PR or unusually large diff), please run the following two commands to ensure your Swagger version is up to date, then re-run the make commands.
go install github.com/bwplotka/bingo@latest
bingo get github.com/go-swagger/go-swagger/cmd/swagger@v0.30.2