familysearch2 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4ad5e548141b7a6d73584b857c504c88c3feb072
-  data.tar.gz: b7cf54907a88b008e5a272842e8fb67cceea837a
+  metadata.gz: e5e3a8f176f23c64328144548fd125e888f02a31
+  data.tar.gz: e7667eda6b3479a5f3d5b4f24b2bdf1bebcf9f19
 SHA512:
-  metadata.gz: fa0414c36da79554166eb3cd0cadb228311a806d8365f75c93bec596a24a70a33aa657931fdaead90384519e0a3e472a03593712331dfbb0bb0650f3394f9c80
-  data.tar.gz: 34be9a7abff86e6f9cb8791f2724c0424f4a47d1b39fb9c09a2f3154810c5edf8a12320cecfdb5c303a1181a7c8fbb254b4548bbb747e2828be3ddee7f8805e6
+  metadata.gz: d24317d59d145938f267d45ff3aee83102a9a61cc163145011a33f82c94512842bff0a5a398d3a7f4dd2c3c50b479788f9932dfeec9b7648d7e78e557aa2a252
+  data.tar.gz: da1877d1f1c73d8451fd151112aae458410a99e101e81136469154c640da205457aac292356dc67597d9833fe60b2fe5b09b18fdfde83f97911737e689a1e502

data/Gemfile.lock

@@ -4,16 +4,29 @@ PATH
     familysearch2 (0.1.0)
       faraday
       json
+      oauth
+      rest-client
 
 GEM
   remote: http://rubygems.org/
   specs:
     diff-lcs (1.2.5)
+    domain_name (0.5.24)
+      unf (>= 0.0.5, < 1.0.0)
     faraday (0.9.1)
       multipart-post (>= 1.2, < 3)
+    http-cookie (1.0.2)
+      domain_name (~> 0.5)
     json (1.8.3)
+    mime-types (2.6.1)
     multipart-post (2.0.0)
+    netrc (0.10.3)
+    oauth (0.4.7)
     rake (10.4.2)
+    rest-client (2.0.0.rc1)
+      http-cookie (>= 1.0.2, < 2.0)
+      mime-types (>= 1.16, < 3.0)
+      netrc (~> 0.8)
     rspec (3.3.0)
       rspec-core (~> 3.3.0)
       rspec-expectations (~> 3.3.0)
@@ -27,6 +40,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.3.0)
     rspec-support (3.3.0)
+    unf (0.2.0.beta2)
 
 PLATFORMS
   ruby

data/api_library

@@ -0,0 +1,21 @@
+discussions => https://sandbox.familysearch.org/platform/discussions/discussions
+user-collections => https://sandbox.familysearch.org/platform/sources/collections
+current-user => https://sandbox.familysearch.org/platform/users/current
+child-and-parents-relationships => https://sandbox.familysearch.org/platform/tree/child-and-parents-relationships
+authorities => https://integration.familysearch.org/authorities
+reservation => https://integration.familysearch.org/reservation
+memories => https://sandbox.familysearch.org/platform/memories/memories
+fs-identity-v2-login => https://integration.familysearch.org/identity/v2/login
+http://oauth.net/core/2.0/endpoint/token => https://integration.familysearch.org/cis-web/oauth2/v3/token
+http://oauth.net/core/2.0/endpoint/authorize => https://integration.familysearch.org/cis-web/oauth2/v3/authorization
+redirect => https://sandbox.familysearch.org/platform/redirect
+relationships => https://sandbox.familysearch.org/platform/tree/relationships
+registration => https://integration.familysearch.org/cis-web/pages/registration/registration.html
+pending-modifications => https://sandbox.familysearch.org/platform/pending-modifications
+persons => https://sandbox.familysearch.org/platform/tree/persons
+fs-identity-v2-permission => https://integration.familysearch.org/identity/v2/permission
+fs-identity-v2-logout => https://integration.familysearch.org/identity/v2/logout
+couple-relationships => https://sandbox.familysearch.org/platform/tree/couple-relationships
+source-descriptions => https://sandbox.familysearch.org/platform/sources/descriptions
+current-user-person => https://sandbox.familysearch.org/platform/tree/current-person
+fs-identity-v2-session => https://integration.familysearch.org/identity/v2/session

data/familysearch2.gemspec

@@ -22,6 +22,8 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'json'
   spec.add_dependency 'faraday'
+  spec.add_dependency 'rest-client'
+  spec.add_dependency 'oauth'
 
   spec.add_development_dependency 'rspec'
   spec.add_development_dependency "bundler", "~> 1.10"

data/lib/familysearch2/version.rb

@@ -1,3 +1,3 @@
 module Familysearch2git
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/lib/familysearch2.rb

