user_mgmt 0.0.616 → 0.0.621

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cf8aea6d8a403bce7e8739c4e3d4c1ff3a53e253
-  data.tar.gz: 2ef0ff5bdbf86d84feebc46c7a45cde1bc245869
+  metadata.gz: 324e6866dcf4b2a821153210dd52a4811ef41c28
+  data.tar.gz: b4dbde104f1b03f9e2a04f86905f5d31e9c36b28
 SHA512:
-  metadata.gz: 2556f800f3a9617c4743e26ebdf3d1f38ea0e621db9bb2dd8c2af693aa7a034b20200cc68cb0c61e8fd9dd4fd55e9922437d413c9bdc9bb5889f902db66d2e39
-  data.tar.gz: 7f7a4ee513e77fb500ef7ad31cf68edaeef9435168e49dca10e89e41eb87fb2619cd18d9c48370f6f527a4b742d9a24f4ff97884f7f534585ed4832e0c4c2651
+  metadata.gz: ba0a73a307eede6a4c5e03699d80090f4d0555214cafe7cf29c1ee60760f96812e30a32bc58a49bca7792578c8d0a952a4907bdd31f0c47e84f77ddc89d333d7
+  data.tar.gz: 0d98c1d696c599ca19e738de67d3cf02cc58f8811858a62e8513e8a70bcc8256493d1d87737f32e1da2f1eb7256a68c5f33dd7b8cb243a957b147d0c03f67205

data/README.md

@@ -16,11 +16,19 @@ Then you have to run the generator:
 
     rails generate user_mgmt:install
 
-This generator will install an initializer which describes all the gem's configuration options and you must take a look at it.
+This generator will install an initializer which describes all the gem's configuration options and you must take a look at it. 
 
 ## Usage
 
-TODO: Write usage instructions here
+The gem includes some views (with their respective controllers) that are gonna be used by many distinct apps. 
+
+In order to use the gem's views, you have to refer to them by:
+
+	user_mgmt.<route path>
+
+Which can be "log_in_path", "sign_up_path" and "log_out_path" (more to be added in the future), e.g:
+
+	user_mgmt.log_in_path
 
 ## Contributing
 

data/app/controllers/user_mgmt/sessions_controller.rb

@@ -25,14 +25,25 @@ module UserMgmt
     end
 
     # GET 'auth/:provider/callback'
+    # That is the controller method that is called after getting the information from an oauth strategy
     def oauth_email
 
         @uid = env['omniauth.auth']["uid"]
         @provider= env['omniauth.auth']["provider"]
-            
+
+        if @provider == "google_oauth2"
+            @provider = "google"
+        end
+        
+        if @provider == "windowslive"
+            @provider = "windows_live"
+        end
+
         response = log_in_oauth @uid, @provider
         
-        # if user logged in succesfully, just redirect to main page
+        # if user logged in succesfully, just redirect to main page,
+        # otherwise it means the user doesn't exist yet, so continue 
+        # normaly (user will be asked for his email).
         if response[:status] == "200"
             session[:user_session_id] = response[:body]["session"]
             redirect_to main_app.root_path, notice: "User logged in!"
@@ -43,8 +54,13 @@ module UserMgmt
     # POST '/oauth_log_in'
     def create_oauth
 
-        sign_up_oauth params["uid"], params["provider"].to_sym, params["user"]["Email"] 
-        
+        response = sign_up_oauth params["uid"], params["provider"].to_sym, params["user"]["Email"] 
+
+        #if for some reason, the user couldn't be created
+        if response[:status] == "400"
+            redirect_to sign_up_path, notice: response[:body]
+        end
+
         response = log_in_oauth params["uid"], params["provider"].to_sym
 
         session[:user_session_id] = response[:body]["session"]

data/app/helpers/user_mgmt/application_helper.rb

@@ -5,9 +5,5 @@ module UserMgmt
 		session[:user_session_id] != nil
 	end
 
-	def router_name
-		UserMgmt.router_name
-	end
-
   end
 end

data/app/views/user_mgmt/registrations/new.html.haml

@@ -5,6 +5,14 @@
     = submit_tag 'submit', :class => "btn btn-large btn-primary"
     %ul.unstyled 
       %li 
-      = link_to "Sign up with Facebook", "auth/facebook" 
+      = link_to "Log in with Facebook", "auth/facebook" 
       %li 
