Initial v2 subscription fix (#1152)

Author: piotrmilcarz

lib/travis/api/app/endpoint/authorization.rb

@@ -134,7 +134,6 @@ class Authorization < Endpoint
         def update_first_login(user)
           unless user.first_logged_in_at
             user.update_attributes(first_logged_in_at: Time.now)
-            user.create_initial_subscription unless Travis.config.org?
           end
         end
 
@@ -179,6 +178,7 @@ def handshake
             token                  = generate_token(user: user, app_id: 0)
             payload                = params[:state].split(":::", 2)[1]
             update_first_login(user)
+            user.create_initial_subscription
             yield serialize_user(user), token, payload
           else
             values[:state]         = create_state
@@ -213,6 +213,7 @@ def vcs_handshake
 
             user = User.find(vcs_data['user']['id'])
             update_first_login(user)
+            user.create_initial_subscription
             yield serialize_user(user), vcs_data['token'], payload(params[:provider])
           else
             state = vcs_create_state(params[:origin] || params[:redirect_uri])

lib/travis/api/v3/models/user.rb

@@ -84,6 +84,8 @@ def github?
     end
 
     def create_initial_subscription
+      return if Travis.config.org?
+
       client = BillingClient.new(id)
       client.create_initial_v2_subscription
     end

lib/travis/model/user.rb

@@ -171,6 +171,8 @@ def github?
   end
 
   def create_initial_subscription
+    return if Travis.config.org?
+
     client = Travis::API::V3::BillingClient.new(id)
     client.create_initial_v2_subscription
   end