ishapi 0.1.8.84 → 0.1.8.85

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 580afca9946792fc16b0e740aeebe5e668ab4475
-  data.tar.gz: b1dbcf23e708cbd6e9ed6239ca08c358cf3e675e
+SHA256:
+  metadata.gz: e7df53ccd0fa042a10f88a685837f32b05b6b16be632aefc0c3037ce6f8cee41
+  data.tar.gz: 2878e809162d18cb96e9dac69f9cba6051158530bda65e8b134c8873e6ab2037
 SHA512:
-  metadata.gz: 679fea13081466918b96a8e5766d124f99fc212a97c68f16e6d024f6fc945bab89466fea8e75fab0f25edcd1f21225944e98cd6cbe365a7ec34220730d2f3c3c
-  data.tar.gz: 15724413ffc4b8b4fc878dde5c28740536f871999c39125607fab5a34557b1417cd454fa3c39ff6f59ce789a3391906b485892387a249764d2a5bcd0882d340c
+  metadata.gz: 17ae7286eccc72a13b70a52e97139801f9c8bdb97d5d3ab285ae23ec98e641c1dd866eb7e84332690146ca73038b24f4313df0bbc6aeee2c111abebb0965ec69
+  data.tar.gz: 67c346985d52c486a41b2a40734d7e401bf5e58e5204f28ef2997effca0c1e92bd98bba7fc696e1cb1a6f07eb9a13d73a16283f46f54d0366c2a714af7957ad6

data/app/controllers/ishapi/application_controller.rb

@@ -3,19 +3,43 @@ module Ishapi
     protect_from_forgery :prepend => true, :with => :exception
     layout :false
 
-    before_action :check_profile
-    before_action :set_current_ability
+    before_action :check_profile, except: [ :test ]
+    # before_action :set_current_ability
     
     check_authorization
     skip_before_action :verify_authenticity_token
 
+    def test
+    end
+
     #
     # private
     #
     private
 
+    def check_multiprofile provider = 'google'
+      if provider == 'google'
+        # client_secrets = ::Google::APIClient::ClientSecrets.load
+        # accessToken = params[:accessToken]
+        # authorization = ::Google::Auth.get_application_default
+        # result = authorization.apply({ accessToken: params[:accessToken] })
+        # puts! result, 'googleauth result'
+
+        decoded_token = JWT.decode params[:idToken], nil, false
+        
+        @current_user = User.find_by email: decoded_token[0]['email']
+        # puts! @current_user.email, 'multiprofile'
+        
+        sign_in @current_user, scope: :user
+        set_current_ability
+      end
+    end
+
     # this doesn't generate long-lived token, doesn't update user_profile
+    # this is only for facebook?
     def check_profile
+      return check_multiprofile 'google'
+
       # puts! params, 'params'
       # puts! current_user, 'current_user'
       # puts! @current_user, '@current_user'
@@ -92,7 +116,7 @@ module Ishapi
     end
 
     def set_current_ability
-      puts! @current_user, '@current_user 111'
+      puts! current_user.email, '#set_current_ability() :: @current_user'
       @current_ability ||= ::Ishapi::Ability.new( @current_user )
     end
 

data/app/controllers/ishapi/galleries_controller.rb

@@ -15,6 +15,7 @@ module Ishapi
         @galleries = @galleries.where( :site => @site )
       end
       @galleries = @galleries.page( params[:galleries_page] ).per( 10 )
+      byebug
     end
 
     def show

data/app/controllers/ishapi/newsitems_controller.rb

@@ -3,12 +3,18 @@ require_dependency "ishapi/application_controller"
 module Ishapi
   class NewsitemsController < ApplicationController
 
+    before_action :check_profile # , except: [ :index ] # @TODO: this is fucked
+    # before_action :check_multiprofile, only: [ :index ]
+
     def index
       if params[:domain]
         resource = Site.find_by( :domain => params[:domain], :lang => :en )
+      else
+        resource = current_user.profile
       end
+
       authorize! :show, resource
-      @newsitems = resource.newsitems.page( params[:newsitems_page] ).per( resource.newsitems_per_page )
+      @newsitems = current_user.profile.newsitems
     end
 
   end

data/app/models/ishapi/ability.rb

@@ -22,12 +22,16 @@ class Ishapi::Ability
         true
       end
 
+
+
     end
     #
     # anonymous user
     #
     user ||= User.new
 
+    can [ :show ], IshModels::UserProfile
+
     can [ :index, :show ], City
 
     can [ :update ], ::CoTailors::Address

data/config/routes.rb

@@ -27,6 +27,7 @@ Ishapi::Engine.routes.draw do
   namespace :my do
     post 'reports', :to => 'reports#index'
     get  'reports', :to => 'reports#index'
+    get 'newsitems', to: 'newsitems#index'
 
     # resources :reports
     # resources :galleries
@@ -48,7 +49,8 @@ Ishapi::Engine.routes.draw do
   get 'sites/view/:domain/tags',                       :to => 'tags#index',      :constraints => { :domain => /[^\/]+/ }
 
   get 'tags/view/:tagname', :to => 'tags#show'
-
+  get 'test', to: 'application#test'
+  
   namespace :tgm do
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ishapi
 version: !ruby/object:Gem::Version
-  version: 0.1.8.84
+  version: 0.1.8.85
 platform: ruby
 authors:
 - piousbox
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-10 00:00:00.000000000 Z
+date: 2019-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -94,6 +94,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: googleauth
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.8.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.8.0
 - !ruby/object:Gem::Dependency
   name: fb_graph
   requirement: !ruby/object:Gem::Requirement
@@ -281,7 +295,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: Summary of Ishapi.