1
0
mirror of https://github.com/Foltik/Shimapan synced 2024-11-28 13:36:41 -05:00

Merge branch 'mean' of https://github.com/Foltik/shimapan into mean

This commit is contained in:
Jack 2017-10-11 18:21:20 -04:00
commit 123672dbfb
Signed by: foltik
GPG Key ID: 303F88F996E95541
2 changed files with 10 additions and 3 deletions

View File

@ -1,4 +1,4 @@
function UploadController($scope, Upload, $timeout) {
function UploadController($scope, Upload, $timeout, AuthService) {
$scope.errToString = function(err) {
if (err === 'maxSize')
return "File too large.";
@ -14,7 +14,9 @@ function UploadController($scope, Upload, $timeout) {
file.upload = Upload.upload({
url: '/upload',
method: 'POST',
// data: loginToken, unique id, something
headers: {
'Authorization': AuthService.getAuthHeader()
},
file: file
});
@ -36,7 +38,7 @@ function UploadController($scope, Upload, $timeout) {
};
}
angular.module('UploadComp', ['ngFileUpload']).component('uploadComponent', {
angular.module('UploadComp', ['ngFileUpload', 'AuthSvc']).component('uploadComponent', {
templateUrl: '/views/upload-form.html',
controller: UploadController,
controllerAs: 'vm'

View File

@ -18,6 +18,11 @@ angular.module('AuthSvc', []).service('AuthService', ['$http', '$window', functi
return $window.localStorage['shimapan-token'];
}
this.getAuthHeader = function() {
return 'Bearer ' + getToken();
};
this.login = function(user) {
return $http({
method: 'POST',