nu
/
CharmBoard
1
0
Fork 0
Code Issues 8 Pull Requests Projects 1 Releases Activity

Change all vars to snake_case (#5) + misc changes 

- Remaining camelCase variables in `lib/CharmBoard/Controller/Register.pm` have been swapped to snake_case
- Dev/prod environment check is now case insensitive
- Change `pass_crypt => scheme` in conf to an array
This commit is contained in:
ngoomie 2024-08-19 02:28:14 -06:00
parent 1b179fb08d
commit e86434f300
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
charmboard.example.conf
View File

@ -10,7 +10,7 @@
}, },
pass_crypt => { pass_crypt => {
scheme => '', # currently only 'argon2' scheme => [''], # currently only 'argon2'
pepper => '' pepper => ''
}, },

2
lib/CharmBoard.pm
View File

@ -24,7 +24,7 @@ sub startup {
$self->helper(board_name => sub { $config->{board_name} }); $self->helper(board_name => sub { $config->{board_name} });
# load dev env only stuff, if applicable # load dev env only stuff, if applicable
if ($config->{environment} eq 'dev') { if (lc($config->{environment}) eq 'dev') {
$self->renderer->cache->max_keys(0) $self->renderer->cache->max_keys(0)
} }

22
lib/CharmBoard/Controller/Register.pm
View File

@ -28,11 +28,11 @@ sub register_do {
my $password = $self->param('password'); my $password = $self->param('password');
my $confirmPassword = $self->param('confirm-password'); my $confirmPassword = $self->param('confirm-password');
my $catchError; my $catch_error;
# declare vars used through multiple try/catch blocks with # declare vars used through multiple try/catch blocks with
# 'our' so they work throughout the entire subroutine # 'our' so they work throughout the entire subroutine
our ($userCheck, $emailCheck, $salt, $hash); our ($user_check, $email_check, $salt, $hash);
# make sure registration info is valid # make sure registration info is valid
try { try {
@ -50,20 +50,20 @@ sub register_do {
# check to make sure username and/or email isn't already in use; # check to make sure username and/or email isn't already in use;
# if not, continue with registration # if not, continue with registration
## search for input username and email in database ## search for input username and email in database
$userCheck = $self->schema->resultset('Users') $user_check = $self->schema->resultset('Users')
->search({ username => $username })->single; ->search({ username => $username })->single;
$emailCheck = $self->schema->resultset('Users') $email_check = $self->schema->resultset('Users')
->search({ email => $email })->single; ->search({ email => $email })->single;
# TODO: compress this into something less redundant # TODO: compress this into something less redundant
($userCheck && $emailCheck) eq undef ($user_check && $email_check) eq undef
or die "Username already in use.\nemail already in use."; or die "Username already in use.\nemail already in use.";
($userCheck) eq undef ($user_check) eq undef
or die "Username already in use."; or die "Username already in use.";
($emailCheck) eq undef ($email_check) eq undef
or die "email already in use." or die "email already in use."
} catch ($catchError) { } catch ($catch_error) {
$self->flash(error => $catchError); $self->flash(error => $catch_error);
$self->redirect_to('register') $self->redirect_to('register')
} }
@ -85,8 +85,8 @@ sub register_do {
$self->flash(message => 'User registered successfully!'); $self->flash(message => 'User registered successfully!');
$self->redirect_to('register') $self->redirect_to('register')
} catch ($catchError) { } catch ($catch_error) {
print $catchError; print $catch_error;
$self->flash( $self->flash(
error => error =>
'Your registration info was correct, but a server error 'Your registration info was correct, but a server error