self-host enhancements for Word/PDF handling

core/api/convert/apidocumizecom/init.go

@@ -1,48 +0,0 @@
-// Copyright 2016 Documize Inc. <legal@documize.com>. All rights reserved.
-//
-// This software (Documize Community Edition) is licensed under
-// GNU AGPL v3 http://www.gnu.org/licenses/agpl-3.0.en.html
-//
-// You can operate outside the AGPL restrictions by purchasing
-// Documize Enterprise Edition and obtaining a commercial license
-// by contacting <sales@documize.com>.
-//
-// https://documize.com
-
-package apidocumizecom
-
-import (
-	"crypto/tls"
-	"errors"
-	"net/http"
-
-	"github.com/documize/community/core/api/request"
-)
-
-func endPoint() string {
-	r := request.ConfigString("LICENSE", "endpoint")
-	if r != "" {
-		return r
-	}
-	return "https://api.documize.com"
-}
-
-func token() (string, error) {
-	r := request.ConfigString("LICENSE", "token")
-	if r == "" {
-		return "", errors.New("Documize token is empty")
-	}
-	// TODO more validation here
-	return r, nil
-}
-
-var transport = &http.Transport{
-	TLSClientConfig: &tls.Config{
-		InsecureSkipVerify: true, // TODO should be glick.InsecureSkipVerifyTLS (from -insecure flag) but get error: x509: certificate signed by unknown authority
-	}}
-
-// CheckToken returns an error if the Documize LICENSE token is invalid.
-func CheckToken() error {
-	_, err := token()
-	return err
-}

core/api/convert/apidocumizecom/msword.go

@@ -13,13 +13,13 @@ package apidocumizecom
 
 import (
 	"bytes"
+	"crypto/tls"
 	"encoding/json"
 	"fmt"
 	"net/http"
 	"path/filepath"
 
 	api "github.com/documize/community/core/convapi"
-
 	"golang.org/x/net/context"
 )
 
@@ -35,14 +35,14 @@ func (file *Msword) Convert(r api.DocumentConversionRequest, reply *api.Document
 	base := filepath.Base(r.Filename)
 	fmt.Println("Starting conversion of document: ", base)
 
+	var transport = &http.Transport{
+		TLSClientConfig: &tls.Config{
+			InsecureSkipVerify: true, // TODO should be glick.InsecureSkipVerifyTLS (from -insecure flag) but get error: x509: certificate signed by unknown authority
+		}}
+
 	client := &http.Client{Transport: transport}
 
-	tok, err := token()
-	if err != nil {
-		return err
-	}
-
-	resp, err := client.Post(endPoint()+"/api/word?token="+tok, "application/json", bytes.NewReader(byts))
+	resp, err := client.Post(r.ServiceEndpoint+"/api/word", "application/json", bytes.NewReader(byts))
 	if err != nil {
 		return err
 	}

core/api/convert/convert.go

@@ -25,7 +25,6 @@ import (
 
 // Convert provides the entry-point into the document conversion process.
 func Convert(ctx context.Context, xtn string, fileRequest *api.DocumentConversionRequest) (*api.DocumentConversionResponse, error) {
-	fileRequest.Token = plugins.Lib.Token("Convert", xtn)
 	fileResultI, err := plugins.Lib.Run(ctx, "Convert", xtn, fileRequest)
 	if err != nil {
 		return nil, err