Skip to content
Snippets Groups Projects
Verified Commit 0108fdcd authored by Andrej Ramašeuski's avatar Andrej Ramašeuski
Browse files

Roles bugfix, allow skip migration

parent bed7ac3b
Branches
No related tags found
No related merge requests found
Pipeline #6030 passed
...@@ -2,7 +2,7 @@ image: docker:20.10.9 ...@@ -2,7 +2,7 @@ image: docker:20.10.9
variables: variables:
DOCKER_TLS_CERTDIR: "/certs" DOCKER_TLS_CERTDIR: "/certs"
IMAGE_VER: 0.5.0 IMAGE_VER: 0.5.1
services: services:
- docker:20.10.9-dind - docker:20.10.9-dind
......
...@@ -24,6 +24,7 @@ sub startup { ...@@ -24,6 +24,7 @@ sub startup {
# $self->helper( redis => sub { return $redis; } ); # $self->helper( redis => sub { return $redis; } );
# migrace schematu # migrace schematu
if (! $cfg->{skip_migration}) {
my $pg = Mojo::Pg->new my $pg = Mojo::Pg->new
->dsn($cfg->{db_dsn}) ->dsn($cfg->{db_dsn})
->username($cfg->{db_username}) ->username($cfg->{db_username})
...@@ -37,6 +38,7 @@ sub startup { ...@@ -37,6 +38,7 @@ sub startup {
$pg->migrations->from_dir($self->home . '/sql'); $pg->migrations->from_dir($self->home . '/sql');
$pg->migrations->migrate(); $pg->migrations->migrate();
$self->helper( pg => sub { return $pg; } ); $self->helper( pg => sub { return $pg; } );
}
# DB Schema # DB Schema
my $schema = CF2022::Schema->connect({ my $schema = CF2022::Schema->connect({
......
...@@ -45,9 +45,9 @@ sub create ($c ) { ...@@ -45,9 +45,9 @@ sub create ($c ) {
); );
@products = grep { $_->{id} !~ MAIN_PRODUCTS } @products; @products = grep { $_->{id} !~ MAIN_PRODUCTS } @products;
push @products, { @products = ({
id => $c->config->{'pretix_product_' . $group->{role}} id => $c->config->{'pretix_product_' . $group->{role}}
}; }, @products);
if ( $group->{role} eq 'member' ) { if ( $group->{role} eq 'member' ) {
$args->{email} = $claims->{preferred_username} $args->{email} = $claims->{preferred_username}
......
...@@ -80,12 +80,14 @@ sub register ( $class, $self, $conf) { ...@@ -80,12 +80,14 @@ sub register ( $class, $self, $conf) {
GROUP: GROUP:
foreach my $group ( sort @{ $claims->{groups} } ) { foreach my $group ( sort @{ $claims->{groups} } ) {
if ( $group =~ REGIONS ) { if ( $group =~ REGIONS ) {
my $role = ( $2 eq 'f') ? 'member':'regp';
my $region = $c->oauth_groups->{ $group }; my $region = $c->oauth_groups->{ $group };
$region =~ s/^KS\s+//i; $region =~ s/^KS\s+//i;
return { return {
region => $region, region => $region,
role => ( $2 eq 'f') ? 'member':'regp', role => $role,
}; };
} }
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment