Skip to content
This repository was archived by the owner on Feb 13, 2024. It is now read-only.

Commit 6287eef

Browse files
DeepDiver1975DeepDiver1975
committed
feat: add wopi validator command
1 parent 7b5be7b commit 6287eef

File tree

11 files changed

+375
-12
lines changed

11 files changed

+375
-12
lines changed

‎.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
/cs3-wopi-server
2+
/wopi-validator

‎README.md

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,25 @@
99
4. check that the office is running: http://localhost:8080/hosting/discovery
1010
5. log in into oCIS
1111
6. open / create office files
12+
13+
## WOPI Validator
14+
To run wopi-validator in this development setup
15+
16+
1. build with `go build ./cmd/wopi-validator`
17+
2. run with `MICRO_REGISTRY=mdns ./wopi-validator admin admin`
18+
19+
Example output:
20+
```
21+
➭ MICRO_REGISTRY=mdns ./wopi-validator admin admin | more
22+
Starting wopi-validation ....
23+
24+
Test group: CheckFileInfoSchema
25+
Fail: FullCheckFileInfoSchema
26+
) CheckFileInfo, response code: 200 OK
27+
- Uri Expected: HostEditUrl, HostViewUrl
28+
Property Required: Size
29+
z Unknown Properties: CloseButtonClosesWindow, AllowErrorReportPrompt, SupportsGetFileWopiSrc, EnableOwnerTermination
30+
Re-run command: .\wopivalidator.exe -n FullCheckFileInfoSchema -w http://172.17.0.1:6789/wopi/files/fd5f0f569b39c459077693abdaf03b2f69041cd0d0caa12d8349b859c544afcc -t eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJXb3BpQ29udGV4dCI6eyJBY2Nlc3NUb2tlbiI6Ilhzbnl1N0VQN1E3YnFuNzRJdW9PeUo1TmlsaE5FYkpLZ3BoTmktaERsYXllTVRmc3Y4VDNDYTc2dldTNkJPLTJhVWs1ZG5XRG1mcmR2SzQ4dTdkUm1Va3FNSU42U29ZVENEVWE1Q3NyclE5cFh2bFNaU3JLbWhmaUdHbWduVVNGSVNIeERxZDlCYW41Qk5ORVpFa0lobEppYTFGdWZpN3E1dlgycnYyVHdZOXVybnJKTDBPMENFWEQxSWtET0Vwel9ZN3hXdFB3ZGJlMTlZSGNSZkZOOTAzYlVEdkFHa1J0Vkh4eC1KSjVxNkhUYlVyaWw1ZlVWcWVra1hiMEFIbEhyN1RCLWliMXJHRzJjVU5VdmhKU3ZzWW5OUFBycnhVQTNhTzVUM1FfZnVrMEs2TzBweV94OWxHbjFfdEhaaXFqTlZmLXlHOHdOcVVTQlZYNTVTVHkwMW1kME1tT2xBZV92aXcwVEJ1NlN4NEw5Z1RHWlB6RWZRS2FJRmpza2pRWHprbkRQVU1mOEF0dDFwQVlKVzV1clFWQkJtUHZiZ2doRXJERllUUDNfeUpvQTZYSU9WRWthN3ZYUFpYaHl6cmNMMk9kR3JkdzVwbE83SEZrblVvQ3d3TmdWM3FfWGxyVFJDeUhKQlY0Z2hRZkx5OVNrc2ZqYnAzUUYzVFQ2MVNxU2xOanQ2b0tIM01yVTR0Y2ttTkZSUWxELXRlWVRJQkFRVkVLYlRVRklNZG1SenpySVlHWTE1OWpXZkI5T0NPcEhQcnhhaEIzSUtNX3FMaXZTMzhVZzNzQ0V6T2cxSGxTNjRUclh5ajhVdFRXNGVDZm16NU9kRHB3eDM3MGVQNmRWMHRWblhkZU13emhLRTRmamNQeG5GM0M5TGdYWmZFVVdwb3FRWGt2Nnd6X0pwTkdmNGQ4ZmZoZjRXNnlscFRkbmNRaHF2TjdqRGhBQUViNXZwVENIUmwyYkd5TUtiTkRNNXFmbUJ1N042Y0tuaDhpTUtDVnRiY05ybk9sUEI4Vllka244R0FWQjZyNDNJLVFJamEzLTFzPSIsIkZpbGVSZWZlcmVuY2UiOnsicmVzb3VyY2VfaWQiOnsic3RvcmFnZV9pZCI6ImQ1NmFlOTdjLWI2MWMtNDk1Mi04OGQ1LWZkZmNkYjYzMTYxOSIsIm9wYXF1ZV9pZCI6Ijg5MTFkYzM4LWEzY2ItNDYzZC1iMjVhLWMwZDA3MWU2OTVjMCIsInNwYWNlX2lkIjoiMzY2OTIzZGYtMGI4OC00MGJjLWFkMGQtZDQyZGExMjEzNWUxIn0sInBhdGgiOiIuIn0sIlVzZXIiOnsiaWQiOnsiaWRwIjoiaHR0cHM6Ly9sb2NhbGhvc3Q6OTIwMCIsIm9wYXF1ZV9pZCI6IjM2NjkyM2RmLTBiODgtNDBiYy1hZDBkLWQ0MmRhMTIxMzVlMSIsInR5cGUiOjF9LCJ1c2VybmFtZSI6ImFkbWluIiwibWFpbCI6ImFkbWluQGV4YW1wbGUub3JnIiwiZGlzcGxheV9uYW1lIjoiQWRtaW4iLCJ1aWRfbnVtYmVyIjo5OSwiZ2lkX251bWJlciI6OTl9LCJWaWV3TW9kZSI6MywiRWRpdEFwcFVybCI6Ij9XT1BJU3JjPWh0dHAlM0ElMkYlMkYxNzIuMTcuMC4xJTNBNjc4OSUyRndvcGklMkZmaWxlcyUyRmZkNWYwZjU2OWIzOWM0NTkwNzc2OTNhYmRhZjAzYjJmNjkwNDFjZDBkMGNhYTEyZDgzNDliODU5YzU0NGFmY2MiLCJWaWV3QXBwVXJsIjoiP1dPUElTcmM9aHR0cCUzQSUyRiUyRjE3Mi4xNy4wLjElM0E2Nzg5JTJGd29waSUyRmZpbGVzJTJGZmQ1ZjBmNTY5YjM5YzQ1OTA3NzY5M2FiZGFmMDNiMmY2OTA0MWNkMGQwY2FhMTJkODM0OWI4NTljNTQ0YWZjYyJ9LCJleHAiOjE3MDEyNzA3Njd9.h-DL9EeJR5YmpVpAR6VL7lfMv-m9cSoukf_1gOGgfFQ -l 1701270767000
31+
32+
...
33+
```

