Fix #360

cairis/bin/add_cairis_user.py

@@ -52,6 +52,7 @@ class User(db.Model, UserMixin):
   id = db.Column(db.Integer, primary_key=True)
   email = db.Column(db.String(255), unique=True)
   password = db.Column(db.String(255))
+  name = db.Column(db.String(255))
   active = db.Column(db.Boolean())
   confirmed_at = db.Column(db.DateTime())
   roles = db.relationship('Role', secondary=roles_users, backref=db.backref('users', lazy='dynamic'))
@@ -70,7 +71,7 @@ def main():
   createDatabaseSchema(b.cairisRoot,b.dbHost,b.dbPort,args.user,'',args.user + '_default')
 
   db.create_all()
-  user_datastore.create_user(email=args.user, password=args.password) 
+  user_datastore.create_user(email=args.user, password=args.password, name=args.name) 
   db.session.commit()
 
 if __name__ == '__main__':

cairis/core/BorgFactory.py

@@ -191,6 +191,7 @@ def dInitialise(withTest = True):
     'jsonPrettyPrint': True,
     'apFontSize': '7.5',
     'dbUser': 'cairis_test',
+    'userName' : 'CAIRIS test user account',
     'dbPasswd' : 'cairis_test',
     'dbName' : 'cairis_test_default',
     'dbHost': b.dbHost,

cairis/daemon/main/views.py

@@ -39,10 +39,12 @@
     DependencyController, DocumentationController, FindController, ExternalDocumentController, DocumentReferenceController, \
     PersonaCharacteristicController, TaskCharacteristicController, ObjectDependencyController, ArchitecturalPatternController, SecurityPatternController, ValueTypeController, TemplateGoalController, TemplateAssetController,TemplateRequirementController, LocationsController, RiskLevelController, TraceController, SummaryController, ConceptReferenceController, DataFlowController, DirectoryController,TrustBoundaryController, VersionController, ValidationController
 from cairis.daemon.main import main, api
+from cairis.tools.SessionValidator import get_session_id
+
 
 __author__ = 'Robin Quetin, Shamal Faily'
 
-def set_dbproxy(dbUser):
+def set_dbproxy(dbUser,userName):
   b = Borg()
   dbName = dbUser + '_default'
   dbPasswd = ''
@@ -55,6 +57,7 @@ def set_dbproxy(dbUser):
   session['session_id'] = id
   b.settings[id]['dbProxy'] = db_proxy
   b.settings[id]['dbUser'] = dbUser
+  b.settings[id]['userName'] = userName
   b.settings[id]['dbPasswd'] =dbPasswd
   b.settings[id]['dbHost'] = b.dbHost
   b.settings[id]['dbPort'] = b.dbPort
@@ -67,7 +70,7 @@ def set_dbproxy(dbUser):
   return b.settings[id]
 
 def make_session():
-  s = set_dbproxy(current_user.email)
+  s = set_dbproxy(current_user.email,current_user.name)
   resp_dict = {'session_id': s['session_id'], 'message': 'Session created'}
   resp = make_response(encode(resp_dict), OK)
   resp.headers['Content-type'] = 'application/json'
@@ -173,6 +176,18 @@ def get_image(path):
       return send_from_directory('static/images', path)
   return handle_error(err)
 
+@main.route('/api/user')
+def get_user_details():
+  session_id = get_session_id(session, request)
+  b = Borg()
+  emailName = b.settings[session_id]['dbUser'] 
+  userName = b.settings[session_id]['userName']
+  user_dict = {'name' : userName, 'email' : emailName}
+  resp = make_response(encode(user_dict), OK)
+  resp.headers['Content-type'] = 'application/json'
+  return resp
+
+
 # Architectural Pattern routes
 api.add_resource(ArchitecturalPatternController.ArchitecturalPatternsAPI, '/api/architectural_patterns', endpoint = 'architecturalpatterns')
 api.add_resource(ArchitecturalPatternController.ArchitecturalPatternByNameAPI, '/api/architectural_patterns/name/<string:name>', endpoint='architecturalpattern')

cairis/daemon/models.py

@@ -32,6 +32,7 @@ class User(db.Model, UserMixin):
   __tablename__ = 'auth_user'
   id = db.Column(db.Integer, primary_key=True)
   email = db.Column(db.String(255), unique=True) 
+  name = db.Column(db.String(255)) 
   password = db.Column(db.String(255))
   active = db.Column(db.Boolean())
   confirmed_at = db.Column(db.DateTime())