Merge pull request root-gg#334 from camathieu/master

1.3.1
paulkitt · Oct 27, 2020 · a05ae36 · a05ae36
2 parents 1cfa6a8 + aecbdc8
commit a05ae36
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 3 deletions.
diff --git a/releaser/releaser.sh b/releaser/releaser.sh
@@ -48,7 +48,7 @@ do
 
   echo "################################################"
   echo "Building Plik client for $TARGET to $CLIENT_PATH"
-  make client
+  make --no-print-directory client
 
   mkdir -p "$CLIENT_DIR"
   cp client/plik "$CLIENT_PATH"
@@ -74,7 +74,7 @@ mkdir -p releases/archives
 function build_release {
     echo "#################################"
     echo "Building server for $GOOS $GOARCH"
-    make server
+    make --no-print-directory server
 
     RELEASE="plik-$RELEASE_VERSION-$GOOS-$GOARCH"
     RELEASE_DIR="releases/$RELEASE"

diff --git a/server/common/config.go b/server/common/config.go
@@ -41,7 +41,7 @@ type Configuration struct {
 	UploadWhitelist []string `json:"-"`
 
 	Authentication       bool     `json:"authentication"`
-	NoAnonymousUploads   bool     `json:"-"`
+	NoAnonymousUploads   bool     `json:"noAnonymousUploads"`
 	OneShot              bool     `json:"oneShot"`
 	Removable            bool     `json:"removable"`
 	Stream               bool     `json:"stream"`

diff --git a/webapp/js/ctrl/home.js b/webapp/js/ctrl/home.js
@@ -224,5 +224,12 @@ plik.controller('HomeCtrl', ['$scope', '$api', '$config', '$dialog', '$location'
             return filesize(size, {base: 2});
         };
 
+        // Redirect to main page
+        $scope.mainpage = function () {
+            $location.search({});
+            $location.hash("");
+            $location.path('/');
+        };
+
         loadUser($config.getUser());
     }]);
diff --git a/webapp/js/ctrl/main.js b/webapp/js/ctrl/main.js
@@ -14,6 +14,17 @@ plik.controller('MainCtrl', ['$scope', '$api', '$config', '$route', '$location',
             .then(function (config) {
                 $scope.config = config;
                 $scope.setDefaultTTL();
+                if ( config.noAnonymousUploads ) {
+                    // Redirect to login page if user is not authenticated
+                    $config.getUser()
+                        .then(null, function (error) {
+                            if (error.status === 401 || error.status === 403) {
+                                $location.path('/login');
+                            } else {
+                                $dialog.alert(error);
+                            }
+                        });
+                }
             })
             .then(null, function (error) {
                 $dialog.alert(error);

diff --git a/webapp/partials/home.html b/webapp/partials/home.html
@@ -21,6 +21,14 @@
                 <p>Total Size : {{humanReadableSize(user.stats.totalSize)}}</p>
             </div>
         </div>
+        <!-- UPLOAD FILE BUTTON -->
+        <div class="tile menu">
+            <div class="menu-item">
+                <button type="button" class="btn btn-lg btn-primary btn-block" ng-click="mainpage()">
+                    <i class="fa fa-upload"></i> Upload files
+                </button>
+            </div>
+        </div>
         <!-- LOGOUT BUTTON -->
         <div class="tile menu">
             <div class="menu-item">