ishapi 0.1.8.57 → 0.1.8.58

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d8ddc797c8db2ef08884a2c2248e6a9ddd858ed8
-  data.tar.gz: 3f7268f8c4a699840def26da0496c31bf389381f
+  metadata.gz: 6c92b67c14e6c55592bdc128aa289ff60ed361b2
+  data.tar.gz: 735a14c7f9fa8f8d2b7b225fc55c7e91ab9da436
 SHA512:
-  metadata.gz: 466a89bd883ab52af7e980a1a5304b175443fc6acaeaaafedcf0e81f84b7494cffc5a7ac06b37ca6370f0a14d375ca2c826be89b28f98c09f6d37d89f3508e1a
-  data.tar.gz: d0b3089fa5012cced5d33181f3802360747f5752010e110aaab80de356fde717c8ed2f3283bc68a8c016c560326b90b7cd297ebc7d8c40ae6d3f8799bd1dc162
+  metadata.gz: d0ad0e81ca3aa3202f03c7fa80ffed7c6d94dd02fb8e4b16fc9276e6ff745faf0cc499390225cbe38d9204df2130344fb9000b4620f12fda7b2ec9d6212e79d7
+  data.tar.gz: af92344d2edc48c8e508599a6521e9b042a26dffcca5ef7b0f806a13ad7b582daa2e395243cba11c688a9ebf9358f6c34da3c63fea384cdb724401baada2c114

data/app/controllers/ishapi/addresses_controller.rb

@@ -0,0 +1,23 @@
+require_dependency "ishapi/application_controller"
+
+module Ishapi
+  class AddressesController < ApplicationController
+    before_action :check_profile, :only => [ :create ]
+
+    def create
+      if @current_profile.addresses.length == 0
+        @address = CoTailors::Address.new({ :profile_id => @current_profile.id })
+      else
+        @address = @current_profile.addresses[0]
+      end
+      authorize! :update, @address
+      flag = @address.update_attributes( params[:address].permit(:name, :phone, :address_1, :address_2, :city, :state, :zipcode ) )
+      if flag
+        render :json => { :status => :ok, :message => 'Successfully put an address.' }
+      else
+        render :json => { :status => :not_ok, :error => @address.errors.messages }
+      end
+    end
+
+  end
+end

data/app/controllers/ishapi/application_controller.rb

@@ -11,6 +11,19 @@ module Ishapi
     #
     private
 
+    # this doesn't generate long-lived token, doesn't update user_profile
+    def check_profile
+      accessToken   = request.headers[:accessToken]
+      accessToken ||= params[:fb_long_access_token]
+      accessToken ||= params[:accessToken] # if (params[:debug] == 'abba' && Rails.env.development?)
+      if accessToken
+        @graph            = Koala::Facebook::API.new( accessToken )
+        @me               = @graph.get_object( 'me', :fields => 'email' )
+        @current_user     = User.find_by :email => @me['email']
+        @current_profile  = @current_user.profile
+      end
+    end
+
     def set_profile
       accessToken   = request.headers[:accessToken]
       accessToken ||= params[:fb_long_access_token]
@@ -24,19 +37,23 @@ module Ishapi
           @me               = @graph.get_object( 'me', :fields => 'email' )
           @user             = User.find_or_create_by :email => @me['email']
           @oauth            = Koala::Facebook::OAuth.new( FB[params['domain']][:app], FB[params['domain']][:secret] )
-          @long_lived_token = get_long_token( accessToken )
+          get_token         = get_long_token( accessToken )
+          @long_lived_token = get_token['access_token']
 
           begin
             @profile = IshModels::UserProfile.find_by :email => @me['email']
             @profile.update_attributes({ :fb_access_token      => @long_lived_token,
-                                         :fb_long_access_token => @long_lived_token })
+                                         :fb_long_access_token => @long_lived_token,
+                                         :fb_expires_in        => get_token['expires_in']
+                                       })
           rescue Mongoid::Errors::DocumentNotFound
             @profile = IshModels::UserProfile.create :user => @user, :email => @me['email'],
-                                      :fb_access_token       => @long_lived_token,
-                                      :fb_long_access_token  => @long_lived_token,
-                                      :fb_id                 => params[:id],
-                                      :name                  => params[:name],
-                                      :signed_request        => params[:signedRequest]
+                                                     :fb_access_token       => @long_lived_token,
+                                                     :fb_long_access_token  => @long_lived_token,
+                                                     :fb_expires_in         => get_token['expires_in'],
+                                                     :fb_id                 => params[:id],
+                                                     :name                  => params[:name],
+                                                     :signed_request        => params[:signedRequest]
           end
           @current_user    = @user
           @current_profile = @profile
@@ -52,8 +69,7 @@ module Ishapi
             "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"
