rhoconnect 3.0.4 → 3.0.5

data/doc/push.txt

@@ -44,9 +44,17 @@ To setup your RhoConnect application for Android push, you will need to update `
 	  :redis: localhost:6379
 	  :syncserver: http://localhost:9292/application/
 	  :licensefile: settings/license.key
+	  :c2dm_username: username
+	  :c2dm_passwd: passwd
 	  :authtoken: authtoken
 
-Replace `:authtoken:` value with actual authentication token. This token MUST be related to the role-based google account registered for your application. See [the rhodes push instructions](/rhodes/device-caps#push-notifications) for more details. To retrieve this token, use sample script [c2dm.rb](http://github.com/rhomobile/rhodes/blob/master/bin/c2dm.rb). Uncomment last two lines and put your google account specific data, then run it. It will print token to stdout.
+In order to push messages to the Android device, your server needs to obtain Google's C2DM authentication token associated with the trusted google account.
+For this purpose, you can specify C2DM Google account's username/password combo via the `:c2dm_username` and `:c2dm_passwd` settings.
+At run-time, the system will use these credentials to obtain the C2DM token and store it in the Redis for the future use.
+Once the token is expired, the system will automatically connect to the Google C2DM service to renew the token.
+
+Alternatively, you can use `:authtoken` setting to specify the pre-defined authentication token. This token MUST be related to the role-based google account registered for your application. See [the rhodes push instructions](/rhodes/device-caps#push-notifications) for more details. To retrieve this token, use sample script [c2dm.rb](http://github.com/rhomobile/rhodes/blob/master/bin/c2dm.rb). Uncomment last two lines and put your google account specific data, then run it. It will print token to stdout.
+However, this approach will not allow the server to connect to the C2DM service and renew the token once it is expired.
 
 For those who interested in what this token means, the description is [here](http://code.google.com/apis/accounts/docs/AuthForInstalledApps.html).
 

data/doc/rails-plugin.txt

@@ -1,9 +1,9 @@
 rhoconnect-rb
 ===
 
-A ruby library for the [Rhoconnect](http://rhomobile.com/products/rhoconnect) App Integration Server.
+A ruby library for the [RhoConnect](http://rhomobile.com/products/rhoconnect) App Integration Server.
 
-Using rhoconnect-rb, your application's model data will transparently synchronize with a mobile application built on the [Rhodes framework](http://rhomobile.com/products/rhodes), or any of the available [Rhoconnect clients](http://rhomobile.com/products/rhoconnect/).  This client includes built-in support for [ActiveRecord](http://ar.rubyonrails.org/) and [DataMapper](http://datamapper.org/) models.
+Using rhoconnect-rb, your application's model data will transparently synchronize with a mobile application built on the [Rhodes framework](http://rhomobile.com/products/rhodes), or any of the available [RhoConnect clients](http://rhomobile.com/products/rhoconnect/).  This client includes built-in support for [ActiveRecord](http://ar.rubyonrails.org/) and [DataMapper](http://datamapper.org/) models.
 
 ## Getting started
 
@@ -68,7 +68,7 @@ For more information about Rhoconnect partitions, please refer to the [Rhoconnec
 	  end
 	
 	  def self.rhoconnect_query(partition)
-	    Product.where(:user_id => partition)
+	    Product.includes(:user).where("users.username = ?",partition)
 	  end
 	end
 
@@ -76,16 +76,15 @@ In this example, `self.rhoconnect_query` returns a list of products where the pa
 
 ## Configuration and Authentication
 
-Configure Rhoconnect in an initializer like `config/initializers/rhoconnect.rb` (for Rails), or directly in your application (i.e. Sinatra).  Here you will setup the rhoconnect uri (the location of your rhoconnect instance), and app\_endpoint (the location of your ruby app):
+### Running RhoConnect Manually
 
+Configure RhoConnect in an initializer like `config/initializers/rhoconnect.rb` (for Rails), or directly in your application (i.e. Sinatra).  Here you will setup the rhoconnect uri (the location of your RhoConnect instance), the api\_token (see [rhoconnect:get_token](http://docs.rhomobile.com/rhoconnect/command-line#rake-tasks) rake task), and app\_endpoint (the location of your ruby app):
 
-	# Use rhoconnect:get_token to get the token value.
-	
 	config.uri   = "http://myrhoconnect.com"
 	config.token = "secrettoken"
 	config.app_endpoint = "http://myapp.heroku.com"
 	
-If `app_endpoint` is defined, your Rhoconnect instance will be configured to query data from the endpoint using the rhoconnect_query method in your model.  For example, if your `app_endpoint` is defined as "http://myapp.heroku.com", Rhoconnect will query data with:
+If `app_endpoint` is defined, your Rhoconnect instance will be configured to query data from the endpoint using the rhoconnect_query method in your model.  For example, if your `app_endpoint` is defined as "http://myapp.heroku.com", RhoConnect will query data with:
 
 	POST http://myapp.heroku.com/rhoconnect/query
 
@@ -109,12 +108,11 @@ Example with authentication:
 	  }
 	end
 	
-Example using the [RhoConnect Heroku Addon](/rhoconnect/heroku-addon):
+### Using the [RhoConnect Heroku Addon](http://docs.rhomobile.com/rhoconnect/heroku-addon)
 
-If you're using the [RhoConnect Heroku Addon](/rhoconnect/heroku-addon), then you can omit the config.uri (it is added for you):
+If you're using the [RhoConnect Heroku Addon](http://docs.rhomobile.com/rhoconnect/heroku-addon), then you can omit the config.uri and config.token (they are managed for you):
 
 	Rhoconnect.configure do |config|
-	  config.token = "secrettoken"
 	  config.authenticate = lambda { |credentials| 
 	    User.authenticate(credentials[:login], credentials[:password]) 
 	  }

data/doc/settings.txt

@@ -23,6 +23,27 @@ In addition, the following settings can be specified:
 									 as a default sync poll interval.
 	:bulk_data_poll_interval: <secs> - poll interval setting for bulk data sync
 	
+	:c2dm_username: <google's email>
+	:c2dm_passwd: <passwd>                       
+	:authtoken: <authtoken>          - these settings are used specifically for Android push notifications.
+									   In order to push messages to the Android device, your server needs to 
+									   obtain Google's C2DM authentication token associated with the trusted google account.
+									   For this purpose, you can specify C2DM Google account's username/password combo 
+									   via the `:c2dm_username` and `:c2dm_passwd` settings.
+									   At run-time, the system will use these credentials to obtain 
+									   the C2DM token and store it in the Redis for the future use.
+									   Once the token is expired, the system will automatically 
+									   connect to the Google C2DM service to renew the token.
+
+									   Alternatively, you can use `:authtoken` setting to specify 
+									   the pre-defined authentication token. This token MUST be related to the role-based google account 
+									   registered for your application. See [the rhodes push instructions](/rhodes/device-caps#push-notifications) 
+									   for more details. To retrieve this token, use sample script [c2dm.rb](http://github.com/rhomobile/rhodes/blob/master/bin/c2dm.rb). 
+									   Uncomment last two lines and put your google account specific data, then run it. 
+									   It will print token to stdout.
+									   This approach, however, will not allow the server to connect 
+									   to the C2DM service and renew the token once it is expired.
+
 ## Source settings
 
 All source-specific settings are specified under the corresponding source name entry in the `:sources` category.

data/installer/unix-like/rho_connect_install_constants.rb

@@ -8,7 +8,7 @@ module Constants
                            "libaprutil1-dev",
                            "dtach"]
 
-  REDIS                   = "redis-2.2.14"
+  REDIS                   = "redis-2.4.1"
   SQLITE3                 = "sqlite-autoconf-3070701"
   RUBY                    = "ruby-enterprise-1.8.7-2011.03"
   Nginx                   = "nginx-1.0.6"

data/installer/utils/package_upload/repos.rake

@@ -0,0 +1,5 @@
+desc 'Creates and uploads apt and rpm repos.'
+task "build:repos" => ['build:deb', 'build:rpm'] do
+  # Run repos.rb
+  ruby "installer/utils/package_upload/repos.rb"
+end #build:repos

data/installer/utils/package_upload/repos.rb

@@ -0,0 +1,83 @@
+#!/usr/bin/env ruby
+
+require 'find'
+
+# CONSTANTS
+
+PKG_DIR = '/packages'
+START_DIR = PKG_DIR
+BUCKET = 'rhoconnect'
+
+def cmd(cmd)
+  puts cmd unless @raked
+  system(cmd)  
+end #cmd
+
+def prepare_destination
+  # Prompt to remove the /deb directory if it exists
+  if File.directory?("#{PKG_DIR}/deb")
+    if !@raked
+      puts "Remove #{PKG_DIR}/deb?"
+      remove = STDIN.gets.strip.downcase.chars.first
+    else
+      remove = 'y'
+    end #if
+    if remove == 'y'
+      cmd "sudo rm -rf #{PKG_DIR}/deb"
+    end #if
+  end #if
+
+  # Create deb directory if it does not already exist
+  cmd "sudo mkdir -p #{PKG_DIR}/deb" unless File.directory?("#{PKG_DIR}/deb")
+    
+  # Create configuration file "ditributions" in deb directory
+  filename = "#{PKG_DIR}/deb/conf/"
+  cmd "sudo mkdir -p #{filename}"
+  distributions = "Origin: Rhomobile, Inc.\n" +
+                  "Label: Rhomobile, Inc.\n" +
+                  "Codename: rhoconnect\n" +
+                  "Architectures: i386 amd64\n" +
+                  "Components: main\n" +
+                  "Description: Rhoconnect APT Repository"
+  cmd "touch #{filename}/distributions"
+   
+  # Write distributions string to corresponding file 
+  dist_file = File.new("#{filename}/distributions", "w")
+  dist_file.write(distributions)
+  dist_file.close
+
+  # Create rpm directory if it does not already exist
+  cmd "sudo mkdir -p #{PKG_DIR}/rpm" unless File.directory?("#{PKG_DIR}/rpm")
+ 
+end #prepare_destination
+
+def copy_files
+  # Copy the packages to their respective directory
+  Find.find('./pkg') do |file|
+    if !FileTest.directory?(file)
+      dest_dir = File.extname(file)
+      #get rid of '.' before extension name
+      dest_dir[0] = ''
+      if dest_dir == 'deb' || dest_dir == 'rpm'
+        if dest_dir == 'deb'
+          @deb_pkg = File.basename(file)
+        end #if
+        file_path = File.expand_path(file)
+        cmd "sudo cp -rf #{file_path} #{PKG_DIR}/#{dest_dir}"
+      end #if
+    end #if
+  end #do
+end #copy_files
+
+@raked = true
+
+prepare_destination
+
+copy_files
+
+# REPOIFY!
+cmd "sudo reprepro -b #{PKG_DIR}/deb includedeb rhoconnect #{PKG_DIR}/deb/#{@deb_pkg}"
+cmd "sudo createrepo #{PKG_DIR}/rpm"
+
+# Call S3 upload script
+cmd "ruby ./installer/utils/package_upload/s3_upload.rb #{START_DIR} #{BUCKET} #{@raked}"

data/installer/utils/package_upload/s3_upload.rb

@@ -0,0 +1,104 @@
+#!/usr/bin/env ruby
+
+require 'rubygems'
+require 'aws/s3'
+require 'find'
+
+# CONSTANTS
+
+ACCESS_KEY_FILE = '/home/vagrant/.s3/keys'
+START_DIR       = ARGV[0]
+BUCKET          = ARGV[1]
+
+# METHODS
+
+def check_params
+  if ARGV.size != 2 && ARGV.size != 3
+    puts "Wrong number of arguments (#{ARGV.size} for 2)"
+    exit
+  end #if
+
+  if ARGV.size == 3 && ARGV[2] == "true"
+    @raked = true
+  else
+    @raked = false
+  end #if
+
+  if !FileTest.directory?(START_DIR)
+    puts "#{START_DIR} is not a directory."
+    exit
+  end #if
+  
+  begin
+    found = AWS::S3::Bucket.find(BUCKET)
+    puts "#{BUCKET} is a valid bucket :)" unless @raked
+  rescue
+    puts "#{BUCKET} is not a valid bucket."
+    exit
+  end
+end #check_params
+
+def get_keys
+  lines = IO.readlines ACCESS_KEY_FILE
+  @access_key = lines.first.strip
+  @secret_access_key = lines.last.strip
+end #get_keys
+
+def establish_s3_connection
+  get_keys
+  @s3_connection = AWS::S3::Base.establish_connection!(
+                     :access_key_id => @access_key,
+                     :secret_access_key => @secret_access_key
+                   )
+end #establish_s3_connection
+
+def upload(file)
+  puts "Uploading #{file} to bucket #{BUCKET}..." unless @raked
+  # Upload the given file
+  AWS::S3::S3Object.store( file,
+                           open( file ),
+                           BUCKET,
+                           :access => :public_read )
+
+  # display the URL of the file just uploaded
+  puts AWS::S3::S3Object.url_for((file), BUCKET)[/[^?]+/]
+  puts unless @raked
+end #upload
+
+def upload_files 
+  # Get list of files do be added
+  number_of_files = 0
+  paths = []
+  Find.find(START_DIR) do |path|
+    if FileTest.directory?(path)
+      next
+    else
+      paths.push(path)
+      puts path unless @raked
+      number_of_files += 1
+    end
+  end
+
+  if !@raked
+    puts "Would you like to upload these #{number_of_files} files to the #{BUCKET} bucket? (y/n)"
+    choice = STDIN.gets.strip.downcase
+  else
+    choice = 'y'
+  end #if
+  
+  if choice == 'y'
+    puts "Uploading #{number_of_files} files."
+    paths.each do |path|
+      upload path
+    end #do
+    puts "#{number_of_files} files uploaded."
+  else
+    puts "Exiting."
+  end #if
+end #upload_files
+
+establish_s3_connection
+
+check_params
+
+upload_files

data/installer/windows/rhosync.nsi

@@ -99,7 +99,7 @@ section "uninstall"
     Push "PATH" 
     Push "R" 
     Push "HKLM" 
-    Push "$INSTDIR\redis-2.2.14"
+    Push "$INSTDIR\redis-2.4.1"
     Call un.EnvVarUpdate
     Pop $R0
 
@@ -170,25 +170,25 @@ Section "Redis" redisSection
  
   SetOutPath $INSTDIR
  
-  File /r "redis-2.2.14"
+  File /r "redis-2.4.1"
  
   ;add to path here
 
   Push "PATH" 
   Push "P" 
   Push "HKLM" 
-  Push "$INSTDIR\redis-2.2.14"
+  Push "$INSTDIR\redis-2.4.1"
   Call EnvVarUpdate
   Pop $R0
 
   Push "REDIS_HOME" 
   Push "P" 
   Push "HKLM" 
-  Push "$INSTDIR\redis-2.2.14"
+  Push "$INSTDIR\redis-2.4.1"
   Call EnvVarUpdate
   Pop $R0
 
-  ExecWait '$INSTDIR\redis-2.2.14\redis-service.exe install' $0
+  ExecWait '$INSTDIR\redis-2.4.1\redis-service.exe install' $0
   StrCmp $0 "0" continue wrong
 
   wrong:

data/lib/rhoconnect/api/application/clientregister.rb

@@ -1,6 +1,13 @@
 Server.api :clientregister, :application, :post do |params,user,server|
   server.catch_all do 
-    server.current_client.update_fields(params)
+    current_client = server.current_client
+    if current_client.nil? and server.current_user and server.current_app
+      fields = {:user_id => server.current_user.id}
+      fields[:id] = params[:client_id].to_s
+      fields[:app_id] = server.current_app.id
+      current_client = Client.create(fields)
+    end
+    current_client.update_fields(params)
     server.status 200
   end
-end
+end

data/lib/rhoconnect/client.rb

@@ -17,7 +17,7 @@ module Rhoconnect
     
     def self.create(fields,params={})
       Rhoconnect.license.check_and_use_seat
-      fields[:id] = get_random_uuid
+      fields[:id] ||= get_random_uuid
       res = super(fields,params)
       user = User.load(fields[:user_id])
       user.clients << res.id

data/lib/rhoconnect/ping/android.rb

@@ -1,38 +1,36 @@
 require 'rest_client'
+require 'rhoconnect/store'
 
 module Rhoconnect
   class Android
-    class StaleAuthToken < Exception; end
+    C2DM_AUTHTOKEN_KEY = 'app:application:c2dm_auth_token'
     class InvalidAuthToken < Exception; end
     class AndroidPingError < Exception; end
     
     def self.ping(params)
+      already_retried = false
       begin
         settings = get_config(Rhoconnect.base_directory)[Rhoconnect.environment]
         authtoken = settings[:authtoken]
-              
-        RestClient.post(
-          'https://android.apis.google.com/c2dm/send', c2d_message(params), 
-          :authorization => "GoogleLogin auth=#{authtoken}"
-        ) do |response, request, result, &block|
-          # return exceptions based on response code & body
-          case response.code
-          when 200
-            # TODO: Automate authtoken updates
-            if response[:update_client_auth]
-              raise StaleAuthToken.new(
-                "Stale auth token, please update :authtoken: in settings.yml."
-              )
-            # body will contain the exception class
-            elsif response.body =~ /^Error=(.*)$/
-              raise AndroidPingError.new("Android ping error: #{$1 || ''}")
-            else
-              response.return!(request, result, &block)
-            end
-          when 401, 403
-            raise InvalidAuthToken.new("Invalid auth token, please update :authtoken: in settings.yml.")
+        
+        # obtain C2DM auth token
+        if not authtoken
+          authtoken = get_c2dm_token
+          if not already_retried
+            authtoken = "BadToken"
           end
         end
+              
+        send_ping_to_device(authtoken, params)
+      rescue InvalidAuthToken => error
+        if not already_retried
+          Store.flash_data(C2DM_AUTHTOKEN_KEY)
+          already_retried = true
+          retry
+        end
+        log error
+        log error.backtrace.join("\n")
+        raise error
       rescue Exception => error
         log error
         log error.backtrace.join("\n")
@@ -40,6 +38,29 @@ module Rhoconnect
       end
     end
     
+    def self.send_ping_to_device(authtoken,params)
+      RestClient.post(
+        'https://android.apis.google.com/c2dm/send', c2d_message(params), 
+        :authorization => "GoogleLogin auth=#{authtoken}"
+      ) do |response, request, result, &block|
+        # return exceptions based on response code & body
+        case response.code
+        when 200
+          if response.body =~ /^Error=(.*)$/
+            raise AndroidPingError.new("Android ping error: #{$1 || ''}")
+          else
+            # store new token in redis for future calls
+            if response[:update_client_auth]
+              Store.put_value(C2DM_AUTHTOKEN_KEY, response[:update_client_auth])
+            end
+            response.return!(request, result, &block)
+          end
+        when 401, 403
+          raise InvalidAuthToken.new("Invalid or expired auth token. Obtain new authtoken from C2DM service.")
+        end
+      end
+    end
+    
     def self.c2d_message(params)
       params.reject! {|k,v| v.nil? || v.length == 0}
       data = {}
@@ -52,5 +73,44 @@ module Rhoconnect
       data['data.phone_id'] = params['phone_id'] if params['phone_id']
       data
     end
+    
+    def self.get_c2dm_token
+      if Store.exists? C2DM_AUTHTOKEN_KEY
+        return Store.get_value(C2DM_AUTHTOKEN_KEY)
+      end
+      
+      settings = get_config(Rhoconnect.base_directory)[Rhoconnect.environment]
+      data = {}
+      data['accountType'] = 'HOSTED_OR_GOOGLE'
+      data['Email'] = settings[:c2dm_username]
+      data['Passwd'] = settings[:c2dm_passwd]
+      data['service'] = 'ac2dm'
+      
+      urldata = ''
+      data.each do |key,value|
+        urldata += '&' + key.to_s + '=' + value.to_s
+      end
+      urldata[0,1] = ''
+      
+      RestClient.post(
+        'https://www.google.com/accounts/ClientLogin', urldata, 
+        :content_type => "application/x-www-form-urlencoded"
+      ) do |response, request, result, &block|
+        # return exceptions based on response code & body
+        case response.code
+        when 200
+          authdata = /.*Auth=(.*)\n.*/.match(response.body)
+          Store.put_value(C2DM_AUTHTOKEN_KEY, authdata[1])
+          return authdata[1]
+        else
+          error_code = "Can not obtain auth token from C2DM service. Make sure that your C2DM credentials are valid."
+          if response.body =~ /^Error=(.*)$/
+            error_code += ': ' + response.body.to_s
+          end
+          raise InvalidAuthToken.new(error_code)
+        end
+      end
+      nil
+    end
   end
 end

data/lib/rhoconnect/version.rb

@@ -1,3 +1,3 @@
 module Rhoconnect
-  VERSION = '3.0.4'
+  VERSION = '3.0.5'
 end

data/spec/client_spec.rb

@@ -103,6 +103,7 @@ describe "Client" do
       it "should increment clients stats on create" do
         Time.stub!(:now).and_return(10)
         Rhoconnect.stats = true
+        @c_fields.delete(:id)
         Client.create(@c_fields,{:source_name => @s_fields[:name]})
         Rhoconnect::Stats::Record.range('clients',0,-1).should == ["2:10"]
         Store.get_value('client:count').should == "2"
@@ -112,6 +113,7 @@ describe "Client" do
       it "should decrement clients stats on delete" do
         Time.stub!(:now).and_return(10)
         Rhoconnect.stats = true
+        @c_fields.delete(:id)
         c = Client.create(@c_fields,{:source_name => @s_fields[:name]})
         Rhoconnect::Stats::Record.range('clients',0,-1).should == ["2:10"]
         c.delete

data/spec/client_sync_spec.rb

@@ -274,6 +274,7 @@ describe "ClientSync" do
     describe "search" do
       before(:each) do
         @s_fields[:name] = 'SimpleAdapter'
+        @c_fields.delete(:id)
         @c1 = Client.create(@c_fields,{:source_name => @s_fields[:name]})
         @s1 = Source.create(@s_fields,@s_params)
         @cs1 = ClientSync.new(@s1,@c1,2)

data/spec/jobs/ping_job_spec.rb

@@ -89,8 +89,10 @@ describe "PingJob" do
         "sources" => [@s.name], "message" => 'hello world', 
         "vibrate" => '5', "badge" => '5', "sound" => 'hello.mp3',"phone_id"=>nil}
       # another client with the same device pin ...
+      @c_fields.delete(:id)
       @c1 = Client.create(@c_fields,{:source_name => @s_fields[:name]})
       # and yet another one ...
+      @c_fields.delete(:id)
       @c2 = Client.create(@c_fields,{:source_name => @s_fields[:name]})
 
       Apple.should_receive(:ping).with({'device_pin' => @c.device_pin, 'device_port' => @c.device_port}.merge!(params))
@@ -105,8 +107,10 @@ describe "PingJob" do
       @c.phone_id = '3'
       @c_fields.merge!(:phone_id => '3')
       # another client with the same phone id..
+      @c_fields.delete(:id)
       @c1 = Client.create(@c_fields,{:source_name => @s_fields[:name]})
       #  yet another...
+      @c_fields.delete(:id)
       @c2 = Client.create(@c_fields,{:source_name => @s_fields[:name]})
 
       Apple.should_receive(:ping).with({'device_pin' => @c.device_pin, 'phone_id' => @c.phone_id, 'device_port' => @c.device_port}.merge!(params))

data/spec/ping/android_spec.rb

@@ -19,6 +19,7 @@ describe "Ping Android" do
     end
 
     it "should ping android successfully" do
+      Store.put_value(Android::C2DM_AUTHTOKEN_KEY, 'ValidAuthToken')
       result = 'id=0:34234234134254%abc123\n'
      	@response.stub!(:code).and_return(200)
      	@response.stub!(:body).and_return(result)
@@ -27,7 +28,7 @@ describe "Ping Android" do
      	setup_post_yield(@response)
      	Android.ping(@params).body.should == result
     end
-
+    
     it "should ping android with 503 connection error" do
       error = 'Connection refused'
       @response.stub!(:body).and_return(error)
@@ -37,6 +38,7 @@ describe "Ping Android" do
     end
 
     it "should ping android with 200 error message" do
+      Store.put_value(Android::C2DM_AUTHTOKEN_KEY, 'ValidAuthToken')
       error = 'Error=QuotaExceeded'
       @response.stub!(:code).and_return(200)
       @response.stub!(:body).and_return(error)
@@ -45,25 +47,61 @@ describe "Ping Android" do
       Android.should_receive(:log).twice
       lambda { Android.ping(@params) }.should raise_error(Android::AndroidPingError, "Android ping error: QuotaExceeded")
     end
+    
+    it "should fail to obtain auth token from C2DM without creds" do
+      error = 'Error=BadAuthentication'
+      @response.stub!(:code).and_return(403)
+      @response.stub!(:body).and_return(error)
+      @response.stub!(:[]).and_return(nil)
+     	setup_post_yield(@response)
+      Android.should_receive(:log).twice
+      lambda { Android.ping(@params) }.should raise_error(Android::InvalidAuthToken, "Can not obtain auth token from C2DM service. Make sure that your C2DM credentials are valid.: Error=BadAuthentication")
+    end
+    
+    it "should pass to obtain auth token from C2DM" do
+      result = "SID=somesid\nAuth=myauthtoken\n"
+      @response.stub!(:code).and_return(200)
+      @response.stub!(:body).and_return(result)
+      @response.stub!(:[]).and_return(nil)
+     	setup_post_yield(@response)
+     	
+     	Android.get_c2dm_token
+      Store.get_value(Android::C2DM_AUTHTOKEN_KEY).should == 'myauthtoken'
+    end
+    
+    it "should fail with invalid C2DM token and call retry" do
+      Store.put_value(Android::C2DM_AUTHTOKEN_KEY, 'BadToken')
+      error = 'Error=BadAuthentication'
+      @response.stub!(:code).and_return(403)
+      @response.stub!(:body).and_return(error)
+      @response.stub!(:[]).and_return(nil)
+     	setup_post_yield(@response)
+     	
+     	Store.should_receive(:flash_data).once
+     	Android.should_receive(:get_c2dm_token).twice.and_return('BadToken')
+     	Android.should_receive(:log).twice
+     	lambda { Android.ping(@params) }.should raise_error(Android::InvalidAuthToken, "Invalid or expired auth token. Obtain new authtoken from C2DM service.")
+    end
 
-    it "should ping android with stale auth token" do
+    it "should ping android and receive Update-Client-Auth header" do
+      Store.put_value(Android::C2DM_AUTHTOKEN_KEY, 'ValidAuthToken')
       @response.stub!(:code).and_return(200)
       @response.stub!(:body).and_return('')
-      @response.stub!(:[]).and_return({:update_client_auth => 'abc123'})
+      @response.stub!(:[]).and_return(:update_client_auth => 'abc123')
+     	@response.stub!(:return!).and_return(@response)
      	setup_post_yield(@response)
-      Android.should_receive(:log).twice
-      lambda { Android.ping(@params) }.should raise_error(
-        Android::StaleAuthToken, "Stale auth token, please update :authtoken: in settings.yml."
-      )
+     	Android.ping(@params)
+     	Store.get_value(Android::C2DM_AUTHTOKEN_KEY).should_not == 'ValidAuthToken'
     end
 
     it "should ping android with 401 error message" do
       @response.stub!(:code).and_return(401)
       @response.stub!(:body).and_return('')
      	setup_post_yield(@response)
+     	Android.should_receive(:get_c2dm_token).twice.and_return("ValidAuthToken")
       Android.should_receive(:log).twice
       lambda { Android.ping(@params) }.should raise_error(
-        Android::InvalidAuthToken, "Invalid auth token, please update :authtoken: in settings.yml."
+        Android::InvalidAuthToken, "Invalid or expired auth token. Obtain new authtoken from C2DM service."
       )
     end