crusade_rails 0.8.0 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1758a05336f3d5d9c4b170811ddb6ab87a12cccf
-  data.tar.gz: 3a303c0367f99bf7ec1ced5188f7022b9fc1d171
+  metadata.gz: ad05870d665a99388112114ae45317f7291ada9a
+  data.tar.gz: 3c53eef9f8f498ed58f8c8f3bafc9e46e5eacc9e
 SHA512:
-  metadata.gz: c69c513d634b54a466de60fb9a4afbc5a9a21ff8f4debca5e3d0c662786dc4ef1f7fc5789daa87dd39697bba6157c9f7af61b883cc29c98837acc7ccf84fd639
-  data.tar.gz: f1f7fbf9ab9aa59fede370fb27537c5c82f31edd606b38e58b9bcef04f7b8143c7912ca44cd922500fa5a63c7aa62064fccd39113f8e409fdceb312bba017ce0
+  metadata.gz: 56317ffd6dbd24928a25d99d892371bb51f8f713978a6d7bf06e9f120b0d3c5da33062bf41d7247949ca91574e524fb0068524e26fe0836bacb946875487faed
+  data.tar.gz: c77868abdc4bb2f840fe733ca027a88e0875a23eddf97a3d4f91b31aab31d0593936ce984a2e2f1996815466280fbc5587395f9648eaf6d154e3465a7357130b

data/app/assets/javascripts/crusade_rails/abstract_notification.js.coffee

@@ -0,0 +1,38 @@
+window.Crusade ||= {}
+
+class @Crusade.AbstractNotification
+
+  requestPermission: ->
+    promise = $.Deferred((defer) =>
+      permission = @checkPermission()
+
+      @resolve(permission, defer)
+
+    ).promise()
+
+    promise.granted = promise.done
+    promise.denied  = promise.fail
+
+    promise
+
+  checkPermission: ->
+    return @browserUnsupportedPermission() unless @isBrowserSupported()
+
+    @currentPermission()
+
+  wrapPermission: (safariPermission) ->
+    new Crusade.NotificationPermission safariPermission
+
+  resolve: (permission, defer) ->
+    switch permission.permission
+      when 'granted'          then defer.resolve(permission)
+      when 'unauthenticated'  then defer.reject(permission)
+      when 'denied'           then defer.reject(permission)
+      when 'unsupported'      then defer.reject(permission)
+      when 'default'
+        @requestNewPemission().
+          done((permission) -> defer.resolve(permission)).
+          fail((permission) -> defer.reject(permission))
+
+  browserUnsupportedPermission: ->
+    {permission: 'unsupported'}

data/app/assets/javascripts/crusade_rails/configuration.js.coffee.erb

@@ -1,4 +1,5 @@
+window.Crusade ||= {}
 
-window.crusade =
+window.Crusade.configuration =
   pushId:        '<%= Rails.application.config.crusade.apns.push_id %>'
   webserviceUrl: '<%= Rails.application.config.crusade.apns.webservice_url %>'

data/app/assets/javascripts/crusade_rails/local_notification.js.coffee

@@ -0,0 +1,23 @@
+
+class Crusade.LocalNotification extends Crusade.AbstractNotification
+
+  requestNewPemission: ->
+    $.Deferred((defer) =>
+      window.Notification.requestPermission (permission) =>
+        @resolve(@wrapPermission(permission: permission), defer)
+    ).promise().done((permission) ->
+      permission
+    ).fail((permission) ->
+      permission
+    )
+
+  currentPermission: ->
+    @wrapPermission { permission: window.Notification.permission }
+
+  notify: (title, body) ->
+    return 'unauthorized' unless @currentPermission().permission == 'granted'
+
+    new Notification(title, {body: body})
+
+  isBrowserSupported: ->
+    !! window.Notification

data/app/assets/javascripts/crusade_rails/notification_permission.js.coffee

