google_directory 0.2.3 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8d686d850e36f8f0ca476fa18866bfd73fb913de0e8b134a2fdca08b580a2187
-  data.tar.gz: faa84394c013ca04239bd3f9a5659cf82129f90a8f5750a4cd8b8b2c1a66e07d
+  metadata.gz: 2c500b521381a697f0db03d78359f84358f9bbc518bb10fcceb5346032e1f473
+  data.tar.gz: 61a5059a6b49f492184d27b053b696927de371127abb5b1bb8b5bc0140af3d01
 SHA512:
-  metadata.gz: 9f4af38fd52d322d6a2a4844e29c3c013c88f74af7e1a3c91e7fe5d540dbbbb28e973eb142f44ff97f46c0b35451a0fa008970c7ac4653e8fb075fe9f1e3ed45
-  data.tar.gz: b70dc522431b30f6cdd4edc57bc3053090e2694e3ee8569f4ac54bd6cb137bbc88450da4d031e3376b551e1bd1bd9184a67090ff39ec746255b4dd030ad61050
+  metadata.gz: 218c568d547060affbac27d35f3361d61411991f11a1f90dd4e646c78f0cab19d785cd3725d249eb4d94d09f28deb60c1c7f470f10b39ec7065a6de4ef306c8d
+  data.tar.gz: 3b14d88941ee473e25987ab62effde623e65b18f2084cfa789fac640503c9cdda1df54b04733c6306a78e7ad0ab8e04caf481deffc30958ac6b9e9eade27be55

data/lib/google_directory/connection.rb

@@ -1,8 +1,6 @@
-require 'google/apis/admin_directory_v1'
 require 'googleauth'
-require 'googleauth/stores/file_token_store'
+require 'google/apis/admin_directory_v1'
 require 'fileutils'
-
 require "google_directory/version"
 require "google_directory/user_commands"
 
@@ -19,17 +17,17 @@ module GoogleDirectory
     include GoogleDirectory::UserCommands
 
     # default settings from google for all users
-    OOB_URI = ENV['OOB_URI'] || 'urn:ietf:wg:oauth:2.0:oob'
-    CREDENTIALS_PATH = ENV['CREDENTIALS_PATH'] || File.join( Dir.home, '.credentials', "admin-directory_v1-ruby-accounts.yaml")
+    CREDENTIALS_PATH = ENV['CREDENTIALS_JSON_PATH']
+    SUB_ACCOUNT = ENV['SUB_ACCOUNT_NAME']
 
     # Get info the Google Cloud Admin
     # https://console.cloud.google.com/apis/ or
     # build using: https://developers.google.com/api-client-library/ruby/guide/aaa_client_secrets
-    CLIENT_SECRETS_PATH = ENV['CLIENT_SECRETS_PATH'] || 'client_secret.json'
+    # CLIENT_SECRETS_PATH = ENV['CLIENT_SECRETS_PATH'] || 'client_secret.json'
 
     # Scope options - https://www.googleapis.com/auth/admin.directory.user
     # https://developers.google.com/admin-sdk/directory/v1/guides/authorizing
-    SCOPE = Google::Apis::AdminDirectoryV1::AUTH_ADMIN_DIRECTORY_USER
+    # SCOPE = Google::Apis::AdminDirectoryV1::AUTH_ADMIN_DIRECTORY_USER
     # SCOPE = 'https://www.googleapis.com/auth/admin.directory.user'
 
     # Initialize the API
@@ -39,9 +37,7 @@ module GoogleDirectory
     # @note make connection to google directory services
     # @param service [Class] the default is: Google::Apis::AdminDirectoryV1::DirectoryService
     def initialize( service: Google::Apis::AdminDirectoryV1::DirectoryService )
-      app_name ||= ENV['APPLICATION_NAME'] || 'google_cloud_app_name'
       @service   = service.new
-      @service.client_options.application_name = app_name
       @service.authorization = authorize
     end
 
@@ -49,8 +45,6 @@ module GoogleDirectory
       VERSION
     end
 
-    # @note Run a command against Google Directory
-    #
     # @param command [Symbol] choose command to perform these include: :user_get, :user_exists? (t/f), :user_create, :user_delete, :user_update & convience commands :user_suspend, :user_reactivate, :user_change_password
     # @param attributes [Hash] attributes needed to perform command
     # @return [Hash] formatted as: `{success: {command: :command, attributes: {primary_email: "user@domain"}, response: GoogleAnswer} }`
@@ -78,32 +72,15 @@ module GoogleDirectory
 
     private
     attr_reader :service
