authorizme 0.0.2 → 0.0.3

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 0.0.3
+
+### Features & Enhancements
+
+* [#1][]: Add role methods to controller ([@artursbraucs][])
+* Add providers callback popup view with jquery support.
+
 ## 0.0.2
 
 ### Features & Enhancements

data/README.md

@@ -30,15 +30,42 @@ Then migrate your database `rake db:migrate`
 
 ### Getting started
 
+#### Authorization
+
 To authorize user with basic authorization, post email and password to `/authorizme/sessions`. (if you have another namespace, use `/{your_namespace}/sessions`)
 
 To authorize user with providers, use `/authorizme/login/{provider_name}`. Before that you MUST set your api keys and secrets to those providers in `config/initializers`
 
 To register user with basic authorization you can just save data to your user model and then call `login(user)` from your controller.
 
+#### Using roles
+
+Also you can set roles. Just add some roles in Role model and then set it to user. In controller you can use `before_filter` method `require_user` or `require_{role}` where `role` is your required role name. 
+
 ### Advanced usage
 
-You can implement your own provider. Create controller under model `Authorizme::Login` and extend `AuthorizmeController`. Then you must implement `auth` and `callback` methods, where `auth` is method which redirect user to provider and `callback` get data from provider callback data. Then you must add your provider namespace in authorizme config file in array `providers`. 
+#### Custom provider callback view
+
+By default providers use callback view which require JQuery and require `eventBus` in `window` dom element:
+
+```javascript
+<script type="text/javascript">
+  $(document).ready(function() {
+    window.close();
+    window.opener.eventBus.trigger("loginDone");
+    window.opener.focus();
+  });
+</script>
+```
+You can override this by creating new view: `views/authorizme/authorizme/popup.html.erb`.
+
+#### Custom providers
+
+You can implement your own provider: 
+
+1. Create controller under model `Authorizme::Login` and extend `AuthorizmeController`. 
+2. You must implement `auth` and `callback` methods, where `auth` is method which redirect user to provider and `callback` get data from provider callback data. 
+3. Then you must add your provider namespace in authorizme config file in array `providers`. 
 
 ## Development
 

data/app/controllers/authorizme/authorizme_controller.rb

@@ -16,6 +16,10 @@ module Authorizme
         end
       end
       
+      def render_popup_view
+        render "popup", :layout => "authorizme/layouts/popup"
+      end
+      
       def respond_with_status status_name, attributes = nil
         status = {status: status_name}
         status = status.merge(attributes) if attributes
@@ -24,13 +28,13 @@ module Authorizme
       
       def redirect_uri provider
         if Rails.env.development?
-          redirect_url = "http://localhost:3000/authorizme/login/#{provider}/callback.json"
+          "http://#{request.host}:#{request.port}/#{Authorizme::namespace}/login/#{provider}/callback"
         else
           "http://#{request.host}/#{Authorizme::namespace}/login/#{provider}/callback"
         end
       end
       
-      def request_synchronize user
+      def another_user_logged_in user
       end
   end
 end

data/app/controllers/authorizme/login/draugiem_controller.rb

@@ -14,9 +14,9 @@ module Authorizme
           attributes = {first_name: user_json["name"], last_name: user_json["surname"], image_url: user_json["img"]}
           user = User.authenticate_with_draugiem(json["uid"], attributes, json["apikey"]) 
           login user
-          respond_with_status "logged_in", user: user
+          render_popup_view
         else
-          respond_with_status "error_in_loggin"
+          render_popup_view
         end
       end
 

data/app/controllers/authorizme/login/facebook_controller.rb

@@ -15,7 +15,7 @@ module Authorizme
         attributes = {first_name: user_json.first_name, last_name: user_json.last_name, image_url: image_url}
         user = User.authenticate_with_facebook(user_json.id, attributes, access_token) 
         login user
-        respond_with_status "logged_in", user: user
+        render_popup_view
       end
       
       private

data/app/controllers/authorizme/login/twitter_controller.rb

@@ -12,14 +12,14 @@ module Authorizme
 
       def callback
         if params[:denied]
-          respond_with_status "error_in_logging"
+          render_popup_view
         else
           access_token = authorize_with_twitter params[:oauth_token], params[:oauth_verifier]
           twitter_user = Twitter.user
           attributes = {first_name: twitter_user.name, image_url: twitter_user.profile_image_url}
           user = User.authenticate_with_twitter(twitter_user.id, attributes, access_token.token, access_token.secret)
           login user
-          respond_with_status "logged_in", user: user
+          render_popup_view
         end
       end
 

data/app/controllers/authorizme/sessions_controller.rb

@@ -6,8 +6,7 @@ module Authorizme
       if user && user.authenticate(params[:password])
         login user
         if Authorizme::remote
-          status = {status: "logged_in", user: user}
-          respond_with status
+          respond_with_status "logged_in", {user: user}
         else
           redirect_to Authorizme::after_login_path
         end

data/app/views/authorizme/authorizme/popup.html.erb

@@ -0,0 +1,7 @@
+<script type="text/javascript">
+  $(document).ready(function() {
+    window.close();
+    window.opener.eventBus.trigger("loginDone");
+    window.opener.focus();
+  });
+</script>

data/app/views/authorizme/layouts/popup.html.erb

@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <title>Authorization completed</title>
+  <%= javascript_include_tag "jquery" %>
+  <%= csrf_meta_tags %>
+</head>
+<body>
+<%= yield %>
+</body>
+</html>

data/lib/authorizme/for_controllers.rb

@@ -18,23 +18,44 @@ module Authorizme
     
     def login user
       if current_user
-        request_synchronize user
+        another_user_logged_in user
       else
     	  session[:user_id] = user.id
     	end
     end
     
-    def require_user
+    def run_require_user
       unless current_user
-        if Authorizme::remote
-          status = {status: "not_logged_in"}
-          respond_with status
+        not_logged_in_status
+      end
+    end
+    
+    def method_missing(meth, *args, &block)
+      if meth.to_s =~ /^require_(.+)$/
+        if $1 == "user"
+          run_require_user
         else
-          redirect_to "/#{Authorizme::namespace}/"
+          run_require_role($1, *args, &block)
         end
+      else
+        super
+      end
+    end
+    
+    def run_require_role(role, *args, &block)
+      unless current_user && current_user.role.name == role
+        not_logged_in_status
       end
     end
     
+    def not_logged_in_status
+      if Authorizme::remote
+        status = {status: "not_logged_in"}
+        respond_with status
+      else
+        redirect_to "/#{Authorizme::namespace}/"
+      end
+    end
   end
 end
 

data/lib/authorizme/version.rb

@@ -1,3 +1,3 @@
 module Authorizme
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: authorizme
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-02 00:00:00.000000000 Z
+date: 2012-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70318637094620 !ruby/object:Gem::Requirement
+  requirement: &70223193870600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70318637094620
+  version_requirements: *70223193870600
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70318637094200 !ruby/object:Gem::Requirement
+  requirement: &70223193870000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70318637094200
+  version_requirements: *70223193870000
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: &70318637093780 !ruby/object:Gem::Requirement
+  requirement: &70223193869460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70318637093780
+  version_requirements: *70223193869460
 - !ruby/object:Gem::Dependency
   name: webrat
-  requirement: &70318637093360 !ruby/object:Gem::Requirement
+  requirement: &70223193868900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70318637093360
+  version_requirements: *70223193868900
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: &70318637092940 !ruby/object:Gem::Requirement
+  requirement: &70223193868400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70318637092940
+  version_requirements: *70223193868400
 - !ruby/object:Gem::Dependency
   name: factory_girl_rails
-  requirement: &70318635117920 !ruby/object:Gem::Requirement
+  requirement: &70223193867880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +77,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70318635117920
+  version_requirements: *70223193867880
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70318635112960 !ruby/object:Gem::Requirement
+  requirement: &70223193867340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +88,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70318635112960
+  version_requirements: *70223193867340
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70318635111500 !ruby/object:Gem::Requirement
+  requirement: &70223193866840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70318635111500
+  version_requirements: *70223193866840
 - !ruby/object:Gem::Dependency
   name: bcrypt-ruby
-  requirement: &70318647421440 !ruby/object:Gem::Requirement
+  requirement: &70223193866360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,10 +110,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70318647421440
+  version_requirements: *70223193866360
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70318647421020 !ruby/object:Gem::Requirement
+  requirement: &70223193865800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,10 +121,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70318647421020
+  version_requirements: *70223193865800
 - !ruby/object:Gem::Dependency
   name: twitter_oauth
-  requirement: &70318647420600 !ruby/object:Gem::Requirement
+  requirement: &70223193865140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -132,10 +132,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70318647420600
+  version_requirements: *70223193865140
 - !ruby/object:Gem::Dependency
   name: twitter
-  requirement: &70318647420180 !ruby/object:Gem::Requirement
+  requirement: &70223193864480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -143,10 +143,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70318647420180
+  version_requirements: *70223193864480
 - !ruby/object:Gem::Dependency
   name: oauth2
-  requirement: &70318647419760 !ruby/object:Gem::Requirement
+  requirement: &70223193863440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -154,10 +154,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70318647419760
+  version_requirements: *70223193863440
 - !ruby/object:Gem::Dependency
   name: fbgraph
-  requirement: &70318647419340 !ruby/object:Gem::Requirement
+  requirement: &70223193862900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -165,7 +165,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70318647419340
+  version_requirements: *70223193862900
 description: Authorization that includes basic authorization and 3 social authorization
   with Latvia social network draugiem.lv, facebook.com and twitter.com.
 email:
@@ -192,6 +192,8 @@ files:
 - app/models/authorizme/user_provider.rb
 - app/models/authorizme/user_role.rb
 - app/views/authorizme/authorizme/index.html.erb
+- app/views/authorizme/authorizme/popup.html.erb
+- app/views/authorizme/layouts/popup.html.erb
 - app/views/authorizme/users/new.html.erb
 - authorizme.gemspec
 - config/routes.rb