Reimplement ReviewMappingsController

app/controllers/application_controller.rb

@@ -1,7 +1,24 @@
+# app/controllers/application_controller.rb
 class ApplicationController < ActionController::API
-  include Authorization
-  include JwtToken
-
-  before_action :authorize
+  before_action :authenticate_request!
 
+  private
+
+  def authenticate_request!
+    @current_user = authorize_request
+    render json: { error: 'Not Authorized' }, status: 401 unless @current_user
+  end
+
+  def authorize_request
+    header = request.headers['Authorization']
+    token = header.split(' ').last if header
+    decoded = JsonWebToken.decode(token)
+    User.find(decoded[:id]) if decoded
+  rescue
+    nil
+  end
+
+  def current_user
+    @current_user
+  end
 end

app/controllers/authentication_controller.rb

@@ -1,19 +1,28 @@
-# app/controllers/api/v1/authentication_controller.rb
+# app/controllers/authentication_controller.rb
 require 'json_web_token'
 
-class AuthenticationController < ApplicationController
-  skip_before_action :authenticate_request!
 
-  # POST /login
-  def login
-    user = User.find_by(name: params[:user_name]) || User.find_by(email: params[:user_name])
-    if user&.authenticate(params[:password])
-      payload = { id: user.id, name: user.name, full_name: user.full_name, role: user.role.name,
-                  institution_id: user.institution.id }
-      token = JsonWebToken.encode(payload, 24.hours.from_now)
-      render json: { token: }, status: :ok
-    else
-      render json: { error: 'Invalid username / password' }, status: :unauthorized
+    class AuthenticationController < ApplicationController
+      skip_before_action :authenticate_request!
+
+      # POST /login
+      def login
+        user = User.find_by(name: params[:user_name]) || User.find_by(email: params[:user_name])
+
+        if user&.authenticate(params[:password])
+          payload = {
+            id: user.id,
+            name: user.name,
+            full_name: user.full_name,
+            role: user.role.name,
+            institution_id: user.institution&.id
+          }
+
+          token = JsonWebToken.encode(payload, 24.hours.from_now)
+
+          render json: { token: }, status: :ok
+        else
+          render json: { error: 'Invalid username or password' }, status: :unauthorized
+        end
+      end
     end
-  end
-end