omniauth-oauth2-oneid 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2b61ad0817150bd052d2e76ebd163ebf48f7e18fa6f90283604a432c1fcf75ef
-  data.tar.gz: 53132f583c695c88a87ba02d774262bfe5a07bb205b9b33e3a5959b3d9537d3e
+  metadata.gz: e5587fb3f326337ca7207ae6b9c9d7d0c0afc4d14f439e7b39e98949aab4848f
+  data.tar.gz: cb4e7707ff4d9475ba011bd33f07953aedacbede029e3d3d92d176b6de0824d4
 SHA512:
-  metadata.gz: ff7e75bced530609cd8e78a082645c27a9447674e5c12925fe000d2788edaef7f1cc10318507d7be6cebf04666432784a534565df3326d38076d7d0db8163cce
-  data.tar.gz: 62d1293cbad8e21dbeda14b1b4e5b1ce76c103d8b5d22d42d9156cf3d314d2ee9b564fd72d60db346199456dc67e00e387f7d0b6da042a8ae4c265dcb7b8b4c6
+  metadata.gz: 8167b8c848d19f2d5ea403421bc5e64443ed92c73f00a3a37621dfcdbe91f532a26ae8c1f08197fbfba585244d016efb53497f8b2cb9f16c5c884288b9c155f9
+  data.tar.gz: 5736a350bcdc15fd7db8873d1d7f82c657575e4a341659d044df842395a4e2ecbfa46c1422b93edeae7c778aa9b0b0623036e78455acf787d317e5febb0704b6

data/lib/omniauth/oneid/version.rb

@@ -2,6 +2,6 @@
 
 module OmniAuth
   module OAuth2OneID
-    VERSION = "0.1.0"
+    VERSION = "0.2.0"
   end
 end

data/lib/omniauth/strategies/oauth2_oneid.rb

@@ -20,8 +20,10 @@ module OmniAuth
         authorize_url: "/api/oauth/getcode",
         token_url: "/oauth/token",
         business_url: "/api/v3/business/service/list-business",
+        department_url: "/go-api/v1/business/service/account-detail"
       }
       option :businesses, []
+      option :departments, {}
       option :auto_block,
       {
         enabled: false,
@@ -60,6 +62,7 @@ module OmniAuth
         hash = {}
         hash[:id_info] = user_path
         hash[:business_info] = business_info
+        hash[:deepartment_info] = deepartment_info
         if business_info['data'].empty?
           gitlab_auto_block
           raise "Forbidden. Unauthorized access restricted."
@@ -78,6 +81,10 @@ module OmniAuth
       def business_info
         @business_info ||= access_token.get(options.client_options[:business_url]).parsed
       end
+
+      def deepartment_info
+        @department_info || access_token.get(options.client_options[:department_url]).parsed
+      end
   
       def authorize_params
         params = super
@@ -100,6 +107,12 @@ module OmniAuth
         end
 
         def check_business
+          # Check department 1st if configured
+          if !options.departments.empty?
+            return check_department
+          end
+
+          # Check business 2nd
           return true unless !options.businesses.empty?
           b_set = options.businesses.to_set
           business_info['data'].each do |b|
@@ -111,6 +124,23 @@ module OmniAuth
           false
         end
 
+        def check_department
+          deepartment_info['data']['business_lists'].each do |b|
+            b_id = b[:id]
+            if options.departments.include?(b_id)
+              # Option
+              dept_set = options.departments[b_id].to_set
+              b[:account_roles].each do |a|
+                if dept_set.include?(a[:dept_id])
+                  log :info, "Match account department_id: #{a[:dept_id]} at biz_id: #{b_id}"
+                  return true
+                end
+              end
+            end
+          end
+          false
+        end
+
         def gitlab_auto_block
           if !options.auto_block[:enabled]
             return

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-oauth2-oneid
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Patcharapong
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-03-11 00:00:00.000000000 Z
+date: 2025-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth-oauth2