Merge pull request #3253 from metacpan/haarg/remove-captcha

remove captcha
metacpan · Dec 21, 2024 · f4c296d · f4c296d
2 parents dd53856 + 53b7030
commit f4c296d
Show file tree

Hide file tree

Showing 13 changed files with 7 additions and 119 deletions.
diff --git a/app.psgi b/app.psgi
@@ -88,8 +88,7 @@ builder {
                         "frame-ancestors 'self' *.metacpan.org",
 
         # temporary 'unsafe-eval' because root/static/js/jquery.tablesorter.js
-                        "script-src 'self' 'unsafe-eval' 'unsafe-inline' *.metacpan.org https://*.googletagmanager.com  https://www.google.com/recaptcha/ https://www.gstatic.com/recaptcha/",
-
+                        "script-src 'self' 'unsafe-eval' 'unsafe-inline' *.metacpan.org https://*.googletagmanager.com",
                         ),
                         'X-Frame-Options'        => 'SAMEORIGIN',
                         'X-XSS-Protection'       => '1; mode=block',

diff --git a/lib/MetaCPAN/Web/Authentication/User.pm b/lib/MetaCPAN/Web/Authentication/User.pm
@@ -42,10 +42,8 @@ sub BUILDARGS {
 
 sub for_session { $_[0]->token }
 
-has id             => ( is => 'ro' );
-has looks_human    => ( is => 'ro' );
-has passed_captcha => ( is => 'ro' );
-has access_token   => ( is => 'ro' );
+has id           => ( is => 'ro' );
+has access_token => ( is => 'ro' );
 has identity => (
     is     => 'ro',
     isa    => HashRef->plus_coercions( ArrayToHash ['name'] ),
@@ -70,7 +68,6 @@ for my $method ( qw(
     get_profile
     add_favorite
     remove_favorite
-    turing
 ) )
 {
     no strict 'refs';

diff --git a/lib/MetaCPAN/Web/Controller/Account/Favorite.pm b/lib/MetaCPAN/Web/Controller/Account/Favorite.pm
@@ -32,11 +32,7 @@ sub add : Local : Args(0) {
         }
     }
     else {
-        $c->res->redirect(
-              $res->{error}
-            ? $c->uri_for('/account/turing/index')
-            : $c->req->referer
-        );
+        $c->res->redirect( $c->req->referer );
     }
 }
 

diff --git a/lib/MetaCPAN/Web/Controller/Account/Turing.pm b/lib/MetaCPAN/Web/Controller/Account/Turing.pm
diff --git a/lib/MetaCPAN/Web/Model/API/User.pm b/lib/MetaCPAN/Web/Model/API/User.pm
@@ -86,15 +86,6 @@ sub remove_favorite {
         undef, { access_token => $token }, 'DELETE' );
 }
 
-sub turing {
-    my ( $self, $token, $answer ) = @_;
-    $self->request(
-        '/user/turing',
-        { answer       => $answer },
-        { access_token => $token },
-    );
-}
-
 __PACKAGE__->meta->make_immutable;
 
 1;
diff --git a/metacpan_web.conf b/metacpan_web.conf
@@ -16,10 +16,6 @@ mark_unauthorized_releases = 0
     cache = 1
 </View::Xslate>
 
-<Controller::Account::Turing>
-    public_key 6LeH2MsSAAAAANwz3AA73Gw5OjCVjT6I51Ev-ior
-</Controller::Account::Turing>
-
 <sitemap sitemap-authors.xml.gz>
     object_type = author
     field_name  = pauseid

diff --git a/root/account/turing.tx b/root/account/turing.tx
diff --git a/root/base/account.tx b/root/base/account.tx
@@ -3,11 +3,6 @@
 %%  }
 %%  override left_nav_classes -> { 'nav nav-pills nav-stacked' }
 %%  override left_nav_content -> {
-%%  if !$user.looks_human {
-<li class="[% if $current['account/turing'] { 'active' } %]">
-    <a href="/account/turing">Verify Account</a>
-</li>
-%%  }
 <li class="[% if $current['account/identities'] { 'active' } %]">
     <a href="/account/identities">Identities</a>
 </li>

diff --git a/root/static/js/cpan.js b/root/static/js/cpan.js
@@ -236,9 +236,7 @@ for (const favForm of document.querySelectorAll('form[action="/account/favorite/
             body: formData,
         });
         if (!response.ok) {
-            if (confirm("You have to complete a Captcha in order to ++.")) {
-                document.location.href = "/account/turing";
-            }
+            alert("Error adding favorite!");
         }
 
         const button = favForm.querySelector('button');

diff --git a/root/static/js/main.mjs b/root/static/js/main.mjs
@@ -5,7 +5,6 @@ import './cpan.js';
 import './github.js';
 import './dropdown.js';
 import './profile.js';
-import './recaptcha.mjs';
 import './search.js';
 import 'bootstrap/js/dropdown.js';
 import 'bootstrap/js/collapse.js';

diff --git a/root/static/js/recaptcha.mjs b/root/static/js/recaptcha.mjs
diff --git a/t/controller/account.t b/t/controller/account.t
@@ -85,10 +85,7 @@ test_psgi app, sub {
     };
 
     # (we're always authenticated from now on)
-    $user_res = {
-        looks_human => \1,
-        id          => '5',
-    };
+    $user_res = { id => '5', };
 
     subtest 'GET profile' => sub {
         $api_res = { error => 'broken' };

diff --git a/t/html.t b/t/html.t
@@ -9,8 +9,7 @@ use Path::Tiny qw( path );
 
 # files that have inline <script> tags
 my %skip = map { $_ => 1 } (
-    'root/about/contributors.tx', 'root/account/profile.tx',
-    'root/account/turing.tx',     'root/base.tx',
+    'root/about/contributors.tx', 'root/account/profile.tx', 'root/base.tx',
 );
 
 File::Find::find(