Merge pull request #119 from gigalixir/feat-signup-2.0

feat: new signup support

Author: gigatim

DEPLOYING.md

@@ -14,6 +14,13 @@ rm dist/*
 python3 -m build
 ```
 
+## Install locally
+
+```
+pip install dist/gigalixir-X.Y.Z.tar.gz
+```
+
+
 ## Upload and tsting from pypitest
 
 ```

gigalixir/__init__.py

@@ -5,26 +5,27 @@
 from .openers.linux import LinuxOpener
 from .openers.darwin import DarwinOpener
 from .openers.windows import WindowsOpener
-from . import observer as gigalixir_observer
-from . import user as gigalixir_user
-from . import mfa as gigalixir_mfa
+from . import api_key as gigalixir_api_key
+from . import api_session as gigalixir_api_session
+from . import app_activity as gigalixir_app_activity
 from . import app as gigalixir_app
+from . import canary as gigalixir_canary
 from . import config as gigalixir_config
+from . import database as gigalixir_database
+from . import domain as gigalixir_domain
+from . import free_database as gigalixir_free_database
+from . import invoice as gigalixir_invoice
+from . import log_drain as gigalixir_log_drain
+from . import mfa as gigalixir_mfa
+from . import observer as gigalixir_observer
+from . import payment_method as gigalixir_payment_method
 from . import permission as gigalixir_permission
 from . import release as gigalixir_release
-from . import app_activity as gigalixir_app_activity
-from . import api_key as gigalixir_api_key
+from . import signup as gigalixir_signup
 from . import ssh_key as gigalixir_ssh_key
-from . import log_drain as gigalixir_log_drain
-from . import payment_method as gigalixir_payment_method
-from . import domain as gigalixir_domain
-from . import invoice as gigalixir_invoice
 from . import usage as gigalixir_usage
-from . import database as gigalixir_database
-from . import free_database as gigalixir_free_database
-from . import canary as gigalixir_canary
+from . import user as gigalixir_user
 from . import git
-from . import api_session as gigalixir_api_session
 import click
 import getpass
 import stripe
@@ -560,17 +561,29 @@ def logout(ctx):
     gigalixir_user.logout(ctx.obj['env'])
 
 @cli.command()
-@click.option('-e', '--email', prompt=True)
-@click.option('-p', '--password', prompt=True, hide_input=True, confirmation_prompt=False)
+@click.option('-e', '--email', prompt=False)
+@click.option('-p', '--password', prompt=False)
 @click.option('-t', '--mfa_token', prompt=False) # we handle prompting if needed, not always needed
 @click.option('-y', '--yes', is_flag=True)
 @click.pass_context
 @report_errors
-def login(ctx, email, password, yes, mfa_token):
+def login(ctx, email, password, mfa_token, yes):
     """
     Login and receive an api key.
     """
-    gigalixir_user.login(ctx.obj['session'], email, password, yes, ctx.obj['env'], mfa_token)
+    method = None
+    if not email and not password:
+        print("How would you like to log in?")
+        print("1. Email and password")
+        print("2. Google authentication")
+        while True:
+            value = click.prompt('Authentication', type=int)
+            if value == 1:
+                return gigalixir_user.login(ctx.obj['session'], email, password, ctx.obj['env'], mfa_token)
+            elif value == 2:
+                return gigalixir_user.oauth_login(ctx.obj['session'], ctx.obj['env'], 'google')
+
+    gigalixir_user.login(ctx.obj['session'], email, password, ctx.obj['env'], mfa_token)
 
 @cli.command(name='login:google')
 @click.option('-y', '--yes', is_flag=True)
@@ -580,7 +593,7 @@ def google_login(ctx, yes):
     """
     Login with Google and receive an api key.
     """
-    gigalixir_user.oauth_login(ctx.obj['session'], yes, ctx.obj['env'], 'google')
+    gigalixir_user.oauth_login(ctx.obj['session'], ctx.obj['env'], 'google')
 
 # @get.command()
 @cli.command()
@@ -1063,46 +1076,20 @@ def current_running_usage(ctx):
 
 # @create.command()
 @cli.command()
-@click.option('--email')
-@click.option('-p', '--password')
-@click.option('-y', '--accept_terms_of_service_and_privacy_policy', is_flag=True)
 @click.pass_context
 @report_errors
-def signup(ctx, email, password, accept_terms_of_service_and_privacy_policy):
+def signup(ctx):
     """
     Sign up for a new account.
     """
-    if not accept_terms_of_service_and_privacy_policy:
-        logging.getLogger("gigalixir-cli").info("GIGALIXIR Terms of Service: https://www.gigalixir.com/terms")
-        logging.getLogger("gigalixir-cli").info("GIGALIXIR Privacy Policy: https://www.gigalixir.com/privacy")
-        if not click.confirm('Do you accept the Terms of Service and Privacy Policy?'):
-            raise Exception("You must accept the Terms of Service and Privacy Policy to continue.")
-
-    if email == None:
-        email = click.prompt('Email')
-    gigalixir_user.validate_email(ctx.obj['session'], email)
+    gigalixir_signup.by_email(ctx)
 
-    if password == None:
-        password = click.prompt('Password', hide_input=True)
-    gigalixir_user.validate_password(ctx.obj['session'], password)
-
-    gigalixir_user.create(ctx.obj['session'], email, password, accept_terms_of_service_and_privacy_policy)
 
 @cli.command('signup:google')
-@click.option('-y', '--accept_terms_of_service_and_privacy_policy', is_flag=True)
 @click.pass_context
 @report_errors
-def google_signup(ctx, accept_terms_of_service_and_privacy_policy):
-    """
-    Sign up for a new account using your google login.
-    """
-    if not accept_terms_of_service_and_privacy_policy:
-        logging.getLogger("gigalixir-cli").info("GIGALIXIR Terms of Service: https://www.gigalixir.com/terms")
-        logging.getLogger("gigalixir-cli").info("GIGALIXIR Privacy Policy: https://www.gigalixir.com/privacy")
-        if not click.confirm('Do you accept the Terms of Service and Privacy Policy?'):
-            raise Exception("You must accept the Terms of Service and Privacy Policy to continue.")
-
-    gigalixir_user.oauth_create(ctx.obj['session'], ctx.obj['env'], "google")
+def google_signup(ctx):
+    gigalixir_signup.by_oauth(ctx, "google")
 
 @cli.command(name='ps:observer')
 @click.option('-a', '--app_name', envvar="GIGALIXIR_APP")

gigalixir/signup.py

@@ -0,0 +1,242 @@
+import click
+import datetime
+import re
+import stripe
+from . import netrc
+from . import user as gigalixir_user
+
+def by_email(ctx):
+  env = ctx.obj['env']
+  session = ctx.obj['session']
+
+  print("Welcome, let's get you started!")
+  print("")
+  print("We require a *valid* email address to be on file in case we need to reach you about your applications.")
+  print("We promise to not abuse your email address.")
+  print("Don't believe us? Read our privacy policy: https://gigalixir.com/privacy-policy")
+  print("")
+  email = click.prompt('Email')
+  uuid = set_email(session, email)
+
+  print("")
+  print("Please check your email for the confirmation code we have sent you.")
+  accepted = False
+  while not accepted:
+    code = click.prompt('Confirmation code')
+    accepted = confirm(session, uuid, code)
+  print("Thank you for your trust in us.")
+  print("")
+
+  print("Now we need a password.")
+  accepted = False
+  while not accepted:
+    password = click.prompt('Password', hide_input=True)
+    accepted = set_password(session, uuid, password)
+  print("")
+
+  (promo, tier) = select_tier(session, uuid)
+
+  confirm_and_complete(session, uuid, email, tier, promo, env)
+
+def by_oauth(ctx, provider):
+  env = ctx.obj['env']
+  session = ctx.obj['session']
+
+  welcome_message()
+
+  (oauth_session, url, uuid) = start_oauth(session, provider)
+
+  email = gigalixir_user.oauth_process(session, provider, 'signup', url, oauth_session)['email']
+  print("Thank you for your trust in us.")
+  print("")
+
+  (promo, tier) = select_tier(session, uuid)
+
+  confirm_and_complete(session, uuid, email, tier, promo, env)
+
+
+def welcome_message():
+  print("Welcome, let's get you started!")
+  print("")
+
+  print("We require a *valid* email address to be on file in case we need to reach you about your applications.")
+  print("We promise to not abuse your email address.")
+  print("Don't believe us? Read our privacy policy: https://gigalixir.com/privacy-policy")
+  print("")
+
+def start_oauth(session, provider):
+  r = session.post('/api/signup', json = { 'oauth': provider })
+  if r.status_code != 200:
+    raise Exception(r.text)
+
+  data = r.json()['data']
+  return (data['session'], data['url'], data['uuid'])
+
+def set_email(session, email):
+  r = session.post('/api/signup', json = { 'email': email })
+  if r.status_code == 429:
+    raise Exception('Too many attempts. Please try again later.')
+  if r.status_code != 200:
+    raise Exception(r.text)
+
+  return r.json()['data']['uuid']
+
+def confirm(session, uuid, code):
+  r = session.post('/api/signup', json = { 'confirmation_code': code, 'uuid': uuid })
+  if r.status_code == 429:
+    raise Exception('Too many attempts. Please try again later.')
+
+  return r.status_code == 200
+
+def set_password(session, uuid, password):
+  r = session.post('/api/signup', json = { 'password': password, 'uuid': uuid })
+  if r.status_code != 200:
+    print(r.text)
+    return False
+
+  return True
+
+def set_cc(session, uuid, stripe_token):
+  r = session.post('/api/signup', json = { 'stripe_token': stripe_token, 'uuid': uuid })
+  if r.status_code == 429:
+    raise Exception('Too many attempts. Please try again later.')
+
+  if r.status_code != 200:
+    print(r.text)
+    return False
+
+  return True
+
+def finalize(session, uuid, tier):
+  r = session.post('/api/signup', json = { 'tier': tier, 'uuid': uuid })
+  if r.status_code != 200:
+    raise Exception(r.text)
+
+  data = r.json()['data']
+  return (data['email'], data['key'])
+
+
+## input validations
+def luhn_check(card_number):
+  """Validate credit card number using Luhn algorithm."""
+  digits = [int(d) for d in card_number]
+  checksum = 0
+
+  # Double every second digit from the right, subtracting 9 if >9
+  for i, digit in enumerate(reversed(digits)):
+    if i % 2 == 1:
+      digit *= 2
+      if digit > 9:
+        digit -= 9
+    checksum += digit
+
+  return checksum % 10 == 0
+
+def validate_credit_card_number(card_number):
+  """Ensure card number is valid using regex and Luhn check."""
+  card_number = card_number.replace(" ", "")  # Allow spaces for readability
+  if not re.fullmatch(r"\d{13,19}", card_number):
+    raise click.BadParameter("Credit card number must be 13-19 digits long.")
+  if not luhn_check(card_number):
+    raise click.BadParameter("Invalid credit card number (failed Luhn check).")
+  return card_number
+
+def validate_cvv(cvv):
+  """Ensure CVV is numeric and correct length."""
+  if not re.fullmatch(r"\d{3,4}", cvv):
+    raise click.BadParameter("CVV must be 3 or 4 digits.")
+  return cvv
+
+def validate_exp_month(exp_month):
+  """Ensure expiration month is valid (1-12)."""
+  try:
+    month = int(exp_month)
+    if 1 <= month <= 12:
+      return f"{month:02d}"  # Ensure two-digit format
+  except ValueError:
+    pass
+  raise click.BadParameter("Expiration month must be a number between 1 and 12.")
+
+def validate_exp_year(exp_year):
+  """Ensure expiration year is in the future and valid."""
+  current_year = datetime.datetime.now().year
+  try:
+    year = int(exp_year)
+    if current_year <= year <= current_year + 20:  # Prevent unrealistic years
+      return str(year)
+  except ValueError:
+    pass
+  raise click.BadParameter(f"Expiration year must be {current_year} or later.")
+
+def select_tier(session, uuid):
+  promo = add_promo_code(session, uuid)
+  print("")
+
+  tier = None
+  if promo:
+    tier = "STANDARD"
+  else:
+    tier = prompt_tier()
+    print("")
+
+  if tier == "STANDARD":
+    accepted = False
+    while not accepted:
+      card_number = click.prompt("Enter credit card number", type=str, value_proc=validate_credit_card_number)
+      cvc = click.prompt("Enter CVV", type=str, value_proc=validate_cvv)
+      exp_month = click.prompt("Enter expiration month (MM)", type=str, value_proc=validate_exp_month)
+      exp_year = click.prompt("Enter expiration year (YYYY)", type=str, value_proc=validate_exp_year)
+
+      stripe_token = stripe.Token.create(card={ "number": card_number, "exp_month": exp_month, "exp_year": exp_year, "cvc": cvc })
+
+      accepted = set_cc(session, uuid, stripe_token["id"])
+    print("")
+
+  return (promo, tier)
+
+def add_promo_code(session, uuid):
+  while True:
+    promo = click.prompt('Promo code [enter to skip]', default="", show_default=False, type=str)
+    if promo == "":
+      return None
+    else:
+      r = session.post('/api/signup', json = { 'promo_code': promo, 'uuid': uuid })
+
+      if r.status_code == 200:
+        return r.json()['data']['promo']
+
+      elif r.status_code == 429:
+        raise Exception('Too many attempts. Please try again later.')
+
+      print("Invalid promo code")
+
+def prompt_tier():
+  print("Which tier would you like to sign up for?")
+  print("1. Free")
+  print("2. Standard")
+  while True:
+    value = click.prompt('Tier', type=int)
+    if value == 1:
+      return "FREE"
+    elif value == 2:
+      return "STANDARD"
+
+def confirm_and_complete(session, uuid, email, tier, promo, env):
+  print("")
+  print("You are about to signup for the %s tier." % tier)
+  print("  Email: %s" % email)
+
+  if promo:
+    print("  Promo: %s" % promo)
+  print("")
+
+  print("By continuing, you agree to our Terms of Service and Privacy Policy.")
+  print("  Privacy Policy:   https://gigalixir.com/privacy-policy")
+  print("  Terms of Service: https://gigalixir.com/terms-of-service")
+  print("")
+  if not click.confirm('Do you wish to proceed?', default=True):
+    raise Exception("Signup cancelled.")
+  (email, key) = finalize(session, uuid, tier)
+
+  print("Welcome to Gigalixir!")
+  netrc.update_netrc(email, key, env)