yalla_auth_ruby_client 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1f130db14d4ab21f5160424c47c583bb75d355bc871afb38448eae5eabe6dfba
-  data.tar.gz: ec774cbda5742b775b4aec193e8eceeee142cca7311feb47644923aa8f98b29a
+  metadata.gz: d5d0daaf481f7552506732d1fc02b5adcdd993eaebf7136981817b78eb052849
+  data.tar.gz: 6e2896599fe4d9820cab1117c45f5f5b91927add54c2b85a01b6aa6b7c4219d6
 SHA512:
-  metadata.gz: 1c51ed7933e90841eb6ae1c41c538dcb782e7ed26cb8921961d5c3964acd92dbdabd02f1522ec8f23f97211c59550c60066b0ae148c419d4cd1c0fa1af88e4ba
-  data.tar.gz: d2f5f225d39421b540ea40420bf19c017eb9e91b43e493c95a4d76a07db6d234da4d10c2bbda4da95830e2a61e85403d5a5fa42d95e20b80e6d7578253769a4b
+  metadata.gz: 493756c3593d198b8a1d2178a7035b620eac083145bd82cae84cfc5bc5b10b837fc0a5bc7ed3c66119ebc87dc45dd7526e79656565ba5990ac1263e00f61a248
+  data.tar.gz: 9e23efe2ff05c8d85f44d82f32d49fed84966ca3df085bd7d19d4da74dee4e3ec4857fd84fee561353baee6d0de6a9aa12da4beea2a327b7459430a897c17e97

data/README.md

@@ -76,6 +76,12 @@ end
   provided by the authentication service.
 - `logout` clears the cookie and redirects to `ENV["AUTH_URL"]`.
 
+For controllers that inherit from `ActionController::API`, the engine includes
+`YallaAuthRubyClient::ApiControllerAuthentication`, which reads the bearer token
+from the `Authorization` header. It exposes the same helpers but responds with a
+`401` JSON body containing the `redirect_uri` when authentication fails instead
+of issuing an HTTP redirect.
+
 ### Use the authentication middleware
 
 Add `YallaAuthRubyClient::AuthTokenMiddleware` to your Rails middleware stack

data/lib/openapi_client/version.rb

@@ -11,5 +11,5 @@ Generator version: 7.12.0
 =end
 
 module OpenapiClient
-  VERSION = '2.0.0'
+  VERSION = '2.0.1'
 end

data/lib/yalla_auth_ruby_client/api_controller_authentication.rb

@@ -0,0 +1,58 @@
+module YallaAuthRubyClient
+  module ApiControllerAuthentication
+    def logout
+      render json: { redirect_uri: ENV["AUTH_URL"] }
+    end
+
+    def authenticate_user
+      token = bearer_token
+      return false unless token.present?
+
+      begin
+        api_client = OpenapiClient::AuthApi.new
+        response = api_client.auth_validate_token_get(token)
+
+        if response && response.success
+          @yalla_user = response.user
+          @current_user = find_or_create_app_user(@yalla_user)
+          true
+        else
+          false
+        end
+      rescue OpenapiClient::ApiError => e
+        Rails.logger.error "Authentication failed: #{e.message}"
+        false
+      end
+    end
+
+    def authenticate_user!
+      return if authenticate_user
+
+      render json: { error: 'unauthorized', redirect_uri: login_redirect_uri }, status: :unauthorized
+    end
+
+    def current_user
+      @current_user
+    end
+
+    private
+
+    def bearer_token
+      auth_header = request.headers['Authorization'].to_s
+      return unless auth_header.present?
+
+      scheme, token = auth_header.split(' ', 2)
+      return unless scheme&.casecmp('Bearer')&.zero?
+
+      token&.strip.presence
+    end
+
+    def find_or_create_app_user(user)
+      AppUser.find_or_create_by(yalla_id: user.id)
+    end
+
+    def login_redirect_uri
+      "#{ENV['AUTH_URL']}/users/sign_in?redirect_uri=#{request.original_url}"
+    end
+  end
+end

data/lib/yalla_auth_ruby_client.rb

@@ -1,6 +1,7 @@
 require 'openapi_client'
 require 'rails/railtie'
 require 'yalla_auth_ruby_client/controller_authentication'
+require 'yalla_auth_ruby_client/api_controller_authentication'
 require 'yalla_auth_ruby_client/middleware/auth_token_middleware'
 
 module YallaAuthRubyClient
@@ -9,6 +10,10 @@ module YallaAuthRubyClient
       ActiveSupport.on_load(:action_controller_base) do
         include YallaAuthRubyClient::ControllerAuthentication
       end
+
+      ActiveSupport.on_load(:action_controller_api) do
+        include YallaAuthRubyClient::ApiControllerAuthentication
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yalla_auth_ruby_client
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Yalla auth openapi client
@@ -101,6 +101,7 @@ files:
 - lib/openapi_client/models/user_role_add.rb
 - lib/openapi_client/version.rb
 - lib/yalla_auth_ruby_client.rb
+- lib/yalla_auth_ruby_client/api_controller_authentication.rb
 - lib/yalla_auth_ruby_client/controller_authentication.rb
 - lib/yalla_auth_ruby_client/middleware/auth_token_middleware.rb
 - spec/api/apps_api_spec.rb