Refactor RNHTMLtoPDFModule (#81)

Author: Ligia-Andreica

README.md

@@ -65,7 +65,7 @@ export default class Example extends Component {
     let options = {
       html: '<h1>PDF TEST</h1>',
       fileName: 'test',
-      directory: 'docs',
+      directory: 'Documents',
     };
 
     let file = await RNHTMLtoPDF.convert(options)
@@ -91,7 +91,8 @@ export default class Example extends Component {
 |---|---|---|---|
 | `html` | `string` |  | HTML string to be converted
 | `fileName` | `string` | Random  | Custom Filename excluding .pdf extension
-| `base64` | boolean | false  | return base64 string of pdf file (not recommended)
+| `base64` | `boolean` | false  | return base64 string of pdf file (not recommended)
+| `directory` | `string` |default cache directory| Directory where the file will be created (`Documents` folder in example above). Please note, on iOS `Documents` is the only custom value that is accepted.
 
 
 #### iOS Only
@@ -103,7 +104,7 @@ export default class Example extends Component {
 | `padding` | number | 10  | Outer padding (points)
 
 
-##### Android Only
+#### Android Only
 
 | Param | Type | Default | Note |
 |---|---|---|---|

android/src/main/java/android/print/PdfConverter.java

@@ -98,13 +98,13 @@ public void setPdfPrintAttrs(PrintAttributes printAttrs) {
     }
 
     public void convert(Context context, String htmlString, File file, boolean shouldEncode, WritableMap resultMap,
-            Promise promise, String baseURL) {
+            Promise promise, String baseURL) throws Exception {
         if (context == null)
-            throw new IllegalArgumentException("context can't be null");
+            throw new Exception("context can't be null");
         if (htmlString == null)
-            throw new IllegalArgumentException("htmlString can't be null");
+            throw new Exception("htmlString can't be null");
         if (file == null)
-            throw new IllegalArgumentException("file can't be null");
+            throw new Exception("file can't be null");
 
         if (mIsCurrentlyConverting)
             return;

android/src/main/java/com/christopherdro/htmltopdf/RNHTMLtoPDFModule.java

@@ -9,14 +9,24 @@
 import com.facebook.react.bridge.WritableMap;
 
 import java.io.File;
+import java.io.IOException;
 import java.util.UUID;
 
 import android.os.Environment;
 import android.print.PdfConverter;
 
 public class RNHTMLtoPDFModule extends ReactContextBaseJavaModule {
 
-  private final ReactApplicationContext mReactContext;
+    private static final String HTML = "html";
+    private static final String FILE_NAME = "fileName";
+    private static final String DIRECTORY = "directory";
+    private static final String BASE_64 = "base64";
+    private static final String BASE_URL = "baseURL";
+
+    private static final String PDF_EXTENSION = ".pdf";
+    private static final String PDF_PREFIX = "PDF_";
+
+    private final ReactApplicationContext mReactContext;
 
   public RNHTMLtoPDFModule(ReactApplicationContext reactContext) {
     super(reactContext);
@@ -32,57 +42,64 @@ public String getName() {
   public void convert(final ReadableMap options, final Promise promise) {
     try {
       File destinationFile;
-      String htmlString = options.hasKey("html") ? options.getString("html") : null;
-      if (htmlString == null) return;
+      String htmlString = options.hasKey(HTML) ? options.getString(HTML) : null;
+      if (htmlString == null) {
+        promise.reject(new Exception("RNHTMLtoPDF error: Invalid htmlString parameter."));
+        return;
+      }
 
       String fileName;
-      if (options.hasKey("fileName")) {
-        fileName = options.getString("fileName");
+      if (options.hasKey(FILE_NAME)) {
+        fileName = options.getString(FILE_NAME);
+        if (!isFileNameValid(fileName)) {
+          promise.reject(new Exception("RNHTMLtoPDF error: Invalid fileName parameter."));
+          return;
+        }
       } else {
-        fileName = UUID.randomUUID().toString();
+        fileName = PDF_PREFIX + UUID.randomUUID().toString();
       }
 
-      if (options.hasKey("directory") && options.getString("directory").equals("docs")) {
+      if (options.hasKey(DIRECTORY)) {
         String state = Environment.getExternalStorageState();
-          File path = (Environment.MEDIA_MOUNTED.equals(state)) ?
-                  new File(Environment.getExternalStorageDirectory(), Environment.DIRECTORY_DOCUMENTS)
-                  : new File(mReactContext.getFilesDir(), Environment.DIRECTORY_DOCUMENTS);
-
-        if (!path.exists()) path.mkdir();
-        destinationFile = new File(path, fileName + ".pdf");
+        File path = (Environment.MEDIA_MOUNTED.equals(state)) ?
+          new File(Environment.getExternalStorageDirectory(), options.getString(DIRECTORY)) :
+          new File(mReactContext.getFilesDir(), options.getString(DIRECTORY));
+
+        if (!path.exists()) {
+          if (!path.mkdirs()) {
+            promise.reject(new Exception("RNHTMLtoPDF error: Could not create folder structure."));
+            return;
+          }
+        }
+        destinationFile = new File(path, fileName + PDF_EXTENSION);
       } else {
         destinationFile = getTempFile(fileName);
       }
 
       convertToPDF(htmlString,
               destinationFile,
-              options.hasKey("base64") && options.getBoolean("base64") == true,
+              options.hasKey(BASE_64) && options.getBoolean(BASE_64),
               Arguments.createMap(),
               promise,
-              options.hasKey("baseURL") ? options.getString("baseURL") : null);
+              options.hasKey(BASE_URL) ? options.getString(BASE_URL) : null);
     } catch (Exception e) {
-      promise.reject(e.getMessage());
+      promise.reject(e);
     }
   }
 
   private void convertToPDF(String htmlString, File file, boolean shouldEncode, WritableMap resultMap, Promise promise,
       String baseURL) throws Exception {
-    try {
       PdfConverter.getInstance().convert(mReactContext, htmlString, file, shouldEncode, resultMap, promise, baseURL);
-    } catch (Exception e) {
-      throw new Exception(e);
-    }
   }
 
-  private File getTempFile(String fileName) throws Exception {
-    try {
+  private File getTempFile(String fileName) throws IOException {
       File outputDir = getReactApplicationContext().getCacheDir();
-      File outputFile = File.createTempFile("PDF_" + UUID.randomUUID().toString(), ".pdf", outputDir);
+      return File.createTempFile(fileName, PDF_EXTENSION, outputDir);
 
-      return outputFile;
+  }
 
-    } catch (Exception e) {
-      throw new Exception(e);
-    }
+  private boolean isFileNameValid(String fileName) throws Exception {
+    return new File(fileName).getCanonicalFile().getName().equals(fileName);
   }
 }
+

ios/RNHTMLtoPDF/RNHTMLtoPDF.m

@@ -80,7 +80,7 @@ - (instancetype)init
         _fileName = [[NSProcessInfo processInfo] globallyUniqueString];
     }
 
-    if (options[@"directory"] && [options[@"directory"] isEqualToString:@"docs"]){
+    if (options[@"directory"] && [options[@"directory"] isEqualToString:@"Documents"]){
         NSArray *paths = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES);
         NSString *documentsPath = [paths objectAtIndex:0];
 
@@ -90,11 +90,11 @@ - (instancetype)init
     }
 
     if (options[@"base64"] && [options[@"base64"] boolValue]) {
-        _base64 = true;   
+        _base64 = true;
     } else {
-        _base64 = false;   
+        _base64 = false;
     }
-    
+
     if (options[@"height"] && options[@"width"]) {
         float width = [RCTConvert float:options[@"width"]];
         float height = [RCTConvert float:options[@"height"]];
@@ -139,10 +139,10 @@ - (void)webViewDidFinishLoad:(UIWebView *)awebView
 
     if (pdfData) {
         NSString *pdfBase64 = @"";
-        
+
         [pdfData writeToFile:_filePath atomically:YES];
         if (_base64) {
-            pdfBase64 = [pdfData base64EncodedStringWithOptions:0];   
+            pdfBase64 = [pdfData base64EncodedStringWithOptions:0];
         }
         NSDictionary *data = [NSDictionary dictionaryWithObjectsAndKeys:
                              pdfBase64, @"base64",