@@ -1,4 +1,6 @@
-class @NotificationPermission
+window.Crusade ||= {}
+
+class @Crusade.NotificationPermission
 
   constructor: (safariPermission) ->
     safariPermission = defaultPermission() unless safariPermission

data/app/assets/javascripts/crusade_rails/push_notification.coffee

@@ -0,0 +1,42 @@
+window.Crusade ||= {}
+
+class @Crusade.PushNotification extends Crusade.AbstractNotification
+
+  requestNewPemission: ->
+    $.Deferred((defer) =>
+      forgeryProtection = @authenticityRequest()
+
+      return @resolve(forgeryProtection, defer) if forgeryProtection.permission == 'unauthenticated'
+
+      window.safari.pushNotification.requestPermission(
+        window.Crusade.configuration.webserviceUrl
+        window.Crusade.configuration.pushId
+        { user_id: String(forgeryProtection.user_id), authenticity_token: forgeryProtection.authenticity_token }
+        (safariPermission) =>
+          permission = @wrapPermission safariPermission
+
+          @resolve(permission, defer)
+      )
+    ).promise()
+
+  currentPermission: ->
+    @wrapPermission window.safari.pushNotification.permission(window.Crusade.configuration.pushId)
+
+  authenticityRequest: ->
+    response = $.ajax({
+      url: "#{window.Crusade.configuration.webserviceUrl}/v1/pushPackages/#{window.Crusade.configuration.pushId}/new"
+      dataType: 'json'
+      method: 'get'
+      async: false})
+
+    return @wrapPermission(permission: 'unauthenticated') unless @isRequestSuccesful(response)
+
+    response.responseJSON.user_subscription
+
+  isRequestSuccesful: (response) ->
+      response.status >= 200 &&
+      response.status < 300  &&
+      response.responseJSON.user_subscription
+
+  isBrowserSupported: ->
+    !! window.safari && !! window.safari.pushNotification

data/app/controllers/crusade_rails/apns/v1/push_package_controller.rb

@@ -2,21 +2,52 @@ module CrusadeRails
   module Apns
     module V1
       class PushPackageController < CrusadeRails::ApplicationController
-        skip_before_action :verify_authenticity_token
+        protect_from_forgery except: :create
 
         def create
+          unless user_subscription_service.authenticate authenticity_token
+            render status: 401, nothing: true
+            return
+          end
+
           generator = Crusade::APNS::PushPackageGenerator.new Rails.application.config.crusade.apns
-          user_id = json['user']
 
           Rails.logger.debug "requesting push package for user #{user_id}"
           user_token, push_package = generator.generate(user_id)
 
           Rails.logger.debug "registering push package #{user_id} - #{user_token}"
-          CrusadeRails::UserSubscriptionService.new.register user_id, user_token
+          subscription = user_subscription_service.register authenticity_token, user_token
 
           Rails.logger.debug "Generation done. sending the file"
           send_data File.read(push_package), type: 'application/zip'
         end
+
+        def new
+          user_id = crusade_config.user_id_block.call(self)
+          Rails.logger.debug "generating a new user subscription for user #{user_id}"
+
+          subscription = CrusadeRails::UserSubscriptionService.new(user_id).new_subscription
+
+          render status: 201, json: { user_subscription: { user_id: user_id, authenticity_token: subscription.authenticity_token } }
+        end
+
+        private
+
+        def crusade_config
+          Rails.application.config.crusade
+        end
+
+        def authenticity_token
+          json['authenticity_token']
+        end
+
+        def user_id
+          json['user_id']
+        end
+
+        def user_subscription_service
+          @service ||= CrusadeRails::UserSubscriptionService.new(user_id)
+        end
       end
     end
   end

data/app/controllers/crusade_rails/apns/v1/subscription_controller.rb

@@ -29,7 +29,11 @@ module CrusadeRails
         end
 
         def user_service