-      = link_to "Sign up with Twitter", "auth/twitter"
+      = link_to "Log in with Twitter", "auth/twitter" 
+      %li 
+      = link_to "Log in with Outlook", "auth/windowslive" 
+      %li 
+      = link_to "Log in with LinkedIn", "auth/linkedin" 
+      %li 
+      = link_to "Log in with Yahoo", "auth/yahoo" 
+      %li 
+      = link_to "Log in with GMail", "auth/google_oauth2" 

data/app/views/user_mgmt/sessions/new.html.haml

@@ -23,7 +23,7 @@
       %li 
       = link_to "Log in with Yahoo", "auth/yahoo" 
       %li 
-      = link_to "Log in with GMail", "auth/google" 
+      = link_to "Log in with GMail", "auth/google_oauth2" 
 
 
 

data/lib/generators/templates/user_mgmt.rb

@@ -6,11 +6,6 @@ UserMgmt.setup do |config|
   # authentication won't be possible to happen
   config.external_database_URI = "http://localhost:3000/"
 
-  # Namespace router name. It is gonna appear in front of every route that the gem generates.
-  # If you change this name, you are gonna have to change it as well in your app's routes file:
-  # 	  mount UserMgmt::Engine => "/new_name"
-  config.router_name = "user/"
-
 end
 
 # Edit your strategy keys:
@@ -21,6 +16,18 @@ ENV['TWITTER_SECRET'] = ""
 ENV['FACEBOOK_KEY'] = ""
 ENV['FACEBOOK_SECRET'] = ""
 
+ENV['LINKEDIN_KEY'] = ""
+ENV['LINKEDIN_SECRET'] = ""
+
+ENV['WINDOWSLIVE_KEY'] = ""
+ENV['WINDOWSLIVE_SECRET'] = ""
+
+ENV['YAHOO_KEY'] = ""
+ENV['YAHOO_SECRET'] = ""
+
+ENV['GOOGLE_KEY'] = ""
+ENV['GOOGLE_SECRET'] = ""
+
 # The code below include the view helpers from user_mgmt in the main app.
 # NOTE: Do not change this code.
 ActiveSupport.on_load :action_controller do

data/lib/user_mgmt.rb

@@ -8,9 +8,6 @@ module UserMgmt
 	mattr_accessor :external_database_URI
 	@@external_database_URI = "http://localhost:3000/"
 
-	# Namespace router name. It is gonna appear in front of every route that the gem generates.
-	mattr_accessor :router_name
-	@@router_name = "user/"
 
 	# Default way to setup UserMgmt. Run rails generate user_mgmt:install to create
 	# a fresh initializer with all configuration values.

data/lib/user_mgmt/engine.rb

@@ -4,6 +4,11 @@ module UserMgmt
   require 'omniauth'
   require 'omniauth-facebook'
   require 'omniauth-twitter'
+  require 'omniauth-linkedin'
+  require 'omniauth-windowslive'
+  require 'omniauth-yahoo'
+  require "omniauth-google-oauth2"
+
 
   class Engine < ::Rails::Engine
     isolate_namespace UserMgmt
@@ -13,7 +18,11 @@ module UserMgmt
 	    # provider :developer unless Rails.env.production?
 	    provider :twitter, ENV['TWITTER_KEY'], ENV['TWITTER_SECRET']
 	    provider :facebook, ENV['FACEBOOK_KEY'], ENV['FACEBOOK_SECRET']
-	  end
+      provider :linkedin, ENV['LINKEDIN_KEY'], ENV['LINKEDIN_SECRET'], :scope => 'r_fullprofile r_emailaddress r_network'
+      provider :windowslive, ENV['WINDOWSLIVE_KEY'], ENV['WINDOWSLIVE_SECRET'], :scope => 'wl.basic'
+      provider :yahoo, ENV['YAHOO_KEY'], ENV['YAHOO_SECRET']
+      provider :google_oauth2, ENV["GOOGLE_KEY"], ENV["GOOGLE_SECRET"]
+    end
 
   end
 end

data/lib/user_mgmt/version.rb

@@ -1,3 +1,3 @@
 module UserMgmt
-  VERSION = "0.0.616"
+  VERSION = "0.0.621"
 end

data/test/dummy/app/views/simulate/index.html.haml

@@ -1,7 +1,4 @@
 %h1 Main Page
-=#debug(session[:user_session_id])
-=#debug(session[:user_session_id] != nil)
-=#debug(user_logged_in)
 %br
 - if user_logged_in
   Logged In 

data/test/dummy/config/initializers/user_mgmt.rb

@@ -6,20 +6,27 @@ UserMgmt.setup do |config|
   # authentication won't be possible to happen
   config.external_database_URI = "http://localhost:3001/"
 
