Skip to content

Commit

Permalink
fix: resolving external URLs via file ID (#9833)
Browse files Browse the repository at this point in the history
* fix: resolving external URLs via file ID

* test: fix unit tests

* improve method naming

* fix: redirect after closing external apps
  • Loading branch information
JammingBen committed Oct 24, 2023
1 parent 31abfe4 commit 2a0cc63
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 10 deletions.
1 change: 0 additions & 1 deletion deployments/oc10-app.md
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,6 @@ There are a few config values which need to be set in order for ownCloud Web to
"apps" : [
"files",
"preview",
"search",
"draw-io"
],
"applications" : [
Expand Down
4 changes: 0 additions & 4 deletions getting-started.md
Original file line number Diff line number Diff line change
Expand Up @@ -76,10 +76,6 @@ Depending on the backend you are using, there are sample config files provided i
- `options.contextHelpersReadMore` Specifies whether the "Read more" link should be displayed or not.
- `options.openLinksWithDefaultApp` Specifies whether single file link shares should be opened with default app or not.
- `options.tokenStorageLocal` Specifies whether the access token will be stored in the local storage when set to `true` or in the session storage when set to `false`. If stored in the local storage, login state will be persisted across multiple browser tabs, means no additional logins are required. Defaults to `true`.
- `options.loginUrl` Specifies the target URL to the login page. This is helpful when an external IdP is used. This option is disabled by default. Example URL like: 'https://www.myidp.com/login'.
- `options.logoutUrl` Adds a link to the user's profile page to point him to an external page, where he can manage his session and devices. This is helpful when an external IdP is used. This option is disabled by default.
- `options.imprintUrl` Specifies the target URL for the imprint link valid for the ocis instance in the account menu.
- `options.privacyUrl` Specifies the target URL for the privacy link valid for the ocis instance in the account menu.

#### Scripts and Styles

Expand Down
9 changes: 4 additions & 5 deletions testing/testing.md
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ Bundle the web frontend with the following command:
$ pnpm build:w
```

Our compose setup automatically mounts it into an oCIS backend, respectively. Web also gets recompiled on changes.
Our compose setup automatically mounts it into an oC10 and oCIS backend, respectively. Web also gets recompiled on changes.

#### Run E2E Tests

Expand All @@ -77,7 +77,6 @@ To run a particular test, simply add the feature file and line number to the tes

Various options are available via ENV variables, e.g.

- `BASIC_AUTH=true` use basic authorization for api requests.
- `RETRY=n` to retry failures `n` times
- `SLOW_MO=n` to slow the execution time by `n` milliseconds
- `TIMEOUT=n` to set tests to timeout after `n` milliseconds
Expand Down Expand Up @@ -127,12 +126,12 @@ $ pnpm build:w
The acceptance tests need additional docker containers to be running.

```shell
$ docker compose up ocis selenium middleware-ocis
$ docker compose up ocis vnc selenium middleware-ocis
```

and make sure there are no conflicting ports and everything runs smoothly. You can check if everything has worked by opening [https://host.docker.internal:9200](https://host.docker.internal:9200) and logging in using the demo user (admin/admin).

If you're using a M1 Mac, you need to use `seleniarm/standalone-chromium:4.7.0-20221206`for now. To do so, export `SELENIUM_IMAGE=seleniarm/standalone-chromium:4.7.0-20221206`.
If you're using a M1 Mac, you need to use `seleniarm/standalone-chromium:4.4.0-20220814`for now. To do so, export `SELENIUM_IMAGE=seleniarm/standalone-chromium:4.4.0-20220814`.

#### Run acceptance tests

Expand All @@ -146,7 +145,7 @@ If you're using a M1 Mac, you need to use `seleniarm/standalone-chromium:4.7.0-2

#### Watch the Test Run

To watch the tests while running, open [http://host.docker.internal:7900/](http://host.docker.internal:7900/) in the browser to access your VNC client.
To watch the tests while running, open [http://host.docker.internal:6080/](http://host.docker.internal:6080/) in the browser to access your VNC client.

### Analyze the Test Report

Expand Down

0 comments on commit 2a0cc63

Please sign in to comment.