github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-21 20:47:08 -05:00
Code Issues Projects Releases Packages Wiki Activity

redirect to login if session expired in file upload

Browse source
This commit is contained in:
Henry Oswald 2015-12-02 15:40:14 +00:00
parent 9383977ca5
commit 25411189a7
2 changed files with 24 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
services/web/app/views/project/editor/file-tree.jade
View file

@ -357,6 +357,7 @@ script(type="text/ng-template", id="uploadFileModalTemplate")
span   span  
.alert.alert-warning.small(ng-if="tooManyFiles") #{translate("maximum_files_uploaded_together", {max:"{{max_files}}"})} .alert.alert-warning.small(ng-if="tooManyFiles") #{translate("maximum_files_uploaded_together", {max:"{{max_files}}"})}
.alert.alert-warning.small(ng-if="rateLimitHit") #{translate("too_many_files_uploaded_throttled_short_period")} .alert.alert-warning.small(ng-if="rateLimitHit") #{translate("too_many_files_uploaded_throttled_short_period")}
.alert.alert-warning.small(ng-if="notLoggedIn") #{translate("session_expired_redirecting_to_login", {seconds:"{{secondsToRedirect}}"})}
.modal-body( .modal-body(
fine-upload fine-upload

25
services/web/public/coffee/ide/file-tree/controllers/FileTreeController.coffee
View file

@ -99,11 +99,28 @@ define [
] ]
App.controller "UploadFileModalController", [ App.controller "UploadFileModalController", [
"$scope", "ide", "$modalInstance", "$timeout", "parent_folder", "$scope", "ide", "$modalInstance", "$timeout", "parent_folder", "$window"
($scope, ide, $modalInstance, $timeout, parent_folder) -> ($scope, ide, $modalInstance, $timeout, parent_folder, $window) ->
$scope.parent_folder_id = parent_folder?.id $scope.parent_folder_id = parent_folder?.id
$scope.tooManyFiles = false $scope.tooManyFiles = false
$scope.rateLimitHit = false $scope.rateLimitHit = false
$scope.secondsToRedirect = 10
$scope.notLoggedIn = false
needToLogBackIn = ->
$scope.notLoggedIn = true
decreseTimeout = ->
$timeout (() ->
if $scope.secondsToRedirect == 0
$window.location.href = "/login?redir=/project/#{ide.project_id}"
else
decreseTimeout()
$scope.secondsToRedirect = $scope.secondsToRedirect - 1
), 1000
decreseTimeout()
uploadCount = 0 uploadCount = 0
$scope.onUpload = () -> $scope.onUpload = () ->
@ -127,8 +144,12 @@ define [
return true return true
$scope.onError = (id, name, reason)-> $scope.onError = (id, name, reason)->
console.log(id, name, reason)
if reason.indexOf("429") != -1 if reason.indexOf("429") != -1
$scope.rateLimitHit = true $scope.rateLimitHit = true
else if reason.indexOf("403") != -1
needToLogBackIn()
$scope.cancel = () -> $scope.cancel = () ->
$modalInstance.dismiss('cancel') $modalInstance.dismiss('cancel')