IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix: Email and username trimming and invitation validation (#58442)

Browse Source 
* fix: email and username trimming and invitation validation

* Trim leading and trailing whitespaces from email and username on signup

* Check whether the provided email address is the same as where the invitation sent

* Align tests

Co-authored-by: Mihaly Gyongyosi <mgyongyosi@users.noreply.github.com>
This commit is contained in:
Jo
2022-11-14 12:11:26 +00:00
committed by GitHub
parent 1fddd9aed1
commit 121631daae
12 changed files with 229 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
public/app/features/admin/UserProfile.tsx
View File

@@ -220,7 +220,9 @@ export class UserProfileRow extends PureComponent<UserProfileRowProps, UserProfi
return;
}
this.setState({ value: event.target.value });
this.setState({
value: event.target.value,
});
};
onInputBlur = (event: React.FocusEvent<HTMLInputElement>, status?: LegacyInputStatus) => {
@@ -228,7 +230,9 @@ export class UserProfileRow extends PureComponent<UserProfileRowProps, UserProfi
return;
}
this.setState({ value: event.target.value });
this.setState({
value: event.target.value,
});
};
focusInput = () => {

4
public/app/features/admin/utils.ts
View File

@@ -1,5 +1,9 @@
import { config } from '@grafana/runtime/src';
// https://html.spec.whatwg.org/multipage/input.html#valid-e-mail-address
export const w3cStandardEmailValidator =
/^[a-zA-Z0-9.!#$%&'*+\/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$/;
export function isTrial() {
const expiry = config.licenseInfo?.trialExpiry;
return !!(expiry && expiry > 0);