google_directory 0.2.2 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9818097fe34668cd39dc6ef720cf127ba5fbc2538bf89ee72ce9f65f585ed0f7
-  data.tar.gz: 12a8026b64acb4d5f30416bb4904f89f5463ce1b880663e725e946f4bb20c2f0
+  metadata.gz: ad3d45be79a46c765d3e286620049175179c317083042a816acd730751a00ebc
+  data.tar.gz: 2032dcf141e7f8c93d23cee5262c1104fbb902de6bcab02aff8f031b03c8091a
 SHA512:
-  metadata.gz: 13c4dd4666a71ad46397c6c298f6ee7d3db374b0bac46d83bb6de540f20dae966e1098b3a0b78474bfaa889ece9ca0fc2c99e7417267523d052f3f45a96e9633
-  data.tar.gz: ebfa0eae70d15e7de9fa9c6ca89148824f8052d7bce27d368dc66852fd9c62450948c4f4cb2df9c656339d82f76e89d5a7bc6ef5e437c22cc52eac7b21af9ae3
+  metadata.gz: db8d3e223648271045ae7ede6b39e2ff6b6ac4ffbf0979a88338bbe86c408a2e6cb0366328d9723cd03db536e226e85c2839f8ca0e474208ed732733c9a9e6a5
+  data.tar.gz: 39e9c27cd74a021935569401113c71fd3814db24bfd7813977d5460b74fc4bde218b3fb23b3c4666687eec1e7addb781d3903e70cc76be66db16a3526c2d82b0

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} }`
@@ -60,8 +54,9 @@ module GoogleDirectory
         response           = send( command, attributes: attributes )
         response[:status]  = 'success'
       rescue Google::Apis::ClientError => error
-        response = {response: error, command: command,
-                    attributes: attributes, status: 'error'}
+        response = {status: 'error', response: error,
+                    attributes: attributes, command: command,
+                   }
       end
       response
     end
@@ -77,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

@@ -13,7 +13,7 @@ module GoogleDirectory
     # @return [Hash] formatted as {success: {command: :user_get, attributes: {primary_email: "user@domain"}, response: GoogleUserObject } }
     def user_get( attributes: )
       response = service.get_user( attributes[:primary_email] )
-      {command: :user_get, user: attributes[:primary_email], response: response}
+      {response: response, attributes: attributes[:primary_email], command: :user_get}
     end
 
     # @note Test if user exists in Google Directory
@@ -23,10 +23,10 @@ module GoogleDirectory
     def user_exists?( attributes: )
       begin
         response = service.get_user( attributes[:primary_email] )
-        return {command: :user_exists?, user: attributes[:primary_email], response: true}
+        return {response: true, attributes: attributes[:primary_email], command: :user_exists?}
       rescue Google::Apis::ClientError => error
         if error.message.include? 'notFound'
-          return {command: :user_exists?, user: attributes[:primary_email], response: false}
+          return {response: false, attributes: attributes[:primary_email], command: :user_exists?}
         else
           raise error
         end
@@ -46,7 +46,7 @@ module GoogleDirectory
       user_object = Google::Apis::AdminDirectoryV1::User.new user_attr
       # create user in directory services
       response = service.insert_user( user_object )
-      {command: :user_create, user: attributes[:primary_email], response: response}
+      {response: response, attributes: attributes[:primary_email], command: :user_create}
     end
 
     # @note updates an exising Google Directory User
@@ -56,7 +56,7 @@ module GoogleDirectory
     def user_update( attributes: )
       # create a user object for google to update
       response = update_user( attributes )
-      {command: :user_update, user: attributes[:primary_email], response: response}
+      {response: response, attributes: attributes[:primary_email], command: :user_update}
     end
 
     # @note updates an exising Google Directory User password - convience method instead of using :user_update
@@ -69,7 +69,7 @@ module GoogleDirectory
       user_attr = defaults.merge( attributes )
 
       response = update_user( user_attr )
-      {command: :user_change_password, user: attributes[:primary_email], response: response}
+      {response: response, attributes: attributes[:primary_email], command: :user_change_password}
     end
 
     # @note activates an exising Google Directory User password - convience method instead of using :user_update
@@ -81,7 +81,7 @@ module GoogleDirectory
       user_attr = defaults.merge( attributes )
 
       response = update_user( user_attr )
-      {command: :user_reactivate, user: attributes[:primary_email], response: response}
+      {response: response, attributes: attributes[:primary_email], command: :user_reactivate}
     end
 
     # @note suspends an exising Google Directory User password - convience method instead of using :user_update
@@ -93,7 +93,7 @@ module GoogleDirectory
       user_attr = defaults.merge( attributes )
 
       response = update_user( user_attr )
-      {command: :user_suspend, user: attributes[:primary_email], response: response}
+      {response: response, attributes: attributes[:primary_email], command: :user_suspend}
     end
 
     # @note deletes an exising Google Directory User
@@ -102,7 +102,7 @@ module GoogleDirectory
     # @return [Hash] formatted as {success: {command: :user_delete, attributes: {primary_email: "user@domain"}, response: "" } }
     def user_delete( attributes: )
       response = service.delete_user( attributes[:primary_email] )
-      {command: :user_delete, user: attributes[:primary_email], response: response}
+      {response: response, attributes: attributes[:primary_email], command: :user_delete}
     end
 
     private

data/lib/google_directory/users_commands.rb

@@ -17,7 +17,7 @@ module GoogleDirectory
       defaults = { max_results: 10, order_by: 'email' }
       filters  = defaults.merge( attributes )
       response = service.list_users( filters )
-      {command: :users_list, filters: filters, response: response}
+      {response: response, attributes: filters, command: :users_list}
     end
 
   end

data/lib/google_directory/version.rb

@@ -1,5 +1,5 @@
 module GoogleDirectory
   module Version
-    VERSION = "0.2.2"
+    VERSION = "0.2.4"
   end
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: google_directory
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.4
 platform: ruby
 authors:
 - Bill Tihen
 - Lee Weisbecker
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2018-06-14 00:00:00.000000000 Z
+date: 2023-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-api-client
@@ -17,70 +17,70 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.21'
+        version: '0.37'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.21'
+        version: '0.37'
 - !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 +98,7 @@ homepage: https://github.com/LAS-IT/google_directory
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -113,9 +113,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !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: []