From d4a5737c515234d072ad7f24815928a324a84971 Mon Sep 17 00:00:00 2001
From: Seth Call <seth@jamkazam.com>
Date: Mon, 3 Feb 2014 21:19:14 +0000
Subject: [PATCH 01/21] * VRFS-1025 finished

---
 db/manifest                                   |   3 +-
 db/up/facebook_signup.sql                     |  16 +
 ruby/lib/jam_ruby.rb                          |   2 +
 ruby/lib/jam_ruby/models/facebook_signup.rb   |  15 +
 ruby/lib/jam_ruby/models/user.rb              |  70 ++++-
 .../lib/jam_ruby/models/user_authorization.rb |   4 +-
 .../scheduled/cleanup_facebook_signup.rb      |  19 ++
 ruby/spec/factories.rb                        |  10 +
 .../jam_ruby/models/facebook_signup_spec.rb   |  20 ++
 ruby/spec/jam_ruby/models/user_spec.rb        |  28 ++
 web/app/assets/javascripts/jamkazam.js        |   5 +
 web/app/assets/javascripts/layout.js          |  16 +
 .../assets/javascripts/web/signinDialog.js    |  43 +++
 .../assets/javascripts/web/signupDialog.js    |   8 +-
 web/app/assets/javascripts/web/web.js         |   1 +
 web/app/assets/javascripts/web/welcome.js     |   6 +
 web/app/controllers/api_users_controller.rb   |  26 --
 web/app/controllers/sessions_controller.rb    |  48 ++-
 web/app/controllers/users_controller.rb       | 114 +++++--
 web/app/views/layouts/web.erb                 |   4 +
 web/app/views/users/_signinDialog.html.erb    |  58 ++++
 web/app/views/users/_signupDialog.html.erb    |   6 +-
 web/config/application.rb                     |   3 +
 web/config/environments/production.rb         |   3 +
 web/config/environments/test.rb               |   3 +
 web/config/initializers/omniauth.rb           |   2 +-
 web/config/scheduler.yml                      |   6 +-
 web/lib/user_manager.rb                       |  34 ++-
 .../controllers/sessions_controller_spec.rb   |  12 -
 web/spec/factories.rb                         |  11 +-
 web/spec/features/signup_spec.rb              |  11 +-
 web/spec/features/welcome_spec.rb             |  66 +++++
 web/spec/managers/user_manager_spec.rb        | 278 ++++++++++++++++--
 web/spec/spec_helper.rb                       |   3 +
 34 files changed, 830 insertions(+), 124 deletions(-)
 create mode 100644 db/up/facebook_signup.sql
 create mode 100644 ruby/lib/jam_ruby/models/facebook_signup.rb
 create mode 100644 ruby/lib/jam_ruby/resque/scheduled/cleanup_facebook_signup.rb
 create mode 100644 ruby/spec/jam_ruby/models/facebook_signup_spec.rb
 create mode 100644 web/app/assets/javascripts/web/signinDialog.js
 create mode 100644 web/app/views/users/_signinDialog.html.erb
 create mode 100644 web/spec/features/welcome_spec.rb

diff --git a/db/manifest b/db/manifest
index ec3b567a2..25fd574e1 100755
--- a/db/manifest
+++ b/db/manifest
@@ -96,4 +96,5 @@ ms_user_history_add_instruments.sql
 icecast_config_changed.sql
 invited_users_facebook_support.sql
 first_recording_at.sql
-share_token.sql
\ No newline at end of file
+share_token.sql
+facebook_signup.sql
\ No newline at end of file
diff --git a/db/up/facebook_signup.sql b/db/up/facebook_signup.sql
new file mode 100644
index 000000000..d27ec0cdd
--- /dev/null
+++ b/db/up/facebook_signup.sql
@@ -0,0 +1,16 @@
+-- when a user authorizes our application to signup, we create this row
+CREATE UNLOGGED TABLE facebook_signups (
+  id VARCHAR(64) PRIMARY KEY DEFAULT uuid_generate_v4(),
+  lookup_id VARCHAR(255) UNIQUE NOT NULL,
+  last_name VARCHAR(100),
+  first_name VARCHAR(100),
+  gender VARCHAR(1),
+  email VARCHAR(1024),
+  uid VARCHAR(1024),
+  token VARCHAR(1024),
+  token_expires_at TIMESTAMP,
+  created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
+  updated_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP
+);
+
+ALTER TABLE user_authorizations ADD CONSTRAINT user_authorizations_uniqkey UNIQUE (provider, uid);
\ No newline at end of file
diff --git a/ruby/lib/jam_ruby.rb b/ruby/lib/jam_ruby.rb
index 6ab7a51bb..aa036793d 100755
--- a/ruby/lib/jam_ruby.rb
+++ b/ruby/lib/jam_ruby.rb
@@ -35,6 +35,7 @@ require "jam_ruby/resque/resque_hooks"
 require "jam_ruby/resque/scheduled/audiomixer_retry"
 require "jam_ruby/resque/scheduled/icecast_config_retry"
 require "jam_ruby/resque/scheduled/icecast_source_check"
+require "jam_ruby/resque/scheduled/cleanup_facebook_signup"
 require "jam_ruby/mq_router"
 require "jam_ruby/base_manager"
 require "jam_ruby/connection_manager"
@@ -117,6 +118,7 @@ require "jam_ruby/models/icecast_server_socket"
 require "jam_ruby/models/icecast_template_socket"
 require "jam_ruby/models/icecast_server_group"
 require "jam_ruby/models/icecast_mount_template"
+require "jam_ruby/models/facebook_signup"
 
 
 include Jampb
diff --git a/ruby/lib/jam_ruby/models/facebook_signup.rb b/ruby/lib/jam_ruby/models/facebook_signup.rb
new file mode 100644
index 000000000..9e232b2a1
--- /dev/null
+++ b/ruby/lib/jam_ruby/models/facebook_signup.rb
@@ -0,0 +1,15 @@
+module JamRuby
+  class FacebookSignup < ActiveRecord::Base
+
+    before_create :generate_lookup_id
+
+    def self.delete_old
+      FacebookSignup.where("created_at < :week", {:week => 1.week.ago}).delete_all
+    end
+
+    private
+    def generate_lookup_id
+      self.lookup_id = SecureRandom.urlsafe_base64
+    end
+  end
+end
diff --git a/ruby/lib/jam_ruby/models/user.rb b/ruby/lib/jam_ruby/models/user.rb
index 00011b407..e137b8a81 100644
--- a/ruby/lib/jam_ruby/models/user.rb
+++ b/ruby/lib/jam_ruby/models/user.rb
@@ -697,8 +697,23 @@ module JamRuby
 
     # throws ActiveRecord::RecordNotFound if instrument is invalid
     # throws an email delivery error if unable to connect out to SMTP
-    def self.signup(first_name, last_name, email, password, password_confirmation, terms_of_service,
-            location, instruments, birth_date, musician, photo_url, invited_user, signup_confirm_url)
+    def self.signup(options)
+
+      first_name = options[:first_name]
+      last_name = options[:last_name]
+      email = options[:email]
+      password = options[:password]
+      password_confirmation = options[:password_confirmation]
+      terms_of_service = options[:terms_of_service]
+      location = options[:location]
+      instruments = options[:instruments]
+      birth_date = options[:birth_date]
+      musician = options[:musician]
+      photo_url = options[:photo_url]
+      invited_user = options[:invited_user]
+      fb_signup = options[:fb_signup]
+      signup_confirm_url = options[:signup_confirm_url]
+
       user = User.new
 
       UserManager.active_record_transaction do |user_manager|
@@ -744,11 +759,25 @@ module JamRuby
 
         user.photo_url = photo_url
 
+        unless fb_signup.nil?
+          user.update_fb_authorization(fb_signup)
+
+          if fb_signup.email.casecmp(user.email).zero?
+            user.email_confirmed = true
+            user.signup_token = nil
+          else
+            user.email_confirmed = false
+            user.signup_token = SecureRandom.urlsafe_base64
+          end
+        end
 
         if invited_user.nil?
           user.can_invite = Limits::USERS_CAN_INVITE
-          user.email_confirmed = false
-          user.signup_token = SecureRandom.urlsafe_base64
+
+          unless user.email_confirmed # important that the only time this goes true is if some other mechanism, like fb_signup, set this high
+            user.email_confirmed = false
+            user.signup_token = SecureRandom.urlsafe_base64
+          end
         else
           # if you are invited by an admin, we'll say you can invite too.
           # but if not, then you can not invite
@@ -785,15 +814,10 @@ module JamRuby
         if user.errors.any?
           raise ActiveRecord::Rollback
         else
-          # don't send an signup email if the user was invited already *and* they used the same email that they were invited with
-          if !invited_user.nil? && invited_user.email.casecmp(user.email).zero?
+          # don't send an signup email if email is already confirmed
+          if user.email_confirmed
             UserMailer.welcome_message(user).deliver
           else
-
-            # FIXME:
-            # It's not standard to require a confirmation when a user signs up with Facebook.
-            # We should stop asking for it.
-            #
             # any errors here should also rollback the transaction; that's OK. If emails aren't going to be delivered,
             # it's already a really bad situation; make user signup again
             UserMailer.confirm_email(user, signup_confirm_url.nil? ? nil : (signup_confirm_url + "/" + user.signup_token) ).deliver
@@ -941,6 +965,30 @@ module JamRuby
       end
     end
 
+    # updates an existing user_authorization for facebook, or creates a new one if none exist
+    def update_fb_authorization(fb_signup)
+      if fb_signup.uid && fb_signup.token && fb_signup.token_expires_at
+
+        user_authorization = nil
+
+        unless self.new_record?
+          # see if this user has an existing user_authorization for this provider
+          user_authorization = UserAuthorization.find_by_user_id_and_provider(self.id, 'facebook')
+        end
+
+        if user_authorization.nil?
+          self.user_authorizations.build provider: 'facebook',
+                                         uid: fb_signup.uid,
+                                         token: fb_signup.token,
+                                         token_expiration: fb_signup.token_expires_at
+        else
+          user_authorization.uid = fb_signup.uid
+          user_authorization.token = fb_signup.token
+          user_authorization.token_expiration = fb_signup.token_expires_at
+        end
+      end
+    end
+
     def provides_location?
       !self.city.blank? && (!self.state.blank? || !self.country.blank?)
     end
diff --git a/ruby/lib/jam_ruby/models/user_authorization.rb b/ruby/lib/jam_ruby/models/user_authorization.rb
index 5f7c97e25..47061e17e 100644
--- a/ruby/lib/jam_ruby/models/user_authorization.rb
+++ b/ruby/lib/jam_ruby/models/user_authorization.rb
@@ -9,8 +9,10 @@ module JamRuby
 
     belongs_to :user, :class_name => "JamRuby::User", :foreign_key => "user_id"
     validates :provider, :uid, :presence => true
+    validates_uniqueness_of :uid, scope: :provider
 
     # token and token_expiration can be missing
-    
+
+
   end
 end
diff --git a/ruby/lib/jam_ruby/resque/scheduled/cleanup_facebook_signup.rb b/ruby/lib/jam_ruby/resque/scheduled/cleanup_facebook_signup.rb
new file mode 100644
index 000000000..a2cbab476
--- /dev/null
+++ b/ruby/lib/jam_ruby/resque/scheduled/cleanup_facebook_signup.rb
@@ -0,0 +1,19 @@
+
+module JamRuby
+  class CleanupFacebookSignup
+
+    @queue = :cleanup_facebook_signup
+
+    @@log = Logging.logger[CleanupFacebookSignup]
+
+
+    def self.perform
+      @@log.debug("waking up")
+
+      FacebookSignup.delete_old
+
+      @@log.debug("done")
+    end
+
+  end
+end
diff --git a/ruby/spec/factories.rb b/ruby/spec/factories.rb
index 68b71c553..a8eda4e0a 100644
--- a/ruby/spec/factories.rb
+++ b/ruby/spec/factories.rb
@@ -317,4 +317,14 @@ FactoryGirl.define do
     association         :authentication, :factory => :icecast_user_authentication
   end
 
+  factory :facebook_signup, :class => JamRuby::FacebookSignup do
+    sequence(:lookup_id)      { |n| "lookup-#{n}"}
+    sequence(:first_name)     { |n| "first-#{n}"}
+    sequence(:last_name)      { |n| "last-#{n}"}
+    gender                    'M'
+    sequence(:email)          { |n| "jammin-#{n}@jamkazam.com"}
+    sequence(:uid)            { |n| "uid-#{n}"}
+    sequence(:token)          { |n| "token-#{n}"}
+    token_expires_at          Time.now
+  end
 end
diff --git a/ruby/spec/jam_ruby/models/facebook_signup_spec.rb b/ruby/spec/jam_ruby/models/facebook_signup_spec.rb
new file mode 100644
index 000000000..6edbab157
--- /dev/null
+++ b/ruby/spec/jam_ruby/models/facebook_signup_spec.rb
@@ -0,0 +1,20 @@
+require 'spec_helper'
+
+describe FacebookSignup do
+
+  it "does not delete new one" do
+    new_signup = FactoryGirl.create(:facebook_signup)
+
+    FacebookSignup.delete_old
+
+    FacebookSignup.find(new_signup)
+  end
+
+  it "does delete old one" do
+    old_signup = FactoryGirl.create(:facebook_signup, :created_at => 10.days.ago)
+
+    FacebookSignup.delete_old
+
+    FacebookSignup.find_by_id(old_signup.id).should be_nil
+  end
+end
diff --git a/ruby/spec/jam_ruby/models/user_spec.rb b/ruby/spec/jam_ruby/models/user_spec.rb
index a29179a8a..a069e7ee0 100644
--- a/ruby/spec/jam_ruby/models/user_spec.rb
+++ b/ruby/spec/jam_ruby/models/user_spec.rb
@@ -397,6 +397,34 @@ describe User do
     end
   end
 
+  describe "user_authorizations" do
+
+    it "can create" do
+      @user.user_authorizations.build  provider: 'facebook',
+                                       uid: '1',
+                                       token: '1',
+                                       token_expiration: Time.now
+      @user.save!
+    end
+
+    it "fails on duplicate" do
+      @user.user_authorizations.build  provider: 'facebook',
+                                       uid: '1',
+                                       token: '1',
+                                       token_expiration: Time.now
+      @user.save!
+
+      @user2 = FactoryGirl.create(:user)
+      @user2.user_authorizations.build  provider: 'facebook',
+                                       uid: '1',
+                                       token: '1',
+                                       token_expiration: Time.now
+      @user2.save.should be_false
+      @user2.errors[:user_authorizations].should == ['is invalid']
+    end
+
+
+  end
 =begin
   describe "update avatar" do
 
diff --git a/web/app/assets/javascripts/jamkazam.js b/web/app/assets/javascripts/jamkazam.js
index d9ec02fba..108c7753a 100644
--- a/web/app/assets/javascripts/jamkazam.js
+++ b/web/app/assets/javascripts/jamkazam.js
@@ -322,10 +322,15 @@
 
             var hash = context.location.hash;
 
+            if(!this.layout.isScreenName(hash)) {
+                hash = null;
+            }
+
             var url = '#/home';
             if (hash) {
                 url = hash;
             }
+
             logger.debug("Changing screen to " + url);
             context.location = url;
         }
diff --git a/web/app/assets/javascripts/layout.js b/web/app/assets/javascripts/layout.js
index 53bac88fa..979a73d5d 100644
--- a/web/app/assets/javascripts/layout.js
+++ b/web/app/assets/javascripts/layout.js
@@ -428,6 +428,18 @@
             dialogEvent(dialog, 'afterHide');
         }
 
+        function isScreenName(screenName) {
+            if(!screenName) return false;
+
+            var hashIndex = screenName.indexOf('#');
+
+            if(hashIndex > -1) {
+               screenName = screenName.substr(hashIndex);
+            }
+
+            return screenBindings[screenName];
+        }
+
         function screenEvent(screen, evtName, data) {
             if (screen && screen in screenBindings) {
                 if (evtName in screenBindings[screen]) {
@@ -752,6 +764,10 @@
             };
         };
 
+        this.isScreenName = function(screenName) {
+            return isScreenName(screenName);
+        }
+
         this.bindScreen = function(screen, handler) {
             screenBindings[screen] = handler;
         };
diff --git a/web/app/assets/javascripts/web/signinDialog.js b/web/app/assets/javascripts/web/signinDialog.js
new file mode 100644
index 000000000..aded10b15
--- /dev/null
+++ b/web/app/assets/javascripts/web/signinDialog.js
@@ -0,0 +1,43 @@
+(function(context,$) {
+
+    "use strict";
+
+    context.JK = context.JK || {};
+
+    context.JK.SigninDialog = function(app) {
+        var logger = context.JK.logger;
+        var rest = context.JK.Rest();
+        var dialogId = '#signin-dialog';
+
+        function events() {
+           $(dialogId + ' .signin-cancel').click(function(e) {
+               app.layout.closeDialog('signin-dialog');
+               e.stopPropagation();
+               return false;
+           });
+        }
+
+        function beforeShow() {
+
+        }
+
+        function afterHide() {
+
+        }
+
+        function initialize(){
+
+            var dialogBindings = {
+                'beforeShow' : beforeShow,
+                'afterHide': afterHide
+            };
+
+            app.bindDialog('signin-dialog', dialogBindings);
+
+            events();
+        }
+
+        this.initialize = initialize;
+
+    }
+})(window, jQuery);
\ No newline at end of file
diff --git a/web/app/assets/javascripts/web/signupDialog.js b/web/app/assets/javascripts/web/signupDialog.js
index 459833503..2c85ac2f7 100644
--- a/web/app/assets/javascripts/web/signupDialog.js
+++ b/web/app/assets/javascripts/web/signupDialog.js
@@ -10,8 +10,11 @@
         var dialogId = '#signup-dialog';
 
         function events() {
-
-
+           $(dialogId + ' .signup-cancel').click(function(e) {
+               app.layout.closeDialog('signup-dialog');
+               e.stopPropagation();
+               return false;
+           });
         }
 
         function beforeShow() {
@@ -31,7 +34,6 @@
 
             app.bindDialog('signup-dialog', dialogBindings);
 
-            console.log("honuth")
             events();
         }
 
diff --git a/web/app/assets/javascripts/web/web.js b/web/app/assets/javascripts/web/web.js
index c6489a530..ea049bbd4 100644
--- a/web/app/assets/javascripts/web/web.js
+++ b/web/app/assets/javascripts/web/web.js
@@ -6,6 +6,7 @@
 //= require AAC_underscore
 //= require globals
 //= require web/signupDialog
+//= require web/signinDialog
 //= require invitationDialog
 //= require shareDialog
 //= require layout
diff --git a/web/app/assets/javascripts/web/welcome.js b/web/app/assets/javascripts/web/welcome.js
index 7d4728e03..55ed205a1 100644
--- a/web/app/assets/javascripts/web/welcome.js
+++ b/web/app/assets/javascripts/web/welcome.js
@@ -10,6 +10,12 @@
             e.preventDefault();
             return false;
         });
+
+        $('#signin').click(function(e) {
+            context.JK.app.layout.showDialog('signin-dialog');
+            e.preventDefault();
+            return false;
+        });
     }
 
     initialize()
diff --git a/web/app/controllers/api_users_controller.rb b/web/app/controllers/api_users_controller.rb
index 0565d95b5..01eb5107e 100644
--- a/web/app/controllers/api_users_controller.rb
+++ b/web/app/controllers/api_users_controller.rb
@@ -27,32 +27,6 @@ class ApiUsersController < ApiController
     respond_with @user, responder: ApiResponder, :status => 200
   end
 
-  # this API call is disabled by virtue of it being commented out in routes.rb
-  # the reason is that it has no captcha, and is therefore a bit abuseable
-  # if someone wants to use it, please add in captcha or some other bot-protector
-  def create
-    # sends email to email account for confirmation
-    @user = UserManager.new.signup(params[:first_name],
-                                params[:last_name],
-                                params[:email],
-                                params[:password],
-                                params[:password_confirmation],
-                                params[:city],
-                                params[:state],
-                                params[:country],
-                                params[:instruments],
-                                params[:photo_url],
-                                ApplicationHelper.base_uri(request) + "/confirm")
-
-    # check for errors
-    unless @user.errors.any?
-      render :json => {}, :status => :ok # an empty response, but 200 OK
-    else
-      response.status = :unprocessable_entity
-      respond_with @user, responder: ApiResponder
-    end
-  end
-
   def update
 
     @user = User.find(params[:id])
diff --git a/web/app/controllers/sessions_controller.rb b/web/app/controllers/sessions_controller.rb
index 45e019b27..019c52b99 100644
--- a/web/app/controllers/sessions_controller.rb
+++ b/web/app/controllers/sessions_controller.rb
@@ -48,15 +48,10 @@ class SessionsController < ApplicationController
       # an email and whatnot.
       #
       # Also, should we grab their photo from facebook?
-      user = UserManager.new.signup(remote_ip(),
-                                    auth_hash[:info][:first_name],
-                                    auth_hash[:info][:last_name],
-                                    auth_hash[:info][:email],
-                                    nil,
-                                    nil,
-                                    nil, # instruments
-                                    nil, # photo_url
-                                    nil)
+      user = UserManager.new.signup(remote_ip: remote_ip(),
+                                    first_name: auth_hash[:info][:first_name],
+                                    last_name: auth_hash[:info][:last_name],
+                                    email: auth_hash[:info][:email])
                               
       # Users who sign up using oauth are presumed to have valid email adddresses.
       user.confirm_email!
@@ -72,18 +67,49 @@ class SessionsController < ApplicationController
 
   
   def oauth_callback
+
+    auth_hash = request.env['omniauth.auth']
+
+    provider = auth_hash[:provider]
+
+    if provider == 'facebook'
+      fb_uid = auth_hash[:uid]
+      token = auth_hash[:credentials][:token]
+      token_expiration = Time.at(auth_hash[:credentials][:expires_at])
+      first_name = auth_hash[:extra][:raw_info][:first_name]
+      last_name = auth_hash[:extra][:raw_info][:last_name]
+      email = auth_hash[:extra][:raw_info][:email]
+      gender = auth_hash[:extra][:raw_info][:gender]
+
+      fb_signup = FacebookSignup.new
+      fb_signup.uid = fb_uid
+      fb_signup.token = token
+      fb_signup.token_expires_at = token_expiration
+      fb_signup.first_name = first_name
+      fb_signup.last_name = last_name
+      fb_signup.email = email
+      if gender == 'male'
+        fb_signup.gender = 'M'
+      elsif gender == 'female'
+        fb_signup.gender = 'F'
+      end
+      fb_signup.save!
+
+      redirect_to "#{signup_path}?facebook_signup=#{fb_signup.lookup_id}"
+      return
+    end
+
     if current_user.nil?
       render :nothing => true, :status => 404
       return
     end
 
-    auth_hash = request.env['omniauth.auth']
     #authorization = UserAuthorization.find_by_provider_and_uid(auth_hash["provider"], auth_hash["uid"])
 
     # Always make and save a new authorization. This is because they expire, and honestly there's no cost
     # to just making and saving it.
     #if authorization.nil?
-      authorization = current_user.user_authorizations.build :provider => auth_hash[:provider], 
+      authorization = current_user.user_authorizations.build :provider => auth_hash[:provider],
                                                              :uid => auth_hash[:uid], 
                                                              :token => auth_hash[:credentials][:token], 
                                                              :token_expiration => Time.at(auth_hash[:credentials][:expires_at])
diff --git a/web/app/controllers/users_controller.rb b/web/app/controllers/users_controller.rb
index e2aae2132..6c98a031d 100644
--- a/web/app/controllers/users_controller.rb
+++ b/web/app/controllers/users_controller.rb
@@ -27,6 +27,33 @@ class UsersController < ApplicationController
       return
     end
 
+    @fb_signup = load_facebook_signup(params)
+
+
+    # check if the email specified by @fb_signup already exists in the databse--if so, log them in and redirect
+    if @fb_signup && @fb_signup.email
+      user = User.find_by_email_and_email_confirmed(@fb_signup, true)
+      if user
+        # update user_authorization for user because this is fresher
+        user.update_fb_authorization(@fb_signup)
+        sign_in(user)
+        redirect_to client_url
+        return
+      end
+    end
+
+    # check if the uid specified by @fb_signup already exists in the databse--if so, log them in and redirect
+    if @fb_signup && @fb_signup.uid
+      user_authorization = UserAuthorization.find_by_uid_and_provider(@fb_signup.uid, 'facebook')
+      # update user_authorization for user because this is fresher
+      if user_authorization
+        user_authorization.user.update_fb_authorization(@fb_signup)
+        sign_in(user_authorization.user)
+        redirect_to client_url
+        return
+      end
+    end
+
     @invited_user = load_invited_user(params)
 
     if !@invited_user.nil? && @invited_user.has_required_email? && @invited_user.accepted
@@ -34,7 +61,7 @@ class UsersController < ApplicationController
       render "already_signed_up", :layout => 'landing'
       return
     end
-    @signup_postback = load_postback(@invited_user)
+    @signup_postback = load_postback(@invited_user, @fb_signup)
 
     load_location(request.remote_ip)
 
@@ -42,21 +69,54 @@ class UsersController < ApplicationController
     @user.musician = true # default the UI to musician as selected option
 
     # preseed the form with the invited email as a convenience to the user
-    unless @invited_user.nil?
-      @user.email = @invited_user.email
+    @user.email = @invited_user.email unless @invited_user.nil?
+
+    if @fb_signup
+      @user.email = @fb_signup.email
+      @user.first_name = @fb_signup.first_name
+      @user.last_name = @fb_signup.last_name
+      @user.gender = @fb_signup.gender
     end
 
     render :layout => 'web'
   end
 
   def create
+
     if current_user
       redirect_to client_url
       return
     end
 
+    @fb_signup = load_facebook_signup(params)
+
+    # check if the email specified by @fb_signup already exists in the databse--if so, log them in and redirect
+    if @fb_signup && @fb_signup.email
+      user = User.find_by_email_and_email_confirmed(@fb_signup, true)
+      if user
+        # update user_authorization for user because this is fresher
+        user.update_fb_authorization(@fb_signup)
+        sign_in(user)
+        redirect_to client_url
+        return
+      end
+    end
+
+    # check if the uid specified by @fb_signup already exists in the databse--if so, log them in and redirect
+    if @fb_signup && @fb_signup.uid
+      user_authorization = UserAuthorization.find_by_uid_and_provider(@fb_signup.uid, 'facebook')
+      # update user_authorization for user because this is fresher
+      if user_authorization
+        user_authorization.user.update_fb_authorization(@fb_signup)
+        sign_in(user_authorization.user)
+        redirect_to client_url
+        return
+      end
+
+    end
+
     @invited_user = load_invited_user(params)
-    @signup_postback = load_postback(@invited_user)
+    @signup_postback = load_postback(@invited_user, @fb_signup)
 
     @user = User.new
 
@@ -73,21 +133,20 @@ class UsersController < ApplicationController
     terms_of_service = params[:jam_ruby_user][:terms_of_service].nil? ? false : true
     musician = params[:jam_ruby_user][:musician]
 
-
-    @user = UserManager.new.signup(request.remote_ip,
-                                    params[:jam_ruby_user][:first_name],
-                                    params[:jam_ruby_user][:last_name],
-                                    params[:jam_ruby_user][:email],
-                                    params[:jam_ruby_user][:password],
-                                    params[:jam_ruby_user][:password_confirmation],
-                                    terms_of_service,
-                                    instruments,
-                                    birth_date,
-                                    location,
-                                    musician,
-                                    nil, # we don't accept photo url on the signup form yet
-                                    @invited_user,
-                                    ApplicationHelper.base_uri(request) + "/confirm")
+    @user = UserManager.new.signup(remote_ip: request.remote_ip,
+                                    first_name: params[:jam_ruby_user][:first_name],
+                                    last_name: params[:jam_ruby_user][:last_name],
+                                    email: params[:jam_ruby_user][:email],
+                                    password: params[:jam_ruby_user][:password],
+                                    password_confirmation: params[:jam_ruby_user][:password_confirmation],
+                                    terms_of_service: terms_of_service,
+                                    instruments: instruments,
+                                    birth_date: birth_date,
+                                    location: location,
+                                    musician: musician,
+                                    invited_user: @invited_user,
+                                    fb_signup: @fb_signup,
+                                    signup_confirm_url: ApplicationHelper.base_uri(request) + "/confirm")
 
     # check for errors
     if @user.errors.any?
@@ -308,6 +367,12 @@ class UsersController < ApplicationController
     return Date.new(year.to_i, month.to_i, day.to_i)
   end
 
+  def load_facebook_signup(params)
+    lookup_id = params[:facebook_signup]
+
+    FacebookSignup.find_by_lookup_id(lookup_id)
+  end
+
   def load_invited_user(params)
     # check if this an anonymous request, or result of invitation code
     invitation_code = params[:invitation_code]
@@ -336,11 +401,10 @@ class UsersController < ApplicationController
     @cities = @location[:state].nil? ? [] : MaxMindManager.cities(@location[:country], @location[:state])
   end
 
-  def load_postback(invited_user)
-    if invited_user.nil?
-      signup_path
-    else
-      signup_path + "?invitation_code=" + invited_user.invitation_code
-    end
+  def load_postback(invited_user, fb_signup)
+    query = {}
+    query[:invitation_code] = invited_user.invitation_code if invited_user
+    query[:facebook_signup] = fb_signup.lookup_id if fb_signup
+    signup_path + "?" + params.to_query
   end
 end
diff --git a/web/app/views/layouts/web.erb b/web/app/views/layouts/web.erb
index 58c07dd86..28f55c2f9 100644
--- a/web/app/views/layouts/web.erb
+++ b/web/app/views/layouts/web.erb
@@ -50,6 +50,7 @@
 
     <%= render "clients/invitationDialog" %>
     <%= render "users/signupDialog" %>
+    <%= render "users/signinDialog" %>
 
     <script type="text/javascript">
         $(function () {
@@ -73,6 +74,9 @@
 
             var signupDialog = new JK.SignupDialog(JK.app);
             signupDialog.initialize();
+
+            var signinDialog = new JK.SigninDialog(JK.app);
+            signinDialog.initialize();
         })
     </script>
 
diff --git a/web/app/views/users/_signinDialog.html.erb b/web/app/views/users/_signinDialog.html.erb
new file mode 100644
index 000000000..9dc8df8a0
--- /dev/null
+++ b/web/app/views/users/_signinDialog.html.erb
@@ -0,0 +1,58 @@
+<div class="dialog thin-dialog overlay-small" layout-id="signin-dialog" id="signin-dialog">
+
+  <!-- ftue header -->
+  <div class="content-head">
+    <h1>sign in</h1>
+  </div>
+
+  <!-- inner wrapper -->
+  <div class="overlay-inner">
+
+    <%= link_to image_tag("content/button_facebook_signin.png", {:width => 249, :height => 46 }), '/auth/facebook', class: "signin-facebook" %>
+
+    <br>
+    <br>
+    <br>
+    <strong class="white">Or sign in with JamKazam Account</strong>
+    <br>
+    <br>
+
+    <form>
+      <table cellpadding="10" cellspacing="2">
+        <tbody>
+        <tr>
+          <td>Email Address:<br>
+            <input type="text"><br><br>
+          </td>
+        </tr>
+        <tr>
+          <td>Password:<br>
+            <input type="password"></td>
+        </tr>
+
+        <tr>
+          <td valign="top">
+            <small><input type="checkbox"> Keep me signed in</small>
+            <br><br>
+
+            <div align="center">
+              <a href="web_home.html" class="button-grey signin-cancel">CANCEL</a>&nbsp;&nbsp;<a href="#" class="button-orange m0">SIGN
+              IN</a><br>
+              <br>
+              <small><a href="#">Forgot Password?</a></small>
+            </div>
+          </td>
+        </tr>
+        </tbody>
+      </table>
+    </form>
+
+    <br>
+
+    <div class="center">
+      <small>Don't have an account? <a href="signup.shtml">Sign Up</a></small>
+    </div>
+  </div>
+  <!-- end inner -->
+  <br clear="all">
+</div>
\ No newline at end of file
diff --git a/web/app/views/users/_signupDialog.html.erb b/web/app/views/users/_signupDialog.html.erb
index 9484902a5..6b19e7b1e 100644
--- a/web/app/views/users/_signupDialog.html.erb
+++ b/web/app/views/users/_signupDialog.html.erb
@@ -8,7 +8,7 @@
   <!-- inner wrapper -->
   <div class="overlay-inner">
 
-    <%= image_tag "content/button_facebook_signup.png", {:width => 249, :height => 46 } %>
+    <%= link_to image_tag("content/button_facebook_signup.png", {:width => 249, :height => 46 }), '/auth/facebook', class: "signup-facebook" %>
     <br>
     <br><br>
 
@@ -16,14 +16,14 @@
     <br>
     <br>
 
-    <div class="center"><%= link_to "SIGN UP WITH YOUR EMAIL", signup_path, class: "button-orange block" %>
+    <div class="center"><%= link_to "SIGN UP WITH YOUR EMAIL", signup_path, class: "button-orange block signup-email" %>
 
       <br>
 
       <div class="center">
         <small>Already have an account? <a href="#" class='signin'>Sign In</a><br>
           <br>
-          <a href="#" layout-action="close">Cancel</a></small>
+          <a href="#" class="signup-cancel">Cancel</a></small>
       </div>
     </div>
     <!-- end inner -->
diff --git a/web/config/application.rb b/web/config/application.rb
index f6050245a..bc41c2612 100644
--- a/web/config/application.rb
+++ b/web/config/application.rb
@@ -194,5 +194,8 @@ include JamRuby
     config.email_smtp_user_name       = 'jamkazam'
     config.email_smtp_password        = 'jamjamblueberryjam'
     config.email_smtp_starttls_auto   = true
+
+    config.facebook_app_id       = '468555793186398'
+    config.facebook_app_secret   = '546a5b253972f3e2e8b36d9a3dd5a06e'
   end
 end
diff --git a/web/config/environments/production.rb b/web/config/environments/production.rb
index 61a091e10..04d979d01 100644
--- a/web/config/environments/production.rb
+++ b/web/config/environments/production.rb
@@ -86,4 +86,7 @@ SampleApp::Application.configure do
   config.fp_secret = 'HZBIMSOI5VAQ5LXT4XLG6XA7IE'
 
   config.allow_force_native_client = false
+
+  config.facebook_app_id       = '1412328362347190' # staging
+  config.facebook_app_secret   = '8b1f20430356d44fb49c0a504a9ff401' # staging
 end
diff --git a/web/config/environments/test.rb b/web/config/environments/test.rb
index a7983a303..b164e765c 100644
--- a/web/config/environments/test.rb
+++ b/web/config/environments/test.rb
@@ -59,5 +59,8 @@ SampleApp::Application.configure do
   config.aws_secret_access_key = 'h0V0ffr3JOp/UtgaGrRfAk25KHNiO9gm8Pj9m6v3'
 
   config.icecast_wait_after_reload = 0
+
+  config.facebook_app_id       = '1441492266082868'
+  config.facebook_app_secret   = '233bd040a07e47dcec1cff3e490bfce7'
 end
 
diff --git a/web/config/initializers/omniauth.rb b/web/config/initializers/omniauth.rb
index 243e880cf..0dba7848d 100644
--- a/web/config/initializers/omniauth.rb
+++ b/web/config/initializers/omniauth.rb
@@ -1,5 +1,5 @@
 Rails.application.config.middleware.use OmniAuth::Builder do
-  provider :facebook, '468555793186398', '546a5b253972f3e2e8b36d9a3dd5a06e', {name: "facebook", :scope => 'email,user_location'}
+  provider :facebook, Rails.application.config.facebook_app_id, Rails.application.config.facebook_app_secret, {name: "facebook", :scope => 'email,user_location'}
   provider :google_oauth2, Rails.application.config.google_client_id, Rails.application.config.google_secret, {name: "google_login", approval_prompt: '', scope: 'userinfo.email, userinfo.profile, https://www.google.com/m8/feeds'}
 end
 
diff --git a/web/config/scheduler.yml b/web/config/scheduler.yml
index 8a6dde7df..10fd84d55 100644
--- a/web/config/scheduler.yml
+++ b/web/config/scheduler.yml
@@ -9,9 +9,13 @@ IcecastConfigRetry:
   class: "JamRuby::IcecastConfigRetry"
   description: "Finds icecast servers that have had their config_changed, but no IcecastConfigWriter check recently"
 
-
 IcecastSourceCheck:
   cron: "10 * * * * *"
   class: "JamRuby::IcecastSourceCheck"
   description: "Finds icecast mounts that need their 'sourced' state to change, but haven't in some time"
 
+CleanupFacebookSignup:
+  cron: "30 2 * * *"
+  class: "JamRuby::CleanupFacebookSignup"
+  description: "Deletes facebook_signups that are old"
+
diff --git a/web/lib/user_manager.rb b/web/lib/user_manager.rb
index c4f4fdaec..728bcb652 100644
--- a/web/lib/user_manager.rb
+++ b/web/lib/user_manager.rb
@@ -10,8 +10,22 @@ class UserManager < BaseManager
 
   # Note that almost everything can be nil here. This is because when users sign up via social media,
   # we don't know much about them.
-  def signup(remote_ip, first_name, last_name, email, password = nil, password_confirmation = nil, terms_of_service = nil,
-             instruments = nil, birth_date = nil, location = nil, musician = nil, photo_url = nil, invited_user = nil, signup_confirm_url = nil)
+  def signup(options)
+    remote_ip = options[:remote_ip]
+    first_name = options[:first_name]
+    last_name = options[:last_name]
+    email = options[:email]
+    password = options[:password]
+    password_confirmation = options[:password_confirmation]
+    terms_of_service = options[:terms_of_service]
+    instruments = options[:instruments]
+    birth_date = options[:birth_date]
+    location = options[:location]
+    musician = options[:musician]
+    photo_url = options[:photo_url]
+    invited_user = options[:invited_user]
+    fb_signup = options[:fb_signup]
+    signup_confirm_url = options[:signup_confirm_url]
 
     @user = User.new
 
@@ -33,8 +47,20 @@ class UserManager < BaseManager
     #  return @user # @user.errors.any? is true now
     #else
     # sends email to email account for confirmation
-    @user = User.signup(first_name, last_name, email, password, password_confirmation, terms_of_service,
-                        location, instruments, birth_date, musician, photo_url, invited_user, signup_confirm_url)
+    @user = User.signup(first_name: first_name,
+                        last_name: last_name,
+                        email: email,
+                        password: password,
+                        password_confirmation: password_confirmation,
+                        terms_of_service: terms_of_service,
+                        location: location,
+                        instruments: instruments,
+                        birth_date: birth_date,
+                        musician: musician,
+                        photo_url: photo_url,
+                        invited_user: invited_user,
+                        fb_signup: fb_signup,
+                        signup_confirm_url: signup_confirm_url)
 
     return @user
     #end
diff --git a/web/spec/controllers/sessions_controller_spec.rb b/web/spec/controllers/sessions_controller_spec.rb
index f0de20a45..4c0456aa0 100644
--- a/web/spec/controllers/sessions_controller_spec.rb
+++ b/web/spec/controllers/sessions_controller_spec.rb
@@ -70,18 +70,6 @@ describe SessionsController do
         visit '/auth/facebook'
       end.should change(User, :count).by(0)
     end
-    
-    
-    it "should not create a user when oauth comes in with a currently existing user" do
-      user = FactoryGirl.create(:user)  # in the jam session
-      OmniAuth.config.mock_auth[:facebook][:info][:email] = user.email 
-      OmniAuth.config.mock_auth[:facebook] = OmniAuth.config.mock_auth[:facebook] 
-      
-      lambda do
-        visit '/auth/facebook'
-      end.should change(User, :count).by(0)
-    end
-    
   end
   
   
diff --git a/web/spec/factories.rb b/web/spec/factories.rb
index 0cc98df63..0c359d05a 100644
--- a/web/spec/factories.rb
+++ b/web/spec/factories.rb
@@ -308,5 +308,14 @@ FactoryGirl.define do
     association         :authentication, :factory => :icecast_user_authentication
   end
 
-
+  factory :facebook_signup, :class => JamRuby::FacebookSignup do
+    sequence(:lookup_id)      { |n| "lookup-#{n}"}
+    sequence(:first_name)     { |n| "first-#{n}"}
+    sequence(:last_name)      { |n| "last-#{n}"}
+    gender                    'M'
+    sequence(:email)          { |n| "jammin-#{n}@jamkazam.com"}
+    sequence(:uid)            { |n| "uid-#{n}"}
+    sequence(:token)          { |n| "token-#{n}"}
+    token_expires_at          Time.now
+  end
 end
diff --git a/web/spec/features/signup_spec.rb b/web/spec/features/signup_spec.rb
index 2cf59a348..43bf5049e 100644
--- a/web/spec/features/signup_spec.rb
+++ b/web/spec/features/signup_spec.rb
@@ -83,9 +83,12 @@ describe "Signup", :js => true, :type => :feature, :capybara_feature => true do
       before do
         @invited_user = FactoryGirl.create(:invited_user, :email => "noone@jamkazam.com")
         visit "#{signup_path}?invitation_code=#{@invited_user.invitation_code}"
