Upload with new API

examples/querysheet.http

@@ -23,6 +23,12 @@ GET http://localhost:8080/api/fling
 Content-Type: application/json
 :token
 
+# Add a new fling
+POST http://localhost:8080/api/fling
+Content-Type: application/json
+:token
+{"name": "Shared Fling from querysheet", "expirationClicks": 12, "shared": true}
+
 # Add a new fling
 POST http://localhost:8080/api/fling
 Content-Type: application/json

service/fling/src/main/java/net/friedl/fling/persistence/entities/ArtifactEntity.java

@@ -9,6 +9,7 @@ import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
 import javax.persistence.ManyToOne;
 import javax.persistence.Table;
+import javax.persistence.UniqueConstraint;
 import javax.persistence.Version;
 import org.hibernate.annotations.CreationTimestamp;
 import org.hibernate.annotations.UpdateTimestamp;
@@ -16,7 +17,7 @@ import lombok.Getter;
 import lombok.Setter;
 
 @Entity
-@Table(name = "Artifact")
+@Table(name = "Artifact", uniqueConstraints = @UniqueConstraint(columnNames = {"fling_id", "path"}))
 @Getter
 @Setter
 public class ArtifactEntity {

service/fling/src/main/java/net/friedl/fling/persistence/repositories/FlingRepository.java

@@ -11,6 +11,6 @@ public interface FlingRepository extends JpaRepository<FlingEntity, UUID> {
 
   FlingEntity findByShareId(String shareId);
 
-  @Query("SELECT fe FROM FlingEntity fe JOIN ArtifactEntity ae ON fe.id=ae.id WHERE ae.id=:artifactId")
+  @Query("SELECT fe FROM FlingEntity fe JOIN ArtifactEntity ae ON fe.id=ae.fling.id WHERE ae.id=:artifactId")
   FlingEntity findByArtifactId(UUID artifactId);
 }

service/fling/src/main/java/net/friedl/fling/security/FlingWebSecurityConfigurer.java

@@ -109,15 +109,15 @@ public class FlingWebSecurityConfigurer extends WebSecurityConfigurerAdapter {
         /***************************************/
         .authorizeRequests()
           .antMatchers(HttpMethod.GET, "/api/artifacts/{artifactId}/**")
-          .access("@authorizationService.allowArtifactAccess(#artifactId, token)")
+          .access("@authorizationService.allowArtifactAccess(#artifactId, authentication)")
         .and()
         .authorizeRequests()
           .antMatchers(HttpMethod.POST, "/api/artifacts/{artifactId}/data")
-          .access("@authorizationService.allowArtifactUpload(#artifactId, token)")
+          .access("@authorizationService.allowArtifactUpload(#artifactId, authentication)")
         .and()
         .authorizeRequests()
           .antMatchers(HttpMethod.DELETE, "/api/artifacts/{artifactId}")
-          .access("@authorizationService.allowArtifactUpload(#artifactId, token)");
+          .access("@authorizationService.allowArtifactUpload(#artifactId, authentication)");
 
         //@formatter:on
   }

service/fling/src/main/java/net/friedl/fling/service/ArtifactService.java

@@ -57,6 +57,7 @@ public class ArtifactService {
   public ArtifactDto create(UUID flingId, ArtifactDto artifactDto) {
     FlingEntity flingEntity = flingRepository.getOne(flingId);
     
+    log.debug("Creating new ArtifactEntity for ArtifactDto[.path={}]", artifactDto.getPath());
     ArtifactEntity artifactEntity = artifactMapper.map(artifactDto);
     artifactEntity.setFling(flingEntity);
     artifactEntity = artifactRepository.save(artifactEntity);

service/fling/src/main/java/net/friedl/fling/service/archive/impl/FileSystemArchive.java

@@ -89,6 +89,7 @@ public class FileSystemArchive implements ArchiveService {
   public void storeArtifact(UUID artifactId, InputStream artifactStream) throws IOException {
     log.debug("Storing artifact {}", artifactId);
 
+    synchronized (filesystems) {
       setArchived(artifactId, false);
       FileSystem zipDisk = getZipDisk(artifactId);
       Files.copy(artifactStream, getZipDiskPath(artifactId, zipDisk),
@@ -98,6 +99,7 @@ public class FileSystemArchive implements ArchiveService {
       closeZipDisk(artifactId);
       setArchived(artifactId, true);
     }
+  }
 
   @Override
   public void deleteArtifact(UUID artifactId) throws IOException {
@@ -129,7 +131,7 @@ public class FileSystemArchive implements ArchiveService {
 
       Path zipDiskPath = archivePath.resolve(flingId.toString() + ".zip");
       log.debug("Deleting fling [.id={}] at {}", flingId, zipDiskPath);
-      if(Files.exists(zipDiskPath)) {
+      if (Files.exists(zipDiskPath)) {
         Files.delete(zipDiskPath);
       } else {
         log.warn("No fling disk found at {}", zipDiskPath);
@@ -142,7 +144,6 @@ public class FileSystemArchive implements ArchiveService {
   private void setArchived(UUID artifactId, boolean archived) {
     ArtifactEntity artifactEntity = artifactRepository.getOne(artifactId);
     artifactEntity.setArchived(archived);
-
     log.debug("Artifact[.id={}] set to {} archived", artifactId, archived ? "" : "not");
   }
 

web/fling/src/components/admin/FlingContent.jsx

@@ -1,42 +1,65 @@
 import log from 'loglevel';
 import React from 'react';
-import {Switch, Route, useLocation, Link} from "react-router-dom";
+import { Switch, Route, useLocation, Link } from "react-router-dom";
+
+import { useSelector } from "react-redux";
 
 import FlingArtifacts from './FlingArtifacts';
 import Upload from './Upload';
 import Settings from './Settings';
 
-export default function FlingContent(props) {
-    let location = useLocation();
+export default function FlingContent() {
+  const location = useLocation();
+  const activeFling = useSelector(state => state.flings.activeFling);
 
-    function path(tail) {
-        return `/admin/${props.activeFling}/${tail}`;
+  function Empty() {
+    return (
+      <div className="empty">
+        <div className="empty-icon">
+          <i className="icon icon-search icon-2x"></i>
+        </div>
+        <p className="empty-title h5">No Fling selected</p>
+        <p className="empty-subtitle">Select a fling from the list</p>
+      </div>
+    );
   }
 
-    return(
+  function Content() {
+    function path(tail) {
+      return `/admin/${activeFling.id}/${tail}`;
+    }
+
+    return (
       <div className="fling-content p-2">
         {log.info("FlingContent location ", location)}
-          {log.info("FlingContent active fling ", props.activeFling)}
+        {log.info("FlingContent active fling ", activeFling)}
         <ul className="tab tab-block mt-0">
-            <li className={`tab-item ${location.pathname !== path("upload") && location.pathname !== path("settings") ? "active": ""}`}>
+          <li className={`tab-item ${location.pathname !== path("upload") && location.pathname !== path("settings") ? "active" : ""}`}>
             <Link to={path("files")}>Files</Link>
           </li>
-            <li className={`tab-item ${location.pathname === path("upload") ? "active": ""}`}>
+          <li className={`tab-item ${location.pathname === path("upload") ? "active" : ""}`}>
             <Link to={path("upload")}>Upload</Link>
           </li>
-            <li className={`tab-item ${location.pathname === path("settings") ? "active": ""}`}>
+          <li className={`tab-item ${location.pathname === path("settings") ? "active" : ""}`}>
             <Link to={path("settings")}>Settings</Link>
           </li>
         </ul>
 
         <div className="mt-2">
           <Switch>
-              <Route exact path="/admin/:fling"><FlingArtifacts activeFling={props.activeFling} /></Route>
-              <Route path="/admin/:fling/files"><FlingArtifacts activeFling={props.activeFling} /></Route>
-              <Route path="/admin/:fling/upload"><Upload activeFling={props.activeFling} /></Route>
-              <Route path="/admin/:fling/settings"><Settings activeFling={props.activeFling} /></Route>
+            <Route exact path="/admin/:fling"><FlingArtifacts /></Route>
+            <Route path="/admin/:fling/files"><FlingArtifacts /></Route>
+            <Route path="/admin/:fling/upload"><Upload /></Route>
+            <Route path="/admin/:fling/settings"><Settings /></Route>
           </Switch>
         </div>
       </div>
     );
+  }
+
+  return (
+    <>
+      { activeFling ? Content() : Empty() }
+    </>
+  );
 }

web/fling/src/components/admin/FlingTile.jsx

@@ -43,7 +43,7 @@ function TileAction(props) {
         <li className="menu-item">
           <div className="form-group">
             <label className="form-switch">
-              <input type="checkbox" checked={props.fling.shared} />
+              <input type="checkbox" disabled checked={props.fling.shared} />
               <i className="form-icon" />
               {props.fling.shared ? "Shared" : "Private"}
             </label>

web/fling/src/components/admin/Login.jsx

@@ -1,5 +1,5 @@
 import log from 'loglevel';
-import React, {useState} from 'react';
+import React, {useState, useEffect} from 'react';
 import {useHistory, useLocation} from 'react-router-dom';
 
 import {fc, AuthClient} from '../../util/fc';
@@ -11,6 +11,25 @@ export default function Login() {
   const location = useLocation();
   const { from } = location.state || { from: { pathname: "/admin" } };
 
+  useEffect(() => {
+    sessionStorage.removeItem("token")
+  });
+
+  function handleSubmit(ev) {
+    ev.preventDefault();
+
+    let authClient = new AuthClient();
+    let opt = {adminAuth: new fc.AdminAuth(username, password)};
+
+    authClient.authenticateOwner(opt)
+      .then(response => {
+        log.info("Login successful");
+        sessionStorage.setItem('token', response);
+        log.debug("Returning back to", from);
+        history.replace(from);
+      }).catch(log.error);
+  };
+
   return (
     <div className="container-center">
       <div>
@@ -41,19 +60,4 @@ export default function Login() {
 
     </div>
   );
-
-  function handleSubmit(ev) {
-    ev.preventDefault();
-
-    let authClient = new AuthClient();
-    let opt = {adminAuth: new fc.AdminAuth(username, password)};
-
-    authClient.authenticateOwner(opt)
-      .then(response => {
-        log.info("Login successful");
-        sessionStorage.setItem('token', response);
-        log.debug("Returning back to", from);
-        history.replace(from);
-      }).catch(log.error);
-  };
 }

web/fling/src/components/admin/Upload.jsx

@@ -1,49 +1,43 @@
 import log from 'loglevel';
-import React, {useState, useEffect, useRef} from 'react';
+import React, { useState, useEffect, useRef } from 'react';
+import { useSelector } from "react-redux";
 
-import {artifactClient} from '../../util/flingclient';
+import { ArtifactClient, FlingClient, fc } from '../../util/fc';
+import { prettifyBytes, prettifyTimestamp } from '../../util/fn';
 
 import upload from '../resources/upload.svg';
 import drop from '../resources/drop.svg';
 
-
-export default function Upload(props) {
+export default function Upload() {
   let fileInputRef = useRef(null);
   let [files, setFiles] = useState([]);
   let [dragging, setDragging] = useState(false);
   let [dragCount, setDragCount] = useState(0);
 
+  const activeFling = useSelector(state => state.flings.activeFling);
+
   useEffect(() => {
-        // prevent browser from trying to open the file when drag event
-        // not recognized properly
-        window.addEventListener("dragover",function(e){
-            e.preventDefault();
-        },false);
-        window.addEventListener("drop",function(e){
-            e.preventDefault();
-        },false);
+    // prevent browser from trying to open the file when drag event not
+    // recognized properly
+    window.addEventListener("dragover", e => e.preventDefault(), false);
+    window.addEventListener("drop", e => e.preventDefault(), false);
   });
 
   function fileList() {
-        function readableBytes(bytes) {
-            if(bytes <= 0) return "0 KB";
-
-            var i = Math.floor(Math.log(bytes) / Math.log(1024)),
-                sizes = ['Byte', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'];
-
-            return (bytes / Math.pow(1024, i)).toFixed(2) * 1 + ' ' + sizes[i];
-        }
-
     let fileList = [];
-        files.forEach((file,idx) => {
-            if(!file.uploaded) {
+    files.forEach((file, idx) => {
+      if (!file.uploaded) {
         fileList.push(
-                    <div className="column col-6 col-md-12 mb-2">
+            <div key={idx} className="column col-6 col-md-12 mb-2">
             <div className="card">
               <div className="card-header">
-                          <i className="icon icon-cross float-right c-hand" onClick={ev => deleteFile(idx)}/>
+                <i className="icon icon-cross float-right c-hand"
+                  onClick={ev => deleteFile(idx)} />
                 <div className="card-title h5">{file.name}</div>
-                          <div className="card-subtitle text-gray">{(new Date(file.lastModified)).toLocaleString()+", "+readableBytes(file.size)}</div>
+                <div className="card-subtitle text-gray">
+                  {`${prettifyTimestamp(file.lastModified)}, ` +
+                    `${prettifyBytes(file.size)}`}
+                </div>
               </div>
             </div>
           </div>
@@ -61,21 +55,12 @@ export default function Upload(props) {
   }
 
   function totalSize() {
-        function readableBytes(bytes) {
-            if(bytes <= 0) return "0 KB";
-
-            var i = Math.floor(Math.log(bytes) / Math.log(1024)),
-                sizes = ['B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'];
-
-            return (bytes / Math.pow(1024, i)).toFixed(2) * 1 + ' ' + sizes[i];
-        }
-
     let totalSize = 0;
-        for(let file of files) {
+    for (let file of files) {
       totalSize += file.size;
     }
 
-        return readableBytes(totalSize);
+    return prettifyBytes(totalSize);
   }
 
   function handleClick(ev) {
@@ -109,21 +94,21 @@ export default function Upload(props) {
   }
 
   function fileListToArray(fileList) {
-        if(fileList === undefined || fileList === null) {
+    if (fileList === undefined || fileList === null) {
       return [];
     }
 
     let arr = [];
-        for (let i=0; i<fileList.length; i++) { arr.push(fileList[i]); }
+    for (let i = 0; i < fileList.length; i++) { arr.push(fileList[i]); }
 
     return arr;
   }
 
   function handleOnDragEnter(ev) {
     stopEvent(ev);
-        if(dragCount === 0) setDragging(true);
+    if (dragCount === 0) setDragging(true);
 
-        setDragCount(dragCount+1);
+    setDragCount(dragCount + 1);
   }
 
   function handleOnDragLeave(ev) {
@@ -133,7 +118,7 @@ export default function Upload(props) {
     dc -= 1;
     setDragCount(dc);
 
-        if(dc === 0) setDragging(false);
+    if (dc === 0) setDragging(false);
   }
 
   function stopEvent(ev) {
@@ -142,7 +127,7 @@ export default function Upload(props) {
   }
 
   function logFiles() {
-        log.info("Files so far: ["+files.map((i) => i.name).join(',')+"]");
+    log.info("Files so far: [" + files.map((i) => i.name).join(',') + "]");
   }
 
   function setFileUploaded(idx) {
@@ -152,24 +137,30 @@ export default function Upload(props) {
   }
 
   function handleUpload() {
+    const flingClient = new FlingClient();
+    const artifactClient = new ArtifactClient();
+
     files.forEach((file, idx) => {
-            artifactClient.postArtifact(props.activeFling, file)
-                .then(response => {
+      let artifact = new fc.Artifact(file.name)
+
+      flingClient.postArtifact(activeFling.id, { artifact: artifact })
+        .then(artifact => {
+          artifactClient.uploadArtifactData(artifact.id, { body: file });
           setFileUploaded(idx);
         });
     });
   }
 
   function zoneContent(dragging) {
-        if(dragging){
-            return(
+    if (dragging) {
+      return (
         <>
           <img className="dropzone-icon" alt="dropzone icon" src={drop} />
           <h5 className="text-primary">Drop now!</h5>
         </>
       );
-        }else {
-            return(
+    } else {
+      return (
         <>
           <img className="dropzone-icon-upload" alt="dropzone icon" src={upload} />
           <h5>Click or Drop</h5>
@@ -178,7 +169,7 @@ export default function Upload(props) {
     }
   }
 
-    return(
+  return (
     <div className="container">
       {logFiles()}
       <div className="columns">

web/fling/src/redux/reducers/artifacts.js

@@ -0,0 +1,39 @@
+import log from "loglevel";
+import produce from "immer";
+
+import { SET_FLINGS, SET_ACTIVE_FLING, ADD_FLING } from "../actionTypes";
+
+const initialState = {
+    // type [fc.Artifact]
+    aritfacts: []
+}
+
+export default produce((draft, action) => {
+    switch (action.type) {
+        case SET_FLINGS:
+            draft.flings = action.payload;
+            break;
+        case ADD_FLING:
+            // Check storage again here, otherwise there could be a race
+            // condition due to async calls of SET_FLINGS and ADD_FLING
+            let foundFlingIdx = draft.flings.findIndex(fling =>
+                fling.id === action.payload.id);
+
+            if (foundFlingIdx === -1) {
+                log.debug(`Adding new fling with id ${action.payload.id}`)
+                draft.flings.push(action.payload);
+            } else {
+                log.debug(`Fling already exists. ` +
+                    `Updating fling with id ${action.payload.id}`)
+                draft.flings[foundFlingIdx] = action.payload
+            }
+            break;
+        case SET_ACTIVE_FLING:
+            draft.activeFling = action.payload;
+            break;
+        default:
+            break;
+    }
+    return draft;
+
+}, initialState);

web/fling/src/util/fn.js

@@ -0,0 +1,19 @@
+/*
+ * Returns a human readable presentation of `bytes`
+ */
+export function prettifyBytes(bytes) {
+    if (bytes <= 0) return "0 KB";
+
+    var i = Math.floor(Math.log(bytes) / Math.log(1024)),
+        sizes = ['Byte', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'];
+
+    return (bytes / Math.pow(1024, i)).toFixed(2) * 1 + ' ' + sizes[i];
+}
+
+/**
+ * Returns a human readable date for a unix timestamp in milliseconds
+ */
+export function prettifyTimestamp(timestamp, withTime=false) {
+    let date = new Date(timestamp);
+    return withTime ? date.toLocaleString(): date.toLocaleDateString();
+}