mirror/opencloud
1
0
Fork 0
mirror of https://github.com/opencloud-eu/opencloud.git synced 2025-12-31 01:10:20 -06:00
Code Issues Packages Projects Releases Wiki Activity

Define dispatch

Browse Source
This commit is contained in:
Lukas Hirt
2020-11-12 11:51:27 +01:00
parent b09072be64
commit b9d416b93b
4 changed files with 120 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
changelog/unreleased/fix-choose-account-dialogue Normal file
View File

@@ -0,0 +1,8 @@
Bugfix: Fix choose account dialogue
Tags: konnectd
We've fixed the choose account dialogue in konnectd bug that the user hasn't been logged in after selecting account.
https://github.com/owncloud/ocis/pull/846

5
konnectd/Makefile
View File

@@ -88,10 +88,9 @@ generate: assets
# TODO find a docker container with go and yarn so we can properly build assets in ci
#assets: assets/identifier/static assets/identifier/index.html
assets: assets/identifier/static
assets: static-assets
assets/identifier/static:
mkdir -p assets/identifier/static
static-assets:
curl -o assets/identifier/static/logo.svg ${LOGO_URL}
curl -o assets/identifier/static/favicon.ico ${FAVICON_URL}

160
konnectd/pkg/assets/embed.go
View File

File diff suppressed because one or more lines are too long

4
konnectd/ui/src/containers/Login/Chooseaccount.js
View File

@@ -32,9 +32,7 @@ const styles = theme => ({
}
});
function Chooseaccount(props) {
const { loading, errors, classes, hello, history } = props;
function Chooseaccount({ loading, errors, classes, hello, history, dispatch }) {
useEffect(() => {
if ((!hello || !hello.state) && history.action !== 'PUSH') {
history.replace(`/identifier${history.location.search}${history.location.hash}`);