From 16c067359964f5897e1bb67df9697faa90ba2587 Mon Sep 17 00:00:00 2001
From: Pavel Mihaylov <pavel@ontotext.com>
Date: Tue, 17 Nov 2020 17:27:32 +0200
Subject: [PATCH] GDB-5234: Wrong credentials upon login with valid user (fixed
 to refer to parent scope regarding username and password model inside ng-if)

Updated version to 1.5.0-TR16.
---
 package-lock.json              | 2 +-
 package.json                   | 2 +-
 src/pages/login.html           | 4 ++--
 test-cypress/package-lock.json | 2 +-
 test-cypress/package.json      | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index a2f37eabf..c377a871f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "graphdb-workbench",
-  "version": "1.5.0-TR15",
+  "version": "1.5.0-TR16",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 6ff09c42f..12b832ea2 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "graphdb-workbench",
-    "version": "1.5.0-TR15",
+    "version": "1.5.0-TR16",
     "description": "The web application for GraphDB APIs",
     "scripts": {
         "build": "webpack --config=webpack.config.prod.js",
diff --git a/src/pages/login.html b/src/pages/login.html
index aa8e8a121..05eb4be3f 100644
--- a/src/pages/login.html
+++ b/src/pages/login.html
@@ -11,13 +11,13 @@ <h1>Login</h1>
 					<div class="form-group mb-2" ng-class="wrongCredentials ? 'has-error' : ''">
 						<div class="input-group">
 							<span class="input-group-addon" tooltip="Username" tooltip-trigger="mouseenter"><em class="icon-user icon-2x text-muted"></em></span>
-							<input id="wb-login-username" ng-model="username" placeholder="Your name" type="text" class="form-control form-control-lg" autofocus required ng-blur="wrongCredentials = false">
+							<input id="wb-login-username" ng-model="$parent.username" placeholder="Your name" type="text" class="form-control form-control-lg" autofocus required ng-blur="wrongCredentials = false">
 						</div>
 					</div>
 					<div class="form-group mb-2"  ng-class="wrongCredentials ? 'has-error' : ''">
 						<div class="input-group">
 							<span class="input-group-addon" tooltip="Password" tooltip-trigger="mouseenter"><em class="icon-lock icon-2x text-muted"></em></span>
-							<input id="wb-login-password" type="password" placeholder="Your password" ng-model="password" class="form-control form-control-lg" required ng-blur="wrongCredentials = false">
+							<input id="wb-login-password" type="password" placeholder="Your password" ng-model="$parent.password" class="form-control form-control-lg" required ng-blur="wrongCredentials = false">
 						</div>
 					</div>
 					<div class="form-group">
diff --git a/test-cypress/package-lock.json b/test-cypress/package-lock.json
index c99899a5d..b615daca7 100644
--- a/test-cypress/package-lock.json
+++ b/test-cypress/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "graphdb-workbench-tests",
-  "version": "1.5.0-TR15",
+  "version": "1.5.0-TR16",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/test-cypress/package.json b/test-cypress/package.json
index 80145471f..364cbd291 100644
--- a/test-cypress/package.json
+++ b/test-cypress/package.json
@@ -1,6 +1,6 @@
 {
     "name": "graphdb-workbench-tests",
-    "version": "1.5.0-TR15",
+    "version": "1.5.0-TR16",
     "description": "Cypress tests for GraphDB workbench",
     "scripts": {
         "start": "cypress open",