+        find('#jam_ruby_user_first_name')
+        sleep 1 # if I don't do this, first_name and/or last name intermittently fail to fill out
 
         UserMailer.deliveries.clear
-        fill_in "jam_ruby_user[first_name]",    with: "Mike"
+
+        fill_in "jam_ruby_user[first_name]", with: "Mike"
         fill_in "jam_ruby_user[last_name]", with: "Jones"
         fill_in "jam_ruby_user[email]", with: "newuser2@jamkazam.com"
         fill_in "jam_ruby_user[password]", with: "jam123"
@@ -110,6 +113,8 @@ describe "Signup", :js => true, :type => :feature, :capybara_feature => true do
         @user = FactoryGirl.create(:user)
         @invited_user = FactoryGirl.create(:invited_user, :sender => @user, :autofriend => true, :email => "noone@jamkazam.com")
         visit "#{signup_path}?invitation_code=#{@invited_user.invitation_code}"
+        find('#jam_ruby_user_first_name')
+        sleep 1 # if I don't do this, first_name and/or last name intermittently fail to fill out
 
         fill_in "jam_ruby_user[first_name]",    with: "Mike"
         fill_in "jam_ruby_user[last_name]", with: "Jones"
@@ -136,6 +141,8 @@ describe "Signup", :js => true, :type => :feature, :capybara_feature => true do
       before do
         @invited_user = FactoryGirl.create(:invited_user, :email => "noone@jamkazam.com")
         visit "#{signup_path}?invitation_code=#{@invited_user.invitation_code}"
+        find('#jam_ruby_user_first_name')
+        sleep 1 # if I don't do this, first_name and/or last name intermittently fail to fill out
 
         fill_in "jam_ruby_user[first_name]",    with: "Mike"
         fill_in "jam_ruby_user[last_name]", with: "Jones"
@@ -159,6 +166,8 @@ describe "Signup", :js => true, :type => :feature, :capybara_feature => true do
       before do
         @invited_user = FactoryGirl.create(:invited_user, :email => "what@jamkazam.com")
         visit "#{signup_path}?invitation_code=#{@invited_user.invitation_code}"
+        find('#jam_ruby_user_first_name')
+        sleep 1 # if I don't do this, first_name and/or last name intermittently fail to fill out
 
         UserMailer.deliveries.clear
 
diff --git a/web/spec/features/welcome_spec.rb b/web/spec/features/welcome_spec.rb
new file mode 100644
index 000000000..02eb1c263
--- /dev/null
+++ b/web/spec/features/welcome_spec.rb
@@ -0,0 +1,66 @@
+require 'spec_helper'
+
+describe "Welcome", :js => true, :type => :feature, :capybara_feature => true  do
+
+  subject { page }
+
+  before(:all) do
+    Capybara.javascript_driver = :poltergeist
+    Capybara.current_driver = Capybara.javascript_driver
+    Capybara.default_wait_time = 10
+  end
+
+  before(:each) do
+    page.driver.headers = { 'User-Agent' => ' JamKazam ' }
+    visit "/"
+    find('h1', text: 'Play music together over the Internet as if in the same room')
+
+  end
+
+  let(:user) { FactoryGirl.create(:user) }
+
+  describe "signup" do
+
+    before(:each) do
+      find('#signup').trigger(:click)
+    end
+
+    it "show dialog" do
+      should have_selector('h1',    text: 'sign up for jamkazam')
+    end
+
+    describe "signup with email" do
+
+      it "click will redirect to signup page" do
+        find('.signup-email').trigger(:click)
+        find('h2', text: 'Create a JamKazam account')
+      end
+    end
+
+    # this works becuause OmniAuth.config_mode.test = true
+    describe "signup with facebook" do
+
+
+      before(:each) do
+
+        OmniAuth.config.mock_auth[:facebook] = OmniAuth::AuthHash.new({
+             :provider => "facebook",
+             :uid      => "1234",
+             :info   => {:name       => "John Doe",
+                         :email      => "johndoe@email.com"},
+             :credentials => {:token => "testtoken234tsdf", :expires_at => 2391456019},
+             :extra => { :raw_info => {:first_name => 'John', :last_name => 'Doe', :email => 'facebook@jamkazam.com', :gender => 'male'}} })
+      end
+
+      it "click will redirect to facebook for authorization" do
+        find('.signup-facebook').trigger(:click)
+        find('h2', text: 'Create a JamKazam account')
+        find_field('jam_ruby_user[first_name]').value.should eq 'John'
+        find_field('jam_ruby_user[last_name]').value.should eq 'Doe'
+        find_field('jam_ruby_user[email]').value.should eq 'facebook@jamkazam.com'
+      end
+    end
+
+  end
+end
+
diff --git a/web/spec/managers/user_manager_spec.rb b/web/spec/managers/user_manager_spec.rb
index 89d501ebe..85dec168f 100644
--- a/web/spec/managers/user_manager_spec.rb
+++ b/web/spec/managers/user_manager_spec.rb
@@ -15,7 +15,16 @@ describe UserManager do
       MaxMindIsp.delete_all # prove that city/state/country will remain nil if no maxmind data
       MaxMindGeo.delete_all
 
-      @user = @user_manager.signup("127.0.0.1", "bob", "smith", "userman1@jamkazam.com", "foobar", "foobar", true, @instruments, nil, nil, true, nil, nil, "http://localhost:3000/confirm" )
+      @user = @user_manager.signup(remote_ip: "127.0.0.1",
+                                   first_name: "bob",
+                                   last_name: "smith",
+                                   email: "userman1@jamkazam.com",
+                                   password: "foobar",
+                                   password_confirmation: "foobar",
+                                   terms_of_service: true,
+                                   instruments: @instruments,
+                                   musician:true,
+                                   signup_confirm_url: "http://localhost:3000/confirm" )
 
       @user.errors.any?.should be_false
       @user.first_name.should == "bob"
@@ -33,8 +42,16 @@ describe UserManager do
     end
 
     it "signup successfully with instruments" do
-      @user = @user_manager.signup("127.0.0.1", "bob", "smith", "userman2@jamkazam.com", "foobar", "foobar", true,
-                                   @instruments, nil, nil, true, nil, nil, "http://localhost:3000/confirm")
+      @user = @user_manager.signup(remote_ip: "127.0.0.1",
+                                   first_name: "bob",
+                                   last_name: "smith",
+                                   email: "userman2@jamkazam.com",
+                                   password: "foobar",
+                                   password_confirmation: "foobar",
+                                   terms_of_service: true,
+                                   instruments: @instruments,
+                                   musician: true,
+                                   signup_confirm_url: "http://localhost:3000/confirm")
 
       @user.errors.any?.should be_false
       @user.instruments.length.should == 1
@@ -44,7 +61,15 @@ describe UserManager do
     end
 
     it "doesnt fail if ip address is nil" do
-      @user = @user_manager.signup(nil, "bob", "smith", "userman3@jamkazam.com", "foobar", "foobar", true, @instruments, nil, nil, true, nil, nil, "http://localhost:3000/confirm" )
+      @user = @user_manager.signup(first_name: "bob",
+                                   last_name: "smith",
+                                   email: "userman3@jamkazam.com",
+                                   password: "foobar",
+                                   password_confirmation: "foobar",
+                                   terms_of_service: true,
+                                   instruments: @instruments,
+                                   musician: true,
+                                   signup_confirm_url: "http://localhost:3000/confirm" )
 
       @user.errors.any?.should be_false
       @user.city.should be_nil
@@ -56,7 +81,16 @@ describe UserManager do
       MaxMindManager.active_record_transaction do |manager|
         manager.create_phony_database()
       end
-      @user = @user_manager.signup("127.0.0.1", "bob", "smith", "userman4@jamkazam.com", "foobar", "foobar", true, @instruments, nil, nil, true, nil, nil, "http://localhost:3000/confirm" )
+      @user = @user_manager.signup(remote_ip: "127.0.0.1",
+                                   first_name: "bob",
+                                   last_name: "smith",
+                                   email: "userman4@jamkazam.com",
+                                   password: "foobar",
+                                   password_confirmation: "foobar",
+                                   terms_of_service: true,
+                                   instruments: @instruments,
+                                   musician: true,
+                                   signup_confirm_url: "http://localhost:3000/confirm" )
 
       @user.errors.any?.should be_false
       @user.city.should == 'City 127'
@@ -68,7 +102,17 @@ describe UserManager do
       MaxMindManager.active_record_transaction do |manager|
         manager.create_phony_database()
       end
-      @user = @user_manager.signup("127.0.0.1", "bob", "smith", "userman5@jamkazam.com", "foobar", "foobar", true, @instruments, nil, @location, true, nil, nil, "http://localhost:3000/confirm" )
+      @user = @user_manager.signup(remote_ip: "127.0.0.1",
+                                   first_name: "bob",
+                                   last_name: "smith",
+                                   email: "userman5@jamkazam.com",
+                                   password: "foobar",
+                                   password_confirmation: "foobar",
+                                   terms_of_service: true,
+                                   instruments: @instruments,
+                                   location: @location,
+                                   musician: true,
+                                   signup_confirm_url: "http://localhost:3000/confirm" )
 
       @user.errors.any?.should be_false
       @user.city.should == 'Little Rock'
@@ -80,7 +124,17 @@ describe UserManager do
       MaxMindManager.active_record_transaction do |manager|
         manager.create_phony_database()
       end
-      @user = @user_manager.signup("127.0.0.1", "bob", "smith", "userman6@jamkazam.com", "foobar", "foobar", true, @instruments, nil, {}, true, nil, nil, "http://localhost:3000/confirm" )
+      @user = @user_manager.signup(remote_ip: "127.0.0.1",
+                                   first_name: "bob",
+                                   last_name: "smith",
+                                   email: "userman6@jamkazam.com",
+                                   password: "foobar",
+                                   password_confirmation: "foobar",
+                                   terms_of_service: true,
+                                   instruments: @instruments,
+                                   location: {},
+                                   musician: true,
+                                   signup_confirm_url: "http://localhost:3000/confirm" )
 
       @user.errors.any?.should be_false
       @user.city.should be_nil
@@ -93,7 +147,17 @@ describe UserManager do
       MaxMindManager.active_record_transaction do |manager|
         manager.create_phony_database()
       end
-      @user = @user_manager.signup("127.0.0.1", "bob", "smith", "userman7@jamkazam.com", "foobar", "foobar", true, @instruments, Date.new(2001, 1, 1), nil, true, nil, nil, "http://localhost:3000/confirm" )
+      @user = @user_manager.signup(remote_ip: "127.0.0.1",
+                                   first_name: "bob",
+                                   last_name: "smith",
+                                   email: "userman7@jamkazam.com",
+                                   password: "foobar",
+                                   password_confirmation: "foobar",
+                                   terms_of_service: true,
+                                   instruments: @instruments,
+                                   birth_date: Date.new(2001, 1, 1),
+                                   musician: true,
+                                   signup_confirm_url: "http://localhost:3000/confirm" )
 
       @user.errors.any?.should be_false
       @user.birth_date.should == Date.new(2001, 1, 1)
@@ -101,26 +165,64 @@ describe UserManager do
 
 
     it "duplicate signup failure" do
-      @user = @user_manager.signup("127.0.0.1", "bob", "smith", "userman8@jamkazam.com", "foobar", "foobar", true, @instruments, nil, nil, true, nil, nil, "http://localhost:3000/confirm")
+      @user = @user_manager.signup(remote_ip: "127.0.0.1",
+                                   first_name: "bob",
+                                   last_name: "smith",
+                                   email: "userman8@jamkazam.com",
+                                   password: "foobar",
+                                   password_confirmation: "foobar",
+                                   terms_of_service: true,
+                                   instruments: @instruments,
+                                   musician: true,
+                                   signup_confirm_url: "http://localhost:3000/confirm")
+
       UserMailer.deliveries.length.should == 1
       @user.errors.any?.should be_false
 
       # exactly the same parameters; should dup on email, and send no email
-      @user = @user_manager.signup("127.0.0.1", "bob", "smith", "userman8@jamkazam.com", "foobar", "foobar", true, @instruments, nil, nil, true, nil, nil, "http://localhost:3000/confirm")
+      @user = @user_manager.signup(remote_ip: "127.0.0.1",
+                                   first_name: "bob",
+                                   last_name: "smith",
+                                   email: "userman8@jamkazam.com",
+                                   password: "foobar",
+                                   password_confirmation: "foobar",
+                                   terms_of_service: true,
+                                   instruments: @instruments,
+                                   musician: true,
+                                   signup_confirm_url: "http://localhost:3000/confirm")
       UserMailer.deliveries.length.should == 1
       @user.errors.any?.should be_true
       @user.errors[:email][0].should == "has already been taken"
     end
 
-    it "fail on no username" do
-      @user = @user_manager.signup("127.0.0.1", "", "", "userman10@jamkazam.com", "foobar", "foobar", true, @instruments, nil, nil, true, nil, nil, "http://localhost:3000/confirm")
+    it "fail on no first_name/last_name" do
+      @user = @user_manager.signup(remote_ip: "127.0.0.1",
+                                   first_name: "",
+                                   last_name: "",
+                                   email: "userman10@jamkazam.com",
+                                   password: "foobar",
+                                   password_confirmation: "foobar",
+                                   terms_of_service: true,
+                                   instruments: @instruments,
+                                   musician: true,
+                                   signup_confirm_url: "http://localhost:3000/confirm")
       UserMailer.deliveries.length.should == 0
       @user.errors.any?.should be_true
       @user.errors[:first_name][0].should == "can't be blank"
     end
 
     it "fail on no email" do
-      @user = @user_manager.signup("127.0.0.1", "murp", "blurp", "", "foobar", "foobar", true, @instruments, nil, nil, true, nil, nil, "http://localhost:3000/confirm" )
+      @user = @user_manager.signup(remote_ip: "127.0.0.1",
+                                   first_name: "murp",
+                                   last_name: "blurp",
+                                   email: "",
+                                   password: "foobar",
+                                   password_confirmation: "foobar",
+                                   terms_of_service: true,
+                                   instruments: @instruments,
+                                   musician: true,
+                                   signup_confirm_url: "http://localhost:3000/confirm")
+
       UserMailer.deliveries.length.should == 0
       @user.errors.any?.should be_true
       @user.errors[:email][0].should == "can't be blank"
@@ -130,7 +232,16 @@ describe UserManager do
 
   describe "signup_confirm" do
     it "fail on no username" do
-       @user = @user_manager.signup("127.0.0.1", "bob", "smith", "userman11@jamkazam.com", "foobar", "foobar", true, @instruments, nil, nil, true, nil, nil, "http://localhost:3000/confirm" )
+       @user = @user_manager.signup(remote_ip: "127.0.0.1",
+                                    first_name: "bob",
+                                    last_name: "smith",
+                                    email: "userman11@jamkazam.com",
+                                    password: "foobar",
+                                    password_confirmation: "foobar",
+                                    terms_of_service: true,
+                                    instruments: @instruments,
+                                    musician: true,
+                                    signup_confirm_url: "http://localhost:3000/confirm")
        @user = @user_manager.signup_confirm(@user.signup_token)
        @user.email_confirmed.should be_true
     end
@@ -156,8 +267,17 @@ describe UserManager do
 
     @invitation.accepted.should be_false
 
-    @user = @user_manager.signup("127.0.0.1", "bob", "smith", @invitation.email, "foobar", "foobar", true,
-                                 @instruments, nil, nil, true, nil, @invitation, "http://localhost:3000/confirm")
+    @user = @user_manager.signup(remote_ip: "127.0.0.1",
+                                 first_name: "bob",
+                                 last_name: "smith",
+                                 email: @invitation.email,
+                                 password: "foobar",
+                                 password_confirmation: "foobar",
+                                 terms_of_service: true,
+                                 instruments: @instruments,
+                                 musician: true,
+                                 invited_user: @invitation,
+                                 signup_confirm_url: "http://localhost:3000/confirm")
 
     @user.errors.any?.should be_false
     @user.email_confirmed.should be_true
@@ -176,8 +296,17 @@ describe UserManager do
     UserMailer.deliveries.clear
 
 
-    @user = @user_manager.signup("127.0.0.1", "bob", "smith", @invitation.email, "foobar", "foobar", true,
-                                 @instruments, nil, nil, true, nil, @invitation, "http://localhost:3000/confirm")
+    @user = @user_manager.signup(remote_ip: "127.0.0.1",
+                                 first_name: "bob",
+                                 last_name: "smith",
+                                 email: @invitation.email,
+                                 password: "foobar",
+                                 password_confirmation: "foobar",
+                                 terms_of_service: true,
+                                 instruments: @instruments,
+                                 musician: true,
+                                 invited_user: @invitation,
+                                 signup_confirm_url: "http://localhost:3000/confirm")
 
     @user.errors.any?.should be_false
     @user.email_confirmed.should be_true
@@ -196,8 +325,17 @@ describe UserManager do
     UserMailer.deliveries.clear
 
 
-    @user = @user_manager.signup("127.0.0.1", "bob", "smith", @invitation.email, "foobar", "foobar", true,
-                                 @instruments, nil, nil, true, nil, @invitation, "http://localhost:3000/confirm")
+    @user = @user_manager.signup(remote_ip: "127.0.0.1",
+                                 first_name: "bob",
+                                 last_name: "smith",
+                                 email: @invitation.email,
+                                 password: "foobar",
+                                 password_confirmation: "foobar",
+                                 terms_of_service: true,
+                                 instruments: @instruments,
+                                 musician: true,
+                                 invited_user: @invitation,
+                                 signup_confirm_url: "http://localhost:3000/confirm")
 
     @user.errors.any?.should be_false
     @user.email_confirmed.should be_true
@@ -218,8 +356,17 @@ describe UserManager do
     UserMailer.deliveries.clear
 
 
-    @user = @user_manager.signup("127.0.0.1", "bob", "smith", "userman12@jamkazam.com", "foobar", "foobar", true,
-                                 @instruments, nil, nil, true, nil, @invitation, "http://localhost:3000/confirm")
+    @user = @user_manager.signup(remote_ip: "127.0.0.1",
+                                 first_name: "bob",
+                                 last_name: "smith",
+                                 email: "userman12@jamkazam.com",
+                                 password: "foobar",
+                                 password_confirmation: "foobar",
+                                 terms_of_service: true,
+                                 instruments: @instruments,
+                                 musician: true,
+                                 invited_user: @invitation,
+                                 signup_confirm_url: "http://localhost:3000/confirm")
 
     @user.errors.any?.should be_false
     @user.email_confirmed.should be_false
@@ -229,6 +376,91 @@ describe UserManager do
     @user.friends?(@some_user).should be_true
     @user.friends?(@some_user).should be_true
 
-    UserMailer.deliveries.length.should == 1 # no emails should be sent, in this case
+    UserMailer.deliveries.length.should == 1
+  end
+
+  it "signup successfully with facebook signup additional info" do
+    fb_signup = FactoryGirl.create(:facebook_signup)
+
+    UserMailer.deliveries.clear
+
+
+    @user = @user_manager.signup(remote_ip: "127.0.0.1",
+                                 first_name: "bob",
+                                 last_name: "smith",
+                                 email: fb_signup.email,
+                                 password: "foobar",
+                                 password_confirmation: "foobar",
+                                 terms_of_service: true,
+                                 instruments: @instruments,
+                                 musician: true,
+                                 fb_signup: fb_signup,
+                                 signup_confirm_url: "http://localhost:3000/confirm")
+
+    @user.errors.any?.should be_false
+    @user.email_confirmed.should be_true
+    @user.signup_token.should be_nil
+    @user.user_authorizations.length.should == 1
+    @user.user_authorizations[0].uid = fb_signup.uid
+    @user.user_authorizations[0].token = fb_signup.token
+    @user.user_authorizations[0].token_expiration = fb_signup.token_expires_at
+
+    UserMailer.deliveries.length.should == 1
+  end
+
+  it "signup successfully with facebook signup additional info, but different email" do
+    fb_signup = FactoryGirl.create(:facebook_signup)
+
+    UserMailer.deliveries.clear
+
+
+    @user = @user_manager.signup(remote_ip: "127.0.0.1",
+                                 first_name: "bob",
+                                 last_name: "smith",
+                                 email: "userman13@jamkazam.com",
+                                 password: "foobar",
+                                 password_confirmation: "foobar",
+                                 terms_of_service: true,
+                                 instruments: @instruments,
+                                 musician: true,
+                                 fb_signup: fb_signup,
+                                 signup_confirm_url: "http://localhost:3000/confirm")
+
+    @user.errors.any?.should be_false
+    @user.email_confirmed.should be_false
+    @user.signup_token.should_not be_nil
+    @user.user_authorizations.length.should == 1
+    @user.user_authorizations[0].uid = fb_signup.uid
+    @user.user_authorizations[0].token = fb_signup.token
+    @user.user_authorizations[0].token_expiration = fb_signup.token_expires_at
+
+    UserMailer.deliveries.length.should == 1
+  end
+
+  it "fail to signup when facebook UID already taken" do
+    fb_signup = FactoryGirl.create(:facebook_signup)
+
+    @some_user = FactoryGirl.create(:user)
+    @some_user.update_fb_authorization(fb_signup)
+    @some_user.save!
+
+    UserMailer.deliveries.clear
+
+    @user = @user_manager.signup(remote_ip: "127.0.0.1",
+                                 first_name: "bob",
+                                 last_name: "smith",
+                                 email: "userman13@jamkazam.com",
+                                 password: "foobar",
+                                 password_confirmation: "foobar",
+                                 terms_of_service: true,
+                                 instruments: @instruments,
+                                 musician: true,
+                                 fb_signup: fb_signup,
+                                 signup_confirm_url: "http://localhost:3000/confirm")
+
+    @user.errors.any?.should be_true
+    @user.errors[:user_authorizations].should == ['is invalid']
+
+    UserMailer.deliveries.length.should == 0
   end
 end
