ishapi 0.1.8.46 → 0.1.8.47

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 170e73546c25909c2cbc434038b19099caa85525
-  data.tar.gz: 9e1088d6219ae9345a351603eb0c5e88cc97e8a2
+  metadata.gz: a20173c671af02b9594c0a9c2e7a99a91f8974fd
+  data.tar.gz: 48b52b9fd85cd05fa06a78555c222e0e415a8a77
 SHA512:
-  metadata.gz: fb0d57c1ba431351443fa1866675aa359423c8b3a37ae7217cb2effc956c11972889d550696337bd08fb3be9bbc7aacb856916cd22b0a4ba6f88e844d0b8cd72
-  data.tar.gz: ef07397eadcba06e9bb1b643942b3db2d37eff07cde4ba5a8bda2947396e251e9634e4e99e12bf574e73548d27c83d4b87f508954684b6cb1500c9ea18aeff4e
+  metadata.gz: 0fc840115817634f92f8d24cefff80a997253e52bea0aa6e11d88225c02750630b88bb8fec850f48d69a28f3a8070c8aba3b6b02ddab6c62c475ad25f9bf4764
+  data.tar.gz: '08b5d09c051b6a9ee6918b255c65d6ed3b4e1bf5c102e8591ad66d936c826da5def20326a3f582eebe664a5f832bd618cc058491f197e2b7d61815604dc94e2f'

data/app/controllers/ishapi/api_controller.rb

@@ -4,71 +4,10 @@ module Ishapi
   class ApiController < ApplicationController
 
     def home
-      puts! params, 'params'
-
+      authorize! :welcome_home, Ishapi
       render :json => { :status => :ok, :message => 'Ishapi::ApiController.home', 
                         :n_reports => Report.count, :n_cities => City.count }
-      authorize! :welcome_home, Ishapi
-    end
-
-=begin
-    before_action :set_article, only: [:show, :edit, :update, :destroy]
-
-    # GET /articles
-    def index
-      @articles = Article.all
-    end
-
-    # GET /articles/1
-    def show
-    end
-
-    # GET /articles/new
-    def new
-      @article = Article.new
-    end
-
-    # GET /articles/1/edit
-    def edit
-    end
-
-    # POST /articles
-    def create
-      @article = Article.new(article_params)
-
-      if @article.save
-        redirect_to @article, notice: 'Article was successfully created.'
-      else
-        render :new
-      end
-    end
-
-    # PATCH/PUT /articles/1
-    def update
-      if @article.update(article_params)
-        redirect_to @article, notice: 'Article was successfully updated.'
-      else
-        render :edit
-      end
-    end
-
-    # DELETE /articles/1
-    def destroy
-      @article.destroy
-      redirect_to articles_url, notice: 'Article was successfully destroyed.'
-    end
-
-    private
-    # Use callbacks to share common setup or constraints between actions.
-    def set_article
-      @article = Article.find(params[:id])
-    end
-
-    # Only allow a trusted parameter "white list" through.
-    def article_params
-      params.require(:article).permit(:title, :text)
     end
-=end
 
   end
 end

data/app/controllers/ishapi/application_controller.rb

@@ -6,8 +6,54 @@ module Ishapi
     check_authorization
     skip_before_action :verify_authenticity_token
 
+    #
+    # private
+    #
     private
 
+    def set_profile
+      accessToken   = request.headers[:accessToken]
+      accessToken ||= params[:fb_long_access_token]
+      accessToken ||= params[:accessToken] # if (params[:debug] == 'abba' && Rails.env.development?)
+
+      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 )
+          @long_lived_token = get_long_token( accessToken )
+
+          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 })
+          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]
+          end
+          @current_user    = @user
+          @current_profile = @profile
+        rescue Koala::Facebook::AuthenticationError => e
+          render :json => { :status => :not_ok, :errors => "Probably expired token: #{accessToken}" }
+          return
+        end
+      end
+    end
+    
+    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}"
+      result = HTTParty.get url
+      token  = JSON.parse result.body
+      puts! token['access_token'], "long access token is"
+      return token['access_token']
+    end
+
     def set_current_ability
       @current_ability ||= ::Ishapi::Ability.new( current_user )
     end

data/app/controllers/ishapi/users_controller.rb

@@ -3,32 +3,11 @@ require_dependency "ishapi/application_controller"
 module Ishapi
   class UsersController < ApplicationController
 
+    before_action :set_profile, :only => [ :fb_sign_in ]
+
     def fb_sign_in
       authorize! :fb_sign_in, Ishapi
-      params.permit!
-
-      access_token = params[:accessToken]
-      email        = params[:email]
-      name         = params[:name]
-      user         = User.where( :email => email ).first
-
-      u                 = IshModels::UserProfile.find_or_create_by :email => email
-      u.fb_access_token = access_token
-      u.name          ||= name
-      u.user          ||= user
-      u.email         ||= email
-      u.user          ||= User.create( :email => email, :password => (0..8).map { "#{rand(100)}" }.join("#{rand(100)}") )
-
-      auth                   = Koala::Facebook::OAuth.new
-      u.fb_long_access_token = auth.exchange_access_token access_token
-
-      puts! u, 'profile, here'
-
-      if u.save
-        render :json => { :status => :ok, :profile => u }
-      else
-        render :json => { :status => :not_ok, :errors => u.errors.messages }
-      end
+      render :json => { :status => :ok }
     end
 
     def show

data/config/initializers/koala.rb

@@ -0,0 +1,9 @@
+
+# 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'

data/config/routes.rb

@@ -1,6 +1,4 @@
-
 Ishapi::Engine.routes.draw do
-
   root :to => 'api#home'
   post 'home', :to => 'api#home'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ishapi
 version: !ruby/object:Gem::Version
-  version: 0.1.8.46
+  version: 0.1.8.47
 platform: ruby
 authors:
 - piousbox
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-14 00:00:00.000000000 Z
+date: 2017-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -252,6 +252,7 @@ files:
 - app/views/ishapi/videos/_show.jbuilder
 - app/views/ishapi/videos/_show.jbuilder~
 - app/views/layouts/ishapi/application.html.erb
+- config/initializers/koala.rb
 - config/routes.rb
 - lib/ishapi.rb
 - lib/ishapi/engine.rb