Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix config form with basic auth enabled #13

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix config form with basic auth enabled #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 15 additions & 14 deletions client/src/components/ConfigPage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ function ConfigPage() {
const [basicAuthUsername, setBasicAuthUsername] = useState(null)
const [basicAuthPassword, setBasicAuthPassword] = useState(null)
const [basicAuthEnabled, setBasicAuthEnabled] = useState(false)
const [addingAuth, setAddingAuth] = useState(false)
const [removingAuth, setRemovingAuth] = useState(false)
const [showAddingAuthModal, setShowAddingAuthModal] = useState(false)
const [showRemovingAuthModal, setShowRemovingAuthModal] = useState(false)
const [showErrors, setShowErrors] = useState(false)

useEffect(() => {
Expand All @@ -59,25 +59,24 @@ function ConfigPage() {
(route) => route.name === PAGES.DASHBOARD
).path

if (basicAuthEnabled && (!basicAuthUsername || !basicAuthPassword)) {
return
}

if (
!mergedConfig?.config?.basic_auth_enabled &&
basicAuthEnabled &&
!addingAuth
!showAddingAuthModal
) {
setAddingAuth(true)
// Changed from no auth to auth
if (!basicAuthUsername || !basicAuthPassword) return
setShowAddingAuthModal(true)
return
}

if (
mergedConfig?.config?.basic_auth_enabled &&
!basicAuthEnabled &&
!removingAuth
!showRemovingAuthModal
) {
setRemovingAuth(true)
// Changed from auth to no auth
setShowRemovingAuthModal(true)
return
}

Expand Down Expand Up @@ -183,6 +182,7 @@ function ConfigPage() {
error={
basicAuthEnabled &&
!basicAuthUsername &&
!mergedConfig?.config?.basic_auth_enabled &&
showErrors &&
'Field is required'
}
Expand All @@ -204,6 +204,7 @@ function ConfigPage() {
error={
basicAuthEnabled &&
!basicAuthPassword &&
!mergedConfig?.config?.basic_auth_enabled &&
showErrors &&
'Field is required'
}
Expand Down Expand Up @@ -242,17 +243,17 @@ function ConfigPage() {
cancelText="No, don't reset"
/>
<ConfirmModal
show={!!addingAuth}
close={() => setAddingAuth(false)}
show={!!showAddingAuthModal}
close={() => setShowAddingAuthModal(false)}
onConfirm={() => onSave()}
headerText="Do you want to add basic auth for the app?"
descriptionText="Once you confirm, you won't be able to access this website without username and password"
confirmText="Yes, add"
cancelText="No, don't add"
/>
<ConfirmModal
show={!!removingAuth}
close={() => setRemovingAuth(false)}
show={!!showRemovingAuthModal}
close={() => setShowRemovingAuthModal(false)}
onConfirm={() => onSave()}
headerText="Do you want to remove basic auth?"
descriptionText="Once you confirm, the app will be accessible to anyone"
Expand Down
7 changes: 6 additions & 1 deletion server/controllers/ConfigController.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,16 @@ export default class ConfigController {
basic_auth_username: req.body.basicAuthUsername,
}

if (req.body.basicAuthPassword) {
if (req.body.basicAuthEnabled && req.body.basicAuthPassword) {
const hashedPassword = await argon2.hash(req.body.basicAuthPassword)
newConfig.basic_auth_password = hashedPassword
}

if (!newConfig.basic_auth_enabled) {
newConfig.basic_auth_username = null
newConfig.basic_auth_password = null
}

const config = (await knex('config').first().update(newConfig, '*'))[0]

res.json(config)
Expand Down