Merge pull request #59 from unfoldingWord/bugfix-klappy-files-not-authenticated

fix for files when not authenticated

Author: ancientTexts-net

coverage/shields.json

@@ -1 +1 @@
-{"message":"51.5%","label":"Integration Tests","schemaVersion":1}
+{"message":"47.63%","label":"Integration Tests","schemaVersion":1}

package.json

@@ -14,7 +14,7 @@
     "axios": "0.19.0",
     "axios-cache-adapter": "2.4.1",
     "base-64": "0.1.0",
-    "jszip": "3.2.1",
+    "jszip": "^3.5.0",
     "localforage": "1.7.3",
     "markdown-translatable": "1.2.8",
     "prop-types": "15.7.2",
@@ -110,4 +110,4 @@
       "**/components/**"
     ]
   }
-}
+}

src/components/file/_read.md

@@ -21,21 +21,19 @@ function Component() {
 
 const [repository, setRepository] = React.useState();
 const [filepath, setFilepath] = React.useState();
-const [branch, setBranch] = React.useState('master');
 const config = {
   server: "https://bg.door43.org",
   tokenid:"PlaygroundTesting",
 };
 
-<AuthenticationContextProvider
->
+<AuthenticationContextProvider>
   <RepositoryContextProvider
     repository={repository}
     onRepository={setRepository}
     config={config}
-    defaultQuery=''
-    full_name='unfoldingWord/en_ta'
-    branch={branch}
+    defaultQuery='en_ta'
+    // full_name='unfoldingWord/en_ta'
+    branch='master'
   >
     <FileContextProvider
       filepath={filepath}

src/components/file/_update-delete.md

@@ -53,7 +53,7 @@ const [filepath, setFilepath] = React.useState();
     onRepository={setRepository}
     defaultOwner={authentication && authentication.user.name}
     defaultQuery=""
-    branch='testing'
+    // branch='master'
   >
     <FileContextProvider
       filepath={filepath}

src/components/file/useFile.js

@@ -1,13 +1,14 @@
 import React, {
-  useState, useCallback, useEffect, useContext,
+  useState, useCallback, useContext,
 } from 'react';
 import PropTypes from 'prop-types';
+import useEffect from 'use-deep-compare-effect';
 
 import {
   getContentFromFile, saveFile, ensureFile, deleteFile,
 } from './helpers';
 import {
-  FileCard, FileForm, useBlob, RepositoryContext, AuthenticationContext,
+  FileCard, FileForm, useBlob, RepositoryContext,
 } from '..';
 
 function useFile({
@@ -16,14 +17,14 @@ function useFile({
   filepath,
   onFilepath,
   defaultContent,
-  config,
-  create = false,
+  config: _config,
+  create=false,
 }) {
   const [file, setFile] = useState();
   const [blob, setBlob] = useState();
-  const { actions: repositoryActions } = useContext(RepositoryContext);
-  const { state: contextAuthentication, config: contextConfig } = useContext(AuthenticationContext);
+  const { actions: { updateBranch }, config: repositoryConfig } = useContext(RepositoryContext);
 
+  const config = _config || repositoryConfig;
   const branch = repository && (repository.branch || repository.default_branch);
 
   const [deleted, setDeleted] = useState();
@@ -41,14 +42,18 @@ function useFile({
   }, []);
 
   const read = useCallback(async (_filepath) => {
-    onFilepath && await onFilepath(_filepath);
+    if (onFilepath) {
+      await onFilepath(_filepath);
+    };
   }, [onFilepath]);
 
   const load = useCallback(async () => {
     if (config && repository && filepath) {
       const _file = await ensureFile({
         filepath, defaultContent, authentication, config, repository, branch,
       });
+      // let content;
+      // content = await repositoryActions.fileFromZip(filepath);
       const content = await getContentFromFile(_file);
 
       update({
@@ -57,7 +62,9 @@ function useFile({
     }
   }, [authentication, branch, config, defaultContent, filepath, repository, update]);
 
-  const createFile = useCallback(async ({ branch: _branch, filepath: _filepath, defaultContent: _defaultContent }) => {
+  const createFile = useCallback(async ({
+    branch: _branch, filepath: _filepath, defaultContent: _defaultContent,
+  }) => {
     if (config && repository) {
       const _file = await ensureFile({
         authentication, config, repository,
@@ -67,15 +74,20 @@ function useFile({
       });
 
       if (_file) {
-        repositoryActions.updateBranch(_branch);
+        updateBranch(_branch);
         onFilepath(_filepath);
       };
     }
-  }, [authentication, config, repository]);
+  }, [authentication, config, repository, updateBranch, onFilepath]);
 
   const close = useCallback(() => {
-    if (blobActions && blobActions.close) blobActions.close();
-    if (onFilepath) onFilepath();
+    if (blobActions && blobActions.close) {
+      blobActions.close();
+    };
+
+    if (onFilepath) {
+      onFilepath();
+    };
     update();
   }, [update, blobActions, onFilepath]);
 
@@ -110,14 +122,13 @@ function useFile({
   const blobFilepath = blobState && blobState.filepath;
 
   useEffect(() => {
-    if (blobFilepath && onFilepath) onFilepath(blobFilepath);
+    if (blobFilepath && onFilepath) {
+      onFilepath(blobFilepath);
+    };
   }, [blobFilepath, onFilepath]);
 
   useEffect(() => { // if there is a file but no repository, close file.
-    if (!repository && file) {
-      close();
-    }
-    if (!contextAuthentication) close();
+    if (!repository && file) close();
   }, [repository, file, close]);
 
   useEffect(() => {

src/components/repository/helpers.js

@@ -1,4 +1,3 @@
-
 import {
   createFork,
   readForks,
@@ -7,6 +6,7 @@ import {
   updateRepo,
   deleteRepo,
 } from '../..';
+import { storeZipFromRepo, getFileFromRepoZip } from '.';
 
 export const forkRepository = async ({ repository, config }) => {
   const { owner: { username }, name } = repository;
@@ -20,30 +20,78 @@ export const repositoryForks = async ({ repository, config }) => {
   return response;
 };
 
-export const createRepository = async ({ repo, settings, config }) => {
+export const createRepository = async ({
+  repo, settings, config,
+}) => {
   const _settings = {
     name: repo,
     description: `${repo || settings.name} created via API.`,
     private: false,
     ...settings,
-  }
-  const response = await createRepo({ repo, settings: _settings, config });
+  };
+  const response = await createRepo({
+    repo, settings: _settings, config,
+  });
   return response;
 };
 
-export const readRepository = async ({ owner, repo, config }) => {
-  const response = await readRepo({ owner, repo, config });
+export const readRepository = async ({
+  owner, repo, config,
+}) => {
+  const response = await readRepo({
+    owner, repo, config,
+  });
   return response;
 };
 
-export const saveRepository = async ({ repository, settings, config }) => {
+export const saveRepository = async ({
+  repository, settings, config,
+}) => {
   const { owner: { username }, name } = repository;
-  const response = await updateRepo({ owner: username, repo: name, settings, config });
+  const response = await updateRepo({
+    owner: username, repo: name, settings, config,
+  });
   return response;
 };
 
-export const deleteRepository = async ({ repository, settings, config }) => {
+export const deleteRepository = async ({
+  repository, settings, config,
+}) => {
   const { owner: { username }, name } = repository;
-  const response = await deleteRepo({ owner: username, repo: name, settings, config });
+  const response = await deleteRepo({
+    owner: username, repo: name, settings, config,
+  });
   return response;
 };
+
+export const storeRepositoryZip = async ({ repository, config }) => {
+  const {
+    owner: { username }, name, branch,
+  } = repository;
+  const response = await storeZipFromRepo({
+    owner: username, repo: name, branch, server: config.server,
+  });
+  return response;
+};
+
+export const removeRepositoryZip = async ({ repository, config }) => {
+  const {
+    owner: { username }, name, branch,
+  } = repository;
+  const response = await storeZipFromRepo({
+    owner: username, repo: name, branch, server: config.server,
+  });
+  return response;
+};
+
+export const getFileFromRepositoryZip = async ({
+  repository, filepath, config,
+}) => {
+  const {
+    owner: { username }, name, branch,
+  } = repository;
+  const file = await getFileFromRepoZip({
+    owner: username, repo: name, branch, filepath, config,
+  });
+  return file;
+};

src/components/repository/index.js

@@ -1,4 +1,6 @@
 export * from './crud';
 export * from './Repository.context';
+export * from './zip-core';
+export * from './helpers';
 export { default as Repository } from './Repository';
 export { default as useRepository } from './useRepository';

src/components/repository/useRepository.js

@@ -14,6 +14,9 @@ import {
   repositoryForks,
   createRepository,
   readRepository,
+  storeRepositoryZip,
+  removeRepositoryZip,
+  getFileFromRepositoryZip,
 } from './helpers';
 
 function useRepository({
@@ -33,6 +36,9 @@ function useRepository({
   const { full_name } = repository || {};
   const user = authentication && authentication.user;
 
+  // Due to objects not memoizing in useCallback, deconstruction is necessary
+  // const { owner: { username: owner }, name: repo } = repository;
+
   const update = useCallback((repo) => {
     if (onRepository) {
       let _repo;
@@ -87,6 +93,21 @@ function useRepository({
     };
   }, [config, repository, update]);
 
+  const storeZip = useCallback(async () => {
+    await storeRepositoryZip({ repository, config });
+  }, [repository, config]);
+
+  const removeZip = useCallback(async () =>{
+    await removeRepositoryZip({ repository, config });
+  }, [repository, config]);
+
+  const fileFromZip = useCallback(async (filepath) => {
+    const file = await getFileFromRepositoryZip({
+      repository, filepath, config,
+    });
+    return file;
+  }, [repository, config]);
+
   const forks = useCallback(() => {
     repositoryForks({ repository, config });
   }, [repository, config]);
@@ -150,7 +171,7 @@ function useRepository({
     component = components.browse;
   } else if (config) {
     component = components.search;
-  }
+  };
 
   return {
     state: repository,
@@ -164,6 +185,9 @@ function useRepository({
       forks,
       updateBranch,
       read,
+      storeZip,
+      removeZip,
+      fileFromZip,
     },
     component,
     components,