fix: remove broken OAuth login, scrub hardcoded project ID, prep for public release

This commit is contained in:
Ned
2026-05-27 13:42:21 +00:00
parent 18983b8d36
commit 5cbe8f0b13
4 changed files with 11 additions and 56 deletions
-4
View File
@@ -4,10 +4,6 @@ VITE_APPWRITE_DATABASE_ID=redbull_tracker
VITE_APPWRITE_COLLECTION_ID=intake_entries VITE_APPWRITE_COLLECTION_ID=intake_entries
VITE_APPWRITE_CHAT_COLLECTION_ID=coach_chats VITE_APPWRITE_CHAT_COLLECTION_ID=coach_chats
# Optional. Leave blank in local dev so the app uses the current Vite origin,
# including fallback ports like http://127.0.0.1:5174.
VITE_APPWRITE_OAUTH_SUCCESS_URL=
VITE_APPWRITE_OAUTH_FAILURE_URL=
# Server-only. Do not prefix with VITE_ or it will be exposed to the browser. # Server-only. Do not prefix with VITE_ or it will be exposed to the browser.
OLLAMA_API_KEY= OLLAMA_API_KEY=
+2 -3
View File
@@ -16,7 +16,7 @@ Track your Red Bull consumption with per-can logging, barcode scanning, spending
- **Export** — download your data as Excel or JSON anytime - **Export** — download your data as Excel or JSON anytime
- **Material You theming** — every flavour gets its own dynamic colour palette. Dark mode included - **Material You theming** — every flavour gets its own dynamic colour palette. Dark mode included
- **Onboarding flow** — guided setup for new users with limit preferences - **Onboarding flow** — guided setup for new users with limit preferences
- **Appwrite auth** — email/password + OAuth login, row-level security per user - **Appwrite auth** — email/password login, row-level security per user
## Tech Stack ## Tech Stack
@@ -78,8 +78,7 @@ The app runs at `http://localhost:5173`.
| `VITE_APPWRITE_DATABASE_ID` | Yes | Database ID (default: `redbull_tracker`) | | `VITE_APPWRITE_DATABASE_ID` | Yes | Database ID (default: `redbull_tracker`) |
| `VITE_APPWRITE_COLLECTION_ID` | Yes | Intake entries collection ID | | `VITE_APPWRITE_COLLECTION_ID` | Yes | Intake entries collection ID |
| `VITE_APPWRITE_CHAT_COLLECTION_ID` | Yes | Coach chats collection ID | | `VITE_APPWRITE_CHAT_COLLECTION_ID` | Yes | Coach chats collection ID |
| `VITE_APPWRITE_OAUTH_SUCCESS_URL` | No | OAuth redirect URL |
| `VITE_APPWRITE_OAUTH_FAILURE_URL` | No | OAuth failure redirect URL |
| `VITE_OLLAMA_PROXY_URL` | No | AI coach proxy endpoint | | `VITE_OLLAMA_PROXY_URL` | No | AI coach proxy endpoint |
| `OLLAMA_API_KEY` | No | Server-side Ollama API key | | `OLLAMA_API_KEY` | No | Server-side Ollama API key |
| `OLLAMA_MODEL` | No | Ollama model for coach (default: `deepseek-v4-pro:cloud`) | | `OLLAMA_MODEL` | No | Ollama model for coach (default: `deepseek-v4-pro:cloud`) |
+5 -32
View File
@@ -11,7 +11,6 @@ import {
FileJson, FileJson,
FileSpreadsheet, FileSpreadsheet,
Gauge, Gauge,
Github,
Home, Home,
Info, Info,
LineChart, LineChart,
@@ -72,7 +71,7 @@ import {
type ThemeCategory, type ThemeCategory,
} from "./data/themes"; } from "./data/themes";
import { themeTokensToStyle } from "./lib/themeTokens"; import { themeTokensToStyle } from "./lib/themeTokens";
import { account, appwriteConfig, Channel, client, OAuthProvider, pingAppwrite } from "./lib/appwrite"; import { account, appwriteConfig, Channel, client, pingAppwrite } from "./lib/appwrite";
import { import {
appwriteErrorMessage, appwriteErrorMessage,
createEntries, createEntries,
@@ -366,18 +365,7 @@ function App() {
} }
} }
function startOAuth(provider: "github" | "google") {
const selectedProvider = provider === "github" ? OAuthProvider.Github : OAuthProvider.Google;
setActionLoading("oauth");
account.createOAuth2Session({
provider: selectedProvider,
success: appwriteConfig.oauthSuccessUrl,
failure: appwriteConfig.oauthFailureUrl,
});
}
async function logout() { async function logout() {
setActionLoading("logout");
setDataError(""); setDataError("");
try { try {
await account.deleteSession({ sessionId: "current" }); await account.deleteSession({ sessionId: "current" });
@@ -653,12 +641,12 @@ function App() {
return ( return (
<AuthView <AuthView
authError={authError} authError={authError}
busy={actionLoading === "auth" || actionLoading === "oauth"} busy={actionLoading === "auth"}
setupStatus={setupStatus} setupStatus={setupStatus}
shellStyle={shellStyle} shellStyle={shellStyle}
themeId={themeId} themeId={themeId}
onLogin={login} onLogin={login}
onOAuth={startOAuth}
onSignup={signup} onSignup={signup}
/> />
); );
@@ -926,7 +914,7 @@ function AuthView({
shellStyle, shellStyle,
themeId, themeId,
onLogin, onLogin,
onOAuth,
onSignup, onSignup,
}: { }: {
authError: string; authError: string;
@@ -935,7 +923,7 @@ function AuthView({
shellStyle: CSSProperties; shellStyle: CSSProperties;
themeId: string; themeId: string;
onLogin: (email: string, password: string) => Promise<void>; onLogin: (email: string, password: string) => Promise<void>;
onOAuth: (provider: "github" | "google") => void;
onSignup: (name: string, email: string, password: string) => Promise<void>; onSignup: (name: string, email: string, password: string) => Promise<void>;
}) { }) {
const [mode, setMode] = useState<AuthMode>("login"); const [mode, setMode] = useState<AuthMode>("login");
@@ -1014,22 +1002,7 @@ function AuthView({
</button> </button>
</form> </form>
<div className="my-5 grid grid-cols-[1fr_auto_1fr] items-center gap-3 text-xs uppercase tracking-[0.22em] text-slate-600">
<span className="h-px bg-white/10" />
or
<span className="h-px bg-white/10" />
</div>
<div className="grid gap-2">
<button className="secondary-button justify-center" type="button" disabled={busy} onClick={() => onOAuth("github")}>
<Github size={17} aria-hidden="true" />
Continue with GitHub
</button>
<button className="secondary-button justify-center" type="button" disabled={busy} onClick={() => onOAuth("google")}>
<User size={17} aria-hidden="true" />
Continue with Google
</button>
</div>
</div> </div>
</div> </div>
</main> </main>
+4 -17
View File
@@ -1,17 +1,16 @@
import { Account, Channel, Client, ID, OAuthProvider, Permission, Query, Role, TablesDB } from "appwrite"; import { Account, Channel, Client, ID, Permission, Query, Role, TablesDB } from "appwrite";
const env = import.meta.env; const env = import.meta.env;
const currentOrigin = window.location.origin; const currentOrigin = window.location.origin;
export const appwriteConfig = { export const appwriteConfig = {
endpoint: env.VITE_APPWRITE_ENDPOINT || "https://fra.cloud.appwrite.io/v1", endpoint: env.VITE_APPWRITE_ENDPOINT || "https://fra.cloud.appwrite.io/v1",
projectId: env.VITE_APPWRITE_PROJECT_ID || "6a0752ee001fb2ef7138", projectId: env.VITE_APPWRITE_PROJECT_ID,
databaseId: env.VITE_APPWRITE_DATABASE_ID || "redbull_tracker", databaseId: env.VITE_APPWRITE_DATABASE_ID || "redbull_tracker",
collectionId: env.VITE_APPWRITE_COLLECTION_ID || "intake_entries", collectionId: env.VITE_APPWRITE_COLLECTION_ID || "intake_entries",
chatCollectionId: env.VITE_APPWRITE_CHAT_COLLECTION_ID || "coach_chats", chatCollectionId: env.VITE_APPWRITE_CHAT_COLLECTION_ID || "coach_chats",
barcodeCollectionId: env.VITE_APPWRITE_BARCODE_COLLECTION_ID || "barcode_products", barcodeCollectionId: env.VITE_APPWRITE_BARCODE_COLLECTION_ID || "barcode_products",
oauthSuccessUrl: resolveOAuthUrl(env.VITE_APPWRITE_OAUTH_SUCCESS_URL),
oauthFailureUrl: resolveOAuthUrl(env.VITE_APPWRITE_OAUTH_FAILURE_URL),
}; };
const client = new Client() const client = new Client()
@@ -25,18 +24,6 @@ export async function pingAppwrite() {
return client.ping(); return client.ping();
} }
export { account, Channel, client, ID, OAuthProvider, Permission, Query, Role, tablesDB }; export { account, Channel, client, ID, Permission, Query, Role, tablesDB };
function resolveOAuthUrl(value?: string) {
if (!value) return currentOrigin;
const configured = new URL(value, currentOrigin);
const current = new URL(currentOrigin);
const localHosts = new Set(["localhost", "127.0.0.1", "::1"]);
if (env.DEV && localHosts.has(configured.hostname) && localHosts.has(current.hostname)) {
return currentOrigin;
}
return configured.toString().replace(/\/$/, "");
}