omniauth-kakao 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5843bce85550aa42c87b0b3839b5eccf8e1284d2
-  data.tar.gz: f0ce72b76b8166e592698c428f0237d06a591498
+  metadata.gz: af773d971e3a8b86ac99c335e3658178694b47c7
+  data.tar.gz: 9af03cdf45f938068faf7ed4bd78e81186eedc7e
 SHA512:
-  metadata.gz: 01217d804f966f95b641204c085f4c6f9df42ef4fa113b47c1a502c0ad347e57bf1e4aa6be90931cd3a3ad6e5695da1f96ed53a6bc3766767feb4362f9877521
-  data.tar.gz: 8bf8ef15df823fa594b9950be673a58e9b8bf513ef722e814201c49cbc6785d17888e119999490f9babcbcc8958209d332a4f61401922413af6e3a4895ff4ba3
+  metadata.gz: 9540a11176807a5195f5d50e0e26849e6488c2f137cbc60cf69cc5feb3d4bdc1dc35556c963051fecc0cc87b217131af6476559e6d39d27d09e28817dc550475
+  data.tar.gz: d2fd6c6763a2bd52d1be736a0dba14e686622af0131a65695166b8f080af686d36cffa3b6f354d8c8196d909d329580bbd6222e760bc350200c464a978f2fcc1

data/README.md

@@ -29,6 +29,9 @@ Here's a quick example, adding the middleware to a Rails app in `config/initiali
 ```ruby
 Rails.application.config.middleware.use OmniAuth::Builder do
   provider :kakao, ENV['KAKAO_CLIENT_ID']
+
+  # 또는 Redirect Path를 설정하고 싶다면(or if you want to customize your Redirect Path)
+  # provider :kakao, ENV['KAKAO_CLIENT_ID'], {:redirect_path => ENV['REDIRECT_PATH']}
 end
 ```
 
@@ -52,6 +55,9 @@ You can test omniauth-kakao in the `example/` folder.
 cd example/
 bundle install
 KAKAO_CLIENT_ID='<your-kakako-client-id>' ruby app.rb
+
+# 또는 Redirect Path를 설정하고 싶다면(or if you want to customize your Redirect Path)
+# KAKAO_CLIENT_ID='<your-kakako-client-id>' REDIRECT_PATH='<your-redirect-path>' ruby app.rb
 ```
 
 Then open `http://localhost:4567/` in your browser.
