kotovalexarian-likes-github/fog--fog
1
0
Fork 0
mirror of https://github.com/fog/fog.git synced 2022-11-09 13:51:43 -05:00
Code Releases Activity

should move auth into a the main class.

Browse source
This commit is contained in:
Nat Welch 2013-01-25 19:54:44 -08:00
parent fdee1d7d40
commit 89292047fe
2 changed files with 16 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
lib/fog/google/compute.rb
View file

@ -1,6 +1,5 @@
require 'fog/google' require 'fog/google'
require 'fog/compute' require 'fog/compute'
require 'fog/google/oauth/oauth_util'
require 'google/api_client' require 'google/api_client'
module Fog module Fog
@ -8,6 +7,8 @@ module Fog
class Google < Fog::Service class Google < Fog::Service
requires :google_project requires :google_project
requires :google_client_email
requires :google_key_location
request_path 'fog/google/requests/compute' request_path 'fog/google/requests/compute'
request :list_servers request :list_servers
@ -71,13 +72,24 @@ module Fog
api_scope_url = 'https://www.googleapis.com/auth/compute' api_scope_url = 'https://www.googleapis.com/auth/compute'
@project = options[:google_project] @project = options[:google_project]
google_client_email = options[:google_client_email]
@api_url = base_url + api_version + '/projects/' @api_url = base_url + api_version + '/projects/'
key = ::Google::APIClient::KeyUtils.load_from_pkcs12(options[:google_key_location], 'notasecret')
@client = ::Google::APIClient.new @client = ::Google::APIClient.new
@client.authorization = Signet::OAuth2::Client.new(
:audience => 'https://accounts.google.com/o/oauth2/token',
:auth_provider_x509_cert_url => "https://www.googleapis.com/oauth2/v1/certs",
:client_x509_cert_url => "https://www.googleapis.com/robot/v1/metadata/x509/#{google_client_email}",
:issuer => google_client_email,
:scope => api_scope_url,
:signing_key => key,
:token_credential_uri => 'https://accounts.google.com/o/oauth2/token',
)
@client.authorization.fetch_access_token!
@compute = @client.discovered_api('compute', api_version) @compute = @client.discovered_api('compute', api_version)
@default_network = 'default' @default_network = 'default'
auth_util = CommandLineOAuthHelper.new(api_scope_url)
@client.authorization = auth_util.authorize()
end end
def build_result(api_method, parameters, body_object=nil) def build_result(api_method, parameters, body_object=nil)

24
lib/fog/google/oauth/oauth_util.rb
View file

@ -1,24 +0,0 @@
require 'google/api_client'
require 'google/api_client/client_secrets'
# Small helper for the sample apps for performing OAuth 2.0 flows from the
# command line. Starts an embedded server to handle redirects.
class CommandLineOAuthHelper
def initialize(scope)
credentials = Google::APIClient::ClientSecrets.load
@authorization = Signet::OAuth2::Client.new(
:audience => 'https://accounts.google.com/o/oauth2/token',
:issuer => "#{crendentials.client_id}@developer.gserviceaccount.com",
:redirect_uri => credentials.redirect_uris.first,
:scope => scope,
:signing_key => credentials.signing_key,
:token_credential_uri => credentials.token_credential_uri,
)
@authorization.fetch_access_token!
end
def authorize
return @authorization
end
end