-          @service ||= CrusadeRails::UserSubscriptionService.new
+          @service ||= CrusadeRails::UserSubscriptionService.new crusade_config.user_id_block.call(self)
+        end
+
+        def crusade_config
+          Rails.application.config.crusade
         end
       end
     end

data/app/controllers/crusade_rails/application_controller.rb

@@ -4,11 +4,11 @@ module CrusadeRails
     protected
 
     def body
-      request.body.read
+      @body ||= request.body.read
     end
 
     def json
-      JSON.parse body
+      @json_body ||= JSON.parse body
     end
   end
 end

data/app/services/crusade_rails/user_subscription_service.rb

@@ -1,10 +1,30 @@
+require 'securerandom'
+
 module CrusadeRails
   class UserSubscriptionService
-    def register user_id, user_token
-      subscription = CrusadeRails::UserSubscription.new({
-        user_token: user_token,
-        user_id: user_id
-      })
+    attr_reader :user_id
+
+    def initialize(user_id = nil)
+      self.user_id = Integer user_id
+
+      raise ArgumentError unless user_id
+    end
+
+    def new_subscription
+      subscription = UserSubscription.where(user_id: user_id).last ||
+                     create_user_subscription
+
+      subscription.authenticity_token = generate_authenticity_token
+
+      subscription.save # do something if the save fails
+      subscription
+    end
+
+    def register authenticity_token, user_token
+      subscription = UserSubscription.where(user_id: user_id, authenticity_token: authenticity_token).first
+      return :unauthenticated unless subscription
+
+      subscription.update_attributes user_token: user_token
       subscription.save
     end
 
@@ -25,12 +45,26 @@ module CrusadeRails
       subscription.save
     end
 
+    def authenticate authenticity_token
+      UserSubscription.where(user_id: user_id, authenticity_token: authenticity_token).any?
+    end
+
     private
 
-    attr_accessor :user_id
+    attr_writer :user_id
 
     def find_subscription_by_user_token(user_token)
-      CrusadeRails::UserSubscription.where(user_token: user_token).first
+      UserSubscription.where(user_token: user_token).first
+    end
+
+    def generate_authenticity_token
+      SecureRandom.base64(100)
+    end
+
+    def create_user_subscription
+      subscription = UserSubscription.new({
+       user_id: user_id
+      })
     end
   end
 end

data/config/routes.rb

@@ -5,6 +5,8 @@ CrusadeRails::Engine.routes.draw do
       namespace "v1" do
         post "pushPackages/#{Rails.application.config.crusade.apns.push_id}", 
               to: "push_package#create", as: "apns_push_package"
+        get "pushPackages/#{Rails.application.config.crusade.apns.push_id}/new", 
+              to: "push_package#new", as: "apns_push_package_authorization"
 
         post   "/devices/:device_token/registrations/#{Rails.application.config.crusade.apns.push_id}",
                 to: "subscription#create", as: "apns_push_registration"

data/db/migrate/20130917203302_create_crusade_rails_user_subscriptions.rb

@@ -2,6 +2,7 @@ class CreateCrusadeRailsUserSubscriptions < ActiveRecord::Migration
   def change
     create_table :crusade_rails_user_subscriptions do |t|
       t.integer :user_id
+      t.string  :authenticity_token
       t.string  :user_token
       t.string  :device_token
       t.boolean :active

data/lib/crusade_rails.rb

@@ -1,4 +1,5 @@
 require "crusade_rails/engine"
+require "crusade_rails/configuration"
 
 module CrusadeRails
 end

data/lib/crusade_rails/configuration.rb

@@ -0,0 +1,45 @@
+
+module CrusadeRails
+  def self.config &block
+    c = ConfigurationWrapper.config &block
+    Rails.application.config.crusade = c
+  end
+
+  private
+
+  class ConfigurationWrapper
+    attr_accessor :user_id_block
+
+    def initialize
+      self.crusade = Crusade::Configuration.new
+    end
+
+    def plugins= plugins
+      crusade.plugins = Array(plugins).inject({}) do |memo, plugin|
+        memo.update plugin => File.join(Rails.root, 'config', "crusade-#{plugin}.yml")
+      end
+    end
+
+    def self.config &block
+      config = new
+      yield config
+      config
+    end
+
+    def method_missing(m, *args, &block)
+      if crusade.respond_to? m
+        crusade.send m, *args, &block
+      else
+        super
+      end
+    end
+
+    def respond_to? method
+      super || crusade.respond_to?(method)
+    end
+
+    private
+
+    attr_accessor :crusade
+  end
+end

data/lib/crusade_rails/version.rb

@@ -1,3 +1,3 @@
 module CrusadeRails
-  VERSION = "0.8.0"
+  VERSION = "0.8.2"
 end

data/lib/generators/crusade/install/templates/initializer.rb

@@ -1,6 +1,6 @@
-Crusade.config do |config|
+CrusadeRails.config do |config|
   config.env = Rails.env
-  config.plugins = { apns: "#{Rails.root}/config/crusade-apns.yml" }
+  config.plugins = []
 
-  Rails.application.config.crusade = config
+  config.user_id_block = -> { |controller| 1 }
 end

data/test/controllers/apns/v1/push_package_controller_test.rb

@@ -1,16 +1,19 @@
 require 'test_helper'
 
 describe CrusadeRails::Apns::V1::PushPackageController do
+  let(:service) { stub_everything(:user_service) }
+  let(:user_id)   { 10 }
+  let(:authenticity_token) { 'aaaaa'}
 
-  before { @routes = CrusadeRails::Engine.routes }
+  before do
+    @routes = CrusadeRails::Engine.routes
+    CrusadeRails::UserSubscriptionService.stubs(:new).with(user_id).returns(service)
+  end
 
   describe "create action" do
     let(:temp_file) { '/tmp/text.txt' }
-    let(:user_id)   { 10 }
     let(:user_token) { '123zz' }
 
-    let(:service) { stub_everything(:user_service) }
-
     before do
       File.stubs(:read).with(temp_file).returns('test data')
 
@@ -18,9 +21,9 @@ describe CrusadeRails::Apns::V1::PushPackageController do
       generator.stubs(:generate).with(user_id).returns [user_token, temp_file]
       Crusade::APNS::PushPackageGenerator.stubs(:new).returns generator
 
-      CrusadeRails::UserSubscriptionService.stubs(:new).returns(service)
+      service.stubs(:authenticate).returns(true)
 
-      request.env['RAW_POST_DATA'] = { user: user_id }.to_json
+      request.env['RAW_POST_DATA'] = { user_id: user_id, authenticity_token: authenticity_token }.to_json
 
       post :create, :format => :json
     end
@@ -33,9 +36,38 @@ describe CrusadeRails::Apns::V1::PushPackageController do
     end
 
     it 'register the user_id push package request' do
-      service.expects(:register).with(user_id, user_token)
+      service.expects(:register).with(authenticity_token, user_token)
 
       post :create, :format => :json
     end
+
+    describe 'unauthenticated registration' do
+      before do
+        service.stubs(:authenticate).returns(false)
+
+        post :create, :format => :json
+      end
+
+      it { response.status.must_equal 401 }
+      it { response.body.strip.must_equal '' }
+    end
+  end
+
+  describe 'new' do
+    before do
+      Rails.application.config.crusade.user_id_block = lambda { |c| user_id }
+
+      service.stubs(:new_subscription).returns OpenStruct.new(authenticity_token: authenticity_token)
+
+      get :new
+    end
+
+    let(:json) { JSON.parse response.body }
+
+    it { response.status.must_equal 201 }
+    it { response.content_type.must_equal 'application/json' }
+    it 'generate a json message with the authenticity_token & user_id' do
+      json.must_equal({ 'user_subscription' => { "user_id" => user_id, "authenticity_token" => authenticity_token}})
+    end
   end
 end