ishapi 0.1.8.48 → 0.1.8.49

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7a1565479fe77bf8af6a6ccdabe841d09293a2ba
-  data.tar.gz: 24e055e8d547e06810ef02cc470b772e79652c96
+  metadata.gz: 4150d6b2bea1d24fb8807450e8de3f9409a1e287
+  data.tar.gz: ed08a8de201bc63e72230b412433af5e269e4e17
 SHA512:
-  metadata.gz: 0173d25969807aec031ef354f401630135b1f4629e40a4bc79f6afae68f8fa6a950ef67634af76ba0e04312962cc5c747f895f838249339473799b8993971b34
-  data.tar.gz: fd336bfa29f45eb6194cc244c052c673a03c9f828cd743e93264a7b8b151770af6010651459e654adfe781bf2453108c8cb7a94243ae974cb17826143462f6f5
+  metadata.gz: 76548b3670c85a03d849f47da26f721c43fae1615c5772c91fa7b73e537dbc5038642be5fa8676fd0157f8a77b5fc7d3d5847e0a9ddc405302317129ad7cad5f
+  data.tar.gz: 11d3bd31cbcb899dd9d8c1404dee941b925e8c43bc2350beae4fad4baea3edd68e5b5e77dce031f6ae0199d66b53f6b53c7051c9c381248d9f6f5c700de74eb5

data/app/controllers/ishapi/application_controller.rb

@@ -16,12 +16,14 @@ module Ishapi
       accessToken ||= params[:fb_long_access_token]
       accessToken ||= params[:accessToken] # if (params[:debug] == 'abba' && Rails.env.development?)
 
+      params[:domain] ||= '_default'
+
       if accessToken
         begin
           @graph            = Koala::Facebook::API.new( accessToken )
           @me               = @graph.get_object( 'me', :fields => 'email' )
           @user             = User.find_or_create_by :email => @me['email']
-          @oauth            = Koala::Facebook::OAuth.new( CO_TAILORS_FB_APP_ID, CO_TAILORS_FB_APP_SECRET )
+          @oauth            = Koala::Facebook::OAuth.new( FB[params['domain']][:app], FB[params['domain']][:secret] )
           @long_lived_token = get_long_token( accessToken )
 
           begin
@@ -47,7 +49,7 @@ module Ishapi
     
     def get_long_token accessToken
       url = "https://graph.facebook.com/oauth/access_token?grant_type=fb_exchange_token&" +
-            "client_id=#{FB_APP_ID}&client_secret=#{FB_APP_SECRET}&fb_exchange_token=#{accessToken}"
+            "client_id=#{FB[params['domain']][:app]}&client_secret=#{FB[params['domain']][:secret]}&fb_exchange_token=#{accessToken}"
       result = HTTParty.get url
       token  = JSON.parse result.body
       puts! token['access_token'], "long access token is"

data/app/controllers/ishapi/users_controller.rb

@@ -3,7 +3,7 @@ require_dependency "ishapi/application_controller"
 module Ishapi
   class UsersController < ApplicationController
 
-    before_action :set_profile, :only => [ :fb_sign_in ]
+    before_action :set_profile, :only => [ :fb_sign_in, :show ]
 
     def fb_sign_in
       authorize! :fb_sign_in, Ishapi

data/app/views/ishapi/users/show.jbuilder

@@ -3,9 +3,11 @@
 # ishapi / users / _show.jbuilder
 #
 
-json.email @user_profile.email
-json.about @user_profile.about
-json.lang  @user_profile.lang
+json.email                @user_profile.email
+json.about                @user_profile.about
+json.lang                 @user_profile.lang
+json.name                 @user_profile.name
+json.fb_long_access_token @long_lived_token
 
 if @user_profile.current_city
   json.current_city_id @user_profile.current_city_id.to_s

data/config/initializers/koala.rb

@@ -1,9 +1,15 @@
 
-# this is for... m3?
-
-FB_APP_ID     ||= '107960979836752'
-FB_APP_SECRET ||= '5d32afa4f281bcc28a8df092b1b081a9'
-
-# this is for... co tailors
-CO_TAILORS_FB_APP_ID     ||= '2005729719751456'
-CO_TAILORS_FB_APP_SECRET ||= '7650b1e11ef22318ff5fa33e06b322ee'
+FB = {
+  '_default' => {
+    :app => '',
+    :secret => ''
+  },
+  'travel-guide.mobi' => {
+    :app => '123014244977505',
+    :secret => 'd74e685795a9ef2427fd586fbca99335'
+  },
+  'colombia-tailors.com' => {
+    :app => '2005729719751456',
+    :secret => '7650b1e11ef22318ff5fa33e06b322ee'
+  }
+}

data/config/routes.rb

@@ -5,6 +5,9 @@ Ishapi::Engine.routes.draw do
   get 'cities',                :to => 'cities#index'
   get 'cities/view/:cityname', :to => 'cities#show'
 
+  namespace :co_tailors do
+  end
+
   get 'galleries',                   :to => 'galleries#index'
   get 'galleries/view/:galleryname', :to => 'galleries#show'
 
@@ -32,6 +35,9 @@ Ishapi::Engine.routes.draw do
 
   get 'tags/view/:tagname', :to => 'tags#show'
 
+  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'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ishapi
 version: !ruby/object:Gem::Version
-  version: 0.1.8.48
+  version: 0.1.8.49
 platform: ruby
 authors:
 - piousbox
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-21 00:00:00.000000000 Z
+date: 2017-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails