From 9fa591cb0696bfc8f8af284bac9c4cd312fe293e Mon Sep 17 00:00:00 2001
From: Janik Kleinhoff <ilbelkyr@shalture.org>
Date: Mon, 8 May 2017 02:59:19 +0000
Subject: Revert "Move users to DB"

This reverts commit 7342c7f0e19e15ab3c7ba2133a56393c15989f08.

Turns out there are still issues after all.
---
 lib/ASM/DB/Result/User.pm    | 34 ----------------------------------
 lib/ASM/DB/ResultSet/User.pm | 23 -----------------------
 2 files changed, 57 deletions(-)
 delete mode 100644 lib/ASM/DB/ResultSet/User.pm

(limited to 'lib/ASM/DB')

diff --git a/lib/ASM/DB/Result/User.pm b/lib/ASM/DB/Result/User.pm
index 675ccba..5e5d17c 100644
--- a/lib/ASM/DB/Result/User.pm
+++ b/lib/ASM/DB/Result/User.pm
@@ -6,8 +6,6 @@ use warnings;
 
 use parent 'DBIx::Class::Core';
 
-use Authen::Passphrase::RejectAll;
-
 __PACKAGE__->load_components('InflateColumn::DateTime', 'PassphraseColumn');
 __PACKAGE__->table('users');
 __PACKAGE__->add_columns(
@@ -32,41 +30,9 @@ __PACKAGE__->add_columns(
         passphrase_check_method => 'check_password',
         is_nullable => 0,
     },
-    flag_secret => {
-        data_type   => 'boolean',
-        is_nullable => 0,
-        default_value => 0,
-    },
-    flag_hilights => {
-        data_type   => 'boolean',
-        is_nullable => 0,
-        default_value => 0,
-    },
-    flag_admin => {
-        data_type   => 'boolean',
-        is_nullable => 0,
-        default_value => 0,
-    },
-    flag_plugin => {
-        data_type   => 'boolean',
-        is_nullable => 0,
-        default_value => 0,
-    },
-    flag_debug => {
-        data_type   => 'boolean',
-        is_nullable => 0,
-        default_value => 0,
-    },
 );
 
 __PACKAGE__->set_primary_key('id');
 __PACKAGE__->add_unique_constraint(uniq_user_name => ['name']);
 
-sub new {
-    my $self = shift;
-    $_[0]{passphrase} //= Authen::Passphrase::RejectAll->new;
-
-    $self->SUPER::new(@_);
-}
-
 1;
diff --git a/lib/ASM/DB/ResultSet/User.pm b/lib/ASM/DB/ResultSet/User.pm
deleted file mode 100644
index 68c0871..0000000
--- a/lib/ASM/DB/ResultSet/User.pm
+++ /dev/null
@@ -1,23 +0,0 @@
-use utf8;
-
-package ASM::DB::ResultSet::User;
-
-use strict;
-use warnings;
-
-use parent 'DBIx::Class::ResultSet';
-use namespace::autoclean;
-
-sub by_name {
-    my ( $self, $name ) = @_;
-
-    return $self->find( { name => $name }, { key => 'uniq_user_name' } );
-}
-
-sub by_name_or_new {
-    my ( $self, $name ) = @_;
-
-    return $self->find_or_new( { name => $name }, { key => 'uniq_user_name' } );
-}
-
-1;
-- 
cgit v1.2.3