135/netdisco
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into og-api-tokens-simple

Browse Source
This commit is contained in:
Oliver Gorwits
2019-03-12 14:59:54 +00:00
parent 3cf3a6b73a b9218d91c8
commit 25d46c0b40
9 changed files with 212 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/App/Netdisco/Web.pm
View File

@@ -67,9 +67,13 @@ if (setting('template_paths') and ref [] eq ref setting('template_paths')) {
# load cookie key from database
setting('session_cookie_key' => undef);
my $sessions = schema('netdisco')->resultset('Session');
my $skey = $sessions->find({id => 'dancer_session_cookie_key'});
setting('session_cookie_key' => $skey->get_column('a_session')) if $skey;
setting('session_cookie_key' => 'this_is_for_testing_only')
if $ENV{HARNESS_ACTIVE};
eval {
my $sessions = schema('netdisco')->resultset('Session');
my $skey = $sessions->find({id => 'dancer_session_cookie_key'});
setting('session_cookie_key' => $skey->get_column('a_session')) if $skey;
};
Dancer::Session::Cookie::init(session);
# setup for swagger API