diff --git a/web/spec/spec_helper.rb b/web/spec/spec_helper.rb
index 5dcd63570..8dbb93069 100644
--- a/web/spec/spec_helper.rb
+++ b/web/spec/spec_helper.rb
@@ -1,5 +1,6 @@
 require 'rubygems'
 require 'spork'
+require 'omniauth'
 #uncomment the following line to use spork with the debugger
 #require 'spork/ext/ruby-debug'
 
@@ -25,6 +26,8 @@ include JamRuby
 # put ActionMailer into test mode
 ActionMailer::Base.delivery_method = :test
 
+
+
 Spork.prefork do
   # Loading more in this block will cause your tests to run faster. However,
   # if you change any configuration or code from libraries loaded here, you'll

From d10f966c0be462aa269bf21449abc827f92f3e7b Mon Sep 17 00:00:00 2001
From: Seth Call <seth@jamkazam.com>
Date: Mon, 3 Feb 2014 21:19:34 +0000
Subject: [PATCH 02/21] * VRFS-1025 finished

---
 .../images/content/button_facebook_signin.png    | Bin 0 -> 6583 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 web/app/assets/images/content/button_facebook_signin.png

diff --git a/web/app/assets/images/content/button_facebook_signin.png b/web/app/assets/images/content/button_facebook_signin.png
new file mode 100644
index 0000000000000000000000000000000000000000..08b15b7ba18938096e7b5fa9547b927d02d928c2
GIT binary patch
literal 6583
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
Hw2k~9WN0Vf

literal 0
HcmV?d00001


From d82b0b6fd92f4e3ea3ff987b756ec720be4960e0 Mon Sep 17 00:00:00 2001
From: Seth Call <seth@jamkazam.com>
Date: Tue, 4 Feb 2014 02:45:52 +0000
Subject: [PATCH 03/21] * VRFS-1026 - putting user dropdown back to where it
 belonged

---
 web/app/assets/javascripts/jam_rest.js        |  14 +++
 .../assets/javascripts/web/signinDialog.js    |  56 ++++++++-
 .../assets/javascripts/web/signupDialog.js    |   6 +
 .../stylesheets/client/content.css.scss       |  18 +--
 .../stylesheets/client/user_dropdown.css.scss |   1 -
 .../stylesheets/users/signinDialog.css.scss   |  56 +++++++++
 web/app/assets/stylesheets/web/web.css        |   1 +
 web/app/controllers/api_auths_controller.rb   |  22 ++++
 .../controllers/api_sessions_controller.rb    |  20 ++++
 web/app/controllers/clients_controller.rb     |   2 +-
 web/app/controllers/users_controller.rb       |   2 +
 web/app/views/users/_signinDialog.html.erb    |  61 +++++-----
 web/app/views/users/_signupDialog.html.erb    |   2 +-
 web/config/routes.rb                          |   3 +
 web/spec/features/welcome_spec.rb             | 106 ++++++++++++++++--
 15 files changed, 313 insertions(+), 57 deletions(-)
 create mode 100644 web/app/assets/stylesheets/users/signinDialog.css.scss
 create mode 100644 web/app/controllers/api_auths_controller.rb
 create mode 100644 web/app/controllers/api_sessions_controller.rb

diff --git a/web/app/assets/javascripts/jam_rest.js b/web/app/assets/javascripts/jam_rest.js
index 9b2235032..86e7c6344 100644
--- a/web/app/assets/javascripts/jam_rest.js
+++ b/web/app/assets/javascripts/jam_rest.js
@@ -189,6 +189,19 @@
             });
         }
 
+        function login(options) {
+            var url =  '/api/auths/login';
+
+            return $.ajax({
+                type: "POST",
+                dataType: "json",
+                url: url,
+                processData: false,
+                contentType: 'application/json',
+                data: JSON.stringify(options)
+            });
+        }
+
         function getUserDetail(options) {
             var id = getId(options);
 
@@ -793,6 +806,7 @@
         this.createBandInvitation = createBandInvitation;
         this.updateBandInvitation = updateBandInvitation;
         this.removeBandMember = removeBandMember;
+        this.login = login;
 
         return this;
     };
diff --git a/web/app/assets/javascripts/web/signinDialog.js b/web/app/assets/javascripts/web/signinDialog.js
index aded10b15..5d1f4e989 100644
--- a/web/app/assets/javascripts/web/signinDialog.js
+++ b/web/app/assets/javascripts/web/signinDialog.js
@@ -9,16 +9,60 @@
         var rest = context.JK.Rest();
         var dialogId = '#signin-dialog';
 
+        function reset() {
+            $(dialogId + ' #signin-form').removeClass('login-error')
+
+            $(dialogId + ' input[name=email]').val('');
+            $(dialogId + ' input[name=password]').val('');
+            $(dialogId + ' input[name=remember_me]').attr('checked', 'checked')
+        }
+
+        function login() {
+            var email = $(dialogId + ' input[name=email]').val();
+            var password = $(dialogId + ' input[name=password]').val();
+            var rememberMe = $(dialogId + ' input[name=remember_me]').is(':checked')
+
+            rest.login({email: email, password: password, remember_me: rememberMe})
+                .done(function() {
+                    app.layout.closeDialog('signin-dialog')
+                    window.location = '/client'
+                })
+                .fail(function(jqXHR) {
+                    if(jqXHR.status == 422) {
+                        $(dialogId + ' #signin-form').addClass('login-error')
+                    }
+                    else  {
+                        app.notifyServerError(jqXHR, "Unable to log in")
+                    }
+                })
+        }
+
         function events() {
-           $(dialogId + ' .signin-cancel').click(function(e) {
-               app.layout.closeDialog('signin-dialog');
-               e.stopPropagation();
-               return false;
-           });
+            $(dialogId + ' .signin-cancel').click(function(e) {
+                app.layout.closeDialog('signin-dialog');
+                e.stopPropagation();
+                return false;
+            });
+
+            $(dialogId + ' #signin-form').submit(function(e) {
+                login();
+                return false;
+            });
+
+            $(dialogId + ' .signin-submit').click(function(e) {
+                login();
+                return false;
+            });
+
+            $(dialogId + ' .show-signup-dialog').click(function(e) {
+                app.layout.closeDialog('signin-dialog')
+                app.layout.showDialog('signup-dialog')
+                return false;
+            })
         }
 
         function beforeShow() {
-
+           reset();
         }
 
         function afterHide() {
diff --git a/web/app/assets/javascripts/web/signupDialog.js b/web/app/assets/javascripts/web/signupDialog.js
index 2c85ac2f7..fc126cb57 100644
--- a/web/app/assets/javascripts/web/signupDialog.js
+++ b/web/app/assets/javascripts/web/signupDialog.js
@@ -15,6 +15,12 @@
                e.stopPropagation();
                return false;
            });
+
+            $(dialogId + ' .show-signin-dialog').click(function(e) {
+                app.layout.closeDialog('signup-dialog')
+                app.layout.showDialog('signin-dialog')
+                return false;
+            })
         }
 
         function beforeShow() {
diff --git a/web/app/assets/stylesheets/client/content.css.scss b/web/app/assets/stylesheets/client/content.css.scss
index a7a4d6584..807a4ae93 100644
--- a/web/app/assets/stylesheets/client/content.css.scss
+++ b/web/app/assets/stylesheets/client/content.css.scss
@@ -190,13 +190,17 @@
   font-size:24px;
 }
 
-.content-wrapper select, .content-wrapper textarea, .content-wrapper input[type=text], .content-wrapper input[type=password], div.friendbox, .ftue-inner input[type=text], .ftue-inner input[type=password], .dialog-inner textarea, .dialog-inner input[type=text], .dialog-inner select   {
-  font-family:"Raleway", arial, sans-serif;
-  background-color:#c5c5c5;
-  border:none;
-  -webkit-box-shadow: inset 2px 2px 3px 0px #888;
-  box-shadow: inset 2px 2px 3px 0px #888;
-  color:#666;
+.content-wrapper, .dialog, .dialog-inner, .ftue-inner {
+
+    select, textarea,  input[type=text], input[type=password], div.friendbox {
+    font-family:"Raleway", arial, sans-serif;
+    background-color:#c5c5c5;
+    border:none;
+    -webkit-box-shadow: inset 2px 2px 3px 0px #888;
+    box-shadow: inset 2px 2px 3px 0px #888;
+    color:#666;
+  }
+
 }
 
 .create-session-description {
diff --git a/web/app/assets/stylesheets/client/user_dropdown.css.scss b/web/app/assets/stylesheets/client/user_dropdown.css.scss
index 42e8081af..79096c8b8 100644
--- a/web/app/assets/stylesheets/client/user_dropdown.css.scss
+++ b/web/app/assets/stylesheets/client/user_dropdown.css.scss
@@ -9,7 +9,6 @@
 #profile {
   float: right;
   height: 54px;
-  margin-top: 30px;
   text-align: right;
 
   ul {
diff --git a/web/app/assets/stylesheets/users/signinDialog.css.scss b/web/app/assets/stylesheets/users/signinDialog.css.scss
new file mode 100644
index 000000000..3bcb8cc63
--- /dev/null
+++ b/web/app/assets/stylesheets/users/signinDialog.css.scss
@@ -0,0 +1,56 @@
+#signin-dialog {
+  height:auto;
+}
+
+#signin-dialog {
+
+  div.field {
+    width:100%;
+  }
+
+  div.overlay-inner {
+    height:auto;
+  }
+
+  label {
+    margin-bottom:2px;
+  }
+
+  div.email {
+    margin-top:5px;
+  }
+
+  div.password {
+    margin-top:20px;
+  }
+
+  div.actions {
+      margin-top:20px;
+  }
+
+  .login-error {
+    background-color: #330000;
+    border: 1px solid #990000;
+    padding:4px;
+
+    div.actions {
+      margin-top:10px;
+    }
+  }
+
+  .login-error-msg {
+    display:none;
+    margin-top:10px;
+    text-align:center;
+    color:#F00;
+    font-size:11px;
+  }
+
+  .login-error .login-error-msg {
+    display:block;
+  }
+
+  input[type=text], input[type=password]{
+    box-sizing: border-box;
+  }
+}
\ No newline at end of file
diff --git a/web/app/assets/stylesheets/web/web.css b/web/app/assets/stylesheets/web/web.css
index 98e7bd256..de27dc5bc 100644
--- a/web/app/assets/stylesheets/web/web.css
+++ b/web/app/assets/stylesheets/web/web.css
@@ -13,4 +13,5 @@
 *= require web/recordings
 *= require web/welcome
 #= require web/sessions
+*= require users/signinDialog
 */
\ No newline at end of file
diff --git a/web/app/controllers/api_auths_controller.rb b/web/app/controllers/api_auths_controller.rb
new file mode 100644
index 000000000..00001a7e4
--- /dev/null
+++ b/web/app/controllers/api_auths_controller.rb
@@ -0,0 +1,22 @@
+class ApiAuthsController < ApiController
+
+  respond_to :json
+
+  def login
+    user = User.authenticate(params[:email], params[:password])
+
+    if user.nil?
+      render :json => {}, :status => 422
+    else
+      if jkclient_agent?
+        user.update_progression_field(:first_ran_client_at)
+      end
+
+      @session_only_cookie = !jkclient_agent? && !params[:remember_me]
+
+      sign_in user
+
+      render :json => {}, :status => :ok
+    end
+  end
+end
diff --git a/web/app/controllers/api_sessions_controller.rb b/web/app/controllers/api_sessions_controller.rb
new file mode 100644
index 000000000..b2f860747
--- /dev/null
+++ b/web/app/controllers/api_sessions_controller.rb
@@ -0,0 +1,20 @@
+class ApiSearchController < ApiController
+
+  def login
+    user = User.authenticate(params[:email], params[:password])
+
+    if user.nil?
+      render :json => {}, :status => 422
+    else
+      if jkclient_agent?
+        user.update_progression_field(:first_ran_client_at)
+      end
+
+      @session_only_cookie = !jkclient_agent? && 0 == params[:remember_me].to_i
+
+      sign_in user
+
+      render :json => {}, :status => :ok
+    end
+  end
+end
diff --git a/web/app/controllers/clients_controller.rb b/web/app/controllers/clients_controller.rb
index 009256e40..d8dde3f7a 100644
--- a/web/app/controllers/clients_controller.rb
+++ b/web/app/controllers/clients_controller.rb
@@ -35,7 +35,7 @@ class ClientsController < ApplicationController
     if current_user
       render :layout => 'client'
     else
-      redirect_to "/signin"
+      redirect_to root_url
     end
   end
 
diff --git a/web/app/controllers/users_controller.rb b/web/app/controllers/users_controller.rb
index 6c98a031d..770f3ca15 100644
--- a/web/app/controllers/users_controller.rb
+++ b/web/app/controllers/users_controller.rb
@@ -133,6 +133,8 @@ class UsersController < ApplicationController
     terms_of_service = params[:jam_ruby_user][:terms_of_service].nil? ? false : true
     musician = params[:jam_ruby_user][:musician]
 
+    puts "params: #{params.inspect}"
+
     @user = UserManager.new.signup(remote_ip: request.remote_ip,
                                     first_name: params[:jam_ruby_user][:first_name],
                                     last_name: params[:jam_ruby_user][:last_name],
diff --git a/web/app/views/users/_signinDialog.html.erb b/web/app/views/users/_signinDialog.html.erb
index 9dc8df8a0..b14733178 100644
--- a/web/app/views/users/_signinDialog.html.erb
+++ b/web/app/views/users/_signinDialog.html.erb
@@ -8,7 +8,7 @@
   <!-- inner wrapper -->
   <div class="overlay-inner">
 
-    <%= link_to image_tag("content/button_facebook_signin.png", {:width => 249, :height => 46 }), '/auth/facebook', class: "signin-facebook" %>
+    <%= link_to image_tag("content/button_facebook_signin.png", {:width => 249, :height => 46}), '/auth/facebook', class: "signin-facebook" %>
 
     <br>
     <br>
@@ -17,42 +17,43 @@
     <br>
     <br>
 
-    <form>
-      <table cellpadding="10" cellspacing="2">
-        <tbody>
-        <tr>
-          <td>Email Address:<br>
-            <input type="text"><br><br>
-          </td>
-        </tr>
-        <tr>
-          <td>Password:<br>
-            <input type="password"></td>
-        </tr>
+    <form id="signin-form" method="post" action="/">
 
-        <tr>
-          <td valign="top">
-            <small><input type="checkbox"> Keep me signed in</small>
-            <br><br>
+      <div class="field email">
+        <label for="email">Email Address:</label>
+        <input type="text" name="email"/>
+      </div>
+
+      <div class="field password">
+        <label for="password">Password:</label>
+        <input type="password" name="password"/>
+      </div>
+
+
+      <small><input name="remember_me" type="checkbox"> Keep me signed in</small>
+
+      <div class="login-error-msg">Invalid login</div>
+
+      <br clear="all"/>
+
+      <div align="center" class="actions">
+
+        <a href="web_home.html" class="button-grey signin-cancel">CANCEL</a>&nbsp;&nbsp;<input type="submit" value="SIGN IN" href="#" class="button-orange m0 signin-submit" />
+        <br>
+        <br>
+        <small><a class='forgot-password' href="/request_reset_password">Forgot Password?</a></small>
+      </div>
 
-            <div align="center">
-              <a href="web_home.html" class="button-grey signin-cancel">CANCEL</a>&nbsp;&nbsp;<a href="#" class="button-orange m0">SIGN
-              IN</a><br>
-              <br>
-              <small><a href="#">Forgot Password?</a></small>
-            </div>
-          </td>
-        </tr>
-        </tbody>
-      </table>
     </form>
-
     <br>
 
     <div class="center">
-      <small>Don't have an account? <a href="signup.shtml">Sign Up</a></small>
+      <small>Don't have an account? <a href="#" class="show-signup-dialog">Sign Up</a></small>
     </div>
+
   </div>
+
   <!-- end inner -->
   <br clear="all">
-</div>
\ No newline at end of file
+</div>
+
diff --git a/web/app/views/users/_signupDialog.html.erb b/web/app/views/users/_signupDialog.html.erb
index 6b19e7b1e..66d6fea7f 100644
--- a/web/app/views/users/_signupDialog.html.erb
+++ b/web/app/views/users/_signupDialog.html.erb
@@ -21,7 +21,7 @@
       <br>
 
       <div class="center">
-        <small>Already have an account? <a href="#" class='signin'>Sign In</a><br>
+        <small>Already have an account? <a href="#" class='show-signin-dialog'>Sign In</a><br>
           <br>
           <a href="#" class="signup-cancel">Cancel</a></small>
       </div>
diff --git a/web/config/routes.rb b/web/config/routes.rb
index 4c5556626..41b3a003c 100644
--- a/web/config/routes.rb
+++ b/web/config/routes.rb
@@ -94,6 +94,9 @@ SampleApp::Application.routes.draw do
   end
 
   scope '/api' do
+
+    match '/auths/login' => 'api_auths#login', :via => :post
+
     # music sessions
     match '/sessions/:id/participants' => 'api_music_sessions#participant_create', :via => :post
     match '/participants/:id' => 'api_music_sessions#participant_show', :via => :get, :as => 'api_session_participant_detail'
diff --git a/web/spec/features/welcome_spec.rb b/web/spec/features/welcome_spec.rb
index 02eb1c263..8fa2f131b 100644
--- a/web/spec/features/welcome_spec.rb
+++ b/web/spec/features/welcome_spec.rb
@@ -18,6 +18,87 @@ describe "Welcome", :js => true, :type => :feature, :capybara_feature => true  d
   end
 
   let(:user) { FactoryGirl.create(:user) }
+  let(:fb_auth) {
+  {     :provider => "facebook",
+        :uid      => "1234",
+        :info   => {:name       => "John Doe",
+                    :email      => "johndoe@email.com"},
+        :credentials => {:token => "testtoken234tsdf", :expires_at => 2391456019},
+        :extra => { :raw_info => {:first_name => 'John', :last_name => 'Doe', :email => 'facebook@jamkazam.com', :gender => 'male'}} }
+  }
+
+  describe "signin" do
+    before(:each) do
+      find('#signin').trigger(:click)
+    end
+
+    it "show dialog" do
+      should have_selector('h1',    text: 'sign in')
+    end
+
+    it "shows signup dialog if selected" do
+      find('.show-signup-dialog').trigger(:click)
+
+      find('h1',  text: 'sign up for jamkazam')
+    end
+
+    it "forgot password" do
+      find('a.forgot-password').trigger(:click)
+
+      find('h1', text: 'reset your password')
+    end
+
+    it "closes if cancelled" do
+      find('a.signin-cancel').trigger(:click)
+
+      should_not have_selector('h1',  text: 'sign in')
+    end
+
+    describe "signin natively" do
+
+      it "redirects to client on login" do
+        within('#signin-form') do
+          fill_in "email",    with: user.email
+          fill_in "password", with: user.password
+          click_button "SIGN IN"
+        end
+
+        wait_until_curtain_gone
+
+        find('h2', text: 'musicians')
+      end
+
+      it "shows error if bad login" do
+        within('#signin-form') do
+          fill_in "email",    with: "junk"
+          fill_in "password", with: user.password
+          click_button "SIGN IN"
+        end
+
+        should have_selector('h1',    text: 'sign in')
+
+        find('div.login-error-msg', text: 'Invalid login')
+      end
+    end
+
+    describe "signin with facebook" do
+
+      before(:each) do
+        user.user_authorizations.build provider: 'facebook', uid: '1234', token: 'abc', token_expiration: 1.days.from_now
+        user.save!
+        OmniAuth.config.mock_auth[:facebook] = OmniAuth::AuthHash.new(fb_auth)
+      end
+
+      it "click will redirect to facebook for authorization" do
+        find('.signin-facebook').trigger(:click)
+
+        wait_until_curtain_gone
+
+        find('h2', text: 'musicians')
+      end
+    end
+
+  end
 
   describe "signup" do
 
@@ -29,6 +110,18 @@ describe "Welcome", :js => true, :type => :feature, :capybara_feature => true  d
       should have_selector('h1',    text: 'sign up for jamkazam')
     end
 
+    it "shows signin dialog if selected" do
+      find('.show-signin-dialog').trigger(:click)
+
+      find('h1',  text: 'sign in')
+    end
+
+    it "closes if cancelled" do
+      find('a.signup-cancel').trigger(:click)
+
+      should_not have_selector('h1',  text: 'sign in')
+    end
+
     describe "signup with email" do
 
       it "click will redirect to signup page" do
@@ -37,19 +130,11 @@ describe "Welcome", :js => true, :type => :feature, :capybara_feature => true  d
       end
     end
 
-    # this works becuause OmniAuth.config_mode.test = true
     describe "signup with facebook" do
 
-
       before(:each) do
-
-        OmniAuth.config.mock_auth[:facebook] = OmniAuth::AuthHash.new({
-             :provider => "facebook",
-             :uid      => "1234",
-             :info   => {:name       => "John Doe",
-                         :email      => "johndoe@email.com"},
-             :credentials => {:token => "testtoken234tsdf", :expires_at => 2391456019},
-             :extra => { :raw_info => {:first_name => 'John', :last_name => 'Doe', :email => 'facebook@jamkazam.com', :gender => 'male'}} })
+        fb_auth[:uid] = '12345'
+        OmniAuth.config.mock_auth[:facebook] = OmniAuth::AuthHash.new(fb_auth)
       end
 
       it "click will redirect to facebook for authorization" do
@@ -60,7 +145,6 @@ describe "Welcome", :js => true, :type => :feature, :capybara_feature => true  d
         find_field('jam_ruby_user[email]').value.should eq 'facebook@jamkazam.com'
       end
     end
-
   end
 end
 

From ea19fe002d7358834f50e76e9433c93eecee2758 Mon Sep 17 00:00:00 2001
From: Seth Call <seth@jamkazam.com>
Date: Tue, 4 Feb 2014 03:06:46 +0000
Subject: [PATCH 04/21] * VRFS-1026 and VRFS-1024 resolved (signin and dropdown
 scooted back

---
 web/app/controllers/users_controller.rb        | 2 --
 web/spec/features/authentication_pages_spec.rb | 2 +-
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/web/app/controllers/users_controller.rb b/web/app/controllers/users_controller.rb
index 770f3ca15..6c98a031d 100644
--- a/web/app/controllers/users_controller.rb
+++ b/web/app/controllers/users_controller.rb
@@ -133,8 +133,6 @@ class UsersController < ApplicationController
     terms_of_service = params[:jam_ruby_user][:terms_of_service].nil? ? false : true
     musician = params[:jam_ruby_user][:musician]
 
-    puts "params: #{params.inspect}"
-
     @user = UserManager.new.signup(remote_ip: request.remote_ip,
                                     first_name: params[:jam_ruby_user][:first_name],
                                     last_name: params[:jam_ruby_user][:last_name],
diff --git a/web/spec/features/authentication_pages_spec.rb b/web/spec/features/authentication_pages_spec.rb
index db161396d..6f2ea1ec3 100644
--- a/web/spec/features/authentication_pages_spec.rb
+++ b/web/spec/features/authentication_pages_spec.rb
@@ -62,7 +62,7 @@ describe "Authentication", :js => true,  :type => :feature, :capybara_feature =>
           find('.userinfo .sign-out a').trigger(:click)
 
         end
-        it { page.should have_title("JamKazam | Sign in") }
+        it { find('h1', text: 'Play music together over the Internet as if in the same room') }
       end
     end
   end

From dc70f349b6835253bf79519e2f2263707dd4f5d1 Mon Sep 17 00:00:00 2001
From: Seth Call <seth@jamkazam.com>
Date: Tue, 4 Feb 2014 03:16:39 +0000
Subject: [PATCH 05/21] * overlay-small i being pulled 150px to the left

---
 web/app/assets/stylesheets/client/screen_common.css.scss | 1 -
 1 file changed, 1 deletion(-)

diff --git a/web/app/assets/stylesheets/client/screen_common.css.scss b/web/app/assets/stylesheets/client/screen_common.css.scss
index fe9d3497b..fbc3dbdf9 100644
--- a/web/app/assets/stylesheets/client/screen_common.css.scss
+++ b/web/app/assets/stylesheets/client/screen_common.css.scss
@@ -353,7 +353,6 @@ small, .small {font-size:11px;}
   position:absolute;
   left:50%;
   top:20%;
-  margin-left:-150px;
   background-color:#333;
   border: 1px solid #ed3618;
   z-index:1000;

From 3414229384a19c72a69a7b68e212d557a40dea72 Mon Sep 17 00:00:00 2001
From: Jonathan Kolyer <jonathan@jamkazam.com>
Date: Tue, 4 Feb 2014 01:12:34 -0600
Subject: [PATCH 06/21] vrfs152:  added test to allow multiple signups with a
 fb invite

---
 web/spec/features/signup_spec.rb | 42 ++++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)

diff --git a/web/spec/features/signup_spec.rb b/web/spec/features/signup_spec.rb
index 43bf5049e..76d064fc2 100644
--- a/web/spec/features/signup_spec.rb
+++ b/web/spec/features/signup_spec.rb
@@ -162,6 +162,48 @@ describe "Signup", :js => true, :type => :feature, :capybara_feature => true do
 
     end
 
+    def signup_invited_user
+      visit "#{signup_path}?invitation_code=#{@invited_user.invitation_code}"
+      find('#jam_ruby_user_first_name')
+      sleep 1 # if I don't do this, first_name and/or last name intermittently fail to fill out
+
+      fill_in "jam_ruby_user[first_name]",    with: "Mike"
+      fill_in "jam_ruby_user[last_name]", with: "Jones"
+      @invited_user_email = "newuser#{rand(10000)}@jamkazam.com"
+      fill_in "jam_ruby_user[email]", with: @invited_user_email
+      fill_in "jam_ruby_user[password]", with: "jam123"
+      fill_in "jam_ruby_user[password_confirmation]", with: "jam123"
+      check("jam_ruby_user[instruments][drums][selected]")
+      check("jam_ruby_user[terms_of_service]")
+      click_button "CREATE ACCOUNT"
+    end
+
+    def signup_good
+      should have_title("JamKazam")
+      should have_selector('div.tagline', text: "Congratulations!")
+      @user.friends?(User.find_by_email(@invited_user_email))
+      User.find_by_email(@invited_user_email).friends?(@user)
+      uri = URI.parse(current_url)
+      "#{uri.path}?#{uri.query}".should == congratulations_musician_path(:type => 'Native')
+    end
+
+    describe "can signup with facebook link multiple times with same invite" do
+      before do
+        @user = FactoryGirl.create(:user)
+        @invited_user = FactoryGirl.create(:invited_user, :sender => @user, :autofriend => true, :email => "noone@jamkazam.com", :invite_medium => InvitedUser::FB_MEDIUM)
+      end
+
+      # Successful sign-in goes to the client
+      it {
+        signup_invited_user
+        signup_good
+      }
+      it {
+        signup_invited_user
+        signup_good
+      }
+    end
+
     describe "can signup with an email different than the one used to invite" do
       before do
         @invited_user = FactoryGirl.create(:invited_user, :email => "what@jamkazam.com")

From 7797b6907c30197dca131966da49d91208380438 Mon Sep 17 00:00:00 2001
From: Jonathan Kolyer <jonathan@jamkazam.com>
Date: Tue, 4 Feb 2014 01:16:16 -0600
Subject: [PATCH 07/21] vrfs152:  added GA tracking for FB invites

---
 web/app/assets/javascripts/invitationDialog.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/web/app/assets/javascripts/invitationDialog.js b/web/app/assets/javascripts/invitationDialog.js
index f268554b7..f38dec040 100644
--- a/web/app/assets/javascripts/invitationDialog.js
+++ b/web/app/assets/javascripts/invitationDialog.js
@@ -212,6 +212,9 @@
             };
             function fbFeedDialogCallback(response) {
                 //console.log("feedback dialog closed: " + response['post_id'])
+                if (response['post_id']) {
+                    context.JK.GA.trackServiceInvitations(context.JK.GA.InvitationTypes.facebook, 1);
+                }
             }
             FB.ui(obj, fbFeedDialogCallback);
         }

From 5df00b28834b4e721c1307055c756c850cf02a79 Mon Sep 17 00:00:00 2001
From: Seth Call <seth@jamkazam.com>
Date: Tue, 4 Feb 2014 13:48:13 +0000
Subject: [PATCH 08/21] * VRFS-1012-fixing any URLs that don't start with
 /client

---
 .../views/jam_ruby/user_mailer/new_musicians.html.erb |  2 +-
 .../views/jam_ruby/user_mailer/new_musicians.text.erb |  2 +-
 web/app/assets/javascripts/bandProfile.js             | 11 +++++++++--
 web/app/assets/javascripts/findBand.js                |  4 ++--
 web/app/assets/javascripts/findMusician.js            |  6 +++---
 web/app/assets/javascripts/homeScreen.js              |  2 +-
 web/app/assets/javascripts/searchResults.js           |  6 +++---
 web/app/assets/javascripts/sessionList.js             |  2 +-
 8 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/new_musicians.html.erb b/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/new_musicians.html.erb
index a6abfd81a..d5c91c673 100644
--- a/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/new_musicians.html.erb
+++ b/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/new_musicians.html.erb
@@ -13,7 +13,7 @@
       <% end %>
     </td>
     <td width="70%"><font color="#ccc"><%= user.biography %></font><br /><br />
-<a style="<%= link_style %>" href="http://<%= @host %>/#/profile/<%= user.id %>">Profile</a>&nbsp;&nbsp;<!--<a style="<%= link_style %>" href="">Friend</a>-->
+<a style="<%= link_style %>" href="http://<%= @host %>/client#/profile/<%= user.id %>">Profile</a>&nbsp;&nbsp;<!--<a style="<%= link_style %>" href="">Friend</a>-->
     </td>
   </tr>
   <tr><td colspan="3"></td></tr>
diff --git a/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/new_musicians.text.erb b/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/new_musicians.text.erb
index c69f9965f..13e391154 100644
--- a/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/new_musicians.text.erb
+++ b/ruby/lib/jam_ruby/app/views/jam_ruby/user_mailer/new_musicians.text.erb
@@ -1,7 +1,7 @@
 New JamKazam Musicians in your Area
 
 <% @new_nearby.each do |user| %>
-<%= user.name %> (http://<%= @host %>/#/profile/<%= user.id %>)
+<%= user.name %> (http://<%= @host %>/client#/profile/<%= user.id %>)
   <%= user.location %>
   <% user.instruments.collect { |inst| inst.description }.join(', ') %>
   <%= user.biography %>
diff --git a/web/app/assets/javascripts/bandProfile.js b/web/app/assets/javascripts/bandProfile.js
index 7551163e3..8cae06e1b 100644
--- a/web/app/assets/javascripts/bandProfile.js
+++ b/web/app/assets/javascripts/bandProfile.js
@@ -152,12 +152,14 @@
                 $('#btn-follow-band').text('STOP FOLLOWING');
                 $('#btn-follow-band').click(function() {
                     removeFollowing(true, bandId);
+                    return false;
                 });
             }
             else {
                 $('#btn-follow-band').text('FOLLOW');
                 $('#btn-follow-band').click(function() {
                     addFollowing(true, bandId);
+                    return false;
                 });
             }
         }
@@ -176,12 +178,14 @@
                     $btnFollowMember.text('UN-FOLLOW');
                     $btnFollowMember.click(function() {
                         removeFollowing(false, userId);
+                        return false;
                     });
                 }
                 else {
                     $btnFollowMember.text('FOLLOW');
                     $btnFollowMember.click(function() {
                         addFollowing(false, userId);
+                        return false;
                     });
                 }
             }