@@ -92,6 +98,10 @@ Here's an example *Auth Hash* available in `request.env['omniauth.auth']`:
 }
 ```
 
+## Contributors
+* [Shayne Sung-Hee Kang](https://github.com/shaynekang)
+* [Hong Chulju](https://github.com/fegs)
+
 ## Contribute
 
 1. Fork the repository.

data/example/Gemfile

@@ -1,4 +1,5 @@
 source 'https://rubygems.org'
 
 gem 'sinatra', '~> 1.4.5'
+gem 'shotgun', '~> 0.9'
 gem 'omniauth-kakao', :path => '../'

data/example/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../
   specs:
-    omniauth-kakao (0.1.0)
+    omniauth-kakao (0.1.1)
       omniauth (~> 1.0)
       omniauth-oauth2 (~> 1.1)
 
@@ -10,28 +10,30 @@ GEM
   specs:
     faraday (0.9.0)
       multipart-post (>= 1.2, < 3)
-    hashie (2.1.1)
-    jwt (0.1.12)
-    multi_json (1.10.0)
+    hashie (3.3.1)
+    jwt (1.0.0)
+    multi_json (1.10.1)
     multi_xml (0.5.5)
     multipart-post (2.0.0)
-    oauth2 (0.9.3)
+    oauth2 (1.0.0)
       faraday (>= 0.8, < 0.10)
-      jwt (~> 0.1.8)
+      jwt (~> 1.0)
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (~> 1.2)
-    omniauth (1.2.1)
-      hashie (>= 1.2, < 3)
+    omniauth (1.2.2)
+      hashie (>= 1.2, < 4)
       rack (~> 1.0)
-    omniauth-oauth2 (1.1.2)
+    omniauth-oauth2 (1.2.0)
       faraday (>= 0.8, < 0.10)
       multi_json (~> 1.3)
-      oauth2 (~> 0.9.3)
+      oauth2 (~> 1.0)
       omniauth (~> 1.2)
     rack (1.5.2)
     rack-protection (1.5.3)
       rack
+    shotgun (0.9)
+      rack (>= 1.0)
     sinatra (1.4.5)
       rack (~> 1.4)
       rack-protection (~> 1.4)
@@ -43,4 +45,5 @@ PLATFORMS
 
 DEPENDENCIES
   omniauth-kakao!
+  shotgun (~> 0.9)
   sinatra (~> 1.4.5)

data/example/app.rb

@@ -8,10 +8,12 @@ if client_id == nil
   raise NoClientIDError, "KAKAO_CLIENT_ID is nil. Please run example like `KAKAO_CLIENT_ID='<your-kakako-client-id>' ruby app.rb`"
 end
 
+redirect_path = ENV['REDIRECT_PATH'] || OmniAuth::Strategies::Kakao::DEFAULT_REDIRECT_PATH
+
 use Rack::Session::Cookie
 
 use OmniAuth::Builder do
-  provider :kakao, client_id
+  provider :kakao, client_id, {:redirect_path => redirect_path}
 end
 
 helpers do
@@ -24,6 +26,10 @@ helpers do
   end
 end
 
+before do
+  @redirect_path = redirect_path
+end
+
 get '/' do
   erb :index
 end
@@ -86,6 +92,11 @@ __END__
         font-size: 0;
         color: transparent;
       }
+
+      #redirect-path {
+        text-align: right;
+        margin: 20px 0 0 0;
+      }
     </style>
   </head>
   <body>
@@ -99,6 +110,7 @@ __END__
 
             <div class="panel-body">
               <a href="/auth/kakao" class="btn-kakao">카카오 계정으로 로그인</a>
+              <p id="redirect-path"><small>Redirect Path: <%= @redirect_path %></small></p>
             </div>
           </div>
         </div>

data/lib/omniauth-kakao/version.rb

@@ -1,5 +1,5 @@
 module Omniauth
   module Kakao
-    VERSION = "0.1.1"
+    VERSION = "0.1.2"
   end
 end

data/lib/omniauth/strategies/kakao.rb

@@ -3,6 +3,8 @@ require 'omniauth-oauth2'
 module OmniAuth
   module Strategies
     class Kakao < OmniAuth::Strategies::OAuth2
+      DEFAULT_REDIRECT_PATH = "/oauth"
+
       option :name, 'kakao'
 
       option :client_options, {
@@ -26,7 +28,7 @@ module OmniAuth
 
       def initialize(app, *args, &block)
         super
-        options[:callback_path] = "/oauth"
+        options[:callback_path] = options[:redirect_path] || DEFAULT_REDIRECT_PATH
       end
 
       def callback_phase

data/spec/omniauth/strategies/kakao_spec.rb

@@ -10,12 +10,12 @@ describe OmniAuth::Strategies::Kakao do
     OmniAuth.config.logger.level = 5
   end
 
-  let(:middleware) do
+  def make_middleware(client_id, opts={})
     app = ->(env) { [200, env, "app"] }
 
-    middleware = OmniAuth::Strategies::Kakao.new(app)
+    middleware = OmniAuth::Strategies::Kakao.new(app, opts)
     middleware.tap do |middleware|
-      middleware.options.client_id = CLIENT_ID
+      middleware.options.client_id = client_id
     end
   end
 
@@ -29,6 +29,7 @@ describe OmniAuth::Strategies::Kakao do
   describe "GET /auth/kakao" do
     it "should redirect to authorize page" do
       request = make_request('/auth/kakao')
+      middleware = make_middleware(CLIENT_ID)
 
       code, env = middleware.call(request)
 
@@ -46,6 +47,27 @@ describe OmniAuth::Strategies::Kakao do
 
       actual_url.should == expect_url
     end
+
+    it "should customize redirect path" do
+      request = make_request('/auth/kakao')
+      middleware = make_middleware(CLIENT_ID, redirect_path: '/auth/kakao/callback')
+
+      code, env = middleware.call(request)
+
+      code.should == 302
+
+      expect_url = <<-EXPECT
+        https://kauth.kakao.com/oauth/authorize
+          ?client_id=#{CLIENT_ID}
+          &redirect_uri=http://#{SERVER_NAME}/auth/kakao/callback
+          &response_type=code
+        EXPECT
+        .gsub(/(\n|\t|\s)/, '')
+
+      actual_url = URI.decode(env['Location'].split("&state")[0])
+
+      actual_url.should == expect_url
+    end
   end
 
   describe "GET /oauth" do
@@ -93,6 +115,8 @@ describe OmniAuth::Strategies::Kakao do
         },
       })
 
+      middleware = make_middleware(CLIENT_ID)
+
       code, env = middleware.call(request)
 
       code.should == 200
@@ -133,6 +157,7 @@ describe OmniAuth::Strategies::Kakao do
     describe "GET /auth/kakao" do
       it "should redirect to callback url (/auth/kakao/callback)" do
         request = make_request("/auth/kakao")
+        middleware = make_middleware(CLIENT_ID)
         code, env = middleware.call(request)
 
         code.should == 302
@@ -145,6 +170,7 @@ describe OmniAuth::Strategies::Kakao do
     describe "GET /auth/kakao/callback" do
       it "should request registered mock" do
         request = make_request("/auth/kakao/callback")
+        middleware = make_middleware(CLIENT_ID)
         code, env = middleware.call(request)
 
         code.should == 200

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-kakao
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Shayne Sung-Hee Kang