omniauth-geekpark 0.2.1 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a7243dc2c492c7a98d0950cc0900cfc2793a10de
-  data.tar.gz: 36a747bece1db45a3babea4d55dea936f17803b9
+  metadata.gz: 68ef9ed52f2beb5aaef7a219f08b0fb78e78e71d
+  data.tar.gz: ffe2ec5ac882ebad416d8d854e399ca7b3be2727
 SHA512:
-  metadata.gz: cecd4f0962dd5b233ae1278bf77e9199fd585d2f2c80e0bb49d4e88c3eb2845d9cf5ae5f13effdc039e3681f3d7083e96a27a8991dc04573982d93946a048eda
-  data.tar.gz: a8df5babd21c547f65a1617b877cb86f4d56955cf1f249021a54bfab7be7d833822e12d75a0ee4c85cac1ce54cd2b355f5cc1fcb7b5b540a7e978245871b4bd6
+  metadata.gz: bb3a4e60903eef221e8712ebccf046f26f6a31adee1dd473b0d84ba88abb72efd424a3fff202bd1c2da6bd69d23bfcea0b970d10f55cc0cce2d9590d7025cbab
+  data.tar.gz: bc6c385a26bd7ef5e8eb143fc9c48a4ba8a21699244fd1774d356727f4db08881d4badea25b9080e78dd1ee32f52922916e5b984fcdcb90366aea9d3a241c71a

data/README.md

@@ -21,3 +21,10 @@ use OmniAuth::Builder do
 end
 ```
 
+### Helper
+```
+class User < ActiveRecord::Base
+  include OmniAuth::GeekPark::Helper
+end
+```
+see more at code

data/lib/omniauth/strategies/geekpark.rb

@@ -2,29 +2,26 @@ module OmniAuth
   module Strategies
     class GeekPark < OmniAuth::Strategies::OAuth2
       option :client_options, {
-        site: 'http://www.geekpark.net',
-        authorize_url: 'http://www.geekpark.net/oauth/authorize',
-        token_url: 'http://www.geekpark.net/oauth/token'
+        site: 'https://account.geekpark.net',
+        authorize_url: '/oauth2/authorize',
+        token_url: '/oauth2/token'
       }
 
-      uid { raw_info['uuid'] }
+      uid { raw_info['id'] }
 
       info do
         {
-          username: raw_info['username'],
-          realname: raw_info['realname'],
-          email: raw_info['email'],
-          company: raw_info['company'],
-          position: raw_info['position'],
-          mobile: raw_info['mobile'],
-          avatar: raw_info['avatar'],
+          nickname: raw_info['nickname'],
+          gender: raw_info['gender'],
+          city: raw_info['city'],
           bio: raw_info['bio'],
-          mygeekpark_open_id: raw_info['mygeekpark_open_id'],
+          position: raw_info['position'],
+          avatar_url: raw_info['avatar_url']
         }
       end
 
       def raw_info
-        @raw_info ||= access_token.get('/api/v1/user').parsed || {}
+        @raw_info ||= access_token.get('/api/v1/user').parsed
       end
     end
   end

data/lib/omniauth-geekpark/helper.rb

@@ -0,0 +1,32 @@
+module OmniAuth
+  module GeekPark
+    module Helper
+      def token
+        token? ? super : refresh_token!
+      end
+
+      def token?
+        self[:token].present? && (Time.current < expires_at)
+      end
+
+      def refresh_token!
+        return unless refresh_token.present?
+
+        res = Faraday.post "https://account.geekpark.net/oauth2/token" do |req|
+          req.body = { grant_type: 'refresh_token',
+                       refresh_token: refresh_token,
+                       client_id: ENV['GEEKPARK_KEY'],
+                       client_secret: ENV['GEEKPARK_SECRET'] }
+        end
+
+        if res.status == 200
+          body = JSON.parse(res.body)
+          update(token: body["access_token"], expires_at: (Time.now + body['expires_in']), refresh_token: body['refresh_token'])
+          return body['access_token']
+        else
+          nil
+        end
+      end
+    end
+  end
+end

data/lib/omniauth-geekpark/version.rb

@@ -1,5 +1,5 @@
 module OmniAuth
   module GeekPark
-    VERSION = "0.2.1"
+    VERSION = '1.0.0'
   end
 end

data/lib/omniauth-geekpark.rb

@@ -1,4 +1,5 @@
 require 'omniauth-geekpark/version'
+require 'omniauth-geekpark/helper'
 require 'omniauth-oauth2'
 require 'patch/omniauth-oauth2'
 require 'omniauth/strategies/geekpark'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omniauth-geekpark
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 1.0.0
 platform: ruby
 authors:
 - HaoYunfei
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-05-13 00:00:00.000000000 Z
+date: 2016-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: omniauth
@@ -117,6 +117,7 @@ files:
 - bin/console
 - bin/setup
 - lib/omniauth-geekpark.rb
+- lib/omniauth-geekpark/helper.rb
 - lib/omniauth-geekpark/version.rb
 - lib/omniauth/strategies/geekpark.rb
 - lib/omniauth/strategies/wechat.rb