@@ -385,7 +389,7 @@
                  var template = $('#template-band-profile-members').html();
                  var memberHtml = context.JK.fillTemplate(template, {
                     userId: musician.id,
-                    profile_url: "/#/profile/" + musician.id,
+                    profile_url: "/client#/profile/" + musician.id,
                     avatar_url: context.JK.resolveAvatarUrl(musician.photo_url),
                     name: musician.name,
                     location: musician.location,
@@ -424,6 +428,8 @@
                             $divMember.remove();
                         })
                         .fail(app.ajaxError);
+
+                    return false;
                 });
             }
             else {
@@ -475,7 +481,8 @@
 
             $("#btn-edit-band-profile").click(function() {
                 $('div[layout-id="band/setup"] .hdn-band-id').val(bandId);
-                context.location = "#/band/setup";
+                context.location = "/client#/band/setup";
+                return false;
             });
         }
 
diff --git a/web/app/assets/javascripts/findBand.js b/web/app/assets/javascripts/findBand.js
index 3fcfb3960..bcedec98b 100644
--- a/web/app/assets/javascripts/findBand.js
+++ b/web/app/assets/javascripts/findBand.js
@@ -106,7 +106,7 @@
 
 		    playerVals = {
 			player_name:  aPlayer.name,
-			profile_url: '/#/profile/' + aPlayer.user_id,
+			profile_url: '/client#/profile/' + aPlayer.user_id,
 			avatar_url:  context.JK.resolveAvatarUrl(aPlayer.photo_url),
 			player_instruments: player_instrs
 		    };
@@ -126,7 +126,7 @@
 
 		bVals = {
 		    avatar_url: context.JK.resolveAvatarUrl(bb.photo_url),
-		    profile_url: "/#/profile/" + bb.id,
+		    profile_url: "/client#/profile/" + bb.id,
 		    band_name:  bb.name,
 		    band_location:  bb.city + ', ' + bb.state,
 		    genres: bgenres,
diff --git a/web/app/assets/javascripts/findMusician.js b/web/app/assets/javascripts/findMusician.js
index 91ecca218..9293852c9 100644
--- a/web/app/assets/javascripts/findMusician.js
+++ b/web/app/assets/javascripts/findMusician.js
@@ -106,14 +106,14 @@
                     aFollow = mm['followings'][jj];
                     followVals = {
                         musician_name:  aFollow.name,
-                        profile_url: '/#/profile/' + aFollow.user_id,
+                        profile_url: '/client#/profile/' + aFollow.user_id,
                         avatar_url:  context.JK.resolveAvatarUrl(aFollow.photo_url),
                     };
                     follows += context.JK.fillTemplate(fTemplate, followVals);
                     if (2 == jj) break;
                 }
                 var actionVals = {
-                    profile_url: "/#/profile/" + mm.id,
+                    profile_url: "/client#/profile/" + mm.id,
                     friend_class: 'button-' + (mm['is_friend'] ? 'grey' : 'orange'),
                     friend_caption: (mm.is_friend ? 'DIS':'')+'CONNECT',
                     follow_class: 'button-' + (mm['is_following'] ? 'grey' : 'orange'),
@@ -124,7 +124,7 @@
 
                 mVals = {
                     avatar_url: context.JK.resolveAvatarUrl(mm.photo_url),
-                    profile_url: "/#/profile/" + mm.id,
+                    profile_url: "/client#/profile/" + mm.id,
                     musician_name:  mm.name,
                     musician_location:  mm.city + ', ' + mm.state,
                     instruments: instr_logos,
diff --git a/web/app/assets/javascripts/homeScreen.js b/web/app/assets/javascripts/homeScreen.js
index 9f94bc624..fd6d58ec9 100644
--- a/web/app/assets/javascripts/homeScreen.js
+++ b/web/app/assets/javascripts/homeScreen.js
@@ -88,7 +88,7 @@
             events();
 
             $('.profile').on('click', function() {
-                context.location = '#/profile/' + context.JK.currentUserId;
+                context.location = '/client#/profile/' + context.JK.currentUserId;
             });
         };
 
diff --git a/web/app/assets/javascripts/searchResults.js b/web/app/assets/javascripts/searchResults.js
index ad14a5d84..7795f4076 100644
--- a/web/app/assets/javascripts/searchResults.js
+++ b/web/app/assets/javascripts/searchResults.js
@@ -91,7 +91,7 @@
 		    var args = {
 			userId: val.id, 
 			avatar_url: context.JK.resolveAvatarUrl(val.photo_url),
-			profile_url: "/#/profile/" + val.id,
+			profile_url: "/client#/profile/" + val.id,
 			userName: val.name,
 			location: val.location,
 			instruments: getInstrumentHtml(val.instruments)
@@ -104,7 +104,7 @@
                     var invitationSentHtml = context.JK.fillTemplate($(selector).html(), {
 			userId: val.id,
 			first_name: val.first_name,
-			profile_url: "/#/profile/" + val.id
+			profile_url: "/client#/profile/" + val.id
                     });
 
 		    selector = isSidebar ? '#sidebar-search-results' : '#search-results';
@@ -154,7 +154,7 @@
                     var searchResultHtml = context.JK.fillTemplate($(template_name).html(), {
 			userId: val.id, 
 			avatar_url: context.JK.resolveAvatarUrl(val.photo_url),
-			profile_url: "/#/profile/" + val.id,
+			profile_url: "/client#/profile/" + val.id,
 			userName: val.name,
 			location: val.location
                     });
diff --git a/web/app/assets/javascripts/sessionList.js b/web/app/assets/javascripts/sessionList.js
index 95ac0cde9..0a3fc572f 100644
--- a/web/app/assets/javascripts/sessionList.js
+++ b/web/app/assets/javascripts/sessionList.js
@@ -93,7 +93,7 @@
                     var photoUrl = context.JK.resolveAvatarUrl(participant.user.photo_url);
                     var musicianVals = {
                         avatar_url: photoUrl,
-                        profile_url: "/#/profile/" + id,
+                        profile_url: "/client#/profile/" + id,
                         musician_name: name,
                         instruments: instrumentLogoHtml
                     };

From c3a51989fd6f7efd35fb49d7b61e9b6643ebc73c Mon Sep 17 00:00:00 2001
From: Seth Call <seth@jamkazam.com>
Date: Tue, 4 Feb 2014 14:40:05 +0000
Subject: [PATCH 09/21] * changing to localhost:3000 instead of
 jamkazamdev.local

---
 ruby/lib/jam_ruby/models/invited_user.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ruby/lib/jam_ruby/models/invited_user.rb b/ruby/lib/jam_ruby/models/invited_user.rb
index 228fc024f..cebc0d25e 100644
--- a/ruby/lib/jam_ruby/models/invited_user.rb
+++ b/ruby/lib/jam_ruby/models/invited_user.rb
@@ -65,7 +65,7 @@ module JamRuby
 
     def generate_signup_url
       if 'development'==Rails.env
-        "http://jamkazamdev.local:3000/signup?invitation_code=#{self.invitation_code}"
+        "http://localhost:3000/signup?invitation_code=#{self.invitation_code}"
       else
         "http://www.jamkazam.com/signup?invitation_code=#{self.invitation_code}"
       end

From ae8b6ebbc7a7dc40e098915bde0ad362caeb11ab Mon Sep 17 00:00:00 2001
From: Seth Call <seth@jamkazam.com>
Date: Tue, 4 Feb 2014 17:05:38 +0000
Subject: [PATCH 10/21] * renaming all ShareDialog to ShareSessionDialog

---
 admin/app/controllers/artifacts_controller.rb        | 12 ++++++++----
 web/app/assets/javascripts/playbackControls.js       |  1 +
 .../{shareDialog.js => shareSessionDialog.js}        |  2 +-
 web/app/assets/javascripts/web/web.js                |  2 +-
 web/app/assets/stylesheets/client/client.css         |  2 +-
 ...reDialog.css.scss => shareSessionDialog.css.scss} |  0
 web/app/assets/stylesheets/web/web.css               |  2 +-
 web/app/views/clients/_session.html.erb              |  2 +-
 ...eDialog.html.erb => _shareSessionDialog.html.erb} |  0
 web/app/views/clients/index.html.erb                 |  4 ++--
 web/app/views/music_sessions/show.html.erb           |  8 ++++----
 web/app/views/recordings/show.html.erb               |  8 ++++----
 12 files changed, 24 insertions(+), 19 deletions(-)
 rename web/app/assets/javascripts/{shareDialog.js => shareSessionDialog.js} (98%)
 rename web/app/assets/stylesheets/client/{shareDialog.css.scss => shareSessionDialog.css.scss} (100%)
 rename web/app/views/clients/{_shareDialog.html.erb => _shareSessionDialog.html.erb} (100%)

