click option mongodb for distant dbs

co-demos · Jun 4, 2019 · f7f5fa9 · f7f5fa9
1 parent 4c6f0f5
commit f7f5fa9
Show file tree

Hide file tree

Showing 5 changed files with 310 additions and 263 deletions.
diff --git a/appserver.py b/appserver.py
@@ -30,95 +30,103 @@
 ### + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ###
 
 @click.command()
-@click.option('--mode', 				default="dev", 	nargs=1,	help="The <mode> you need to run the app : dev (default), dev_email, prod, preprod" )
-@click.option('--port', 				default="None", nargs=1,	help="The <port> number you want the app to run on : 4100 (default=None) | <PORT_NUMBER>")
-@click.option('--host', 				default="None", nargs=1,	help="The <host> name you want the app to run on : localhost(default=None) | <IP_NUMBER> " )
-@click.option('--rsa', 					default="no", 	nargs=1,	help="The <rsa> mode (RSA encrypt/decrypt for forms), 												 protects '/login' + '/register' + '/password_forgotten' + '/reset_password': 'no' (default), 'yes'" )
-@click.option('--anojwt', 			default="no", 	nargs=1,	help="The <anojwt> mode (needs an anonymous JWT for login and register routes), affects '/login' + '/register' + '/password_forgotten' : 'no' (default), 'yes'" )
-@click.option('--antispam', 		default="no",		nargs=1,	help="The <antispam> mode (add hidden field check for forms)									 protects '/login' + '/register' + '/password_forgotten' : 'no' (default), 'yes'" )
-@click.option('--antispam_val', default="", 		nargs=1,	help="The <antispam_val> to check in forms against spams : '' (default), <your-string-to-check>" )
-def app_runner(mode, host, port, rsa, anojwt, antispam, antispam_val) : 
-
-	""" 
-	runner for the TOKTOK backend Flask app 
-
-	in command line just type : 
-	"python appserver.py"
-
-	you can also enter some arguments in the command line : 
-	--mode 					: dev | prod | dev_email 
-	--host					: localhost | <your_IP>
-	--port					: <your_favorite_port>
-	--anojwt 				: yes | no
-	--rsa 					: yes | no
-	--antispam			: yes | no
-	--antispam_val	: '' | <your-string-to-check>
-
-	"""
-
-	print()
-	print("=== "*40)
-	print("=== "*40)
-	print("=== "*40)
-	print()
-
-
-	### WARNING : CLIck will treat every input as string as defaults values are string too
-	log.debug("\n=== CUSTOM CONFIG FROM CLI ===\n")
-	log.debug("=== mode			: %s", mode)
-	log.debug("=== host 		: %s", host)
-	log.debug("=== port 		: %s", port)
-	log.debug("=== rsa 			: %s", rsa)
-	log.debug("=== anojwt 	: %s", anojwt)
-	log.debug("=== antispam 		: %s", antispam)
-	log.debug("=== antispam_val : %s", antispam_val)
-	print()
-
-
-	log.debug("\n--- STARTING TOKTOK AUTH API ---\n")
-
-	from auth_api.application import create_app
-
-	app = create_app( 
-		app_name='AUTH_API', 
-		run_mode=mode, 
-		RSA_mode=rsa, 
-		anojwt_mode=anojwt, 
-		antispam_mode=antispam,
-		antispam_value=antispam_val
-	)
-
-	### apply / overwrites host configuration
-	if host == "None" : 
-		app_host 	= app.config["DOMAIN_ROOT"]
-	else : 
-		app_host 	= host
-
-	### apply / overwrites port configuration
-	if port == "None" : 
-		app_port 	= int(app.config["DOMAIN_PORT"])
-	else : 
-		app_port 	= port
-
-	app_debug = app.config["DEBUG"]
-
-	### initiate socketio
-	socketio = SocketIO(app)
-
-	# simple flask runner
-	print()
-	print("=== "*40)
-	print("=== "*40)
-	print("=== "*40)
-	print()
-	app.run( debug=app_debug, host=app_host, port=app_port, threaded=True )
+@click.option('--mode', default="dev", 	nargs=1,	help="The <mode> you need to run the app : dev (default), dev_email, prod, preprod" )
+@click.option('--docker', 	default="docker_off", nargs=1,	help="Are you running the app with <docker> : docker_off | docker_on" )
+@click.option('--host', default="None", nargs=1,	help="The <host> name you want the app to run on : localhost(default=None) | <IP_NUMBER> " )
+@click.option('--port', default="None", nargs=1,	help="The <port> number you want the app to run on : 4100 (default=None) | <PORT_NUMBER>")
+@click.option('--mongodb', default="local", nargs=1,	help="The <mongodb> you need to run the app : local | distant | server" )
+@click.option('--rsa', default="no", nargs=1,	help="The <rsa> mode (RSA encrypt/decrypt for forms), protects '/login' + '/register' + '/password_forgotten' + '/reset_password': 'no' (default), 'yes'" )
+@click.option('--anojwt', default="no", nargs=1,	help="The <anojwt> mode (needs an anonymous JWT for login and register routes), affects '/login' + '/register' + '/password_forgotten' : 'no' (default), 'yes'" )
+@click.option('--antispam', default="no", nargs=1,	help="The <antispam> mode (add hidden field check for forms) protects '/login' + '/register' + '/password_forgotten' : 'no' (default), 'yes'" )
+@click.option('--antispam_val', default="", nargs=1,	help="The <antispam_val> to check in forms against spams : '' (default), <your-string-to-check>" )
+def app_runner(mode, docker, host, port, mongodb, rsa, anojwt, antispam, antispam_val) : 
+
+  """ 
+  runner for the TOKTOK backend Flask app 
+
+  in command line just type : 
+  "python appserver.py"
+
+  you can also enter some arguments in the command line : 
+  --mode : dev | prod | dev_email 
+  --docker : docker_off | docker_on
+  --host : localhost | <your_IP>
+  --port : <your_favorite_port>
+  --mongodb : local | distant | server
+  --anojwt : yes | no
+  --rsa : yes | no
+  --antispam : yes | no
+  --antispam_val	: '' | <your-string-to-check>
+
+  """
+
+  print()
+  print("=== "*40)
+  print("=== "*40)
+  print("=== "*40)
+  print()
+
+
+  ### WARNING : CLIck will treat every input as string as defaults values are string too
+  log.debug("\n=== CUSTOM CONFIG FROM CLI ===\n")
+  log.debug("=== mode : %s", mode)
+  log.debug("=== docker : %s", docker)
+  log.debug("=== host : %s", host)
+  log.debug("=== port : %s", port)
+  log.debug("=== mongodb : %s", mongodb)
+  log.debug("=== rsa : %s", rsa)
+  log.debug("=== anojwt : %s", anojwt)
+  log.debug("=== antispam : %s", antispam)
+  log.debug("=== antispam_val : %s", antispam_val)
+  print()
+
+
+  log.debug("\n--- STARTING TOKTOK AUTH API ---\n")
+
+  from auth_api.application import create_app
+
+  app = create_app( 
+    app_name='AUTH_API', 
+    run_mode=mode, 
+    docker_mode=docker,
+    mongodb_mode=mongodb,
+    RSA_mode=rsa, 
+    anojwt_mode=anojwt, 
+    antispam_mode=antispam,
+    antispam_value=antispam_val
+  )
+
+  ### apply / overwrites host configuration
+  if host == "None" : 
+    app_host 	= app.config["DOMAIN_ROOT"]
+  else : 
+    app_host 	= host
+
+  ### apply / overwrites port configuration
+  if port == "None" : 
+    app_port 	= int(app.config["DOMAIN_PORT"])
+  else : 
+    app_port 	= port
+
+  app_debug = app.config["DEBUG"]
+
+  ### initiate socketio
+  socketio = SocketIO(app)
+
+  # simple flask runner
+  print()
+  print("=== "*40)
+  print("=== "*40)
+  print("=== "*40)
+  print()
+  app.run( debug=app_debug, host=app_host, port=app_port, threaded=True )
 
 
 
 if __name__ == '__main__':  
 
-	app_runner()
+  app_runner()
 
 else : 
 
-	gunicorn_app = app_runner()
+  gunicorn_app = app_runner()
diff --git a/auth_api/_choices/_choices_user.py b/auth_api/_choices/_choices_user.py
@@ -22,7 +22,7 @@
 	"system", 		### robot user
 
 	"admin", 		### real user and confirmed 
-	"staff",   		### can edit all datamodels : dmf + dmt
+	"staff",    ### can edit all datamodels : dmf + dmt
 
 	"registred", 	### confirmed email
 

diff --git a/auth_api/api/api_auth/endpoint_user_login.py b/auth_api/api/api_auth/endpoint_user_login.py
@@ -257,13 +257,13 @@ def post(self):
 
 				error_message = "wrong password"
 				return { 
-							"msg" 				: "incorrect login / {}".format(error_message) 
+							"msg" : "incorrect login / {}".format(error_message) 
 						}, 401
 
 		else : 
 
 			error_message = "bad antispam_check"
 			return { 
-						"msg" 				: "incorrect login / {}".format(error_message) 
+						"msg" : "incorrect login / {}".format(error_message) 
 					}, 406