From 7c60b8358da1f34f389a9159df78f556181d1eca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?H=C3=A5kon=20S=C3=B8gnen?= Date: Thu, 13 Jul 2017 14:49:28 +0200 Subject: [PATCH] Send version with login post. Ask user to reload browser on http code 426 --- shared/auth/loginServices.js | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/shared/auth/loginServices.js b/shared/auth/loginServices.js index f28bab7..b32cc83 100644 --- a/shared/auth/loginServices.js +++ b/shared/auth/loginServices.js @@ -1,7 +1,11 @@ (function () { 'use strict'; - angular.module('fnlf-login', ['http-auth-interceptor']) + angular.module('fnlf-login', ['http-auth-interceptor','config']); + +})(); +(function () { + angular.module('fnlf-login') .controller('LoginController', function ($scope, loginService) { @@ -44,7 +48,7 @@ angular.module('fnlf-login') - .service('loginService', function ($rootScope, $http, authService, GlobalsService, $window, $location, $cookieStore,$q) { + .service('loginService', function ($rootScope, $http, authService, GlobalsService, $window, $location, $cookieStore,$q,ENV) { $rootScope.$on('event:auth-loginRequired', function () { $rootScope.error = 'Login is required'; @@ -64,7 +68,8 @@ $http.post(GlobalsService.get('baseUrl') + 'user/authenticate', { username: username, - password: password + password: password, + version:ENV.version }).success(function (response) { console.log(response); @@ -232,8 +237,11 @@ $scope.info = 'Feil brukernavn eller passord'; }else if(error.status==503){ $scope.error = 'Melwin er nede. Prøv igjen senere'; - console.log(error); - }else{ + console.log(error); + }else if(error.status==426){ + $scope.error = 'Last siden på nytt (Ctrl+F5 på PC)'; + console.log(error); + } else{ $scope.error = 'Feil med serveren. Prøv igjen senere'; console.log(error); }