diff --git a/admin/app/controllers/artifacts_controller.rb b/admin/app/controllers/artifacts_controller.rb
index 8e7012eff..3fb5cc5cc 100644
--- a/admin/app/controllers/artifacts_controller.rb
+++ b/admin/app/controllers/artifacts_controller.rb
@@ -11,12 +11,16 @@ class ArtifactsController < ApplicationController
     file = params[:file]
     environment = params[:environment]
 
-    @artifact = ArtifactUpdate.find_or_create_by_product_and_environment(product, environment)
+    ArtifactUpdate.transaction do
+      # VRFS-1071: Postpone client update notification until installer is available for download
+      ArtifactUpdate.connection.execute('SET TRANSACTION ISOLATION LEVEL READ COMMITTED')
+      @artifact = ArtifactUpdate.find_or_create_by_product_and_environment(product, environment)
 
-    @artifact.version = version
-    @artifact.uri = file
+      @artifact.version = version
+      @artifact.uri = file
 
-    @artifact.save
+      @artifact.save
+    end
 
     unless @artifact.errors.any?
       render :json => {}, :status => :ok
diff --git a/web/app/assets/javascripts/playbackControls.js b/web/app/assets/javascripts/playbackControls.js
index cf1df1323..1df7e6f1c 100644
--- a/web/app/assets/javascripts/playbackControls.js
+++ b/web/app/assets/javascripts/playbackControls.js
@@ -168,6 +168,7 @@
                     currentTimeMs = playbackDurationMs;
                     stopPlay();
                     endReached = true;
