fix: cast JWT payload exp and rendering_id to string and include role

packages/forest_admin_agent/forest_admin_agent.gemspec

@@ -48,7 +48,7 @@ admin work on any Ruby application."
   spec.add_dependency "filecache", "~> 1.0"
   spec.add_dependency "ipaddress", "~> 0.8.3"
   spec.add_dependency "jsonapi-serializers", "~> 1.0"
-  spec.add_dependency "jwt", "~> 2.7"
+  spec.add_dependency "jwt", "~> 3.1"
   spec.add_dependency "ld-eventsource", "~> 2.2"
   spec.add_dependency "mono_logger", "~> 1.1"
   spec.add_dependency "openid_connect", "~> 2.2"

packages/forest_admin_agent/lib/forest_admin_agent/auth/oauth2/forest_resource_owner.rb

@@ -1,4 +1,5 @@
-require 'date'
+require 'active_support'
+require 'active_support/core_ext/numeric/time'
 require 'jwt'
 
 module ForestAdminAgent
@@ -15,19 +16,21 @@ def id
         end
 
         def expiration_in_seconds
-          (DateTime.now + (1 / 24.0)).to_time.to_i
+          Time.now.to_i + 1.hour
         end
 
         def make_jwt
           attributes = @data['attributes']
+
           user = {
             id: id,
             email: attributes['email'],
             first_name: attributes['first_name'],
             last_name: attributes['last_name'],
             team: attributes['teams'][0],
+            role: attributes['role'],
             tags: attributes['tags'],
-            rendering_id: @rendering_id,
+            rendering_id: @rendering_id.to_s,
             exp: expiration_in_seconds,
             permission_level: attributes['permission_level']
           }

packages/forest_admin_agent/spec/lib/forest_admin_agent/auth/oauth2/forest_resource_owner_spec.rb

@@ -16,6 +16,7 @@ module OAuth2
               'first_name' => 'john',
               'last_name' => 'doe',
               'teams' => ['team'],
+              'role' => 'role',
               'tags' => ['tag'],
               'permission_level' => 'permission_level'
             }
@@ -25,7 +26,7 @@ module OAuth2
         context 'when creating a new ForestResourceOwner' do
           it 'initializes the forest resource owner' do
             expect(forest_resource_owner.id).to eq 'id'
-            expect(forest_resource_owner.expiration_in_seconds).to eq (DateTime.now + (1 / 24.0)).to_time.to_i
+            expect(forest_resource_owner.expiration_in_seconds).to eq Time.now.to_i + 1.hour
           end
 
           it 'makes a jwt' do
@@ -37,9 +38,10 @@ module OAuth2
               'first_name' => 'john',
               'last_name' => 'doe',
               'team' => 'team',
+              'role' => 'role',
               'tags' => ['tag'],
-              'rendering_id' => 10,
-              'exp' => forest_resource_owner.expiration_in_seconds,
+              'rendering_id' => '10',
+              'exp' => forest_resource_owner.expiration_in_seconds.to_s,
               'permission_level' => 'permission_level'
             }
 

packages/forest_admin_agent/spec/lib/forest_admin_agent/routes/security/authentication_spec.rb

@@ -37,7 +37,7 @@ module Security
               'permission_level' => 'admin'
             }
           end
-          let(:token) { JWT.encode :user, ForestAdminAgent::Facades::Container.cache(:auth_secret), 'HS256' }
+          let(:token) { JWT.encode user, ForestAdminAgent::Facades::Container.cache(:auth_secret), 'HS256' }
           let(:auth_manager) { instance_double(ForestAdminAgent::Auth::AuthManager) }
 
           before do