Merge branch 'develop' into dist/ubuntu/bionic/develop

client/src/store/sagas/failure.ts

@@ -1,9 +1,11 @@
 import { GiteaUnauthorizedError } from "../../util/gitea";
 import { put } from 'redux-saga/effects';
 import { logout } from '../actions/logout';
+import { saveReferer } from "../../util/referer";
 
 export function* failuresSaga(action) {
   if (action.error instanceof GiteaUnauthorizedError) {
+    saveReferer();
     yield put(logout());
   }
 }

client/src/store/sagas/referer.ts

@@ -0,0 +1,9 @@
+import { hasReferer, getReferer, clearReferer } from '../../util/referer';
+
+export function* navigateToRefererSaga() {
+    if (!hasReferer()) return;
+    const referer = getReferer();
+    console.log("Redirecting to referer", referer);
+    clearReferer();
+    window.location.hash = referer;
+}

client/src/store/sagas/root.ts

@@ -10,9 +10,11 @@ import { LOGOUT_REQUEST, LOGOUT_SUCCESS } from '../actions/logout';
 import { logoutSaga, logoutSuccessSaga } from './logout';
 import { BUILD_KANBOARD_REQUEST, MOVE_CARD } from '../actions/kanboards';
 import { buildKanboardSaga, moveCardSaga, refreshKanboardSaga } from './kanboards';
+import { navigateToRefererSaga } from './referer';
 
 export function* rootSaga() {
   yield all([
+    navigateToRefererSaga(),
     takeEvery(patternFromRegExp(/^.*_FAILURE/), failuresSaga),
     takeLatest(FETCH_BOARDS_REQUEST, fetchBoardsSaga),
     takeLatest(BUILD_KANBOARD_REQUEST, buildKanboardSaga),

client/src/util/referer.ts

@@ -0,0 +1,19 @@
+const localStorage = window.localStorage;
+const refererKey = 'referer';
+
+export function getReferer() {
+    return localStorage.getItem(refererKey);
+}
+
+export function saveReferer() {
+    console.log("Saving referer", window.location.hash);
+    localStorage.setItem(refererKey, window.location.hash);
+}
+
+export function hasReferer() {
+    return !!getReferer();
+}
+
+export function clearReferer() {
+    localStorage.removeItem(refererKey);
+}

cmd/server/container.go

@@ -28,7 +28,7 @@ func getServiceContainer(conf *config.Config) (*service.Container, error) {
 
 	ctn.Provide(
 		session.ServiceName,
-		gorilla.ServiceProvider("gitea-kan", cookieStore),
+		gorilla.ServiceProvider("gengitkan", cookieStore),
 	)
 
 	// Create and expose config service provider