mirror of
https://github.com/grafana/grafana.git
synced 2025-02-15 10:03:33 -06:00
dc9ec7dc91
* Modify backend to allow expiration of API Keys * Add middleware test for expired api keys * Modify frontend to enable expiration of API Keys * Fix frontend tests * Fix migration and add index for `expires` field * Add api key tests for database access * Substitude time.Now() by a mock for test usage * Front-end modifications * Change input label to `Time to live` * Change input behavior to comply with the other similar * Add tooltip * Modify AddApiKey api call response Expiration should be *time.Time instead of string * Present expiration date in the selected timezone * Use kbn for transforming intervals to seconds * Use `assert` library for tests * Frontend fixes Add checks for empty/undefined/null values * Change expires column from datetime to integer * Restrict api key duration input It should be interval not number * AddApiKey must complain if SecondsToLive is negative * Declare ErrInvalidApiKeyExpiration * Move configuration to auth section * Update docs * Eliminate alias for models in modified files * Omit expiration from api response if empty * Eliminate Goconvey from test file * Fix test Do not sleep, use mocked timeNow() instead * Remove index for expires from api_key table The index should be anyway on both org_id and expires fields. However this commit eliminates completely the index for now since not many rows are expected to be in this table. * Use getTimeZone function * Minor change in api key listing The frontend should display a message instead of empty string if the key does not expire.
175 lines
4.2 KiB
Plaintext
175 lines
4.2 KiB
Plaintext
// Jest Snapshot v1, https://goo.gl/fbAQLP
|
|
|
|
exports[`Render should render API keys table if there are any keys 1`] = `
|
|
<Page
|
|
navModel={
|
|
Object {
|
|
"main": Object {
|
|
"text": "Configuration",
|
|
},
|
|
"node": Object {
|
|
"text": "Api Keys",
|
|
},
|
|
}
|
|
}
|
|
>
|
|
<PageContents
|
|
isLoading={true}
|
|
/>
|
|
</Page>
|
|
`;
|
|
|
|
exports[`Render should render CTA if there are no API keys 1`] = `
|
|
<Page
|
|
navModel={
|
|
Object {
|
|
"main": Object {
|
|
"text": "Configuration",
|
|
},
|
|
"node": Object {
|
|
"text": "Api Keys",
|
|
},
|
|
}
|
|
}
|
|
>
|
|
<PageContents
|
|
isLoading={false}
|
|
>
|
|
<EmptyListCTA
|
|
model={
|
|
Object {
|
|
"buttonIcon": "gicon gicon-apikeys",
|
|
"buttonLink": "#",
|
|
"buttonTitle": " New API Key",
|
|
"onClick": [Function],
|
|
"proTip": "Remember you can provide view-only API access to other applications.",
|
|
"proTipLink": "",
|
|
"proTipLinkTitle": "",
|
|
"proTipTarget": "_blank",
|
|
"title": "You haven't added any API Keys yet.",
|
|
}
|
|
}
|
|
/>
|
|
<Component
|
|
in={false}
|
|
>
|
|
<div
|
|
className="cta-form"
|
|
>
|
|
<button
|
|
className="cta-form__close btn btn-transparent"
|
|
onClick={[Function]}
|
|
>
|
|
<i
|
|
className="fa fa-close"
|
|
/>
|
|
</button>
|
|
<h5>
|
|
Add API Key
|
|
</h5>
|
|
<form
|
|
className="gf-form-group"
|
|
onSubmit={[Function]}
|
|
>
|
|
<div
|
|
className="gf-form-inline"
|
|
>
|
|
<div
|
|
className="gf-form max-width-21"
|
|
>
|
|
<span
|
|
className="gf-form-label"
|
|
>
|
|
Key name
|
|
</span>
|
|
<Input
|
|
className="gf-form-input"
|
|
onChange={[Function]}
|
|
placeholder="Name"
|
|
type="text"
|
|
value=""
|
|
/>
|
|
</div>
|
|
<div
|
|
className="gf-form"
|
|
>
|
|
<span
|
|
className="gf-form-label"
|
|
>
|
|
Role
|
|
</span>
|
|
<span
|
|
className="gf-form-select-wrapper"
|
|
>
|
|
<select
|
|
className="gf-form-input gf-size-auto"
|
|
onChange={[Function]}
|
|
value="Viewer"
|
|
>
|
|
<option
|
|
key="Viewer"
|
|
label="Viewer"
|
|
value="Viewer"
|
|
>
|
|
Viewer
|
|
</option>
|
|
<option
|
|
key="Editor"
|
|
label="Editor"
|
|
value="Editor"
|
|
>
|
|
Editor
|
|
</option>
|
|
<option
|
|
key="Admin"
|
|
label="Admin"
|
|
value="Admin"
|
|
>
|
|
Admin
|
|
</option>
|
|
</select>
|
|
</span>
|
|
</div>
|
|
<div
|
|
className="gf-form max-width-21"
|
|
>
|
|
<Component
|
|
tooltip="The api key life duration. For example 1d if your key is going to last for one day. All the supported units are: s,m,h,d,w,M,y"
|
|
>
|
|
Time to live
|
|
</Component>
|
|
<Input
|
|
className="gf-form-input"
|
|
onChange={[Function]}
|
|
placeholder="1d"
|
|
type="text"
|
|
validationEvents={
|
|
Object {
|
|
"onBlur": Array [
|
|
Object {
|
|
"errorMessage": "Not a valid duration",
|
|
"rule": [Function],
|
|
},
|
|
],
|
|
}
|
|
}
|
|
value=""
|
|
/>
|
|
</div>
|
|
<div
|
|
className="gf-form"
|
|
>
|
|
<button
|
|
className="btn gf-form-btn btn-primary"
|
|
>
|
|
Add
|
|
</button>
|
|
</div>
|
|
</div>
|
|
</form>
|
|
</div>
|
|
</Component>
|
|
</PageContents>
|
|
</Page>
|
|
`;
|