ANGOLASUP-917: error body request is not json

src/messages_en.json

@@ -3,6 +3,7 @@
     "openlmisServerErrorHandler.serverResponse.error": "There was an error with this request, please contact the server administrator.",
     "openlmisServerErrorHandler.badCredentials": "Authentication error",
     "openlmisServerErrorHandler.badRequest": "Bad Request",
+    "openlmisServerErrorHandler.badGateway": "Bad Gateway",
     "openlmisServerErrorHandler.gatewayTimeoutError": "Gateway timeout error",
     "openlmisLogin.appHeader": "Logistics Management Information System",
     "openlmisSupport.title": "Contact support",

src/openlmis-login/login-controller.js

@@ -73,8 +73,12 @@
                     // ANGOLASUP-510: ends here
                 })
                 .catch(function(error) {
-                    vm.loginError = error;
                     vm.password = undefined;
+                    if (error.status) {
+                        vm.loginError = '';
+                    } else {
+                        vm.loginError = error;
+                    }
                 })
                 .finally(loadingModalService.close);
         }

src/openlmis-login/login.service.js

@@ -75,7 +75,7 @@
                 })
                 // AO-223: translate error message after passing bad credentials to login modal
                 .catch(function(message) {
-                    alertService.error('openlmisServerErrorHandler.badCredentials', message);
+                    alertService.error('openlmisServerErrorHandler.badCredentials');
                     return $q.reject(message);
                 });
             // AO-223: ends here

src/openlmis-modal/alert.html

@@ -0,0 +1,17 @@
+<div class="modal alert-modal {{vm.alertClass}}" tabindex="-1" role="dialog" aria-hidden="true">
+    <div class="modal-dialog">
+        <div class="modal-content">
+            <div class="modal-body">
+                <div class="alert-main">
+                    <div class="alert-message">
+                        <h2>{{vm.title | message}}</h2>
+                        <div ng-bind-html="vm.message"></div>
+                    </div>
+                </div>
+            </div>
+            <div class="modal-footer">
+                <button ng-click="vm.close()">{{vm.buttonLabel | message}}</button>
+            </div>
+        </div>
+    </div>
+</div>

src/openlmis-server-error-handler/server-error-handler.factory.js

@@ -56,6 +56,12 @@
                     $injector.get('alertService')
                         .error('openlmisServerErrorHandler.gatewayTimeoutError');
                 }, 200);
+            }
+            if (response.status === 502) {
+                $timeout(function() {
+                    $injector.get('alertService')
+                        .error('openlmisServerErrorHandler.badGateway');
+                }, 200);
             //  AO-442: ends here
             } else if (response.status >= 400 && response.status < 600 && response.status !== 401) {
                 $timeout(function() {