metova 0.0.8 → 0.0.9

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YmVhYzhmMjZhNjQyNDFiMmRjZDFmODQ5ZjgyMjQ4MjRlNzBhZGQyYg==
+    YTRmMjlkYjFiZGIxNzU2M2FkNmY2NjM1MDM1MDQ0NDVkOTJhYzA1MA==
   data.tar.gz: !binary |-
-    NTIwZjZmNDUwODMyYjRlMjViOGUzNzYyYjdjMTEzYmNhM2QzYWRjNw==
+    OGFiMWRhYjhiMzU2NWJlYjMyZGMyNGE5Yjc1ZTFhOWMxNDhjNjE0Mw==
 SHA512:
   metadata.gz: !binary |-
-    NjFhMzk5NTI2MDA2MTFjYzBmZDM2OTA1YmRhZmQ5YjlkMmNiODk1ODM2ODM5
-    NDNlZGI0OGYxZTBlNGNjZWZjMTliMjYzNzIyY2RjY2M5YmU0YWJkM2MxYTUz
-    ZmM5Y2VmN2I0MjMxOTE4YmUxYTYxYjVlMjQwZDkyOTExMTYwZTU=
+    MzU1MjY2NjA2YzBlNGRmOWM3ZGUxZjM1NGFmMWU5MmRkOTg5MzI4YWEyOTA4
+    NTA4OGIyZmQxNzk2YTgzYjJkZmE3OTViNWI5ZGRjZTk3NWNiOTYwMGU2MDhi
+    N2YyYTJjYWM3MWY0YzYzNjI5OTMzNDIwODExMzU4Nzk4MmMxYTc=
   data.tar.gz: !binary |-
-    ZTRjODc0YjEwMDMwMGMyMjU0YTBhMjQ1ZWZkYWU1MGYzYWUwZTMzNTliZTc1
-    ODI0ZmIzNmEyYmQ2Y2Y0MTg5MGZiMmJkYmMzNzdkMWFkYjQ5OTU1NjVmNTYy
-    ZGNmNzU2MDNlOWQyYjI2NjQ4NTdlMDA1NjM0ZWJmNGJjNWVjNTc=
+    NzI0M2Q4NjEyNjgzMmYwM2M4YWI5YTc1MGFjZjhjOWU2NDA5YmE0NjZlOTAw
+    NTVjZjhkNDllYzkzZjdhNmQxNzBmMWViZTdkYWUzYjg2M2M4NjMzMGJhNGU5
+    MjJmOTI1NWIwOWM0MzQ0NjI0MWVlZWJlMmM1MzE1OWY4NTBkMjY=

data/app/controllers/metova/omniauth_callbacks_controller.rb

@@ -45,7 +45,9 @@ class Metova::OmniauthCallbacksController < ::Devise::OmniauthCallbacksControlle
     end
 
     def sign_up_user(auth, identity)
-      user = User.new email: auth.info.email, password: SecureRandom.hex
+      Rails.logger.info "Omniauth callback data: #{auth.to_h}"
+      user = User.find_or_initialize_by(email: auth.info.email) { |new_user| new_user.password = SecureRandom.hex }
+
       if user.save and identity.update(user: user)
         sign_in_and_redirect :user, identity.user
       else
@@ -58,11 +60,15 @@ class Metova::OmniauthCallbacksController < ::Devise::OmniauthCallbacksControlle
       redirect_to after_invalid_user_sign_up_path
     end
 
-    def redirect_with_notification(notification, path: main_app.root_path)
+    def redirect_with_notification(notification, path: after_successful_omniauth_path)
       redirect_to path, notice: notification
     end
 
     def after_invalid_user_sign_up_path
       main_app.new_user_registration_path
     end
+
+    def after_successful_omniauth_path
+      main_app.root_path
+    end
 end

data/app/models/metova/identity.rb

@@ -3,6 +3,7 @@ module Metova
     belongs_to :user, required: true
 
     validates :uid, :provider, presence: true
+    validates :uid, uniqueness: { scope: :provider }
 
     def self.find_or_initialize_with_omniauth(auth)
       find_or_initialize_by uid: auth.uid, provider: auth.provider

data/lib/metova/engine.rb

@@ -6,14 +6,5 @@ module Metova
     require 'devise'
     require 'responders'
 
-    # run engine migrations when running bin/rake db:migrate from the main app
-    initializer :append_migrations do |app|
-      unless app.root.to_s.match root.to_s
-        config.paths['db/migrate'].expanded.each do |expanded_path|
-          app.config.paths['db/migrate'] << expanded_path
-        end
-      end
-    end
-
   end
 end

data/lib/metova/oauth.rb

@@ -1,4 +1,6 @@
 require 'metova'
+require 'open-uri'
+
 require 'metova/oauth/generic_provider'
 require 'metova/oauth/facebook_provider'
 require 'metova/oauth/twitter_provider'

data/lib/metova/oauth/google_provider.rb

@@ -1,10 +1,27 @@
 module Metova
   module Oauth
     class GoogleProvider < GenericProvider
+      GOOGLE_API_URL = 'https://www.googleapis.com/plus/v1/people/me'
+      ME_URL = -> (token) { "#{GOOGLE_API_URL}/me?access_token=#{token}" }
 
       def authenticate
+        self.info = OmniAuth::AuthHash.new me
+        self.uid = info.id
+        self
       end
 
+      def provider
+        :google_oauth2
+      end
+
+      private
+        def me
+          super do
+            client = OAuth2
+            token = OAuth2::AccessToken.new
+            JSON.parse URI.parse(ME_URL[access_token]).read
+          end
+        end
     end
   end
 end

data/lib/metova/version.rb

@@ -1,3 +1,3 @@
 module Metova
-  VERSION = '0.0.8'
+  VERSION = '0.0.9'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metova
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Logan Serman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-28 00:00:00.000000000 Z
+date: 2015-09-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails