pgadmin-org
/
pgadmin4
mirror of https://github.com/pgadmin-org/pgadmin4.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merged adjustanct 'if' statements when allowed. 

Also - removed the unused variables.
pull/29/head
Ashesh Vashi 2020-04-08 20:27:09 +05:30
parent 6c5883bce0
commit a930c6617b
2 changed files with 21 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
web/pgAdmin4.py
View File

@ -117,13 +117,12 @@ else:
app.debug = False
# respond to JS
if config.DEBUG:
if javascriptBundler.report() == JsState.NONE:
app.logger.error("Unable to generate javascript")
app.logger.error(
"To run the app ensure that yarn install command runs successfully"
)
raise Exception("No generated javascript, aborting")
if config.DEBUG and javascriptBundler.report() == JsState.NONE:
app.logger.error(
"Unable to generate javascript.\n"
"To run the app ensure that yarn install command runs successfully"
)
raise Exception("No generated javascript, aborting")
# Start the web server. The port number should have already been set by the
# runtime if we're running in desktop mode, otherwise we'll just use the

30
web/pgadmin/__init__.py
View File

@ -472,7 +472,7 @@ def create_app(app_name=None):
try:
proc_arch64 = os.environ['PROCESSOR_ARCHITEW6432'].lower()
except Exception as e:
except Exception:
proc_arch64 = None
if proc_arch == 'x86' and not proc_arch64:
@ -486,7 +486,7 @@ def create_app(app_name=None):
try:
root_key = winreg.OpenKey(
winreg.HKEY_LOCAL_MACHINE,
"SOFTWARE\\" + server_type + "\Services", 0,
"SOFTWARE\\" + server_type + "\\Services", 0,
winreg.KEY_READ | arch_key
)
for i in xrange(0, winreg.QueryInfoKey(root_key)[0]):
@ -518,7 +518,7 @@ def create_app(app_name=None):
)
inst_key.Close()
except Exception as e:
except Exception:
pass
else:
# We use the postgres-winreg.ini file on non-Windows
@ -566,7 +566,7 @@ def create_app(app_name=None):
svr_superuser, svr_port, svr_discovery_id,
svr_comment)
except Exception as e:
except Exception:
pass
@user_logged_in.connect_via(app)
@ -618,12 +618,13 @@ def create_app(app_name=None):
# Check the auth key is valid, if it's set, and we're not in server
# mode, and it's not a help file request.
if not config.SERVER_MODE and app.PGADMIN_INT_KEY != '':
if (('key' not in request.args or
request.args['key'] != app.PGADMIN_INT_KEY) and
request.cookies.get('PGADMIN_INT_KEY') !=
app.PGADMIN_INT_KEY and request.endpoint != 'help.static'):
abort(401)
if not config.SERVER_MODE and app.PGADMIN_INT_KEY != '' and ((
'key' not in request.args or
request.args['key'] != app.PGADMIN_INT_KEY) and
request.cookies.get('PGADMIN_INT_KEY') != app.PGADMIN_INT_KEY and
request.endpoint != 'help.static'
):
abort(401)
if not config.SERVER_MODE and not current_user.is_authenticated:
user = user_datastore.get_user(config.DESKTOP_USER)
@ -642,11 +643,10 @@ def create_app(app_name=None):
# if the server is restarted the in memory key will be lost
# but the user session may still be active. Logout the user
# to get the key again when login
if config.SERVER_MODE and current_user.is_authenticated:
if current_app.keyManager.get() is None and \
request.endpoint not in ('security.login',
'security.logout'):
logout_user()
if config.SERVER_MODE and current_user.is_authenticated and \
current_app.keyManager.get() is None and \
request.endpoint not in ('security.login', 'security.logout'):
logout_user()
@app.after_request
def after_request(response):