Skip to content

Send version with login post. #385

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
haakon-soegnen wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Send version with login post. #385

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 13 additions & 5 deletions shared/auth/loginServices.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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) {


Expand Down Expand Up @@ -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';
Expand All @@ -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);

Expand Down Expand Up @@ -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);
}
Expand Down