‎cmd/wopi-validator/main.go

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
package main
2+
3+
import (
4+
"fmt"
5+
"github.com/wkloucek/cs3-wopi-server/pkg/wopivalidator"
6+
"os"
7+
)
8+
9+
func main() {
10+
if len(os.Args) != 3 {
11+
fmt.Println("Usage: wopivalidator <username> <password>")
12+
return
13+
}
14+
err := wopivalidator.Run(os.Args[1], os.Args[2])
15+
if err != nil {
16+
fmt.Println(err)
17+
}
18+
}

‎go.mod

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ require (
2020
)
2121

2222
require (
23+
github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 // indirect
2324
github.com/KimMachineGun/automemlimit v0.2.6 // indirect
2425
github.com/Microsoft/go-winio v0.6.1 // indirect
2526
github.com/ProtonMail/go-crypto v0.0.0-20230626094100-7e9e0395ebec // indirect
@@ -33,6 +34,10 @@ require (
3334
github.com/coreos/go-semver v0.3.1 // indirect
3435
github.com/coreos/go-systemd/v22 v22.5.0 // indirect
3536
github.com/cpuguy83/go-md2man/v2 v2.0.2 // indirect
37+
github.com/distribution/reference v0.5.0 // indirect
38+
github.com/docker/distribution v2.8.3+incompatible // indirect
39+
github.com/docker/docker v24.0.7+incompatible // indirect
40+
github.com/docker/go-connections v0.4.0 // indirect
3641
github.com/docker/go-units v0.5.0 // indirect
3742
github.com/emirpasic/gods v1.18.1 // indirect
3843
github.com/fatih/color v1.15.0 // indirect
@@ -72,10 +77,14 @@ require (
7277
github.com/mitchellh/go-homedir v1.1.0 // indirect
7378
github.com/mitchellh/hashstructure v1.1.0 // indirect
7479
github.com/mitchellh/mapstructure v1.5.0 // indirect
80+
github.com/moby/term v0.0.0-20201216013528-df9cb8a40635 // indirect
81+
github.com/morikuni/aec v1.0.0 // indirect
7582
github.com/nats-io/nats.go v1.27.1 // indirect
7683
github.com/nats-io/nkeys v0.4.4 // indirect
7784
github.com/nats-io/nuid v1.0.1 // indirect
7885
github.com/nxadm/tail v1.4.8 // indirect
86+
github.com/opencontainers/go-digest v1.0.0 // indirect
87+
github.com/opencontainers/image-spec v1.1.0-rc2 // indirect
7988
github.com/opencontainers/runtime-spec v1.1.0-rc.3 // indirect
8089
github.com/oxtoacart/bpool v0.0.0-20190530202638-03653db5a59c // indirect
8190
github.com/patrickmn/go-cache v2.1.0+incompatible // indirect
@@ -112,6 +121,7 @@ require (
112121
golang.org/x/sync v0.3.0 // indirect
113122
golang.org/x/sys v0.13.0 // indirect
114123
golang.org/x/text v0.13.0 // indirect
124+
golang.org/x/time v0.3.0 // indirect
115125
golang.org/x/tools v0.10.0 // indirect
116126
google.golang.org/genproto v0.0.0-20230822172742-b8732ec3820d // indirect
117127
google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d // indirect

‎go.sum

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ cloud.google.com/go/compute/metadata v0.2.3 h1:mg4jlk7mCAj6xXp9UJ4fjI9VUI5rubuGB
66
cloud.google.com/go/compute/metadata v0.2.3/go.mod h1:VAV5nSsACxMJvgaAuX6Pk2AawlZn8kiOGuCv6gTkwuA=
77
github.com/2403905/go-cs3apis v0.0.0-20230517122726-727045414fd1 h1:dOIG9lXUo5CAZbjlegvZpeTqfAlH+zn+0uXbtlZjCPY=
88
github.com/2403905/go-cs3apis v0.0.0-20230517122726-727045414fd1/go.mod h1:UXha4TguuB52H14EMoSsCqDj7k8a/t7g4gVP+bgY5LY=
9+
github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 h1:w+iIsaOQNcT7OZ575w+acHgRric5iCyQh+xv+KJ4HB8=
10+
github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8=
911
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
1012
github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ=
1113
github.com/KimMachineGun/automemlimit v0.2.6 h1:tQFriVTcIteUkV5EgU9iz03eDY36T8JU5RAjP2r6Kt0=
@@ -64,6 +66,7 @@ github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSV
6466
github.com/cpuguy83/go-md2man/v2 v2.0.2 h1:p1EgwI/C7NhT0JmVkwCD2ZBK8j4aeHQX2pMHHBfMQ6w=
6567
github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
6668
github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
69+
github.com/creack/pty v1.1.11/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
6770
github.com/cs3org/reva/v2 v2.16.2 h1:ZvbxOsogbPMaXP/XeP/Qt+WluMwZ60wt6/GZhcSFRmY=
6871
github.com/cs3org/reva/v2 v2.16.2/go.mod h1:RvhuweTFqzezjUFU0SIdTXakrEx9vJlMvQ7znPXSP1g=
6972
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@@ -72,6 +75,14 @@ github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1
7275
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
7376
github.com/dchest/uniuri v1.2.0 h1:koIcOUdrTIivZgSLhHQvKgqdWZq5d7KdMEWF1Ud6+5g=
7477
github.com/dchest/uniuri v1.2.0/go.mod h1:fSzm4SLHzNZvWLvWJew423PhAzkpNQYq+uNLq4kxhkY=
78+
github.com/distribution/reference v0.5.0 h1:/FUIFXtfc/x2gpa5/VGfiGLuOIdYa1t65IKK2OFGvA0=
79+
github.com/distribution/reference v0.5.0/go.mod h1:BbU0aIcezP1/5jX/8MP0YiH4SdvB5Y4f/wlDRiLyi3E=
80+
github.com/docker/distribution v2.8.3+incompatible h1:AtKxIZ36LoNK51+Z6RpzLpddBirtxJnzDrHLEKxTAYk=
81+
github.com/docker/distribution v2.8.3+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
82+
github.com/docker/docker v24.0.7+incompatible h1:Wo6l37AuwP3JaMnZa226lzVXGA3F9Ig1seQen0cKYlM=
83+
github.com/docker/docker v24.0.7+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
84+
github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ=
85+
github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec=
7586
github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4=
7687
github.com/docker/go-units v0.5.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
7788
github.com/elazarl/goproxy v0.0.0-20221015165544-a0805db90819 h1:RIB4cRk+lBqKK3Oy0r2gRX4ui7tuhiZq2SuTtTCi0/0=
@@ -156,6 +167,7 @@ github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Z
156167
github.com/google/btree v1.0.1 h1:gK4Kx5IaGY9CD5sPJ36FHiBJ6ZXl0kilRiiCj+jdYp4=
157168
github.com/google/btree v1.0.1/go.mod h1:xXMiIv4Fb/0kKde4SpL7qlzvu5cMJDRkFDxJfI9uaxA=
158169
github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
170+
github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
159171
github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
160172
github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
161173
github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
@@ -267,10 +279,14 @@ github.com/mitchellh/hashstructure v1.1.0/go.mod h1:xUDAozZz0Wmdiufv0uyhnHkUTN6/
267279
github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
268280
github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY=
269281
github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
282+
github.com/moby/term v0.0.0-20201216013528-df9cb8a40635 h1:rzf0wL0CHVc8CEsgyygG0Mn9CNCCPZqOPaz8RiiHYQk=
283+
github.com/moby/term v0.0.0-20201216013528-df9cb8a40635/go.mod h1:FBS0z0QWA44HXygs7VXDUOGoN/1TV3RuWkLO04am3wc=
270284
github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
271285
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
272286
github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
273287
github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
288+
github.com/morikuni/aec v1.0.0 h1:nP9CBfwrvYnBRgY6qfDQkygYDmYwOilePFkwzv4dU8A=
289+
github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc=
274290
github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
275291
github.com/nats-io/jwt v1.2.2 h1:w3GMTO969dFg+UOKTmmyuu7IGdusK+7Ytlt//OYH/uU=
276292
github.com/nats-io/jwt/v2 v2.4.1 h1:Y35W1dgbbz2SQUYDPCaclXcuqleVmpbRa7646Jf2EX4=
@@ -286,6 +302,10 @@ github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OS
286302
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
287303
github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE=
288304
github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU=
305+
github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U=
306+
github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM=
307+
github.com/opencontainers/image-spec v1.1.0-rc2 h1:2zx/Stx4Wc5pIPDvIxHXvXtQFW/7XWJGmnM7r3wg034=
308+
github.com/opencontainers/image-spec v1.1.0-rc2/go.mod h1:3OVijpioIKYWTqjiG0zfF6wvoJ4fAXGbjdZuI2NgsRQ=
289309
github.com/opencontainers/runtime-spec v1.1.0-rc.3 h1:l04uafi6kxByhbxev7OWiuUv0LZxEsYUfDWZ6bztAuU=
290310
github.com/opencontainers/runtime-spec v1.1.0-rc.3/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
291311
github.com/owncloud/ocis/v2 v2.0.1-0.20231124123240-d6f4b24ffaaa h1:6cbsV39UqCJlhXsvkpaX4ynKdg/ztN8D0nEHL573FmM=
@@ -339,6 +359,7 @@ github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ
339359
github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
340360
github.com/skeema/knownhosts v1.1.1 h1:MTk78x9FPgDFVFkDLTrsnnfCJl7g1C/nnKvePgrIngE=
341361
github.com/skeema/knownhosts v1.1.1/go.mod h1:g4fPeYpque7P0xefxtGzV81ihjC8sX2IqpAoNkjxbMo=
362+
github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
342363
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
343364
github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
344365
github.com/stretchr/objx v0.5.0 h1:1zr/of2m5FGMsad5YfcqgdqdWrIhu+EBEJRhR1U7z/c=
@@ -470,6 +491,7 @@ golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7w
470491
golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
471492
golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
472493
golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
494+
golang.org/x/sys v0.0.0-20200831180312-196b9ba8737a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
473495
golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
474496
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
475497
golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -517,6 +539,7 @@ golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGm
517539
golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
518540
golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
519541
golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
542+
golang.org/x/tools v0.0.0-20190624222133-a101b041ded4/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc=
520543
golang.org/x/tools v0.0.0-20190907020128-2ca718005c18/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
521544
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
522545
golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE=
@@ -568,5 +591,8 @@ gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
568591
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
569592
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
570593
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
594+
gotest.tools/v3 v3.0.2/go.mod h1:3SzNCllyD9/Y+b5r9JIKQ474KzkZyqLqEfYqMsX94Bk=
595+
gotest.tools/v3 v3.5.0 h1:Ljk6PdHdOhAb5aDMWXjDLMMhph+BpztA4v1QdqEW2eY=
596+
gotest.tools/v3 v3.5.0/go.mod h1:isy3WKz7GK6uNw/sbHzfKBLvlvXwUyV06n6brMxxopU=
571597
honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
572598
honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=

‎pkg/internal/app/app.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,8 @@ type Config struct {
6363
}
6464

6565
type demoApp struct {
66-
gwc gatewayv1beta1.GatewayAPIClient
67-
grpcServer *grpc.Server
66+
GatewayAPIClient gatewayv1beta1.GatewayAPIClient
67+
grpcServer *grpc.Server
6868

6969
appURLs map[string]map[string]string
7070

@@ -122,7 +122,7 @@ func (app *demoApp) GetCS3apiClient() error {
122122
if err != nil {
123123
return err
124124
}
125-
app.gwc = gwc
125+
app.GatewayAPIClient = gwc
126126

127127
return nil
128128
}
@@ -161,7 +161,7 @@ func (app *demoApp) RegisterDemoApp(ctx context.Context) error {
161161
},
162162
}
163163

164-
resp, err := app.gwc.AddAppProvider(ctx, req)
164+
resp, err := app.GatewayAPIClient.AddAppProvider(ctx, req)
165165
if err != nil {
166166
app.Logger.Error().Err(err).Msg("AddAppProvider failed")
167167
return err

‎pkg/internal/app/grpc.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ func (app *demoApp) OpenInApp(
4444
meReq := &gatewayv1beta1.WhoAmIRequest{
4545
Token: req.AccessToken,
4646
}
47-
meResp, err := app.gwc.WhoAmI(ctx, meReq)
47+
meResp, err := app.GatewayAPIClient.WhoAmI(ctx, meReq)
4848
if err == nil {
4949
if meResp.Status.Code == rpcv1beta1.Code_CODE_OK {
5050
user = meResp.User

‎pkg/internal/app/wopifilecontents.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ func GetFile(app *demoApp, w http.ResponseWriter, r *http.Request) {
1717
resp, err := helpers.DownloadFile(
1818
ctx,
1919
&wopiContext.FileReference,
20-
app.gwc,
20+
app.GatewayAPIClient,
2121
wopiContext.AccessToken,
2222
app.Config.CS3DataGatewayInsecure,
2323
app.Logger,
@@ -55,7 +55,7 @@ func PutFile(app *demoApp, w http.ResponseWriter, r *http.Request) {
5555
ctx,
5656
r.Body,
5757
&wopiContext.FileReference,
58-
app.gwc,
58+
app.GatewayAPIClient,
5959
wopiContext.AccessToken,
6060
r.Header.Get(HeaderWopiLock),
6161
app.Config.CS3DataGatewayInsecure,

‎pkg/internal/app/wopiinfo.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ func CheckFileInfo(app *demoApp, w http.ResponseWriter, r *http.Request) {
2222
ctx := r.Context()
2323
wopiContext, _ := WopiContextFromCtx(ctx)
2424

25-
statRes, err := app.gwc.Stat(ctx, &providerv1beta1.StatRequest{
25+
statRes, err := app.GatewayAPIClient.Stat(ctx, &providerv1beta1.StatRequest{
2626
Ref: &wopiContext.FileReference,
2727
})
2828
if err != nil {

‎pkg/internal/app/wopilocking.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ func GetLock(app *demoApp, w http.ResponseWriter, r *http.Request) {
2424
req := &providerv1beta1.GetLockRequest{
2525
Ref: &wopiContext.FileReference,
2626
}
27-
resp, err := app.gwc.GetLock(
27+
resp, err := app.GatewayAPIClient.GetLock(
2828
ctx,
2929
req,
3030
)
@@ -76,7 +76,7 @@ func Lock(app *demoApp, w http.ResponseWriter, r *http.Request) {
7676
}
7777

7878
app.Logger.Debug().Str("lock_id", lockID).Str("FileReference", wopiContext.FileReference.String()).Msg("Performing SetLock")
79-
resp, err := app.gwc.SetLock(
79+
resp, err := app.GatewayAPIClient.SetLock(
8080
ctx,
8181
req,
8282
)
@@ -96,7 +96,7 @@ func Lock(app *demoApp, w http.ResponseWriter, r *http.Request) {
9696
req := &providerv1beta1.GetLockRequest{
9797
Ref: &wopiContext.FileReference,
9898
}
99-
resp, err := app.gwc.GetLock(
99+
resp, err := app.GatewayAPIClient.GetLock(
100100
ctx,
101101
req,
102102
)
@@ -162,7 +162,7 @@ func UnLock(app *demoApp, w http.ResponseWriter, r *http.Request) {
162162
},
163163
}
164164

165-
resp, err := app.gwc.Unlock(
165+
resp, err := app.GatewayAPIClient.Unlock(
166166
ctx,
167167
req,
168168
)

0 commit comments

Comments
 (0)