@@ -1,19 +1,26 @@
 require 'json'
 require 'faraday'
+require 'time'
+require 'cgi'
 
 module Familyseach2
+
   class Client
 
     def initialize(params = {})
-      @access_token = params[:access_token] # if options[:access_token]
       @logger = params[:logger]
       @key = params[:key]
       @base_url = get_base_url(params[:environment])
       @agent = Faraday.new(@base_url) do |faraday|
         faraday.headers['Accept'] = 'application/x-fs-v1+json,application/x-gedcomx-atom+json,application/json'
-        faraday.authorization('Bearer',@access_token) if @access_token
         faraday.adapter  Faraday.default_adapter  # make requests with Net::HTTP
       end
+      get_access_token(params[:username],params[:password],params[:environment])
+      @agent
+    end
+
+    def get_agent
+      @agent
     end
 
     def get_base_url(env)
@@ -24,32 +31,72 @@ module Familyseach2
       base_url
     end
 
-    def basic_auth(username,password,key=nil)
-      self.search
-      @key ||= key if key
-      @agent.basic_auth username, password
-      @parsed_discovery = JSON.parse(@discovery)
-      response = @agent.get @parsed_discovery['links']['fs-identity-v2-login']['href'], :dataFormat => 'application/json', :key => @key
-      puts response.inspect
-      @access_token = JSON.parse(response.body)['authentication']
+    def get_access_token(username,password,env)
+      meta
+      url =  JSON.parse(@discovery)['links']['fs-identity-v2-login']['href']
+      @client_id = "a02j0000007rtRiAAI"
+      RestClient::Resource.new url, username, password
+
+      request_url = get_base_url(env) + "/identity/v2/request_token"
+
+      time = Time.now.utc.to_i.to_s
+
+      request_response = ""
+      begin
+        request_response = RestClient. get "#{request_url}?oauth_consumer_key=#{@client_id}&oauth_signature_method=PLAINTEXT&oauth_signature=%26&oauth_timestamp=#{time}&oauth_nonce=123456789"
+      rescue => e
+        puts e
+      end
+
+      access_token = JSON.parse(CGI::parse(request_response).to_json)['oauth_token']
+      @access_token = access_token.to_s.sub!('["', '')[0...-2]
       @agent.authorization('Bearer',@access_token)
-      return true
     end
 
-    def search
-      @discovery ||= get_search
+    # gets the url in api-library
+    def get_url(call)
+      lines = []
+      url = ""
+      File.open("api_library", "r").each_line do |line|
+        lines << line
+      end
+
+      lines.each do |x|
+        line = x.split("=>")
+        url = line[1].strip if line[0].strip == call
+      end
+      url
     end
 
-    def connection
-      @connection = Faraday.new(url: @base_url) do |faraday|
-        faraday.request  :url_encoded             # form-encode POST params
-        faraday.response :logger                  # log requests to STDOUT
-        faraday.adapter  Faraday.default_adapter  # make requests with Net::HTTP
+    def update_library
+      link_names = []
+      name_hrefs = []
+
+      # get links
+      parsed_links = JSON.parse(@discovery)['links']
+      parsed_links.each do |x|
+        link_names  << x.to_s.split(' ')[0].sub!('["', '')[0...-2]
+      end
+
+      # get hrefs
+      link_names.each do |x|
+        temp = JSON.parse(@discovery)['links'][x]['href']
+        if temp.to_s != ""
+          name_hrefs << ("#{x} => #{temp}")
+        end
       end
+
+      File.open('api_library', "w+") do |f|
+        name_hrefs.each { |element| f.puts(element) }
+      end
+    end
+
+    def meta
+      @discovery ||= get_meta
     end
 
     private
-    def get_search
+    def get_meta
       result = @agent.get('/.well-known/app-meta')
       result.body
     end

data/test.rb

@@ -1,5 +1,17 @@
+require 'rest-client'
+require 'oauth'
+
 require File.expand_path(File.dirname(__FILE__) + '/lib/familysearch2')
 
-client = Familyseach2::Client.new(environment: "production")
-client.basic_auth('','')
+@client = Familyseach2::Client.new(username: "", password: "", environment: "sandbox")
+@client.update_library
+
+agent = @client.get_agent
+
+response = agent.get '/platform/users/current'
+puts response.body
+# RestClient.get "https://sandbox.familysearch.org/platform/users/current", {:Authorization => "Bearer #{@access_token}"}
+
+
+
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: familysearch2
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - kinezu
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-07-11 00:00:00.000000000 Z
+date: 2015-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -38,6 +38,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rest-client
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: oauth
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -97,6 +125,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- api_library
 - bin/console
 - bin/setup
 - familysearch2.gemspec