From 52b30c97239be9103619daa57e45c80b4ba8f388 Mon Sep 17 00:00:00 2001
From: Markin Igor <markin.io210@gmail.com>
Date: Tue, 4 Dec 2018 13:25:32 +0300
Subject: [PATCH] Update main.go and wopiapi-iframe.js
---
javascript/src/iframe/wopiapi-iframe.js | 19 +++++++++++--------
main.go | 19 ++++++++-----------
2 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/javascript/src/iframe/wopiapi-iframe.js b/javascript/src/iframe/wopiapi-iframe.js
index 042cf83..d1a10ff 100644
--- a/javascript/src/iframe/wopiapi-iframe.js
+++ b/javascript/src/iframe/wopiapi-iframe.js
@@ -1,20 +1,23 @@
-const axios = require('axios')
+const axios = require('axios');
function WopiAPI() {}
-WopiAPI.prototype.getPassports = function(publicKey, uuid, token, fileID) {
+WopiAPI.prototype.getPassports = function(fileID) {
const requestConfig = {
headers: {
- 'publicKey': publicKey,
- 'uuid': uuid,
- 'token': token,
+ 'publicKey': viamApi.getConfig().headers.publicKey,
+ 'uuid': viamApi.getConfig().headers.uuid,
+ 'token': viamApi.getConfig().headers.token,
'fileID': fileID
}
};
- const urlParts = window.API_HOST.split(':');
+ const [protocol, host] = window.API_HOST.split(':');
- return axios.post(urlParts[0] + urlParts[1] + ':8787/getPassports', {}, requestConfig);
+ const url = `${protocol}${host}${window.WOPI_URI_PREFIX}/getPassports`;
+ // TODO: remove console log
+ console.log('Wopi', url);
+ return axios.post(url, {}, requestConfig);
};
-module.exports = WopiAPI;
\ No newline at end of file
+module.exports = WopiAPI;
diff --git a/main.go b/main.go
index 0396c04..49dbcdd 100644
--- a/main.go
+++ b/main.go
@@ -2,7 +2,6 @@ package main
import (
"bytes"
- "code.vereign.com/code/restful-api/server"
"fmt"
"io/ioutil"
"os"
@@ -12,13 +11,15 @@ import (
"strings"
"unicode"
"unicode/utf8"
+
+ "code.vereign.com/code/restful-api/server"
)
func main() {
newpath := filepath.Join(".", "javascript/temp")
os.MkdirAll(newpath, os.ModePerm)
- viamapi := buildViamApi()
+ viamapi := buildViamAPI()
err := ioutil.WriteFile("./javascript/temp/viamapi.js", []byte(viamapi), 0644)
if err != nil {
@@ -51,11 +52,12 @@ func buildPenpalMethods() string {
return result
}
-func buildViamApi() string {
+func buildViamAPI() string {
prefixes := []string{}
endPoints := server.GetEndPoints(prefixes)
- result := "const axios = require('axios');\n\n"
+ result := "const axios = require('axios');\n" +
+ "window.WOPI_URI_PREFIX=\"" + server.GetWopiURIPrefix() + "\";\n\n"
var keys []string
for k := range endPoints {
@@ -766,19 +768,14 @@ func getWopiAPIPenpalMethods() string {
const success = extendPinCodeTtl(authenticationPublicKey);
- if(success === false) {
+ if (success === false) {
result({"data" : "",
"code" : "400",
"status" : "Identity not authenticated"
});
}
- wopiAPI.getPassports(
- authenticationPublicKey,
- viamApi.getConfig().headers.uuid,
- viamApi.getConfig().headers.token,
- fileID
- ).then(function(response) {
+ wopiAPI.getPassports(fileID).then(function(response) {
result(response.data);
});
});
--
GitLab