archive/blender-asset-manager
Archived
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Committing using the actual user name

Browse Source
This commit is contained in:
Francesco Siddi
2014-11-07 15:19:09 +01:00
parent a8c8685b0d
commit c853bd71ab
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
webservice/bam/application/__init__.py
View File

@@ -54,6 +54,9 @@ from application.modules.projects.model import Project, ProjectSetting
@auth.get_password @auth.get_password
def get_password(username): def get_password(username):
# Temporarily override API access
# TODO (fsiddi) check against users table
return ''
if username == 'bam': if username == 'bam':
return 'bam' return 'bam'
return None return None
@@ -225,6 +228,9 @@ class FileAPI(Resource):
svn_password = next((setting.value for setting in project.settings if setting.name == 'svn_password')) svn_password = next((setting.value for setting in project.settings if setting.name == 'svn_password'))
svn_default_user = next((setting.value for setting in project.settings if setting.name == 'svn_default_user')) svn_default_user = next((setting.value for setting in project.settings if setting.name == 'svn_default_user'))
# We get the actual username from the http headers
svn_user = auth.username()
# If the setting does not exist, stop here and prevent any other operation # If the setting does not exist, stop here and prevent any other operation
if not svn_password: if not svn_password:
return make_response(jsonify( return make_response(jsonify(
@@ -290,7 +296,7 @@ class FileAPI(Resource):
result = local_client.run_command('commit', result = local_client.run_command('commit',
[local_client.info()['entry_path'], [local_client.info()['entry_path'],
'--message', arguments['message'], '--message', arguments['message'],
'--username', svn_default_user, '--username', svn_user,
'--password', svn_password], '--password', svn_password],
combine=True) combine=True)