tknuth/Greenlens
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: add data privacy settings screen and initialize backend service infrastructure

Browse Source
This commit is contained in:
Timo Knuth
2026-04-03 19:41:04 +02:00
parent 08483c7075
commit c13eb331be
11 changed files with 110 additions and 201 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.env.example
View File

@@ -17,10 +17,6 @@ OPENAI_API_KEY=
OPENAI_SCAN_MODEL=gpt-5-mini
OPENAI_HEALTH_MODEL=gpt-5-mini
STRIPE_SECRET_KEY=
STRIPE_PUBLISHABLE_KEY=
STRIPE_WEBHOOK_SECRET=
REVENUECAT_WEBHOOK_SECRET=
REVENUECAT_PRO_ENTITLEMENT_ID=pro

5
README.md
View File

@@ -27,9 +27,6 @@ Required backend environment:
Optional integrations:
- `OPENAI_API_KEY`
- `STRIPE_SECRET_KEY`
- `STRIPE_PUBLISHABLE_KEY`
- `STRIPE_WEBHOOK_SECRET`
- `REVENUECAT_WEBHOOK_SECRET`
- `PLANT_IMPORT_ADMIN_KEY`
- `MINIO_ENDPOINT`
@@ -71,7 +68,7 @@ Then fill at least:
- `POSTGRES_PASSWORD`
- `JWT_SECRET`
- `MINIO_SECRET_KEY`
- optional: `OPENAI_API_KEY`, `STRIPE_*`, `REVENUECAT_*`
- optional: `OPENAI_API_KEY`, `REVENUECAT_*`
### 2. Start the full production stack

2
app.json
View File

@@ -2,7 +2,7 @@
"expo": {
"name": "GreenLens",
"slug": "greenlens",
"version": "2.1.5",
"version": "2.1.6",
"orientation": "portrait",
"icon": "./assets/icon.png",
"userInterfaceStyle": "automatic",

2
app/profile/data.tsx
View File

@@ -121,7 +121,7 @@ export default function DataScreen() {
text: copy.deleteActionBtn,
style: 'destructive',
onPress: async () => {
// Future implementation: call backend to wipe user data, cancel active Stripe subscriptions
// Future implementation: call backend to wipe user data and cancel active app subscriptions
await signOut();
router.replace('/onboarding');
},

3
docker-compose.yml
View File

@@ -56,9 +56,6 @@ services:
OPENAI_API_KEY: ${OPENAI_API_KEY:-}
OPENAI_SCAN_MODEL: ${OPENAI_SCAN_MODEL:-gpt-5-mini}
OPENAI_HEALTH_MODEL: ${OPENAI_HEALTH_MODEL:-gpt-5-mini}
STRIPE_SECRET_KEY: ${STRIPE_SECRET_KEY:-}
STRIPE_PUBLISHABLE_KEY: ${STRIPE_PUBLISHABLE_KEY:-}
STRIPE_WEBHOOK_SECRET: ${STRIPE_WEBHOOK_SECRET:-}
REVENUECAT_WEBHOOK_SECRET: ${REVENUECAT_WEBHOOK_SECRET:-}
REVENUECAT_PRO_ENTITLEMENT_ID: ${REVENUECAT_PRO_ENTITLEMENT_ID:-pro}
JWT_SECRET: ${JWT_SECRET:?JWT_SECRET is required}

3
greenlns-landing/README.md
View File

@@ -34,8 +34,5 @@ Required environment variables:
Optional service secrets:
- `OPENAI_API_KEY`
- `STRIPE_SECRET_KEY`
- `STRIPE_PUBLISHABLE_KEY`
- `STRIPE_WEBHOOK_SECRET`
- `REVENUECAT_WEBHOOK_SECRET`
- `PLANT_IMPORT_ADMIN_KEY`

3
greenlns-landing/docker-compose.yml
View File

@@ -56,9 +56,6 @@ services:
OPENAI_API_KEY: ${OPENAI_API_KEY:-}
OPENAI_SCAN_MODEL: ${OPENAI_SCAN_MODEL:-gpt-5-mini}
OPENAI_HEALTH_MODEL: ${OPENAI_HEALTH_MODEL:-gpt-5-mini}
STRIPE_SECRET_KEY: ${STRIPE_SECRET_KEY:-}
STRIPE_PUBLISHABLE_KEY: ${STRIPE_PUBLISHABLE_KEY:-}
STRIPE_WEBHOOK_SECRET: ${STRIPE_WEBHOOK_SECRET:-}
REVENUECAT_WEBHOOK_SECRET: ${REVENUECAT_WEBHOOK_SECRET:-}
REVENUECAT_PRO_ENTITLEMENT_ID: ${REVENUECAT_PRO_ENTITLEMENT_ID:-pro}
JWT_SECRET: ${JWT_SECRET:?JWT_SECRET is required}

102
server/index.js
View File

@@ -3,7 +3,6 @@ const path = require('path');
const dotenv = require('dotenv');
const express = require('express');
const cors = require('cors');
const Stripe = require('stripe');
const loadEnvFiles = (filePaths) => {
const mergedFileEnv = {};
@@ -58,33 +57,11 @@ const {
isConfigured: isOpenAiConfigured,
} = require('./lib/openai');
const { applyCatalogGrounding, normalizeText } = require('./lib/scanGrounding');
const { ensureStorageBucket, uploadImage, isStorageConfigured } = require('./lib/storage');
const { ensureStorageBucketWithRetry, uploadImage, isStorageConfigured } = require('./lib/storage');
const app = express();
const port = Number(process.env.PORT || 3000);
const plantsPublicDir = path.join(__dirname, 'public', 'plants');
const stripeSecretKey = (process.env.STRIPE_SECRET_KEY || '').trim();
if (!stripeSecretKey) {
console.error('STRIPE_SECRET_KEY is not set. Payment endpoints will fail.');
}
const stripe = new Stripe(stripeSecretKey || 'sk_test_placeholder_key_not_configured');
const resolveStripeModeFromKey = (key, livePrefix, testPrefix) => {
const normalized = String(key || '').trim();
if (normalized.startsWith(livePrefix)) return 'LIVE';
if (normalized.startsWith(testPrefix)) return 'TEST';
return 'MOCK';
};
const getStripeSecretMode = () =>
resolveStripeModeFromKey(process.env.STRIPE_SECRET_KEY, 'sk_live_', 'sk_test_');
const getStripePublishableMode = () =>
resolveStripeModeFromKey(
process.env.STRIPE_PUBLISHABLE_KEY || process.env.EXPO_PUBLIC_STRIPE_PUBLISHABLE_KEY,
'pk_live_',
'pk_test_',
);
const SCAN_PRIMARY_COST = 1;
const SCAN_REVIEW_COST = 1;
@@ -323,35 +300,6 @@ const isAuthorizedRevenueCatWebhook = (request) => {
return normalized === revenueCatWebhookSecret || normalized === `Bearer ${revenueCatWebhookSecret}`;
};
// Webhooks must be BEFORE express.json() to preserve raw body where required.
app.post('/api/webhook', express.raw({ type: 'application/json' }), (request, response) => {
const signature = request.headers['stripe-signature'];
let event;
try {
event = stripe.webhooks.constructEvent(
request.body,
signature,
process.env.STRIPE_WEBHOOK_SECRET,
);
} catch (error) {
console.error(`Webhook Error: ${error.message}`);
response.status(400).send(`Webhook Error: ${error.message}`);
return;
}
switch (event.type) {
case 'payment_intent.succeeded':
console.log('PaymentIntent succeeded.');
break;
default:
console.log(`Unhandled event type: ${event.type}`);
break;
}
response.json({ received: true });
});
app.post('/api/revenuecat/webhook', express.json({ limit: '1mb' }), async (request, response) => {
try {
if (!isAuthorizedRevenueCatWebhook(request)) {
@@ -374,7 +322,6 @@ app.get('/', (_request, response) => {
status: 'ok',
endpoints: [
'GET /health',
'POST /api/payment-sheet',
'GET /api/plants',
'POST /api/plants/rebuild',
'POST /auth/signup',
@@ -406,7 +353,6 @@ const getDatabaseHealthTarget = () => {
};
app.get('/health', (_request, response) => {
const stripeSecret = (process.env.STRIPE_SECRET_KEY || '').trim();
response.status(200).json({
ok: true,
uptimeSec: Math.round(process.uptime()),
@@ -414,9 +360,6 @@ app.get('/health', (_request, response) => {
openAiConfigured: isOpenAiConfigured(),
dbReady: Boolean(db),
dbPath: getDatabaseHealthTarget(),
stripeConfigured: Boolean(stripeSecret),
stripeMode: getStripeSecretMode(),
stripePublishableMode: getStripePublishableMode(),
scanModel: getScanModel(),
healthModel: getHealthModel(),
});
@@ -480,37 +423,6 @@ app.post('/api/plants/rebuild', async (request, response) => {
}
});
app.post('/api/payment-sheet', async (request, response) => {
try {
const amount = Number(request.body?.amount || 500);
const currency = request.body?.currency || 'usd';
const paymentIntent = await stripe.paymentIntents.create({
amount,
currency,
automatic_payment_methods: { enabled: true },
});
const customer = await stripe.customers.create();
const ephemeralKey = await stripe.ephemeralKeys.create(
{ customer: customer.id },
{ apiVersion: '2023-10-16' },
);
response.json({
paymentIntent: paymentIntent.client_secret,
ephemeralKey: ephemeralKey.secret,
customer: customer.id,
publishableKey: process.env.STRIPE_PUBLISHABLE_KEY || process.env.EXPO_PUBLIC_STRIPE_PUBLISHABLE_KEY || 'pk_test_mock_key',
});
} catch (error) {
response.status(400).json({
code: 'PAYMENT_SHEET_ERROR',
message: error instanceof Error ? error.message : String(error),
});
}
});
app.get('/v1/billing/summary', async (request, response) => {
try {
const userId = ensureRequestAuth(request);
@@ -907,19 +819,9 @@ const start = async () => {
await ensureAuthSchema(db);
await seedBootstrapCatalogIfNeeded();
if (isStorageConfigured()) {
await ensureStorageBucket().catch((err) => console.warn('MinIO bucket setup failed:', err.message));
await ensureStorageBucketWithRetry().catch((err) => console.warn('MinIO bucket setup failed:', err.message));
}
const stripeMode = getStripeSecretMode();
const stripePublishableMode = getStripePublishableMode();
const maskKey = (key) => {
const k = String(key || '').trim();
if (k.length < 12) return k ? '(too short to mask)' : '(not set)';
return `${k.slice(0, 7)}...${k.slice(-4)}`;
};
console.log(`Stripe Mode: ${stripeMode} | Secret: ${maskKey(process.env.STRIPE_SECRET_KEY)}`);
console.log(`Stripe Publishable Mode: ${stripePublishableMode} | Key: ${maskKey(process.env.STRIPE_PUBLISHABLE_KEY || process.env.EXPO_PUBLIC_STRIPE_PUBLISHABLE_KEY)}`);
const server = app.listen(port, () => {
console.log(`GreenLens server listening at http://localhost:${port}`);
});

25
server/lib/storage.js
View File

@@ -29,6 +29,8 @@ const getClient = () => {
});
};
const sleep = (ms) => new Promise((resolve) => setTimeout(resolve, ms));
const ensureStorageBucket = async () => {
const client = getClient();
const exists = await client.bucketExists(MINIO_BUCKET);
@@ -50,6 +52,28 @@ const ensureStorageBucket = async () => {
}
};
const ensureStorageBucketWithRetry = async (options = {}) => {
const attempts = Number(options.attempts || 5);
const delayMs = Number(options.delayMs || 2000);
let lastError;
for (let attempt = 1; attempt <= attempts; attempt += 1) {
try {
await ensureStorageBucket();
return;
} catch (error) {
lastError = error;
if (attempt === attempts) break;
console.warn(
`MinIO bucket setup attempt ${attempt}/${attempts} failed: ${error.message}. Retrying in ${delayMs}ms...`,
);
await sleep(delayMs);
}
}
throw lastError;
};
const uploadImage = async (base64Data, contentType = 'image/jpeg') => {
const client = getClient();
const rawExtension = contentType.split('/')[1] || 'jpg';
@@ -67,6 +91,7 @@ const uploadImage = async (base64Data, contentType = 'image/jpeg') => {
module.exports = {
ensureStorageBucket,
ensureStorageBucketWithRetry,
uploadImage,
isStorageConfigured,
};

1
services/backend/backendApiClient.ts
View File

@@ -116,7 +116,6 @@ export const backendApiClient = {
openAiConfigured: Boolean(process.env.EXPO_PUBLIC_OPENAI_API_KEY),
dbReady: true,
dbPath: 'in-app-mock-backend',
stripeConfigured: Boolean(process.env.EXPO_PUBLIC_STRIPE_PUBLISHABLE_KEY),
scanModel: (process.env.EXPO_PUBLIC_OPENAI_SCAN_MODEL || 'gpt-5').trim(),
healthModel: (process.env.EXPO_PUBLIC_OPENAI_HEALTH_MODEL || process.env.EXPO_PUBLIC_OPENAI_SCAN_MODEL || 'gpt-5').trim(),
};

1
services/backend/contracts.ts
View File

@@ -119,7 +119,6 @@ export interface ServiceHealthResponse {
openAiConfigured: boolean;
dbReady?: boolean;
dbPath?: string;
stripeConfigured?: boolean;
scanModel?: string;
healthModel?: string;
}