catarse_stripe 0.1.0 → 0.1.0.0.1

data/README.md

@@ -1,9 +1,11 @@
 ## The stripe_controller is a work in progress and things will be changing very rapidly. BEWARE!
-### Tests are non-funtional at this point and will be adjusted to Stripe soon!
+### Tests are non-functional at this point and will be adjusted to Stripe soon!
 
 # CatarseStripe
 
-Catarse Stripe integration with [Catarse](http://github.com/danielweinmann/catarse) crowdfunding platform
+Catarse Stripe integration with [Catarse](http://github.com/danielweinmann/catarse) crowdfunding platform. 
+
+So far, catarse_stripe uses Omniauth for an auth connection and to use Catarse as a Platform app. See the wiki on how to use Stripe-Connect.
 
 ## Installation
 
@@ -16,6 +18,11 @@ And then execute:
 
     $ bundle
 
+Install the database migrations
+
+    bundle exec rake catarse_stripe:install:migrations
+    bundle exec rake db:migrate
+    
 ## Usage
 
 Configure the routes for your Catarse application. Add the following lines in the routes file (config/routes.rb):
@@ -35,8 +42,76 @@ In Rails console, run this:
     Configuration.create!(name: "stripe_api_key", value: "API_KEY")
     Configuration.create!(name: "stripe_secret_key", value: "SECRET_KEY")
     Configuration.create!(name: "stripe_test", value: "TRUE/FALSE")
-
-    NOTE: Be sure to add the correct keys from the API section of your Stripe account settings. Stripe_Test: TRUE = Using Stripe Test Server/Sandbox Mode / FALSE = Using Stripe live server.  
+    
+If you've already created your application and been approved at Stripe.com add your Client_id  
+
+    Configuration.create!(name: "stripe_client_id", value: "STRIPE_CLIENT_ID")  
+
+NOTE: Be sure to add the correct keys from the API section of your Stripe account settings. Stripe_Test: TRUE = Using Stripe Test Server/Sandbox Mode / FALSE = Using Stripe live server.  
+
+### Authorization
+
+Users who will be creating projects can now create and connect a Stripe.com project payments account. This is the account that will receive funds for each project.  
+
+Just above the #password field and in the My_Data section, add the following in `app/views/users/_current_user_fields.html.slim`:  
+    
+    ...
+    #payment_gateways
+    h1= t('.payment_gateways')
+    ul
+      li
+        - if @user.stripe_key.blank?
+          = link_to( image_tag('auth/stripe_blue.png'), '/payment/stripe/auth')
+        - else
+          = image_tag 'auth/stripe-solid.png'
+          br
+          p= t('.stripe_key_info')
+          p= @user.stripe_key
+          br
+          p= t('.stripe_customer_info')
+          p= @user.stripe_userid
+          ...
+
+This will create a button in the User/settings tab to connect to the catarse_stripe auth and get a UserID, Secretkey and PublicKey for the User/Project Owner. 
+
+You'll then need to copy those keys to the matchin columns in the projects table.  You can do this automatically when a created project is loaded by adding this to the bottom of app/controllers/projects_controller.rb:  
+
+    def check_for_stripe_keys
+      if @project.stripe_userid.nil?
+        [:stripe_access_token, :stripe_key, :stripe_userid].each do |field|
+          @project.send("#{field.to_s}=", @project.user.send(field).dup)
+        end
+      elsif @project.stripe_userid != @project.user.stripe_userid
+        [:stripe_access_token, :stripe_key, :stripe_userid].each do |field|
+          @project.send("#{field.to_s}=", @project.user.send(field).dup)
+        end
+      end
+      @project.save
+    end  
+
+The insert `check_for_stripe_keys` in the :show method above 'show!'  like so:
+    
+    ...
+    check_for_stripe_keys
+
+      show!{
+        @title = @project.name
+        @rewards = @project.rewards.order(:minimum_value).all
+        @backers = @project.backers.confirmed.limit(12).order("confirmed_at DESC").all
+        fb_admins_add(@project.user.facebook_id) if @project.user.facebook_id
+        @update = @project.updates.where(:id => params[:update_id]).first if params[:update_id].present?
+      }
+     ...
+
+As well as in the :create method after the bitly section like so:  
+    
+    ...
+    unless @project.new_record?
+      @project.reload
+      @project.update_attributes({ short_url: bitly })
+    end
+    check_for_stripe_keys
+    ...
 
 ## Development environment setup
 

data/app/controllers/catarse_stripe/payment/application_controller.rb

@@ -0,0 +1,4 @@
+module CatarseStripe::Payment
+  class ApplicationController < ::ApplicationController
+  end
+end

data/app/controllers/catarse_stripe/payment/stripe_controller.rb

@@ -1,6 +1,7 @@
 require 'catarse_stripe/processors'
 require 'json'
 require 'stripe'
+require 'oauth2'
 
 module CatarseStripe::Payment
     class StripeController < ApplicationController
@@ -10,27 +11,45 @@ module CatarseStripe::Payment
     skip_before_filter :set_locale, :only => [:notifications, :connect]
     skip_before_filter :force_http
 
+    before_filter :setup_auth_gateway
+
     SCOPE = "projects.backers.checkout"
-    SCOPE = "users.projects"
+    AUTH_SCOPE = "users.auth"
 
     layout :false
 
-    #TODO add auth code - replace omniauth
-    def connect
-      @user = current_user
-
+    #Makes the call to @client.auth_code.authorize_url from auth.html.erg
+    def auth
+      @stripe_user = current_user
       respond_to do |format|
         format.html
         format.js
       end
     end
-    
-    #TODO add auth code - replace omniauth
-    #def auth
-      #if @user.stripe_key.present?
-        #render :text => "You have already connected a Stripe account. Your Stripe Key is #{@user.stripe_key}."
-      #end
-    #end
+
+    #Brings back the authcode from Stripe and makes another call to Stripe to convert to a authtoken
+    def callback
+      @stripe_user = current_user
+      code = params[:code]
+
+      @response = @client.auth_code.get_token(code, {
+      :headers => {'Authorization' => "Bearer(::Configuration['stripe_secret_key'])"} #Platform Secret Key
+      })
+      
+      #Save PROJECT owner's new keys
+      @stripe_user.stripe_access_token = @response.token
+      @stripe_user.stripe_key = @response.params['stripe_publishable_key']
+      @stripe_user.stripe_userid = @response.params['stripe_user_id']
+      @stripe_user.save
+
+      
+      return redirect_to payment_stripe_auth_path(@stripe_user)
+    rescue Stripe::AuthenticationError => e
+      ::Airbrake.notify({ :error_class => "Stripe #Pay Error", :error_message => "Stripe #Pay Error: #{e.inspect}", :parameters => params}) rescue nil
+      Rails.logger.info "-----> #{e.inspect}"
+      flash[:error] = e.message
+      return redirect_to main_app.user_path(@stripe_user)
+    end
 
     def review
     
@@ -66,7 +85,7 @@ module CatarseStripe::Payment
       ::Airbrake.notify({ :error_class => "Stripe Notification Error", :error_message => "Stripe Notification Error: #{e.inspect}", :parameters => params}) rescue nil
       render status: 404, nothing: true
     end
-
+    
     def charge
       @backer = current_user.backs.find params[:id]
       access_token = @backer.project.stripe_access_token #Project Owner SECRET KEY
@@ -95,7 +114,6 @@ module CatarseStripe::Payment
 
         response = Stripe::Charge.create(
           {
-          #card: token,
           customer: @backer.payment_token,
           amount: @backer.price_in_cents,
           currency: 'usd',
@@ -157,6 +175,16 @@ module CatarseStripe::Payment
     end
 
   private
+    #Setup the Oauth2 Stripe call with needed params - See initializers.stripe..rb..the Stripe keys are setup in the seed.db or added manually with a Configuration.create! call.
+    def setup_auth_gateway
+      session[:oauth] ||= {}
+
+      @client = OAuth2::Client.new((::Configuration['stripe_client_id']), (::Configuration['stripe_access_token']), {
+        :site => 'https://connect.stripe.com',
+        :authorize_url => '/oauth/authorize',
+        :token_url => '/oauth/token'
+      })
+    end
 
     def build_notification(backer, data)
       processor = CatarseStripe::Processors::Stripe.new
@@ -171,15 +199,12 @@ module CatarseStripe::Payment
       flash[:success] = t('success', scope: SCOPE)
     end
 
-    def setup_gateway
-      if ::Configuration[:stripe_api_key]# and ::Configuration[:stripe_secret_key]
-        @@gateway ||= ActiveMerchant::Billing::StripeGateway.new({
-          :login => ::Configuration[:stripe_api_key]
-          #:login => ::Configuration[:stripe_secret_key]
-        })
-      else
-        puts "[Stripe] API key is required to make requests to Stripe"
-      end
+    def stripe_auth_flash_error
+      flash[:failure] = t('stripe_error', scope: AUTH_SCOPE)
+    end
+
+    def stripe_auth_flash_success
+      flash[:success] = t('success', scope: AUTH_SCOPE)
     end
   end
 end

data/app/views/catarse_stripe/payment/stripe/auth.html.erb

@@ -0,0 +1,49 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>Stripe Connect</title>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <!-- Bootstrap -->
+    <link href="//netdna.bootstrapcdn.com/twitter-bootstrap/2.3.0/css/bootstrap-combined.min.css" rel="stylesheet">
+    <style>
+    body{background-color: #e5e5e5;}
+    div.container { position: relative;}
+    div.row { position: absolute; margin:30px 50px 50px 50px;}
+    div.stripe-field { 
+        position:absolute; 
+        left: 0; 
+        right: 0; 
+        margin-left: auto; 
+        margin-right: auto;
+        }
+    div.stripe-field .stripe-connect-btn { text-align: left;}
+    </style>
+  </head>
+  <body>
+	   <div class="container">
+		    <div class="row">
+		      <div class="span4">
+		        <div class="stripe-field">
+		          <h2>Stripe Connect</h2>
+                    <% if current_user.stripe_access_token %>
+                        <h4>STRIPE CONNECTED!</h4>
+                        <p> You are ready to receive payments for your projects!</p>
+                        <p>Your Stripe user ID: <%= current_user.stripe_userid %></p>
+                    <% else %>
+        		        <p> In order to use Stripe payments as your payment processor, you'll need to connect and create a Stripe account. You can do that easily through this Crowdfunding platform.</p>
+                        <p> If you don't have a Stripe account, you'll be prompted to create one</p>
+                        <p class="stripe-connect-btn">
+                            <a href="<%= @client.auth_code.authorize_url(:scope => 'read_write', :stripe_landing => 'register') %>">
+                                <img src="/assets/auth/stripe_blue.png">
+                            </a>
+                        </p>
+                    <% end %>
+                    <p><%= link_to "Back To User", main_app.user_path(@stripe_user), :class => "btn btn-primary" %></p>
+				</stripe-field>
+				<script src="http://code.jquery.com/jquery.js"></script>
+				<script src="//netdna.bootstrapcdn.com/twitter-bootstrap/2.3.0/js/bootstrap.min.js"></script>
+			    </div>
+		    </div>
+	   </div>
+  </body>
+</html>

data/catarse_stripe.gemspec

@@ -21,6 +21,7 @@ Gem::Specification.new do |s|
   s.add_dependency "stripe"
   s.add_dependency "omniauth-stripe-connect"
   s.add_dependency "stripe_event"
+  s.add_dependency "oauth2"
   s.add_dependency "figaro"
 
   s.add_development_dependency "rspec-rails"

data/config/initializers/stripe.rb

@@ -6,9 +6,9 @@ Rails.configuration.stripe = {
   :stripe_client_id => (::Configuration['stripe_client_id'])
 }
 
-#Stripe.api_key = Rails.configuration.stripe[:secret_key]
-#STRIPE_PUBLIC_KEY = Rails.configuration.stripe[:publishable_key]
-#STRIPE_CLIENT_ID = Rails.configuration.stripe[:stripe_client_id]
+Stripe.api_key = Rails.configuration.stripe[:secret_key]
+STRIPE_PUBLIC_KEY = Rails.configuration.stripe[:publishable_key]
+STRIPE_CLIENT_ID = Rails.configuration.stripe[:stripe_client_id]
 
 #Stripe.api_key = ENV['STRIPE_API_KEY'] #PROJECT secret
 #STRIPE_PUBLIC_KEY = ENV['STRIPE_PUBLIC_KEY'] #PROJECT publishable

data/config/locales/en.yml

@@ -11,4 +11,8 @@ en:
         stripe_cancel: "Your Stripe payment was canceled. Please try again."
         stripe_description: "Back project %{project_name} with %{value} (USD)"
         stripe_error: "Ooops. There was an error while sending your payment to Stripe. Please try again."
-        success: "Your back was successfully made. Thanks a lot!"
+        success: "Your back was successfully made. Thanks a lot!"
+  users:
+    auth:
+      stripe_error: "Ooops. There was an error while authorizing your user to Stripe. Please try again."
+      success: "Your Stripe acct is connected. Your are ready to accept payments!"

data/config/routes.rb

@@ -2,11 +2,12 @@ CatarseStripe::Engine.routes.draw do
   namespace :payment do
     get '/stripe/:id/review' => 'stripe#review', :as => 'review_stripe'
     post '/stripe/notifications' => 'stripe#ipn',  :as => 'ipn_stripe'
+    match '/stripe/callback'          => 'stripe#callback',       :as => 'stripe_auth_callback'
     match '/stripe/:id/notifications' => 'stripe#notifications',  :as => 'notifications_stripe'
     match '/stripe/:id/pay'           => 'stripe#pay',            :as => 'pay_stripe'
     match '/stripe/:id/success'       => 'stripe#success',        :as => 'success_stripe'
     match '/stripe/:id/cancel'        => 'stripe#cancel',         :as => 'cancel_stripe'
     match '/stripe/:id/charge'        => 'stripe#charge',         :as => 'charge_stripe'
-    match '/stripe/connect'        		=> 'stripe#connect',        :as => 'connect_stripe'
+    match '/stripe/auth'              => 'stripe#auth',           :as => 'stripe_auth'
   end
 end

data/lib/catarse_stripe/version.rb

@@ -1,3 +1,3 @@
 module CatarseStripe
-  VERSION = "0.1.0"
+  VERSION = "0.1.0.0.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: catarse_stripe
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.0.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-20 00:00:00.000000000 Z
+date: 2013-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -91,6 +91,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: oauth2
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: figaro
   requirement: !ruby/object:Gem::Requirement
@@ -169,15 +185,23 @@ files:
 - MIT-LICENSE
 - README.md
 - Rakefile
+- app/.DS_Store
+- app/assets/.DS_Store
+- app/assets/images/.DS_Store
+- app/assets/images/catarse_stripe/.DS_Store
 - app/assets/images/catarse_stripe/.gitkeep
+- app/assets/images/catarse_stripe/auth/stripe-outline.png
+- app/assets/images/catarse_stripe/auth/stripe_blue-2x.png
+- app/assets/images/catarse_stripe/auth/stripe_blue.png
 - app/assets/javascripts/.DS_Store
 - app/assets/javascripts/catarse_stripe.js
 - app/assets/javascripts/catarse_stripe/.DS_Store
 - app/assets/javascripts/catarse_stripe/stripe_form.js
 - app/assets/javascripts/catarse_stripe/user_document.js
+- app/controllers/catarse_stripe/payment/application_controller.rb
 - app/controllers/catarse_stripe/payment/stripe_controller.rb
+- app/views/catarse_stripe/payment/stripe/auth.html.erb
 - app/views/catarse_stripe/payment/stripe/charge.html.erb
-- app/views/catarse_stripe/payment/stripe/connect.html.slim
 - app/views/catarse_stripe/payment/stripe/review.html.slim
 - catarse_stripe.gemspec
 - config/initializers/register.rb

data/app/views/catarse_stripe/payment/stripe/connect.html.slim

@@ -1,29 +0,0 @@
-doctype
-html
-  head
-    title Stripe Payment
-    meta content="width=(device-width,)initial-scale=1.0" name="viewport"
-    /! Bootstrap
-    link href="//netdna.bootstrapcdn.com/twitter-bootstrap/2.3.0/css/bootstrap-combined.min.css" rel="stylesheet"
-    = javascript_include_tag "http://code.jquery.com/jquery.js"
-    = javascript_include_tag "//netdna.bootstrapcdn.com/twitter-bootstrap/2.3.0/js/bootstrap.min.js"
-    css:
-      | body{background-color: #e5e5e5;}
-      | div.container { position: relative;}
-      | div.row { position: absolute; margin:50px;}
-      | div.stripe-field {
-          | position:absolute;
-          | left: 0;
-          | right: 0;
-          | margin-left: auto;
-          | margin-right: auto;
-          | }
-  body
-    .container
-      .row
-        .span4
-          .stripe-field
-						h2 Stripe Connect
-						p In order to use Stripe payments as your processor, you'll need to connect and create a Stripe account. You can do that easily through the Crowdfunding platform. NOTE: To be PCI compliant and avoid credit card Aggregation you'll need to have a separate stripe account for each project you create.
-						br
-						= link_to(image_tag('/assets/auth/stripe_blue.png'), authorization_path(:stripe_connect))