-    ##
-    # FROM:
-    # https://www.rubydoc.info/github/google/google-api-ruby-client/Google/Apis/AdminDirectoryV1/DirectoryService
-    # Ensure valid credentials, either by restoring from the saved credentials
-    # files or intitiating an OAuth2 authorization. If authorization is required,
-    # the user's default browser will be launched to approve the request.
-    # @return [Google::Auth::UserRefreshCredentials] OAuth2 credentials
-    def authorize
-      FileUtils.mkdir_p(File.dirname(CREDENTIALS_PATH))
 
-      client_id   = Google::Auth::ClientId.from_file(CLIENT_SECRETS_PATH)
-      token_store = Google::Auth::Stores::FileTokenStore.new(file: CREDENTIALS_PATH)
-      authorizer  = Google::Auth::UserAuthorizer.new( client_id, SCOPE, token_store )
-      user_id = 'default'
-      credentials = authorizer.get_credentials(user_id)
-      if credentials.nil?
-        url = authorizer.get_authorization_url(
-          base_url: OOB_URI)
-        puts "Open the following URL in the browser and enter the " +
-             "resulting code after authorization"
-        puts url
-        code = gets
-        credentials = authorizer.get_and_store_credentials_from_code(
-          user_id: user_id, code: code, base_url: OOB_URI)
-      end
-      credentials
+    def authorize
+      scope = ['https://www.googleapis.com/auth/admin.directory.user', 'https://www.googleapis.com/auth/admin.directory.user.security']
+      authorizer = Google::Auth::ServiceAccountCredentials.make_creds(
+        json_key_io: File.open(CREDENTIALS_PATH),
+        scope: scope)
+      authorizer.update!(sub: SUB_ACCOUNT)
+      authorizer.fetch_access_token!
+      return authorizer
     end
   end
 end

data/lib/google_directory/user_commands.rb

@@ -43,7 +43,15 @@ module GoogleDirectory
       defaults  = { suspended: true, password: password, change_password_at_next_login: true }
       user_attr = defaults.merge( attributes )
       # create a google user object
-      user_object = Google::Apis::AdminDirectoryV1::User.new user_attr
+      # Ruby 3: pass keyword args instead of positional Hash
+      # Also coerce nested :name Hash into a UserName object if provided
+      if user_attr[:name].is_a?(Hash)
+        name_hash = user_attr[:name]
+        user_attr = user_attr.merge(
+          name: Google::Apis::AdminDirectoryV1::UserName.new(**name_hash.transform_keys(&:to_sym))
+        )
+      end
+      user_object = Google::Apis::AdminDirectoryV1::User.new(**user_attr)
       # create user in directory services
       response = service.insert_user( user_object )
       {response: response, attributes: attributes[:primary_email], command: :user_create}
@@ -108,7 +116,15 @@ module GoogleDirectory
     private
     def update_user( user_attr )
       # create a user object that google will create
-      user_object = Google::Apis::AdminDirectoryV1::User.new user_attr
+      # Ruby 3: pass keyword args instead of positional Hash
+      # Also coerce nested :name Hash into a UserName object if provided
+      if user_attr[:name].is_a?(Hash)
+        name_hash = user_attr[:name]
+        user_attr = user_attr.merge(
+          name: Google::Apis::AdminDirectoryV1::UserName.new(**name_hash.transform_keys(&:to_sym))
+        )
+      end
+      user_object = Google::Apis::AdminDirectoryV1::User.new(**user_attr)
       # send user object to google directory
       service.update_user( user_attr[:primary_email], user_object )
     end

data/lib/google_directory/users_commands.rb

@@ -16,7 +16,8 @@ module GoogleDirectory
     def users_list( attributes: {} )
       defaults = { max_results: 10, order_by: 'email' }
       filters  = defaults.merge( attributes )
-      response = service.list_users( filters )
+      # Ruby 3: DirectoryService#list_users accepts only keyword args
+      response = service.list_users(**filters)
       {response: response, attributes: filters, command: :users_list}
     end
 

data/lib/google_directory/version.rb

@@ -1,5 +1,5 @@
 module GoogleDirectory
   module Version
-    VERSION = "0.2.3"
+    VERSION = "1.0.0"
   end
 end

metadata

@@ -1,86 +1,92 @@
 --- !ruby/object:Gem::Specification
 name: google_directory
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 1.0.0
 platform: ruby
 authors:
 - Bill Tihen
 - Lee Weisbecker
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2018-06-14 00:00:00.000000000 Z
+date: 2025-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-api-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0.53'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0.21'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.21'
+        version: '0.53'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.16'
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.9'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.9'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.11'
+        version: '0.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.11'
+        version: '0.12'
 description: Authenticate, list, make, check, suspend and activate google users.
 email:
 - btihen@gmail.com
@@ -98,7 +104,7 @@ homepage: https://github.com/LAS-IT/google_directory
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -106,16 +112,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubygems_version: 3.1.6
+signing_key:
 specification_version: 4
 summary: Simple ruby wrapper to manage google accounts - using oauth2.
 test_files: []