Turn off all references and API calls to billing if the feature is disabled

endpoints/api/__init__.py

@@ -124,6 +124,9 @@ def format_date(date):
 
 def add_method_metadata(name, value):
   def modifier(func):
+    if func is None:
+      return None
+
     if '__api_metadata' not in dir(func):
       func.__api_metadata = {}
     func.__api_metadata[name] = value
@@ -132,6 +135,9 @@ def add_method_metadata(name, value):
 
 
 def method_metadata(func, name):
+  if func is None:
+    return None
+
   if '__api_metadata' in dir(func):
     return func.__api_metadata.get(name, None)
   return None

endpoints/api/billing.py

@@ -4,13 +4,14 @@ from flask import request
 
 from endpoints.api import (resource, nickname, ApiResource, validate_json_request, log_action,
                            related_user_resource, internal_only, Unauthorized, NotFound,
-                           require_user_admin)
+                           require_user_admin, show_if, hide_if)
 from endpoints.api.subscribe import subscribe, subscription_view
 from auth.permissions import AdministerOrganizationPermission
 from auth.auth_context import get_authenticated_user
 from data import model
 from data.plans import PLANS
 
+import features
 
 def carderror_response(e):
   return {'carderror': e.message}, 402
@@ -79,6 +80,7 @@ def get_invoices(customer_id):
 
 
 @resource('/v1/plans/')
+@show_if(features.BILLING)
 class ListPlans(ApiResource):
   """ Resource for listing the available plans. """
   @nickname('listPlans')
@@ -91,6 +93,7 @@ class ListPlans(ApiResource):
 
 @resource('/v1/user/card')
 @internal_only
+@show_if(features.BILLING)
 class UserCard(ApiResource):
   """ Resource for managing a user's credit card. """
   schemas = {
@@ -132,6 +135,7 @@ class UserCard(ApiResource):
 @resource('/v1/organization/<orgname>/card')
 @internal_only
 @related_user_resource(UserCard)
+@show_if(features.BILLING)
 class OrganizationCard(ApiResource):
   """ Resource for managing an organization's credit card. """
   schemas = {
@@ -178,6 +182,7 @@ class OrganizationCard(ApiResource):
 
 @resource('/v1/user/plan')
 @internal_only
+@show_if(features.BILLING)
 class UserPlan(ApiResource):
   """ Resource for managing a user's subscription. """
   schemas = {
@@ -234,6 +239,7 @@ class UserPlan(ApiResource):
 @resource('/v1/organization/<orgname>/plan')
 @internal_only
 @related_user_resource(UserPlan)
+@show_if(features.BILLING)
 class OrganizationPlan(ApiResource):
   """ Resource for managing a org's subscription. """
   schemas = {
@@ -294,6 +300,7 @@ class OrganizationPlan(ApiResource):
 
 @resource('/v1/user/invoices')
 @internal_only
+@show_if(features.BILLING)
 class UserInvoiceList(ApiResource):
   """ Resource for listing a user's invoices. """
   @require_user_admin
@@ -310,6 +317,7 @@ class UserInvoiceList(ApiResource):
 @resource('/v1/organization/<orgname>/invoices')
 @internal_only
 @related_user_resource(UserInvoiceList)
+@show_if(features.BILLING)
 class OrgnaizationInvoiceList(ApiResource):
   """ Resource for listing an orgnaization's invoices. """
   @nickname('listOrgInvoices')
@@ -323,4 +331,4 @@ class OrgnaizationInvoiceList(ApiResource):
         
       return get_invoices(organization.stripe_id)
 
-    raise Unauthorized()
+    raise Unauthorized()

endpoints/api/organization.py

@@ -5,7 +5,7 @@ from flask import request
 
 from endpoints.api import (resource, nickname, ApiResource, validate_json_request, request_error,
                            related_user_resource, internal_only, Unauthorized, NotFound,
-                           require_user_admin, log_action)
+                           require_user_admin, log_action, show_if)
 from endpoints.api.team import team_view
 from endpoints.api.user import User, PrivateRepositories
 from auth.permissions import (AdministerOrganizationPermission,  OrganizationMemberPermission,
@@ -15,6 +15,8 @@ from data import model
 from data.plans import get_plan
 from util.gravatar import compute_hash
 
+import features
+
 
 logger = logging.getLogger(__name__)
 
@@ -163,6 +165,7 @@ class Organization(ApiResource):
 @resource('/v1/organization/<orgname>/private')
 @internal_only
 @related_user_resource(PrivateRepositories)
+@show_if(features.BILLING)
 class OrgPrivateRepositories(ApiResource):
   """ Custom verb to compute whether additional private repositories are available. """
   @nickname('getOrganizationPrivateAllowed')

endpoints/api/subscribe.py

@@ -6,6 +6,7 @@ from endpoints.common import check_repository_usage
 from data import model
 from data.plans import PLANS
 
+import features
 
 logger = logging.getLogger(__name__)
 
@@ -24,6 +25,9 @@ def subscription_view(stripe_subscription, used_repos):
 
 
 def subscribe(user, plan, token, require_business_plan):
+  if not features.BILLING:
+    return
+
   plan_found = None
   for plan_obj in PLANS:
     if plan_obj['stripeId'] == plan:

endpoints/api/user.py

@@ -194,6 +194,7 @@ class User(ApiResource):
 
 @resource('/v1/user/private')
 @internal_only
+@show_if(features.BILLING)
 class PrivateRepositories(ApiResource):
   """ Operations dealing with the available count of private repositories. """
   @require_user_admin
@@ -249,8 +250,7 @@ class ConvertToOrganization(ApiResource):
       'description': 'Information required to convert a user to an organization.',
       'required': [
         'adminUser',
-        'adminPassword',
-        'plan',
+        'adminPassword'
       ],
       'properties': {
         'adminUser': {
@@ -263,7 +263,7 @@ class ConvertToOrganization(ApiResource):
         },
         'plan': {
           'type': 'string',
-          'description': 'The plan to which the organizatino should be subscribed',
+          'description': 'The plan to which the organization should be subscribed',
         },
       },
     },
@@ -290,8 +290,9 @@ class ConvertToOrganization(ApiResource):
                            message='The admin user credentials are not valid')
 
     # Subscribe the organization to the new plan.
-    plan = convert_data['plan']
-    subscribe(user, plan, None, True)  # Require business plans
+    if features.BILLING:
+      plan = convert_data.get('plan', 'free')
+      subscribe(user, plan, None, True)  # Require business plans
 
     # Convert the user to an organization.
     model.convert_user_to_organization(user, model.get_user(admin_username))