ishapi 0.1.8.112 → 0.1.8.113

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8cfba9842d285f46f58468cdadfe514a9e77531682fed68d123cafb0e8eb472b
-  data.tar.gz: 701523107e15d0d3e4fe42cb4b925b91c42d9ce1266d603836b5d58484d319aa
+  metadata.gz: d4637596e6a37543fa475080036de6cf6608819bdec649a8f532dbfd41d2cef9
+  data.tar.gz: cd7efda397b67a7aca5c8367aa5bd99868d9a125667ed00ad3bdaa6e341ece89
 SHA512:
-  metadata.gz: 88aeba09b1c07608e32d4ca772f750deea93313a646130dada9593d603a52685b647761dce4fd298952c3498b08cae1c223be4bf56ff0084b433364f31c30619
-  data.tar.gz: 9cfe824121c501a2f54baf591084b559767ac4319868573f8d9315672e2a4562a3ea92e591db001be23b74e174817307185f4e0d5618a2801124d62c133df3f3
+  metadata.gz: 0e09846934b8b8ef8e8313a8901eab92ffc3bb4e02c355da51c575f9b61a6118e28a2b6babf8e4963658988161ac33ab167b02bcad02014c71b9ba182e2ba55c
+  data.tar.gz: 2acd4ace8859d8a1b787f45fc58596330287e8d50391c766afd528fad03cc25243da82dcf0e7cb7d084aa9f439662261393d79e868ae3262c355abfaa933417c

data/app/controllers/ishapi/application_controller.rb

@@ -1,5 +1,7 @@
 module Ishapi
   class ApplicationController < ActionController::Base
+    after_action :append_long_term_token, except: [ :long_term_token, :test ]
+
     protect_from_forgery :prepend => true, :with => :exception
     layout :false
 
@@ -12,11 +14,36 @@ module Ishapi
     def test
     end
 
+    def long_term_token
+      authorize! :long_term_token, ::Ishapi
+
+      accessToken   = request.headers[:accessToken]
+      accessToken ||= params[:accessToken]
+
+      params['domain'] = 'tgm.piousbox.com'
+
+      response = HTTParty.get "https://graph.facebook.com/v5.0/oauth/access_token?grant_type=fb_exchange_token&" +
+        "client_id=#{FB[params['domain']][:app]}&client_secret=#{FB[params['domain']][:secret]}&" +
+        "fb_exchange_token=#{accessToken}"
+      j = JSON.parse response.body
+      @long_term_token = j['access_token']
+
+      render json: { long_term_token: @long_term_token }
+    end
+
     #
     # private
     #
     private
 
+    def append_long_term_token
+      puts! 'after action!', @long_term_token
+
+      if @long_term_token
+        response.body = JSON.parse(response.body).merge({ long_term_token: @long_term_token }).to_json
+      end
+    end
+
     def check_multiprofile provider = 'google'
       if 'google' == provider
         # client_secrets = ::Google::APIClient::ClientSecrets.load
@@ -30,25 +57,50 @@ module Ishapi
         @current_user = User.find_by email: decoded_token[0]['email']
         
       elsif 'facebook' == provider
+        # accessToken ||= params[:fb_long_access_token]
+
         accessToken   = request.headers[:accessToken]
-        accessToken ||= params[:fb_long_access_token]
         accessToken ||= params[:accessToken]
         if accessToken
+
+          #
+          # long-term token
+          #
+          params['domain'] = 'tgm.piousbox.com'
+          puts! accessToken, 'accessToken'
+          response = HTTParty.get "https://graph.facebook.com/v5.0/oauth/access_token?grant_type=fb_exchange_token&" +
+            "client_id=#{FB[params['domain']][:app]}&client_secret=#{FB[params['domain']][:secret]}&" +
+            "fb_exchange_token=#{accessToken}"
+          j = JSON.parse response.body
+          @long_term_token = j['access_token']
+
+
           @graph            = Koala::Facebook::API.new( accessToken )
           @me               = @graph.get_object( 'me', :fields => 'email' )
           @current_user     = User.where( :email => @me['email'] ).first
           @current_user   ||= User.create! email: @me['email'], password: SecureRandom.urlsafe_base64
-          
+
           @current_profile = @current_user.profile          
           if !@current_profile
+            begin
+              g = Gallery.find '5e1495e2d697f768ad0779eb'
+            rescue Mongoid::Errors::DocumentNotFound => e
+              g = Gallery.create id: '5e1495e2d697f768ad0779eb'
+            end
             @current_profile = IshModels::UserProfile.create user: @current_user, name: @me['email'], email: @me['email']
             test_newsitem = Newsitem.new gallery_id: '5e1495e2d697f768ad0779eb'
             @current_profile.newsitems << test_newsitem
             @current_profile.save
           end
+          @current_profile.update fb_long_access_token: @long_term_token
         else
           @current_user     = current_user  if Rails.env.test?
         end
+
+        puts! @current_user, 'current_user'
+        puts! @current_profile, 'current_profile'
+        # byebug
+
       end
 
       sign_in @current_user, scope: :user

data/app/models/ishapi/ability.rb

@@ -51,7 +51,7 @@ class Ishapi::Ability
       report.is_public
     end
     
-    can [ :welcome_home, :fb_sign_in, :open_permission ], Ishapi
+    can [ :fb_sign_in, :long_term_token, :open_permission, :welcome_home ], Ishapi
 
     can [ :index, :show ], Site
 

data/config/routes.rb

@@ -55,10 +55,11 @@ Ishapi::Engine.routes.draw do
   namespace :tgm do
   end
 
-  post 'users/fb_sign_in',     :to => 'users#fb_sign_in'
-  post 'users/profile',        :to => 'users#show'
-  post 'users/profile/update', :to => 'users#update'
-  get  'users/profile',        :to => 'users#show' # @TODO: only for testing! accessToken must be hidden
+  post  'users/fb_sign_in',     :to => 'users#fb_sign_in'
+  post  'users/profile',        :to => 'users#show'
+  post  'users/profile/update', :to => 'users#update'
+  get   'users/profile',        :to => 'users#show' # @TODO: only for testing! accessToken must be hidden
+  match 'users/long_term_token', to: 'application#long_term_token', via: [ :get, :post ]
 
   get 'venues', :to => 'venues#index'
   get 'venues/view/:venuename', :to => 'venues#show'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ishapi
 version: !ruby/object:Gem::Version
-  version: 0.1.8.112
+  version: 0.1.8.113
 platform: ruby
 authors:
 - piousbox
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-24 00:00:00.000000000 Z
+date: 2020-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails