GGLinnk/foris-js
1
0
Fork 0
mirror of https://gitlab.nic.cz/turris/reforis/foris-js.git synced 2024-12-26 00:21:36 +01:00
Code Issues Releases Activity

Merge branch 'remove-login' into 'dev'

Browse Source 
Remove reForis login page

Closes reforis#355

See merge request turris/reforis/foris-js!167
This commit is contained in:
Aleksandr Gumroian 2021-12-15 16:59:46 +01:00
commit f49529018c
4 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/api/hooks.js
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2019 CZ.NIC z.s.p.o. (http://www.nic.cz/) * Copyright (C) 2019-2021 CZ.NIC z.s.p.o. (http://www.nic.cz/)
* *
* This is free software, licensed under the GNU General Public License v3. * This is free software, licensed under the GNU General Public License v3.
* See /LICENSE for more information. * See /LICENSE for more information.
@ -7,7 +7,6 @@
import { useCallback, useEffect, useReducer, useState } from "react"; import { useCallback, useEffect, useReducer, useState } from "react";
import { ForisURLs } from "../utils/forisUrls";
import { import {
API_ACTIONS, API_ACTIONS,
API_METHODS, API_METHODS,
@ -84,8 +83,8 @@ function APIReducer(state, action) {
data: action.payload, data: action.payload,
}; };
case API_ACTIONS.FAILURE: case API_ACTIONS.FAILURE:
if (action.status === 403) { if (action.status === 401) {
window.location.assign(ForisURLs.login); window.location.reload();
} }
// Not an API error - should be rethrown. // Not an API error - should be rethrown.

5
src/api/utils.js
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2019 CZ.NIC z.s.p.o. (http://www.nic.cz/) * Copyright (C) 2019-2021 CZ.NIC z.s.p.o. (http://www.nic.cz/)
* *
* This is free software, licensed under the GNU General Public License v3. * This is free software, licensed under the GNU General Public License v3.
* See /LICENSE for more information. * See /LICENSE for more information.
@ -11,6 +11,7 @@ export const HEADERS = {
Accept: "application/json", Accept: "application/json",
"Content-Type": "application/json", "Content-Type": "application/json",
"X-CSRFToken": getCookie("_csrf_token"), "X-CSRFToken": getCookie("_csrf_token"),
"X-Requested-With": "json",
}; };
export const TIMEOUT = 30500; export const TIMEOUT = 30500;
@ -56,7 +57,7 @@ function getCookie(name) {
export function getErrorPayload(error) { export function getErrorPayload(error) {
if (error.response) { if (error.response) {
if (error.response.status === 403) { if (error.response.status === 401) {
return _("The session is expired. Please log in again."); return _("The session is expired. Please log in again.");
} }
return getJSONErrorMessage(error); return getJSONErrorMessage(error);

4
src/utils/forisUrls.js
View File

@ -9,8 +9,8 @@ export const REFORIS_URL_PREFIX = "/reforis";
export const REFORIS_API_URL_PREFIX = `${REFORIS_URL_PREFIX}/api`; export const REFORIS_API_URL_PREFIX = `${REFORIS_URL_PREFIX}/api`;
export const ForisURLs = { export const ForisURLs = {
login: `${REFORIS_URL_PREFIX}/login`, login: `/login?${REFORIS_URL_PREFIX}/`,
logout: `${REFORIS_URL_PREFIX}/logout`, logout: `/logout`,
static: `${REFORIS_URL_PREFIX}/static/reforis`, static: `${REFORIS_URL_PREFIX}/static/reforis`,
wifi: `${REFORIS_URL_PREFIX}/network-settings/wifi`, wifi: `${REFORIS_URL_PREFIX}/network-settings/wifi`,

10
src/webSockets/WebSockets.js
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (C) 2020 CZ.NIC z.s.p.o. (http://www.nic.cz/) * Copyright (C) 2020-2021 CZ.NIC z.s.p.o. (http://www.nic.cz/)
* *
* This is free software, licensed under the GNU General Public License v3. * This is free software, licensed under the GNU General Public License v3.
* See /LICENSE for more information. * See /LICENSE for more information.
@ -7,8 +7,6 @@
/* eslint no-console: "off" */ /* eslint no-console: "off" */
import { ForisURLs } from "../utils/forisUrls";
const PROTOCOL = window.location.protocol === "http:" ? "ws" : "wss"; const PROTOCOL = window.location.protocol === "http:" ? "ws" : "wss";
const URL = process.env.LIGHTTPD const URL = process.env.LIGHTTPD
@ -21,12 +19,6 @@ export class WebSockets {
constructor() { constructor() {
this.ws = new WebSocket(URL); this.ws = new WebSocket(URL);
this.ws.onerror = (e) => { this.ws.onerror = (e) => {
if (!window.initialData.logged) {
console.error(
"WS: Error observed, you aren't logged probably."
);
window.location.replace(ForisURLs.login);
}
console.error("WS: Error:", e); console.error("WS: Error:", e);
}; };
this.ws.onmessage = (e) => { this.ws.onmessage = (e) => {