commit a205b1450250baba32d69645fa23e0f866b14752
author Akron <nils@diewald-online.de> Mon Nov 28 13:35:19 2022 +0100
committer Akron <nils@diewald-online.de> Tue Dec 06 15:40:57 2022 +0100
tree f0cd044f5a1ac116c36861059db64dc3be24bbfa
parent 7682d5d1ff55c71564fe6aab1ea9864f37283ff8

Remove legacy JWT handling from mock server

Change-Id: Ia9586b90bc159f0b46307a683912b593a61a8f13

Makefile.PL

diff --git a/Makefile.PL b/Makefile.PL
index 90f76a1..f49daa7 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -30,7 +30,6 @@
     'Mojolicious::Plugin::TagHelpers::ContentBlock' => 0.11,
     'Cache::FastMmap' => 1.56,
     'Data::Serializer' => 0.65,
-    'Mojo::JWT' => 0.09,
 
     # Required for Data::Serializer at the moment
     'JSON' => 4.03,

t/server/mock.pl

diff --git a/t/server/mock.pl b/t/server/mock.pl
index abc6846..3c1f74f 100644
--- a/t/server/mock.pl
+++ b/t/server/mock.pl
@@ -5,7 +5,6 @@
 use Mojo::JSON qw/true false encode_json decode_json/;
 use strict;
 use warnings;
-use Mojo::JWT;
 use Mojo::File qw/path/;
 use Mojo::Util qw/slugify/;
 
@@ -32,24 +31,6 @@
   return $tokens{$token}
 };
 
-# Legacy:
-helper jwt_encode => sub {
-  shift;
-  return Mojo::JWT->new(
-    secret => $secret,
-    token_type => 'api_token',
-    expires => time + (3 * 34 * 60 * 60),
-    claims => { @_ }
-  );
-};
-
-# Legacy;
-helper jwt_decode => sub {
-  my ($c, $auth) = @_;
-  $auth =~ s/\s*api_token\s+//;
-  return Mojo::JWT->new(secret => $secret)->decode($auth);
-};
-
 # Expiration helper
 helper expired => sub {
   my ($c, $auth, $set) = @_;
@@ -181,13 +162,9 @@
   if (my $auth = $c->req->headers->header('Authorization')) {
 
     $c->app->log->debug("There is an authorization header $auth");
-    my $jwt;
     if ($auth =~ /^Bearer/) {
       # Username unknown in OAuth2
       $response->{json}->{meta}->{authorized} = 'yes';
-    }
-    elsif ($auth =~ /^api_token/ && ($jwt = $c->jwt_decode($auth))) {
-      $response->{json}->{meta}->{authorized} = $jwt->{username} if $jwt->{username};
     };
 
     # Code is expired
@@ -302,13 +279,6 @@
     if ($auth =~ /^Bearer/) {
       $c->app->log->debug('Server-Logout: ' . $auth);
       return $c->render(json => { msg => [[0, 'Fine!']]});
-    }
-
-    elsif (my $jwt = $c->jwt_decode($auth)) {
-      my $user = $jwt->{username} if $jwt->{username};
-
-      $c->app->log->debug('Server-Logout: ' . $user);
-      return $c->render(json => { msg => [[0, 'Fine!']]});
     };
   };
 
@@ -337,26 +307,7 @@
 
   # the password is 'pass'
   if ($pwd) {
-
-    # the password is 'pass'
-    if ($pwd eq 'pass') {
-
-      # Render info with token
-      my $jwt = $c->jwt_encode(username => $username);
-
-      # Render in the Kustvakt fashion:
-      return $c->render(
-        format => 'html',
-        text => encode_json({
-          %{$jwt->claims},
-          expires    => $jwt->expires,
-          token      => $jwt->encode,
-          token_type => 'api_token'
-        })
-      );
-    }
-
-    elsif ($pwd eq 'ldaperr') {
+    if ($pwd eq 'ldaperr') {
       return $c->render(
         format => 'html',
         status => 401,