-      return token['access_token']
+      return token # ['access_token']
     end
 
     def set_current_ability

data/app/controllers/ishapi/users_controller.rb

@@ -2,16 +2,17 @@ require_dependency "ishapi/application_controller"
 
 module Ishapi
   class UsersController < ApplicationController
-
     before_action :set_profile, :only => [ :fb_sign_in, :show ]
 
     def fb_sign_in
       authorize! :fb_sign_in, Ishapi
-      render :json => { :status => :ok }
+      # render :json => { :status => :ok }
+      render :action => 'show'
     end
 
     def show
       authorize! :fb_sign_in, Ishapi
+=begin
       begin
         @graph        = Koala::Facebook::API.new( params[:accessToken] )
         me            = @graph.get_object( 'me', :fields => 'email' )
@@ -21,11 +22,12 @@ module Ishapi
         render :json => { :status => :not_ok, :errors => "Probably expired token." }
         return
       end
+=end
     end
 
+=begin
     def update
       authorize! :fb_sign_in, Ishapi
-
       begin
         @graph        = Koala::Facebook::API.new( params[:accessToken] )
         me            = @graph.get_object( 'me', :fields => 'email' )
@@ -37,13 +39,13 @@ module Ishapi
         flag = false
         @errors = "Probably expired token."
       end
-
       if flag
         render :json => { :status => :ok }
       else
         render :json => { :status => :not_ok, :errors => @errors }
       end
     end
+=end
 
   end
 end

data/app/models/ishapi/ability.rb

@@ -16,6 +16,12 @@ class Ishapi::Ability
       can [ :show ], Gallery do |gallery|
         gallery.user == user
       end
+
+
+      can [ :update ], CoTailors::Address do |address|
+        puts [ user.inspect, address.inspect ], '+++ user in cancancan'
+        true
+      end
       
     end
     #
@@ -24,6 +30,8 @@ class Ishapi::Ability
     user ||= User.new
 
     can [ :index, :show ], City
+
+    can [ :update ], CoTailors::Address
     
     can [ :index, :show ], Event
 

data/app/views/ishapi/addresses/_show.jbuilder

@@ -0,0 +1,12 @@
+
+# ishapi / addresses / _show
+
+json.address do
+  json.name      address.name
+  json.phone     address.phone
+  json.address_1 address.address_1
+  json.address_2 address.address_2
+  json.city      address.city
+  json.state     address.state
+  json.zipcode   address.zipcode
+end

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

@@ -3,13 +3,18 @@
 # ishapi / users / _show.jbuilder
 #
 
-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
-  json.current_city    @user_profile.current_city
+json.email                @current_profile.email
+json.about                @current_profile.about
+json.lang                 @current_profile.lang
+json.name                 @current_profile.name
+json.fb_long_access_token @current_profile.fb_long_access_token
+json.expires_in           @current_profile.fb_expires_in
+
+if @current_profile.current_city
+  json.current_city_id @current_profile.current_city_id.to_s
+  json.current_city    @current_profile.current_city
+end
+
+if @current_profile.addresses[0]
+  json.partial! 'ishapi/addresses/show', :address => @current_profile.addresses[0]
 end

data/config/initializers/koala.rb

@@ -1,8 +1,8 @@
 
 FB = {
   '_default' => {
-    :app => '',
-    :secret => ''
+    :app => 'trahs',
+    :secret => 'trhas'
   },
   'travel-guide.mobi' => {
     :app => '123014244977505',

data/config/routes.rb

@@ -2,6 +2,8 @@ Ishapi::Engine.routes.draw do
   root :to => 'api#home'
   post 'home', :to => 'api#home'
 
+  resources :addresses
+
   get 'cities',                :to => 'cities#index'
   get 'cities/view/:cityname', :to => 'cities#show'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ishapi
 version: !ruby/object:Gem::Version
-  version: 0.1.8.57
+  version: 0.1.8.58
 platform: ruby
 authors:
 - piousbox
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-02 00:00:00.000000000 Z
+date: 2018-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -166,6 +166,7 @@ files:
 - app/assets/stylesheets/ishapi/application.css
 - app/assets/stylesheets/ishapi/articles.css
 - app/assets/stylesheets/scaffold.css
+- app/controllers/ishapi/addresses_controller.rb
 - app/controllers/ishapi/api_controller.rb
 - app/controllers/ishapi/api_controller.rb~
 - app/controllers/ishapi/application_controller.rb
@@ -201,6 +202,7 @@ files:
 - app/models/ishapi/ability.rb~
 - app/models/ishapi/application_record.rb
 - app/models/ishapi/article.rb
+- app/views/ishapi/addresses/_show.jbuilder
 - app/views/ishapi/application/_meta.jbuilder
 - app/views/ishapi/application/_meta.jbuilder~
 - app/views/ishapi/articles/_form.html.erb