mirror of
https://github.com/jeffvli/sonixd.git
synced 2026-04-30 03:02:37 -04:00
fix null auth
jest ignore api path ignore test test test test test test test revert back to localstorage for api auth - errors during CI due to unavailable settings file
This commit is contained in:
@@ -1,6 +1,5 @@
|
||||
import React from 'react';
|
||||
import { HashRouter as Router, Switch, Route } from 'react-router-dom';
|
||||
import settings from 'electron-settings';
|
||||
import './styles/App.global.css';
|
||||
import Layout from './components/layout/Layout';
|
||||
import PlaylistList from './components/playlist/PlaylistList';
|
||||
@@ -14,7 +13,7 @@ import LibraryView from './components/library/LibraryView';
|
||||
import PlayerBar from './components/player/PlayerBar';
|
||||
|
||||
const App = () => {
|
||||
if (!settings.getSync('server')) {
|
||||
if (!localStorage.getItem('server')) {
|
||||
return (
|
||||
<Layout
|
||||
disableSidebar
|
||||
|
||||
@@ -1,17 +1,16 @@
|
||||
import axios from 'axios';
|
||||
|
||||
import settings from 'electron-settings';
|
||||
|
||||
const getAuth = () => {
|
||||
const serverConfig = {
|
||||
username: settings.getSync('username') || '',
|
||||
salt: settings.getSync('salt') || '',
|
||||
hash: settings.getSync('hash') || '',
|
||||
server: settings.getSync('server') || '',
|
||||
username: localStorage.getItem('username') || '',
|
||||
salt: localStorage.getItem('salt') || '',
|
||||
hash: localStorage.getItem('hash') || '',
|
||||
server: localStorage.getItem('server') || '',
|
||||
};
|
||||
|
||||
return serverConfig;
|
||||
};
|
||||
|
||||
const auth = getAuth();
|
||||
const API_BASE_URL = `${auth.server}/rest`;
|
||||
|
||||
|
||||
@@ -48,10 +48,10 @@ const Login = () => {
|
||||
return;
|
||||
}
|
||||
|
||||
/* localStorage.setItem('server', cleanServerName);
|
||||
localStorage.setItem('server', cleanServerName);
|
||||
localStorage.setItem('username', userName);
|
||||
localStorage.setItem('salt', salt);
|
||||
localStorage.setItem('hash', hash); */
|
||||
localStorage.setItem('hash', hash);
|
||||
|
||||
settings.setSync('server', cleanServerName);
|
||||
settings.setSync('serverBase64', btoa(cleanServerName));
|
||||
|
||||
Reference in New Issue
Block a user