From 8e81b1bece2b6a361fd924de1de382a86dde3d5f Mon Sep 17 00:00:00 2001
From: Krish Moodbidri <krish94@uab.edu>
Date: Mon, 31 Aug 2020 00:05:18 -0500
Subject: [PATCH] version0.1
---
app/templates/auth/SignUp.html | 2 ++
run.py | 2 +-
tasks.py | 3 ++-
vars.py | 6 +++---
4 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/app/templates/auth/SignUp.html b/app/templates/auth/SignUp.html
index 891a09a..e2f9e84 100644
--- a/app/templates/auth/SignUp.html
+++ b/app/templates/auth/SignUp.html
@@ -92,6 +92,8 @@
<div class="signUpContainer">
<label><b><label for="username">Blazer Id: </label><br></b></label>
<input class="form-control" id="bid" name="bid" placeholder="Enter BlazerId" required="" type="text">
+ <label><b><label for="email">Email Id: </label><br></b></label>
+ <input class="form-control" id="email" name="email" placeholder="Enter Email Id" required="" type="text" pattern="[a-z0-9._%+-]+@[a-z0-9.-]+\.[a-z]{2,3}$" >
<label><b><label for="fullname">Full Name: </label><br></b></label>
<input class="form-control" id="fullname" name="fullname" placeholder="Enter Full Name" required="" type="text">
<label><b><label for="reason">Reason for Requesting Account: </label><br></b></label>
diff --git a/run.py b/run.py
index ff6b025..e7c8fba 100644
--- a/run.py
+++ b/run.py
@@ -36,7 +36,7 @@ def request_account(json, methods=['GET', 'POST']):
room = str(session['uid'])
print("Room: {}".format(room))
try:
- tasks.celery_create_account.delay(json['username'], json['fullname'], json['reason'], session=room)
+ tasks.celery_create_account.delay(json['username'], json['email'], json['fullname'], json['reason'], session=room)
except Exception as e:
print(time.strftime("%m-%d-%Y_%H:%M:%S") + "\tError in account creation: ", e)
socketio.emit("Account creation failed", room)
diff --git a/tasks.py b/tasks.py
index 7deec3a..1e8a415 100644
--- a/tasks.py
+++ b/tasks.py
@@ -24,6 +24,7 @@ def celery_create_account(username, fullname, reason, session):
print(time.strftime("%m-%d-%Y_%H:%M:%S") + '\tUser ' + username + ' added to queue')
send_msg('creating account', room)
print(username)
- subprocess.call(["/opt/rabbitmq_agents/flask_producer.py", "ohpc_account_create", username])
+ subprocess.call(["/opt/rabbitmq_agents/create_account.py", username, email, fullname, reason])
+ print(username + email + fullname + reason)
print(time.strftime("%m-%d-%Y_%H:%M:%S") + '\tAccount successfully created for ' + username)
send_msg('account ready', room)
diff --git a/vars.py b/vars.py
index 8314f9d..0fa6295 100644
--- a/vars.py
+++ b/vars.py
@@ -1,6 +1,6 @@
-id = ''
-password = ''
-key = ''
+id = 'reggie'
+password = 'reggie'
+key = '1234'
broker_url = 'amqp://' + id + ':' + password + '@ohpc:5672/'
message_queue = broker_url + 'socketio'
default_referrer = "https://docs.uabgrid.uab.edu/wiki/Cheaha_Quick_Start"
--
GitLab