+                    console.log("end reached");
                 }
                 else {
                     return;
diff --git a/web/app/assets/javascripts/shareDialog.js b/web/app/assets/javascripts/shareSessionDialog.js
similarity index 98%
rename from web/app/assets/javascripts/shareDialog.js
rename to web/app/assets/javascripts/shareSessionDialog.js
index dff0ce41b..24ee53d5b 100644
--- a/web/app/assets/javascripts/shareDialog.js
+++ b/web/app/assets/javascripts/shareSessionDialog.js
@@ -2,7 +2,7 @@
 
     "use strict";
     context.JK = context.JK || {};
-    context.JK.ShareDialog = function(app) {
+    context.JK.ShareSessionDialog = function(app) {
         var logger = context.JK.logger;
         var rest = context.JK.Rest();
 
diff --git a/web/app/assets/javascripts/web/web.js b/web/app/assets/javascripts/web/web.js
index ea049bbd4..03b14c5b0 100644
--- a/web/app/assets/javascripts/web/web.js
+++ b/web/app/assets/javascripts/web/web.js
@@ -8,7 +8,7 @@
 //= require web/signupDialog
 //= require web/signinDialog
 //= require invitationDialog
-//= require shareDialog
+//= require shareSessionDialog
 //= require layout
 //= require user_dropdown
 //= require jamkazam
diff --git a/web/app/assets/stylesheets/client/client.css b/web/app/assets/stylesheets/client/client.css
index 57f1af430..a86d4cf7f 100644
--- a/web/app/assets/stylesheets/client/client.css
+++ b/web/app/assets/stylesheets/client/client.css
@@ -32,7 +32,7 @@
  *= require ./search
  *= require ./ftue
  *= require ./invitationDialog
- *= require ./shareDialog
+ *= require ./shareSessionDialog
  *= require ./recordingFinishedDialog
  *= require ./localRecordingsDialog
  *= require ./createSession
diff --git a/web/app/assets/stylesheets/client/shareDialog.css.scss b/web/app/assets/stylesheets/client/shareSessionDialog.css.scss
similarity index 100%
rename from web/app/assets/stylesheets/client/shareDialog.css.scss
rename to web/app/assets/stylesheets/client/shareSessionDialog.css.scss
diff --git a/web/app/assets/stylesheets/web/web.css b/web/app/assets/stylesheets/web/web.css
index de27dc5bc..9d047eb01 100644
--- a/web/app/assets/stylesheets/web/web.css
+++ b/web/app/assets/stylesheets/web/web.css
@@ -7,7 +7,7 @@
 *= require client/user_dropdown
 *= require client/dialog
 *= require client/invitationDialog
-*= require client/shareDialog
+*= require client/shareSessionDialog
 *= require web/main
 *= require web/footer
 *= require web/recordings
diff --git a/web/app/views/clients/_session.html.erb b/web/app/views/clients/_session.html.erb
index e12b7e121..cbf3d6105 100644
--- a/web/app/views/clients/_session.html.erb
+++ b/web/app/views/clients/_session.html.erb
@@ -137,7 +137,7 @@
 <%= render "addNewGear" %>
 <%= render "error" %>
 <%= render "sessionSettings" %>
-<%= render :partial => "shareDialog" %>
+<%= render :partial => "shareSessionDialog" %>
 
 <!-- Track Template -->
 <script type="text/template" id="template-session-track">
diff --git a/web/app/views/clients/_shareDialog.html.erb b/web/app/views/clients/_shareSessionDialog.html.erb
similarity index 100%
rename from web/app/views/clients/_shareDialog.html.erb
rename to web/app/views/clients/_shareSessionDialog.html.erb
diff --git a/web/app/views/clients/index.html.erb b/web/app/views/clients/index.html.erb
index 7ddf73b83..7f6af8779 100644
--- a/web/app/views/clients/index.html.erb
+++ b/web/app/views/clients/index.html.erb
@@ -98,8 +98,8 @@
             var invitationDialog = new JK.InvitationDialog(JK.app);
             invitationDialog.initialize('<%= SampleApp::Application.config.facebook_key %>');
 
-            var shareDialog = new JK.ShareDialog(JK.app);
-            shareDialog.initialize();
+            var shareSessionDialog = new JK.ShareSessionDialog(JK.app);
+            shareSessionDialog.initialize();
 
             var localRecordingsDialog = new JK.LocalRecordingsDialog(JK.app);
             localRecordingsDialog.initialize();
diff --git a/web/app/views/music_sessions/show.html.erb b/web/app/views/music_sessions/show.html.erb
index 9e46b6e19..92b91e250 100644
--- a/web/app/views/music_sessions/show.html.erb
+++ b/web/app/views/music_sessions/show.html.erb
@@ -78,7 +78,7 @@
 
 <%= javascript_include_tag "web/sessions" %>
 
-<%= render :partial => "clients/shareDialog", :locals => {:session => @music_session, :share_token => @music_session.share_token} %>
+<%= render :partial => "clients/shareSessionDialog", :locals => {:session => @music_session, :share_token => @music_session.share_token} %>
 
 <script type="text/javascript">
   $(function () {
@@ -95,11 +95,11 @@
           JK.app = JK.JamKazam();
           JK.app.initialize({inClient: false, layoutOpts: {layoutFooter: false}});
 
-          var shareDialog = new JK.ShareDialog(JK.app);
-          shareDialog.initialize();
+          var shareSessionDialog = new JK.ShareSessionDialog(JK.app);
+          shareSessionDialog.initialize();
 
           $("#btnShare").click(function(e) {
-            shareDialog.showDialog();
+            shareSessionDialog.showDialog();
           });
 
           $("#txtSessionComment").keypress(function(e) {
diff --git a/web/app/views/recordings/show.html.erb b/web/app/views/recordings/show.html.erb
index 1be8f9c1f..ce2ddacf4 100644
--- a/web/app/views/recordings/show.html.erb
+++ b/web/app/views/recordings/show.html.erb
@@ -77,7 +77,7 @@
 
  <%= javascript_include_tag "web/recordings" %>
 
-<%= render :partial => "clients/shareDialog", :locals => {:recording => @claimed_recording, :share_token => @claimed_recording.share_token} %>
+<%= render :partial => "clients/shareSessionDialog", :locals => {:recording => @claimed_recording, :share_token => @claimed_recording.share_token} %>
 
 <script type="text/javascript">
   $(function () {
@@ -94,11 +94,11 @@
           JK.app = JK.JamKazam();
           JK.app.initialize({inClient: false, layoutOpts: {layoutFooter: false}});
 
-          var shareDialog = new JK.ShareDialog(JK.app);
-          shareDialog.initialize();
+          var shareSessionDialog = new JK.ShareSessionDialog(JK.app);
+          shareSessionDialog.initialize();
 
           $("#btnShare").click(function(e) {
-            shareDialog.showDialog();
+            shareSessionDialog.showDialog();
           });
 
           $("#txtRecordingComment").keypress(function(e) {

From ff8eea553f5be6b6901796fceb17e023702f34fc Mon Sep 17 00:00:00 2001
From: Seth Call <seth@jamkazam.com>
Date: Tue, 4 Feb 2014 17:28:49 +0000
Subject: [PATCH 11/21] * finish rename of ShareDialog to ShareSessionDialog

---
 web/app/assets/javascripts/shareSessionDialog.js   | 2 +-
 web/app/views/clients/_session.html.erb            | 2 +-
 web/app/views/clients/_shareSessionDialog.html.erb | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/web/app/assets/javascripts/shareSessionDialog.js b/web/app/assets/javascripts/shareSessionDialog.js
index 24ee53d5b..cc774ecd5 100644
--- a/web/app/assets/javascripts/shareSessionDialog.js
+++ b/web/app/assets/javascripts/shareSessionDialog.js
@@ -11,7 +11,7 @@
         }
 
         function showDialog() {
-            app.layout.showDialog('share-dialog');
+            app.layout.showDialog('share-session-dialog');
         }
 
         /*function showEmailDialog() {
diff --git a/web/app/views/clients/_session.html.erb b/web/app/views/clients/_session.html.erb
index cbf3d6105..30899cf7a 100644
--- a/web/app/views/clients/_session.html.erb
+++ b/web/app/views/clients/_session.html.erb
@@ -18,7 +18,7 @@
                 <%= image_tag "content/icon_settings_sm.png", {:align => "texttop", :height => 12, :width => 12} %>
                 SETTINGS
             </a>
-            <a layout-link="share-dialog" class="button-grey left">
+            <a layout-link="share-session-dialog" class="button-grey left">
                 <%= image_tag "content/icon_share.png", {:align => "texttop", :height => 12, :width => 12} %> 
                 SHARE
             </a>
diff --git a/web/app/views/clients/_shareSessionDialog.html.erb b/web/app/views/clients/_shareSessionDialog.html.erb
index 394fe86ae..2495e508c 100644
--- a/web/app/views/clients/_shareSessionDialog.html.erb
+++ b/web/app/views/clients/_shareSessionDialog.html.erb
@@ -1,5 +1,5 @@
 <!-- Share dialog -->
-<div class="dialog share-overlay" layout="dialog" layout-id="share-dialog" style="width:800px; height:auto;">
+<div class="dialog share-overlay" layout="dialog" layout-id="share-session-dialog" style="width:800px; height:auto;">
     <div class="content-head"><h1>share this session</h1></div>
     <div class="dialog-inner">
         <div class="right"> <a class="button-orange" layout-action="close">X CLOSE</a></div>
@@ -69,7 +69,7 @@
                                 <div class="widget-social">&nbsp;
                                     <a href="#"><img src="images/content/icon_like.png" width="12" height="12" alt=""/>&nbsp;&nbsp;LIKE</a>
                                     <a href="#"><img class="space" src="images/content/icon_comment.png" width="12" height="12" alt=""/>&nbsp;&nbsp;COMMENT</a>
-                                    <a href="#"><img class="space" src="images/content/icon_share.png" width="13" height="15" alt=""/>&nbsp;&nbsp;SHARE</a>
+                                    <a href="#"><img class="space share-session" src="images/content/icon_share.png" width="13" height="15" alt=""/>&nbsp;&nbsp;SHARE</a>
                                 </div>
                                 <!-- jamkazam branding -->
                                 <div class="widget-branding">recorded on 

From 389b6d563557f0dfcefaa80da74f24d6de0e01f4 Mon Sep 17 00:00:00 2001
From: Seth Call <seth@jamkazam.com>
Date: Tue, 4 Feb 2014 18:04:12 +0000
Subject: [PATCH 12/21] * rename it all back to Sharedialog

---
 .../{shareSessionDialog.js => shareDialog.js} | 20 ++++++++++++++++---
 web/app/assets/javascripts/web/web.js         |  2 +-
 web/app/assets/stylesheets/client/client.css  |  2 +-
 web/app/assets/stylesheets/web/web.css        |  2 +-
 web/app/views/clients/_session.html.erb       |  4 ++--
 .../clients/_shareSessionDialog.html.erb      |  6 +++---
 web/app/views/clients/index.html.erb          |  4 ++--
 web/app/views/music_sessions/show.html.erb    |  8 ++++----
 web/app/views/recordings/show.html.erb        |  8 ++++----
 9 files changed, 35 insertions(+), 21 deletions(-)
 rename web/app/assets/javascripts/{shareSessionDialog.js => shareDialog.js} (86%)

diff --git a/web/app/assets/javascripts/shareSessionDialog.js b/web/app/assets/javascripts/shareDialog.js
similarity index 86%
rename from web/app/assets/javascripts/shareSessionDialog.js
rename to web/app/assets/javascripts/shareDialog.js
index cc774ecd5..eba178350 100644
--- a/web/app/assets/javascripts/shareSessionDialog.js
+++ b/web/app/assets/javascripts/shareDialog.js
@@ -2,16 +2,28 @@
 
     "use strict";
     context.JK = context.JK || {};
-    context.JK.ShareSessionDialog = function(app) {
+    context.JK.ShareDialog = function(app) {
         var logger = context.JK.logger;
         var rest = context.JK.Rest();
+        var dialogId = '#share-dialog'
 
         function registerEvents(onOff) {
 
+            $(dialogId + ' .dialog-share-button').unbind('click').click(function(e) {
+
+
+                return false;
+            })
+        }
+
+        this.fb_login = function() {
+            FB.login(function(response) {
+                handle_fblogin_response(response);
+            }, {scope:'publish_stream'});
         }
 
         function showDialog() {
-            app.layout.showDialog('share-session-dialog');
+            app.layout.showDialog('share-dialog');
         }
 
         /*function showEmailDialog() {
@@ -95,7 +107,9 @@
                 'afterHide': afterHide
             };
 
-            app.bindDialog('shareSessionRecording', dialogBindings);
+            app.bindDialog('shareRecording', dialogBindings);
+
+           // callFB(fbAppID);
         };
 
         this.initialize = initialize;
diff --git a/web/app/assets/javascripts/web/web.js b/web/app/assets/javascripts/web/web.js
index 03b14c5b0..ea049bbd4 100644
--- a/web/app/assets/javascripts/web/web.js
+++ b/web/app/assets/javascripts/web/web.js
@@ -8,7 +8,7 @@
 //= require web/signupDialog
 //= require web/signinDialog
 //= require invitationDialog
-//= require shareSessionDialog
+//= require shareDialog
 //= require layout
 //= require user_dropdown
 //= require jamkazam
diff --git a/web/app/assets/stylesheets/client/client.css b/web/app/assets/stylesheets/client/client.css
index a86d4cf7f..57f1af430 100644
--- a/web/app/assets/stylesheets/client/client.css
+++ b/web/app/assets/stylesheets/client/client.css
@@ -32,7 +32,7 @@
  *= require ./search
  *= require ./ftue
  *= require ./invitationDialog
- *= require ./shareSessionDialog
+ *= require ./shareDialog
  *= require ./recordingFinishedDialog
  *= require ./localRecordingsDialog
  *= require ./createSession
diff --git a/web/app/assets/stylesheets/web/web.css b/web/app/assets/stylesheets/web/web.css
index 9d047eb01..de27dc5bc 100644
--- a/web/app/assets/stylesheets/web/web.css
+++ b/web/app/assets/stylesheets/web/web.css
@@ -7,7 +7,7 @@
 *= require client/user_dropdown
 *= require client/dialog
 *= require client/invitationDialog
-*= require client/shareSessionDialog
+*= require client/shareDialog
 *= require web/main
 *= require web/footer
 *= require web/recordings
diff --git a/web/app/views/clients/_session.html.erb b/web/app/views/clients/_session.html.erb
index 30899cf7a..e12b7e121 100644
--- a/web/app/views/clients/_session.html.erb
+++ b/web/app/views/clients/_session.html.erb
@@ -18,7 +18,7 @@
                 <%= image_tag "content/icon_settings_sm.png", {:align => "texttop", :height => 12, :width => 12} %>
                 SETTINGS
             </a>
-            <a layout-link="share-session-dialog" class="button-grey left">
+            <a layout-link="share-dialog" class="button-grey left">
                 <%= image_tag "content/icon_share.png", {:align => "texttop", :height => 12, :width => 12} %> 
                 SHARE
             </a>
@@ -137,7 +137,7 @@
 <%= render "addNewGear" %>
 <%= render "error" %>
 <%= render "sessionSettings" %>
-<%= render :partial => "shareSessionDialog" %>
+<%= render :partial => "shareDialog" %>
 
 <!-- Track Template -->
 <script type="text/template" id="template-session-track">
diff --git a/web/app/views/clients/_shareSessionDialog.html.erb b/web/app/views/clients/_shareSessionDialog.html.erb
index 2495e508c..dd700b2ed 100644
--- a/web/app/views/clients/_shareSessionDialog.html.erb
+++ b/web/app/views/clients/_shareSessionDialog.html.erb
@@ -1,5 +1,5 @@
 <!-- Share dialog -->
-<div class="dialog share-overlay" layout="dialog" layout-id="share-session-dialog" style="width:800px; height:auto;">
+<div class="dialog share-overlay" layout="dialog" layout-id="share-dialog" id="share-dialog" style="width:800px; height:auto;">
     <div class="content-head"><h1>share this session</h1></div>
     <div class="dialog-inner">
         <div class="right"> <a class="button-orange" layout-action="close">X CLOSE</a></div>
@@ -15,7 +15,7 @@
                             <input type="checkbox" />
                             <%= image_tag "content/icon_google.png", :size => "24x24", :align => "absmiddle", :alt => "", :style => "vertical-align:middle" %>&nbsp;
                         </div>
-                        <div class=" right mr10 mt5"><a class="button-orange" id="dialog-share-button">SHARE</a></div>
+                        <div class=" right mr10 mt5"><a class="button-orange dialog-share-button">SHARE</a></div>
                 </td>
                 <td valign="top" width="48%">
                     <div class="ml10">
@@ -69,7 +69,7 @@
                                 <div class="widget-social">&nbsp;
                                     <a href="#"><img src="images/content/icon_like.png" width="12" height="12" alt=""/>&nbsp;&nbsp;LIKE</a>
                                     <a href="#"><img class="space" src="images/content/icon_comment.png" width="12" height="12" alt=""/>&nbsp;&nbsp;COMMENT</a>
-                                    <a href="#"><img class="space share-session" src="images/content/icon_share.png" width="13" height="15" alt=""/>&nbsp;&nbsp;SHARE</a>
+                                    <a href="#"><img class="space" src="images/content/icon_share.png" width="13" height="15" alt=""/>&nbsp;&nbsp;SHARE</a>
                                 </div>
                                 <!-- jamkazam branding -->
                                 <div class="widget-branding">recorded on 
diff --git a/web/app/views/clients/index.html.erb b/web/app/views/clients/index.html.erb
index 7f6af8779..7ddf73b83 100644
--- a/web/app/views/clients/index.html.erb
+++ b/web/app/views/clients/index.html.erb
@@ -98,8 +98,8 @@
             var invitationDialog = new JK.InvitationDialog(JK.app);
             invitationDialog.initialize('<%= SampleApp::Application.config.facebook_key %>');
 
-            var shareSessionDialog = new JK.ShareSessionDialog(JK.app);
-            shareSessionDialog.initialize();
+            var shareDialog = new JK.ShareDialog(JK.app);
+            shareDialog.initialize();
 
             var localRecordingsDialog = new JK.LocalRecordingsDialog(JK.app);
             localRecordingsDialog.initialize();
diff --git a/web/app/views/music_sessions/show.html.erb b/web/app/views/music_sessions/show.html.erb
index 92b91e250..9e46b6e19 100644
--- a/web/app/views/music_sessions/show.html.erb
+++ b/web/app/views/music_sessions/show.html.erb
@@ -78,7 +78,7 @@
 
 <%= javascript_include_tag "web/sessions" %>
 
-<%= render :partial => "clients/shareSessionDialog", :locals => {:session => @music_session, :share_token => @music_session.share_token} %>
+<%= render :partial => "clients/shareDialog", :locals => {:session => @music_session, :share_token => @music_session.share_token} %>
 
 <script type="text/javascript">
   $(function () {
@@ -95,11 +95,11 @@
           JK.app = JK.JamKazam();
           JK.app.initialize({inClient: false, layoutOpts: {layoutFooter: false}});
 
-          var shareSessionDialog = new JK.ShareSessionDialog(JK.app);
-          shareSessionDialog.initialize();
+          var shareDialog = new JK.ShareDialog(JK.app);
+          shareDialog.initialize();
 
           $("#btnShare").click(function(e) {
-            shareSessionDialog.showDialog();
+            shareDialog.showDialog();
           });
 
           $("#txtSessionComment").keypress(function(e) {
diff --git a/web/app/views/recordings/show.html.erb b/web/app/views/recordings/show.html.erb
index ce2ddacf4..1be8f9c1f 100644
--- a/web/app/views/recordings/show.html.erb
+++ b/web/app/views/recordings/show.html.erb
@@ -77,7 +77,7 @@
 
  <%= javascript_include_tag "web/recordings" %>
 
-<%= render :partial => "clients/shareSessionDialog", :locals => {:recording => @claimed_recording, :share_token => @claimed_recording.share_token} %>
+<%= render :partial => "clients/shareDialog", :locals => {:recording => @claimed_recording, :share_token => @claimed_recording.share_token} %>
 
 <script type="text/javascript">
   $(function () {
@@ -94,11 +94,11 @@
           JK.app = JK.JamKazam();
           JK.app.initialize({inClient: false, layoutOpts: {layoutFooter: false}});
 
-          var shareSessionDialog = new JK.ShareSessionDialog(JK.app);
-          shareSessionDialog.initialize();
+          var shareDialog = new JK.ShareDialog(JK.app);
+          shareDialog.initialize();
 
           $("#btnShare").click(function(e) {
-            shareSessionDialog.showDialog();
+            shareDialog.showDialog();
           });
 
           $("#txtRecordingComment").keypress(function(e) {

From 103954cb9694f3ebcd10b0ee5768417112687ef5 Mon Sep 17 00:00:00 2001
From: Seth Call <seth@jamkazam.com>
Date: Tue, 4 Feb 2014 18:18:15 +0000
Subject: [PATCH 13/21] * VRFS-1074 - create run folders for pids on every
 upstart start

---
 admin/script/package/jam-admin.conf                     | 6 ++++++
 admin/script/package/post-install.sh                    | 2 --
 web/script/package/jam-web.conf                         | 6 ++++++
 web/script/package/post-install.sh                      | 2 --
 websocket-gateway/script/package/post-install.sh        | 2 --
 websocket-gateway/script/package/websocket-gateway.conf | 6 ++++++
 6 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/admin/script/package/jam-admin.conf b/admin/script/package/jam-admin.conf
index 43e8a34cc..c429d3209 100644
--- a/admin/script/package/jam-admin.conf
+++ b/admin/script/package/jam-admin.conf
@@ -6,4 +6,10 @@ stop on runlevel [016]
 setuid jam-admin
 setgid jam-admin
 
+pre-start script
+    set -e
+    mkdir -p /var/run/jam-admin
+    chown jam-admin:jam-admin /var/run/jam-admin
+end script
+
 exec start-stop-daemon --start --chdir /var/lib/jam-admin --exec /var/lib/jam-admin/script/package/upstart-run.sh 
diff --git a/admin/script/package/post-install.sh b/admin/script/package/post-install.sh
index 9949dce43..1ed894877 100755
--- a/admin/script/package/post-install.sh
+++ b/admin/script/package/post-install.sh
@@ -14,9 +14,7 @@ mkdir -p /var/lib/$NAME/log
 mkdir -p /var/lib/$NAME/tmp
 mkdir -p /etc/$NAME
 mkdir -p /var/log/$NAME
-mkdir -p /var/run/$NAME
 
 chown -R $USER:$GROUP /var/lib/$NAME
 chown -R $USER:$GROUP /etc/$NAME
 chown -R $USER:$GROUP /var/log/$NAME
-chown -R $USER:$GROUP /var/run/$NAME
diff --git a/web/script/package/jam-web.conf b/web/script/package/jam-web.conf
index b2a864627..b85686a76 100755
--- a/web/script/package/jam-web.conf
+++ b/web/script/package/jam-web.conf
@@ -6,4 +6,10 @@ stop on runlevel [016]
 setuid jam-web
 setgid jam-web
 
+pre-start script
+    set -e
+    mkdir -p /var/run/jam-web
+    chown jam-web:jam-web /var/run/jam-web
+end script
+
 exec start-stop-daemon --start --chdir /var/lib/jam-web --exec /var/lib/jam-web/script/package/upstart-run.sh 
diff --git a/web/script/package/post-install.sh b/web/script/package/post-install.sh
index aa3d87230..c6534c54f 100755
--- a/web/script/package/post-install.sh
+++ b/web/script/package/post-install.sh
@@ -14,12 +14,10 @@ mkdir -p /var/lib/$NAME/log
 mkdir -p /var/lib/$NAME/tmp
 mkdir -p /etc/$NAME
 mkdir -p /var/log/$NAME
-mkdir -p /var/run/$NAME
 
 chown -R $USER:$GROUP /var/lib/$NAME
 chown -R $USER:$GROUP /etc/$NAME
 chown -R $USER:$GROUP /var/log/$NAME
-chown -R $USER:$GROUP /var/run/$NAME
 
 # make log folders for jobs
 mkdir -p /var/log/any-job-worker
diff --git a/websocket-gateway/script/package/post-install.sh b/websocket-gateway/script/package/post-install.sh
index c32d60e32..fb09f8d7f 100755
--- a/websocket-gateway/script/package/post-install.sh
+++ b/websocket-gateway/script/package/post-install.sh
@@ -11,7 +11,5 @@ GROUP="$NAME"
 cp /var/lib/$NAME/script/package/$NAME.conf /etc/init/$NAME.conf
 
 mkdir -p /var/lib/$NAME/log
-mkdir -p /var/run/$NAME
 
 chown -R $USER:$GROUP /var/lib/$NAME
-chown -R $USER:$GROUP /var/run/$NAME
diff --git a/websocket-gateway/script/package/websocket-gateway.conf b/websocket-gateway/script/package/websocket-gateway.conf
index af10f4e62..9328c3e9f 100755
--- a/websocket-gateway/script/package/websocket-gateway.conf
+++ b/websocket-gateway/script/package/websocket-gateway.conf
@@ -6,4 +6,10 @@ stop on runlevel [016]
 setuid websocket-gateway
 setgid websocket-gateway
 
+pre-start script
+    set -e
+    mkdir -p /var/run/websocket-gateway
+    chown websocket-gateway:websocket-gateway /var/run/websocket-gateway
+end script
+
 exec start-stop-daemon --start --chdir /var/lib/websocket-gateway --exec /var/lib/websocket-gateway/script/package/upstart-run.sh 

From 9526be15ad91e51795ff21022210164826447f89 Mon Sep 17 00:00:00 2001
From: Seth Call <seth@jamkazam.com>
Date: Tue, 4 Feb 2014 18:25:53 +0000
Subject: [PATCH 14/21] * finish renaming back ShareDialog

---
 ...areSessionDialog.css.scss => shareDialog.css.scss} |  0
 ...reSessionDialog.html.erb => _shareDialog.html.erb} |  0
 web/config/application.rb                             |  2 +-
 web/config/boot.rb                                    | 11 +++++++++++
 4 files changed, 12 insertions(+), 1 deletion(-)
 rename web/app/assets/stylesheets/client/{shareSessionDialog.css.scss => shareDialog.css.scss} (100%)
 rename web/app/views/clients/{_shareSessionDialog.html.erb => _shareDialog.html.erb} (100%)

diff --git a/web/app/assets/stylesheets/client/shareSessionDialog.css.scss b/web/app/assets/stylesheets/client/shareDialog.css.scss
similarity index 100%
rename from web/app/assets/stylesheets/client/shareSessionDialog.css.scss
rename to web/app/assets/stylesheets/client/shareDialog.css.scss
diff --git a/web/app/views/clients/_shareSessionDialog.html.erb b/web/app/views/clients/_shareDialog.html.erb
similarity index 100%
rename from web/app/views/clients/_shareSessionDialog.html.erb
rename to web/app/views/clients/_shareDialog.html.erb
diff --git a/web/config/application.rb b/web/config/application.rb
index bc41c2612..c913c0a9e 100644
--- a/web/config/application.rb
+++ b/web/config/application.rb
@@ -111,7 +111,7 @@ include JamRuby
       config.websocket_gateway_connect_time_expire = 6000
     end
     config.websocket_gateway_internal_debug = false
-    config.websocket_gateway_port = 6767
+    config.websocket_gateway_port = 6767 + ENV['JAM_INSTANCE'].to_i
     # Runs the websocket gateway within the web app
     config.websocket_gateway_uri = "ws://localhost:#{config.websocket_gateway_port}/websocket"
 
diff --git a/web/config/boot.rb b/web/config/boot.rb
index 4489e5868..e582639f1 100644
--- a/web/config/boot.rb
+++ b/web/config/boot.rb
@@ -4,3 +4,14 @@ require 'rubygems'
 ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
 
 require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE'])
+
+require 'rails/commands/server'
+
+module Rails
+  class Server
+    alias :default_options_alias :default_options
+    def default_options
+      default_options_alias.merge!(:Port => 3000 + ENV['JAM_INSTANCE'].to_i)
+    end
+  end
+end
\ No newline at end of file

From 9ce300db56bec93c51eb0245b1d7a6de1a16b149 Mon Sep 17 00:00:00 2001
From: Seth Call <seth@jamkazam.com>
Date: Tue, 4 Feb 2014 19:10:31 +0000
Subject: [PATCH 15/21] * fix for welcome.js not being in assets

---
 db/up/audiomixer_mp3.sql              | 0
 web/app/assets/javascripts/web/web.js | 1 +
 web/app/views/users/welcome.html.erb  | 4 +---
 3 files changed, 2 insertions(+), 3 deletions(-)
 create mode 100644 db/up/audiomixer_mp3.sql

diff --git a/db/up/audiomixer_mp3.sql b/db/up/audiomixer_mp3.sql
new file mode 100644
index 000000000..e69de29bb
diff --git a/web/app/assets/javascripts/web/web.js b/web/app/assets/javascripts/web/web.js
index ea049bbd4..396469d7e 100644
--- a/web/app/assets/javascripts/web/web.js
+++ b/web/app/assets/javascripts/web/web.js
@@ -21,3 +21,4 @@
 //= require web/congratulations
 //= require web/sessions
 //= require web/recordings
+//= require web/welcome
diff --git a/web/app/views/users/welcome.html.erb b/web/app/views/users/welcome.html.erb
index 86d9ed153..8e0120901 100644
--- a/web/app/views/users/welcome.html.erb
+++ b/web/app/views/users/welcome.html.erb
@@ -13,6 +13,4 @@
         Have questions about how JamKazam works?
         <a href="#" id="faq-open">Here are some answers</a>.
     <% end %>
-<% end %>
-
-<%= javascript_include_tag "web/welcome" %>
\ No newline at end of file
+<% end %>
\ No newline at end of file

From 148009ece54d1f2ffa44ddfa79bd956ab006bc0b Mon Sep 17 00:00:00 2001
From: Seth Call <seth@jamkazam.com>
Date: Tue, 4 Feb 2014 20:28:00 +0000
Subject: [PATCH 16/21] * VRFS-1018 - audiomixer ruby runner generates an mp3
 with metadata using ffmpeg

---
 admin/config/boot.rb                         |   4 +-
 db/manifest                                  |   3 +-
 db/up/audiomixer_mp3.sql                     |   9 ++
 ruby/lib/jam_ruby/models/mix.rb              |  52 ++++++---
 ruby/lib/jam_ruby/models/recording.rb        |   6 +-
 ruby/lib/jam_ruby/resque/audiomixer.rb       | 105 +++++++++++++------
 ruby/spec/jam_ruby/models/mix_spec.rb        |  16 ++-
 ruby/spec/jam_ruby/resque/audiomixer_spec.rb |   4 +-
 ruby/spec/support/utilities.rb               |   4 +
 web/app/assets/javascripts/web/welcome.js    |   4 +-
 web/app/controllers/api_mixes_controller.rb  |  10 +-
 web/config/application.rb                    |   1 +
 web/config/boot.rb                           |   4 +-
 web/config/routes.rb                         |   1 -
 14 files changed, 152 insertions(+), 71 deletions(-)

diff --git a/admin/config/boot.rb b/admin/config/boot.rb
index 2b59194e5..56e91c277 100644
--- a/admin/config/boot.rb
+++ b/admin/config/boot.rb
@@ -12,7 +12,9 @@ module Rails
   class Server
     alias :default_options_alias :default_options
     def default_options
-      default_options_alias.merge!(:Port => 3333)
+      default_options_alias.merge!(
+          :Port         => 3333 + ENV['JAM_INSTANCE'].to_i,
+          :pid          => File.expand_path("tmp/pids/server-#{ENV['JAM_INSTANCE'].to_i}.pid"))
     end
   end
 end
\ No newline at end of file
diff --git a/db/manifest b/db/manifest
index 25fd574e1..042e0661c 100755
--- a/db/manifest
+++ b/db/manifest
@@ -97,4 +97,5 @@ icecast_config_changed.sql
 invited_users_facebook_support.sql
 first_recording_at.sql
 share_token.sql
-facebook_signup.sql
\ No newline at end of file
+facebook_signup.sql
+audiomixer_mp3.sql
\ No newline at end of file
diff --git a/db/up/audiomixer_mp3.sql b/db/up/audiomixer_mp3.sql
index e69de29bb..d48cfed01 100644
--- a/db/up/audiomixer_mp3.sql
+++ b/db/up/audiomixer_mp3.sql
@@ -0,0 +1,9 @@
+-- add idea of a mix having mp3 as well as ogg
+
+ALTER TABLE mixes RENAME COLUMN md5 TO ogg_md5;
+ALTER TABLE mixes RENAME COLUMN length TO ogg_length;
+ALTER TABLE mixes RENAME COLUMN url TO ogg_url;
+
+ALTER TABLE mixes ADD COLUMN mp3_md5 VARCHAR(100);
+ALTER TABLE mixes ADD COLUMN mp3_length INTEGER;
+ALTER TABLE mixes ADD COLUMN mp3_url VARCHAR(1024);
\ No newline at end of file
diff --git a/ruby/lib/jam_ruby/models/mix.rb b/ruby/lib/jam_ruby/models/mix.rb
index 66a58e1e5..9ec1c1e66 100644
--- a/ruby/lib/jam_ruby/models/mix.rb
+++ b/ruby/lib/jam_ruby/models/mix.rb
@@ -17,7 +17,8 @@ module JamRuby
       mix = Mix.new
       mix.recording = recording
       mix.save
-      mix.url = construct_filename(mix.created_at, recording.id, mix.id)
+      mix.ogg_url = construct_filename(mix.created_at, recording.id, mix.id, type='ogg')
+      mix.mp3_url = construct_filename(mix.created_at, recording.id, mix.id, type='mp3')
       if mix.save
         mix.enqueue
       end
@@ -27,7 +28,7 @@ module JamRuby
 
     def enqueue
       begin
-        Resque.enqueue(AudioMixer, self.id, self.sign_put)
+        Resque.enqueue(AudioMixer, self.id, self.sign_put(3600 * 24, 'ogg'), self.sign_put(3600 * 24, 'mp3'))
       rescue
         # implies redis is down. we don't update started_at
         false
@@ -51,10 +52,12 @@ module JamRuby
       save
     end
 
-    def finish(length, md5)
+    def finish(ogg_length, ogg_md5, mp3_length, mp3_md5)
       self.completed_at = Time.now
-      self.length = length
-      self.md5 = md5
+      self.ogg_length = ogg_length
+      self.ogg_md5 = ogg_md5
+      self.mp3_length = mp3_length
+      self.mp3_md5 = mp3_md5
       self.completed = true
       if save
         Notification.send_recording_master_mix_complete(recording)
@@ -74,41 +77,56 @@ module JamRuby
 
       manifest["timeline"] << { "timestamp" => 0, "mix" => mix_params }
       manifest["output"] = { "codec" => "vorbis" }
-      manifest["recording_id"] = self.id
+      manifest["recording_id"] = self.recording.id
       manifest
     end
 
-    def s3_url
-      s3_manager.s3_url(url)
+    def s3_url(type='ogg')
+      if type == 'ogg'
+        s3_manager.s3_url(ogg_url)
+      else
+        s3_manager.s3_url(mp3_url)
+      end
+
+
     end
     
     def is_completed
       completed
     end
 
-    def sign_url(expiration_time = 120)
+    def sign_url(expiration_time = 120, type='ogg')
       # expire link in 1 minute--the expectation is that a client is immediately following this link
-      s3_manager.sign_url(self.url, {:expires => expiration_time, :response_content_type => 'audio/ogg', :secure => false})
+      if type == 'ogg'
+        s3_manager.sign_url(self.ogg_url, {:expires => expiration_time, :response_content_type => 'audio/ogg', :secure => false})
+      else
+        s3_manager.sign_url(self.mp3_url, {:expires => expiration_time, :response_content_type => 'audio/mp3', :secure => false})
+      end
     end
 
-    def sign_put(expiration_time = 3600 * 24)
-      s3_manager.sign_url(self.url, {:expires => expiration_time, :content_type => 'audio/ogg', :secure => false}, :put)
+    def sign_put(expiration_time = 3600 * 24, type='ogg')
+      if type == 'ogg'
+        s3_manager.sign_url(self.ogg_url, {:expires => expiration_time, :content_type => 'audio/ogg', :secure => false}, :put)
+      else
+        s3_manager.sign_url(self.mp3_url, {:expires => expiration_time, :content_type => 'audio/mp3', :secure => false}, :put)
+      end
     end
 
     private
 
     def delete_s3_files
-      s3_manager.delete(filename)
+      s3_manager.delete(filename(type='ogg'))
+      s3_manager.delete(filename(type='mp3'))
     end
 
-    def filename
+    def filename(type='ogg')
       # construct a path for s3
-      Mix.construct_filename(self.created_at, self.recording.id, self.id)
+      Mix.construct_filename(self.created_at, self.recording.id, self.id, type)
     end
 
-    def self.construct_filename(created_at, recording_id, id)
+    def self.construct_filename(created_at, recording_id, id, type='ogg')
       raise "unknown ID" unless id
-      "recordings/#{created_at.strftime('%m-%d-%Y')}/#{recording_id}/mix-#{id}.ogg"
+      "recordings/#{created_at.strftime('%m-%d-%Y')}/#{recording_id}/mix-#{id}.#{type}"
     end
   end
 end
diff --git a/ruby/lib/jam_ruby/models/recording.rb b/ruby/lib/jam_ruby/models/recording.rb
index 450385067..738b319bb 100644
--- a/ruby/lib/jam_ruby/models/recording.rb
+++ b/ruby/lib/jam_ruby/models/recording.rb
@@ -214,9 +214,9 @@ module JamRuby
                 :type => "mix",
                 :id => mix.id.to_s,
                 :recording_id => mix.recording_id,
-                :length => mix.length,
-                :md5 => mix.md5,
-                :url => mix.url,
+                :length => mix.ogg_length,
+                :md5 => mix.ogg_md5,
+                :url => mix.ogg_url,
                 :created_at => mix.created_at,
                 :next => mix.id
             }
diff --git a/ruby/lib/jam_ruby/resque/audiomixer.rb b/ruby/lib/jam_ruby/resque/audiomixer.rb
index 3424b11d0..dd1a304e0 100644
--- a/ruby/lib/jam_ruby/resque/audiomixer.rb
+++ b/ruby/lib/jam_ruby/resque/audiomixer.rb
@@ -13,14 +13,16 @@ module JamRuby
 
     @@log = Logging.logger[AudioMixer]
 
-    attr_accessor :mix_id, :manifest, :manifest_file, :output_filename, :error_out_filename, :postback_output_url,
+    attr_accessor :mix_id, :manifest, :manifest_file, :output_filename, :error_out_filename,
+                  :postback_ogg_url, :postback_mp3_url,
                   :error_reason, :error_detail
 
-    def self.perform(mix_id, postback_output_url)
+    def self.perform(mix_id, postback_ogg_url, postback_mp3_url)
 
       JamWebEventMachine.run_wait_stop do
         audiomixer = AudioMixer.new()
-        audiomixer.postback_output_url = postback_output_url
+        audiomixer.postback_ogg_url = postback_ogg_url
+        audiomixer.postback_mp3_url = postback_mp3_url
         audiomixer.mix_id = mix_id
         audiomixer.run
       end
@@ -123,12 +125,13 @@ module JamRuby
 
     # make a suitable location to store the output mix, and pass the chosen filepath into the manifest
     def prepare_output
-      @output_filename = Dir::Tmpname.make_tmpname( ["#{Dir.tmpdir}/audiomixer-output-#{@manifest[:recording_id]}", '.ogg'], nil)
+      @output_ogg_filename = Dir::Tmpname.make_tmpname( ["#{Dir.tmpdir}/audiomixer-output-#{@manifest[:recording_id]}", '.ogg'], nil)
+      @output_mp3_filename = Dir::Tmpname.make_tmpname( ["#{Dir.tmpdir}/audiomixer-output-#{@manifest[:recording_id]}", '.mp3'], nil)
 
       # update manifest so that audiomixer writes here
-      @manifest[:output][:filename] = @output_filename
+      @manifest[:output][:filename] = @output_ogg_filename
 
-      @@log.debug("output ogg file: #{@output_filename}")
+      @@log.debug("output ogg file: #{@output_ogg_filename}, output mp3 file: #{@output_mp3_filename}")
     end
 
     # make a suitable location to store an output error file, which will be populated on failure to help diagnose problems.
@@ -157,39 +160,62 @@ module JamRuby
     end
 
     def postback
-      raise "no output file after mix" unless File.exist? @output_filename
 
-      @@log.debug("posting mix to #{@postback_output_url}")
+      @@log.debug("posting ogg mix to #{@postback_ogg_url}")
 
-      uri = URI.parse(@postback_output_url)
+      uri = URI.parse(@postback_ogg_url)
       http = Net::HTTP.new(uri.host, uri.port)
       request = Net::HTTP::Put.new(uri.request_uri)
 
       response = nil
-      File.open(@output_filename,"r") do |f|
+      File.open(@output_ogg_filename,"r") do |f|
         request.body_stream=f
         request["Content-Type"] = "audio/ogg"
-        request.add_field('Content-Length', File.size(@output_filename))
+        request.add_field('Content-Length', File.size(@output_ogg_filename))
         response = http.request(request)
       end
 
       response_code = response.code.to_i
       unless response_code >= 200 && response_code <= 299
-        @error_reason = "postback-mix-to-s3"
-        raise "unable to put to url: #{@postback_output_url}, status: #{response.code}, body: #{response.body}"
+        @error_reason = "postback-ogg-mix-to-s3"
+        raise "unable to put to url: #{@postback_ogg_url}, status: #{response.code}, body: #{response.body}"
+      end
+
+      
+      @@log.debug("posting mp3 mix to #{@postback_mp3_url}")
+
+      uri = URI.parse(@postback_mp3_url)
+      http = Net::HTTP.new(uri.host, uri.port)
+      request = Net::HTTP::Put.new(uri.request_uri)
+
+      response = nil
+      File.open(@output_mp3_filename,"r") do |f|
+        request.body_stream=f
+        request["Content-Type"] = "audio/mp3"
+        request.add_field('Content-Length', File.size(@output_mp3_filename))
+        response = http.request(request)
+      end
+
+      response_code = response.code.to_i
+      unless response_code >= 200 && response_code <= 299
+        @error_reason = "postback-mp3-mix-to-s3"
+        raise "unable to put to url: #{@postback_mp3_url}, status: #{response.code}, body: #{response.body}"
       end
 
     end
 
     def post_success(mix)
-      raise "no output file after mix" unless File.exist? @output_filename
 
-      length = File.size(@output_filename)
+      ogg_length = File.size(@output_ogg_filename)
+      ogg_md5 = Digest::MD5.new
+      File.open(@output_ogg_filename, 'rb').each {|line| ogg_md5.update(line)}
 
-      md5 = Digest::MD5.new
-      File.open(@output_filename, 'rb').each {|line| md5.update(line)}
+      mp3_length = File.size(@output_mp3_filename)
+      mp3_md5 = Digest::MD5.new
+      File.open(@output_mp3_filename, 'rb').each {|line| mp3_md5.update(line)}
 
-      mix.finish(length, md5.to_s)
+
+      mix.finish(ogg_length, ogg_md5.to_s, mp3_length, mp3_md5.to_s)
     end
 
     def post_error(mix, e)
@@ -233,16 +259,12 @@ module JamRuby
 
         execute(@manifest_file)
 
-        if $? == 0
-          postback
-          post_success(mix)
-          @@log.info("audiomixer job successful. mix_id #{mix_id}")
-        else
-          parse_error_out
-          error_msg = "audiomixer job failed status=#{$?} error_reason=#{error_reason} error_detail=#{error_detail}"
-          @@log.info(error_msg)
-          raise error_msg
-        end
+        postback
+        
+        post_success(mix)
+        
+        @@log.info("audiomixer job successful. mix_id #{mix_id}")
+      
       rescue Exception => e
         post_error(mix, e)
         raise
@@ -260,20 +282,41 @@ module JamRuby
 
       unless File.exist? APP_CONFIG.audiomixer_path
         @@log.error("unable to find audiomixer")
-        error_msg = "audiomixer job failed status=#{$?} error_reason=#{error_reason} error_detail=#{error_detail}"
+        error_msg = "audiomixer job failed status=#{$?} error_reason=#{@error_reason} error_detail=#{@error_detail}"
         @@log.info(error_msg)
         @error_reason = "unable-find-appmixer"
         @error_detail = APP_CONFIG.audiomixer_path
         raise error_msg
       end
 
-
       audiomixer_cmd = "#{APP_CONFIG.audiomixer_path} #{manifest_file}"
 
-
       @@log.debug("executing #{audiomixer_cmd}")
 
       system(audiomixer_cmd)
+
+      unless $? == 0
+        parse_error_out
+        error_msg = "audiomixer job failed status=#{$?} error_reason=#{@error_reason} error_detail=#{@error_detail}"
+        @@log.info(error_msg)
+        raise error_msg
+      end
+
+      raise "no output ogg file after mix" unless File.exist? @output_ogg_filename
+      
+      ffmpeg_cmd = "#{APP_CONFIG.ffmpeg_path} -i \"#{@output_ogg_filename}\" -ab 128k -metadata JamRecordingId=#{@manifest[:recording_id]} -metadata JamMixId=#{@mix_id} -metadata JamType=Mix \"#{@output_mp3_filename}\""
+
+      system(ffmpeg_cmd)
+
+      unless $? == 0
+        @error_reason = 'ffmpeg-failed'
+        @error_detail = $?.to_s
+        error_msg = "ffmpeg failed status=#{$?} error_reason=#{@error_reason} error_detail=#{@error_detail}"
+        @@log.info(error_msg)
+        raise error_msg
+      end
+
+      raise "no output mp3 file after conversion" unless File.exist? @output_mp3_filename
     end
 
     def symbolize_keys(obj)
diff --git a/ruby/spec/jam_ruby/models/mix_spec.rb b/ruby/spec/jam_ruby/models/mix_spec.rb
index bb361bc99..359100423 100755
--- a/ruby/spec/jam_ruby/models/mix_spec.rb
+++ b/ruby/spec/jam_ruby/models/mix_spec.rb
@@ -26,11 +26,19 @@ describe Mix do
   end
 
   it "should record when a mix has finished" do
-    Mix.find(@mix.id).finish(10000, "md5hash")
+    Mix.find(@mix.id).finish(10000, "md5hash", 10000, "md5hash")
     @mix.reload
     @mix.completed_at.should_not be_nil
-    @mix.length.should == 10000
-    @mix.md5.should == "md5hash"
+    @mix.ogg_length.should == 10000
+    @mix.ogg_md5.should == "md5hash"
+  end
+
+  it "create a good manifest" do
+    Mix.find(@mix.id).finish(10000, "md5hash", 10000, "md5hash")
+    @mix.reload
+    manifest = @mix.manifest
+    manifest["recording_id"].should == @recording.id
+    manifest["files"].length.should == 1
   end
 
   it "signs url" do
@@ -40,7 +48,7 @@ describe Mix do
 
   it "mixes are restricted by user" do
 
-    @mix.finish(1, "abc")
+    @mix.finish(1, "abc", 1, "def")
     @mix.reload
     @mix.errors.any?.should be_false
 
diff --git a/ruby/spec/jam_ruby/resque/audiomixer_spec.rb b/ruby/spec/jam_ruby/resque/audiomixer_spec.rb
index 5b27e35d7..5411acc39 100644
--- a/ruby/spec/jam_ruby/resque/audiomixer_spec.rb
+++ b/ruby/spec/jam_ruby/resque/audiomixer_spec.rb
@@ -233,8 +233,8 @@ describe AudioMixer do
 
           @mix.reload
           @mix.completed.should be_true
-          @mix.length.should == 0
-          @mix.md5.should == 'd41d8cd98f00b204e9800998ecf8427e'  # that's the md5 of a touched file, which is what the stubbed :execute does
+          @mix.ogg_length.should == 0
+          @mix.ogg_md5.should == 'd41d8cd98f00b204e9800998ecf8427e'  # that's the md5 of a touched file, which is what the stubbed :execute does
         end
 
         it "bails out with no error if already completed" do
diff --git a/ruby/spec/support/utilities.rb b/ruby/spec/support/utilities.rb
index 52d00aea6..8886ac7bb 100644
--- a/ruby/spec/support/utilities.rb
+++ b/ruby/spec/support/utilities.rb
@@ -21,6 +21,10 @@ def app_config
       ENV['AUDIOMIXER_PATH'] || audiomixer_workspace_path || "/var/lib/audiomixer/audiomixer/audiomixerapp"
     end
 
+    def ffmpeg_path
+      ENV['FFMPEG_PATH'] || '/usr/local/bin/ffmpeg'
+    end
+
     def icecast_reload_cmd
       'true' # as in, /bin/true
     end
diff --git a/web/app/assets/javascripts/web/welcome.js b/web/app/assets/javascripts/web/welcome.js
index 55ed205a1..582e6d220 100644
--- a/web/app/assets/javascripts/web/welcome.js
+++ b/web/app/assets/javascripts/web/welcome.js
@@ -18,6 +18,8 @@
         });
     }
 
-    initialize()
+    $(function() {
+        initialize();
+    })
 
 })(window, jQuery);
\ No newline at end of file
diff --git a/web/app/controllers/api_mixes_controller.rb b/web/app/controllers/api_mixes_controller.rb
index 60944c480..26e9ded8d 100644
--- a/web/app/controllers/api_mixes_controller.rb
+++ b/web/app/controllers/api_mixes_controller.rb
@@ -20,15 +20,7 @@ class ApiMixesController < ApiController
      render :json => { :message => "next mix could not be found" }, :status => 403
     end
   end
- 
-  def finish
-    begin
-      @mix.finish
-    rescue
-      render :json => { :message => "mix finish failed" }, :status => 403
-    end
-    respond_with responder: ApiResponder, :status => 204
-  end
+
 
   def download
     @mix = Mix.find(params[:id])
diff --git a/web/config/application.rb b/web/config/application.rb
index c913c0a9e..02806981d 100644
--- a/web/config/application.rb
+++ b/web/config/application.rb
@@ -173,6 +173,7 @@ include JamRuby
     config.redis_host = "localhost:6379"
 
     config.audiomixer_path = "/var/lib/audiomixer/audiomixer/audiomixerapp"
+    config.ffmpeg_path = ENV['FFMPEG_PATH'] || (File.exist?('/usr/local/bin/ffmpeg') ? '/usr/local/bin/ffmpeg' : '/usr/bin/ffmpeg')
 
     # if it looks like linux, use init.d script; otherwise use kill
     config.icecast_reload_cmd = ENV['ICECAST_RELOAD_CMD'] || (File.exist?('/usr/local/bin/icecast2') ? "bash -l -c #{Shellwords.escape("sudo /etc/init.d/icecast2 reload")}" : "bash -l -c #{Shellwords.escape("kill -1 `ps -f | grep /usr/local/bin/icecast | grep -v grep | awk \'{print $2}\'`")}")
diff --git a/web/config/boot.rb b/web/config/boot.rb
index e582639f1..fa8246936 100644
--- a/web/config/boot.rb
+++ b/web/config/boot.rb
@@ -11,7 +11,9 @@ module Rails
   class Server
     alias :default_options_alias :default_options
     def default_options
-      default_options_alias.merge!(:Port => 3000 + ENV['JAM_INSTANCE'].to_i)
+      default_options_alias.merge!(
+          :Port         => 3000 + ENV['JAM_INSTANCE'].to_i,
+          :pid          => File.expand_path("tmp/pids/server-#{ENV['JAM_INSTANCE'].to_i}.pid"))
     end
   end
 end
\ No newline at end of file
diff --git a/web/config/routes.rb b/web/config/routes.rb
index 41b3a003c..a0c08691c 100644
--- a/web/config/routes.rb
+++ b/web/config/routes.rb
@@ -317,7 +317,6 @@ SampleApp::Application.routes.draw do
     # Mixes
     match '/mixes/schedule' => 'api_mixes#schedule', :via => :post
     match '/mixes/next' => 'api_mixes#next', :via => :get
-    match '/mixes/:id/finish' => 'api_mixes#finish', :via => :put
     match '/mixes/:id/download' => 'api_mixes#download', :via => :get
 
     # version check for JamClient

From dab9063fb9e34fae7047ec5eb3603107cd3764ea Mon Sep 17 00:00:00 2001
From: Seth Call <seth@jamkazam.com>
Date: Tue, 4 Feb 2014 21:20:30 +0000
Subject: [PATCH 17/21] * backend handles these notfications already VRFS-1067

---
 ruby/lib/jam_ruby/models/recording.rb | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/ruby/lib/jam_ruby/models/recording.rb b/ruby/lib/jam_ruby/models/recording.rb
index 738b319bb..8dfe27d35 100644
--- a/ruby/lib/jam_ruby/models/recording.rb
+++ b/ruby/lib/jam_ruby/models/recording.rb
@@ -105,8 +105,9 @@ module JamRuby
         end
       end
 
-      connection = Connection.where(:user_id => owner.id).where(:music_session_id => music_session.id).first
-      Notification.send_recording_started(music_session, connection, owner)
+      # the front-end handles this already
+      #connection = Connection.where(:user_id => owner.id).where(:music_session_id => music_session.id).first
+      #Notification.send_recording_started(music_session, connection, owner)
       
       recording
     end
@@ -122,9 +123,9 @@ module JamRuby
         self.save
       end
 
-      connection = Connection.where(:user_id => self.owner.id).where(:music_session_id => music_session.id).first
-      Notification.send_recording_ended(music_session, connection, self.owner)
-
+      # the front-end handles this already
+      #connection = Connection.where(:user_id => self.owner.id).where(:music_session_id => music_session.id).first
+      #Notification.send_recording_ended(music_session, connection, self.owner)
       self
     end
 

From 8c1e2c5df6e53e34e3a3fa33fbe2ccbd3a711b44 Mon Sep 17 00:00:00 2001
From: Seth Call <seth@jamkazam.com>
Date: Tue, 4 Feb 2014 21:21:51 +0000
Subject: [PATCH 18/21] * backend handles these notfications already VRFS-1067

---
 ruby/lib/jam_ruby/models/recording.rb | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/ruby/lib/jam_ruby/models/recording.rb b/ruby/lib/jam_ruby/models/recording.rb
index 8dfe27d35..beba63625 100644
--- a/ruby/lib/jam_ruby/models/recording.rb
+++ b/ruby/lib/jam_ruby/models/recording.rb
@@ -105,10 +105,6 @@ module JamRuby
         end
       end
 
-      # the front-end handles this already
-      #connection = Connection.where(:user_id => owner.id).where(:music_session_id => music_session.id).first
-      #Notification.send_recording_started(music_session, connection, owner)
-      
       recording
     end
 
@@ -123,9 +119,6 @@ module JamRuby
         self.save
       end
 
-      # the front-end handles this already
-      #connection = Connection.where(:user_id => self.owner.id).where(:music_session_id => music_session.id).first
-      #Notification.send_recording_ended(music_session, connection, self.owner)
       self
     end
 

From 636ca9b891d86de25d6a0a29f55ae1d7d97f981a Mon Sep 17 00:00:00 2001
From: Seth Call <seth@jamkazam.com>
Date: Tue, 4 Feb 2014 21:45:34 +0000
Subject: [PATCH 19/21] * VRFS-1076 - fix for leave session being broken

---
 web/app/assets/javascripts/jamkazam.js |  4 +++-
 web/app/assets/javascripts/layout.js   | 16 ----------------
 2 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/web/app/assets/javascripts/jamkazam.js b/web/app/assets/javascripts/jamkazam.js
index 108c7753a..fba55b8f8 100644
--- a/web/app/assets/javascripts/jamkazam.js
+++ b/web/app/assets/javascripts/jamkazam.js
@@ -322,7 +322,9 @@
 
             var hash = context.location.hash;
 
-            if(!this.layout.isScreenName(hash)) {
+            try { context.RouteMap.parse(hash); }
+            catch(e) {
+                console.log("ignoring bogus screen name: %o", hash)
                 hash = null;
             }
 
diff --git a/web/app/assets/javascripts/layout.js b/web/app/assets/javascripts/layout.js
index 979a73d5d..53bac88fa 100644
--- a/web/app/assets/javascripts/layout.js
+++ b/web/app/assets/javascripts/layout.js
@@ -428,18 +428,6 @@
             dialogEvent(dialog, 'afterHide');
         }
 
-        function isScreenName(screenName) {
-            if(!screenName) return false;
-
-            var hashIndex = screenName.indexOf('#');
-
-            if(hashIndex > -1) {
-               screenName = screenName.substr(hashIndex);
-            }
-
-            return screenBindings[screenName];
-        }
-
         function screenEvent(screen, evtName, data) {
             if (screen && screen in screenBindings) {
                 if (evtName in screenBindings[screen]) {
@@ -764,10 +752,6 @@
             };
         };
 
-        this.isScreenName = function(screenName) {
-            return isScreenName(screenName);
-        }
-
         this.bindScreen = function(screen, handler) {
             screenBindings[screen] = handler;
         };

From 11c5c8723bfbf46be7a3539be0bb580b9ff054a9 Mon Sep 17 00:00:00 2001
From: Seth Call <seth@jamkazam.com>
Date: Tue, 4 Feb 2014 21:49:33 +0000
Subject: [PATCH 20/21] * changing url to mp3_url and ogg_url in rabls

---
 web/app/views/api_claimed_recordings/show.rabl | 2 +-
 web/app/views/api_music_sessions/show.rabl     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/app/views/api_claimed_recordings/show.rabl b/web/app/views/api_claimed_recordings/show.rabl
index 36c020610..59b85f398 100644
--- a/web/app/views/api_claimed_recordings/show.rabl
+++ b/web/app/views/api_claimed_recordings/show.rabl
@@ -13,7 +13,7 @@ child(:recording => :recording) {
     }    
     
     child(:mixes => :mixes) {
-    	attributes :id, :url, :is_completed
+    	attributes :id, :mp3_url, :ogg_url :is_completed
    	}
 
     child(:recorded_tracks => :recorded_tracks) {
diff --git a/web/app/views/api_music_sessions/show.rabl b/web/app/views/api_music_sessions/show.rabl
index 54a4b5e83..3c49ffc1b 100644
--- a/web/app/views/api_music_sessions/show.rabl
+++ b/web/app/views/api_music_sessions/show.rabl
@@ -53,7 +53,7 @@ node(:claimed_recording, :if => lambda { |music_session| music_session.users.exi
             }
 
             child(:mixes => :mixes) {
-                attributes :id, :url, :is_completed
+                attributes :id, :mp3_url, :ogg_url, :is_completed
             }
 
             child(:recorded_tracks => :recorded_tracks) {

From 4549282f0dea0d26b6773ae084d5dcbb5da276cf Mon Sep 17 00:00:00 2001
From: Seth Call <seth@jamkazam.com>
Date: Tue, 4 Feb 2014 21:53:37 +0000
Subject: [PATCH 21/21] * trying no-https rubygems for a bit, see if it helps
 build

---
 admin/Gemfile | 2 +-
 db/Gemfile    | 2 +-
 web/Gemfile   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/admin/Gemfile b/admin/Gemfile
index 7ca5eda28..8a4306801 100644
--- a/admin/Gemfile
+++ b/admin/Gemfile
@@ -1,4 +1,4 @@
-source 'https://rubygems.org'
+source 'http://rubygems.org'
 
 source 'https://jamjam:blueberryjam@int.jamkazam.com/gems/'
 devenv = ENV["BUILD_NUMBER"].nil? # Jenkins sets a build number environment variable
diff --git a/db/Gemfile b/db/Gemfile
index 45bf466d6..0b7addf09 100644
--- a/db/Gemfile
+++ b/db/Gemfile
@@ -1,4 +1,4 @@
-source 'https://rubygems.org'
+source 'http://rubygems.org'
 
 # Assumes you have already cloned pg_migrate_ruby in your workspace
 # $ cd [workspace]
diff --git a/web/Gemfile b/web/Gemfile
index ac5e4551f..93b0ffd53 100644
--- a/web/Gemfile
+++ b/web/Gemfile
@@ -1,4 +1,4 @@
-source 'https://rubygems.org'
+source 'http://rubygems.org'
 
 unless ENV["LOCAL_DEV"] == "1"
   source 'https://jamjam:blueberryjam@int.jamkazam.com/gems/'