-	# Namespace router name. It is gonna appear in front of every route that the gem generates.
-	# If you change this name, you are gonna have to change it as well in your app's routes file:
-	# 	  mount UserMgmt::Engine => "/new_name"
-	config.router_name = "user/"
-
 end
 
 # Edit your strategy keys:
 
-ENV['TWITTER_KEY'] = "p2tqOCLha3wQ8SlmnEauQ"
-ENV['TWITTER_SECRET'] = "vXt7buZBCP0kzSCgGNowPsq9pYAe1InJFHxbixwXOl0"
+ENV['TWITTER_KEY'] = "Xt05nTQGt0QFWbA8FYr1w"
+ENV['TWITTER_SECRET'] = "IYmjtwCNQbDimyeahBj8vCG31gtIrZvQeUAN9X3JIc"
+
+ENV['FACEBOOK_KEY'] = "498728433547179"
+ENV['FACEBOOK_SECRET'] = "ed896033a2f8ecee03fc8be363f47fb6"
+
+ENV['LINKEDIN_KEY'] = "bjqh7h7mnj3f"
+ENV['LINKEDIN_SECRET'] = "wbmOCFf1wvT750m6"
+
+ENV['WINDOWSLIVE_KEY'] = "000000004810271E"
+ENV['WINDOWSLIVE_SECRET'] = "NE7NeuwHYF7OE1Z1huNYJjzOjWhlK7k0"
+
+ENV['YAHOO_KEY'] = "dj0yJmk9NWRNbGFSY1o5ajh0JmQ9WVdrOU5YSmFZbGMzTjJVbWNHbzlNVE13TmpBNU1qSTJNZy0tJnM9Y29uc3VtZXJzZWNyZXQmeD1hYg--"
+ENV['YAHOO_SECRET'] = "56f9a0feb52885a985f01b1f13bd58fc73537096"
 
-ENV['FACEBOOK_KEY'] = "1400267933525151"
-ENV['FACEBOOK_SECRET'] = "1c05cbc4f36271de5b5e1e2ab450f927"
+ENV['GOOGLE_KEY'] = "402445378839.apps.googleusercontent.com"
+ENV['GOOGLE_SECRET'] = "HCjws5JLjaRy79uVHH4ji1kT"
 
 # The code below include the view helpers from user_mgmt in the main app.
 # NOTE: Do not change this code.

data/user_mgmt.gemspec

@@ -14,15 +14,11 @@ Gem::Specification.new do |s|
   s.homepage    = "https://github.com/Methos2013/user_mgmt_gem"
   s.license     = "MIT"
 
-#  s.files = Dir["{app,config,db,lib}/**/*", "MIT-LICENSE", "Rakefile", "README.md","user_mgmt.gemspec"]
- # s.test_files = Dir["test/**/*"]
-
   s.files         = `git ls-files`.split($/) - `git ls-files -d`.split($/)
   s.executables   = s.files.grep(%r{^bin/}) { |f| File.basename(f) }
   s.test_files    = s.files.grep(%r{^(test|s|features)/})
   s.require_paths = ["lib"]
 
- # s.add_dependency "rails", "~> 4.0.0"
   s.add_development_dependency "sqlite3"
 
   s.add_development_dependency "rspec"
@@ -31,6 +27,8 @@ Gem::Specification.new do |s|
   s.add_development_dependency "bundler", "~> 1.3"
   
   s.add_runtime_dependency "rails"
+  # For some reason that I coudn't figure out, I get an error if I dont add 'haml' as a development dependency as well as a runtime dependecy.
+  s.add_development_dependency "haml"
   s.add_runtime_dependency "haml"
   s.add_runtime_dependency "haml-rails"
   s.add_runtime_dependency 'sass-rails'#, '~> 3.2'
@@ -41,6 +39,6 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'omniauth-linkedin'
   s.add_runtime_dependency 'omniauth-windowslive'
   s.add_runtime_dependency 'omniauth-yahoo'
-  s.add_runtime_dependency 'omniauth-google'
+  s.add_runtime_dependency "omniauth-google-oauth2"
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: user_mgmt
 version: !ruby/object:Gem::Version
-  version: 0.0.616
+  version: 0.0.621
 platform: ruby
 authors:
 - Danilo Faria, Fernando Gorodscy, Josh Leslie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-01 00:00:00.000000000 Z
+date: 2013-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3
@@ -94,6 +94,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: haml
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: haml
   requirement: !ruby/object:Gem::Requirement
@@ -235,7 +249,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: omniauth-google
+  name: omniauth-google-oauth2
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='