From d522cd85fe5d285607eae2254e330d27d47bdc09 Mon Sep 17 00:00:00 2001
From: jeffvli <jeffvictorli@gmail.com>
Date: Sat, 28 Aug 2021 20:50:20 -0700
Subject: [PATCH] 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
---
 src/App.tsx                       |  3 +--
 src/api/api.ts                    | 11 +++++------
 src/components/settings/Login.tsx |  4 ++--
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/App.tsx b/src/App.tsx
index f2d5271..a359c93 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -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
diff --git a/src/api/api.ts b/src/api/api.ts
index 25ae3ce..d56d0d5 100644
--- a/src/api/api.ts
+++ b/src/api/api.ts
@@ -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`;
 
diff --git a/src/components/settings/Login.tsx b/src/components/settings/Login.tsx
index c921984..4b6b045 100644
--- a/src/components/settings/Login.tsx
+++ b/src/components/settings/Login.tsx
@@ -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));