Skip to content

Store API key in Firestore instead of localStorage #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
phillsatellite merged 2 commits into from
Mar 4, 2026
Merged

Store API key in Firestore instead of localStorage #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b25e0d3
Store API key in Firestore instead of localStorage
phillsatellite Mar 4, 2026
6de70c9
Fix K-6 test to check app state instead of localStorage
phillsatellite Mar 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 4 additions & 6 deletions cypress/e2e/apikey.cy.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,12 +43,10 @@ describe("API Key Setup", () => {
cy.get(".setup-input").should("have.attr", "type", "password");
});

it("K-6: key persists in localStorage scoped to user UID", () => {
const testKey = "sk-test-key-1234567890";
cy.get(".setup-input").type(testKey);
it("K-6: submitting key shows main app with mic and sidebar", () => {
cy.get(".setup-input").type("sk-test-key-1234567890");
cy.get(".setup-submit-btn").click();
cy.window().then((win) => {
expect(win.localStorage.getItem("sidekick_apikey_test-user-123")).to.equal(testKey);
});
cy.get(".mic-btn").should("be.visible");
cy.get(".sidebar").should("exist");
});
});
25 changes: 19 additions & 6 deletions src/App.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { useState, useEffect } from "react";
import { onAuthStateChanged, signOut } from "firebase/auth";
import { auth } from "./utils/firebase";
import { doc, getDoc, setDoc } from "firebase/firestore";
import { auth, db } from "./utils/firebase";
import Welcome from "./components/Welcome.jsx";
import AuthScreen from "./components/AuthScreen.jsx";
import ApiKeySetup from "./components/ApiKeySetup.jsx";
Expand Down Expand Up @@ -46,17 +47,25 @@ export default function App() {
if (mockUser) {
setUser(mockUser);
setAuthLoading(false);
// In Cypress tests, check localStorage for mock API key
const savedKey = localStorage.getItem(`sidekick_apikey_${mockUser.uid}`);
if (savedKey) setApiKey(savedKey);
return;
}

const unsubscribe = onAuthStateChanged(auth, (firebaseUser) => {
const unsubscribe = onAuthStateChanged(auth, async (firebaseUser) => {
setUser(firebaseUser);
setAuthLoading(false);
if (firebaseUser) {
const savedKey = localStorage.getItem(`sidekick_apikey_${firebaseUser.uid}`);
if (savedKey) setApiKey(savedKey);
// Fetch API key from Firestore
try {
const snap = await getDoc(doc(db, "users", firebaseUser.uid));
if (snap.exists() && snap.data().apiKey) {
setApiKey(snap.data().apiKey);
}
} catch {
// Firestore fetch failed — user will see API key setup screen
}
} else {
setApiKey("");
}
Expand Down Expand Up @@ -93,10 +102,14 @@ export default function App() {
setShowWelcome(false);
};

const handleKeySubmit = (key) => {
const handleKeySubmit = async (key) => {
setApiKey(key);
if (user) {
localStorage.setItem(`sidekick_apikey_${user.uid}`, key);
try {
await setDoc(doc(db, "users", user.uid), { apiKey: key }, { merge: true });
} catch {
// Firestore save failed — key is still in memory for this session
}
}
};

Expand Down