📈 Open source, privacy-first web analytics — a cookie-less Google Analytics alternative with built-in error tracking and performance monitoring. Self-host it or use our cloud. Get started for free!
TypeScript chartsclickhousedockergdprgoogle-analyticsmetricsmonitoringmysqlnestjsprivacyredisself-hostedselfhostedstatisticstailwindcssweb-analyticswebanalyticswebsite
improvments: when protected on
kruzhambus8427ef1fc2c9
diff --git a/src/pages/Project/Settings/ProjectSettings.container.tsx b/src/pages/Project/Settings/ProjectSettings.container.tsxindex 011a8998e..330ffd3a1 100644--- a/src/pages/Project/Settings/ProjectSettings.container.tsx+++ b/src/pages/Project/Settings/ProjectSettings.container.tsx@@ -67,6 +67,12 @@ const mapDispatchToProps = (dispatch: AppDispatch) => ({message,}))},+ setProjectProtectedPassword(id: string, password: string) {+ dispatch(UIActions.setProjectProtectedPassword({+ id,+ password,+ }))+ },})export default connect(mapStateToProps, mapDispatchToProps)(ProjectSettings)diff --git a/src/pages/Project/Settings/ProjectSettings.tsx b/src/pages/Project/Settings/ProjectSettings.tsxindex 442d5ff54..6b7c5a195 100644--- a/src/pages/Project/Settings/ProjectSettings.tsx+++ b/src/pages/Project/Settings/ProjectSettings.tsx@@ -33,6 +33,7 @@ import Checkbox from 'ui/Checkbox'import Modal from 'ui/Modal'import FlatPicker from 'ui/Flatpicker'import { nanoid } from 'utils/random'+import { isValidPassword, MIN_PASSWORD_CHARS } from 'utils/validator'import { trackCustom } from 'utils/analytics'import routes from 'routes'import { getFormatDate } from '../View/ViewProject.helpers'@@ -123,7 +124,7 @@ const DEFAULT_PROJECT_NAME = 'Untitled Project'const ProjectSettings = ({updateProjectFailed, createNewProjectFailed, generateAlerts, projectDeleted, deleteProjectFailed,loadProjects, isLoading, projects, showError, removeProject, user, isSharedProject, sharedProjects,- deleteProjectCache,+ deleteProjectCache, setProjectProtectedPassword,}: {updateProjectFailed: (message: string) => void,createNewProjectFailed: (message: string) => void,@@ -139,6 +140,7 @@ const ProjectSettings = ({isSharedProject: boolean,sharedProjects: ISharedProject[],deleteProjectCache: (pid: string) => void,+ setProjectProtectedPassword: (pid: string, password: string) => void,}) => {const { t }: {t: (key: string, options?: {@@ -165,6 +167,7 @@ const ProjectSettings = ({name?: string,origins?: string,ipBlacklist?: string,+ passwordHash?: string,}>({})const [beenSubmitted, setBeenSubmitted] = useState<boolean>(false)const [showDelete, setShowDelete] = useState<boolean>(false)@@ -293,6 +296,7 @@ const ProjectSettings = ({name?: string,origins?: string,ipBlacklist?: string,+ passwordHash?: string,} = {}if (_isEmpty(form.name)) {@@ -311,6 +315,10 @@ const ProjectSettings = ({allErrors.ipBlacklist = t('project.settings.oxCharsError', { amount: MAX_IPBLACKLIST_LENGTH })}+ if (!_isEmpty(form?.passwordHash) && _size(form.passwordHash) > 0 && !isValidPassword(form?.passwordHash || '')) {+ allErrors.passwordHash = t('auth.common.xCharsError', { amount: MIN_PASSWORD_CHARS })+ }+const valid = _isEmpty(_keys(allErrors))setErrors(allErrors)@@ -360,8 +368,21 @@ const ProjectSettings = ({})}- const onProtected = async () => {- // TODO+ const onProtected = () => {+ setBeenSubmitted(true)++ if (validated) {+ onSubmit({+ ...form,+ isPasswordProtected: true,+ })++ if (!_isEmpty(form.passwordHash) && !_isEmpty(form.id)) {+ setProjectProtectedPassword(form?.id || '', form?.passwordHash || '')+ }++ setShowProtected(false)+ }}const title = isSettings ? `${t('project.settings.settings')} ${form.name}` : t('project.settings.create')@@ -557,10 +578,11 @@ const ProjectSettings = ({id='passwordHash'type='password'label={t('project.settings.password')}- value={form.passwordHash}+ value={form?.passwordHash || ''}placeholder={t('project.settings.password')}className='mt-4'onChange={handleInput}+ error={beenSubmitted ? errors.passwordHash : null}/></div>)}diff --git a/src/redux/reducers/ui/projects.ts b/src/redux/reducers/ui/projects.tsindex a9b1d2f82..3cce39e4b 100644--- a/src/redux/reducers/ui/projects.ts+++ b/src/redux/reducers/ui/projects.ts@@ -28,7 +28,7 @@ interface IInitialState {alerts: IAlerts[]subscribers: any[]liveStats: ILiveStats- password: {+ passwordHash: {[key: string]: string}}@@ -53,7 +53,7 @@ const initialState: IInitialState = {alerts: [],subscribers: [],liveStats: {},- password: getItem(PROJECTS_PROTECTED_PASSWORD) || {},+ passwordHash: getItem(PROJECTS_PROTECTED_PASSWORD) || {},}const projectsSlice = createSlice({@@ -203,11 +203,11 @@ const projectsSlice = createSlice({setProjectProtectedPassword: (state, { payload }: PayloadAction<{ id: string, password: string }>) => {const { id, password } = payload- state.password = {- ...state.password,+ state.passwordHash = {+ ...state.passwordHash,[id]: password,}- setItem(PROJECTS_PROTECTED_PASSWORD, JSON.stringify(state.password))+ setItem(PROJECTS_PROTECTED_PASSWORD, JSON.stringify(state.passwordHash))},reset(state) {state.projects = []