From f9930b143c0bfdb03b29c026ed250a75406e0d91 Mon Sep 17 00:00:00 2001 From: Allen T J Date: Thu, 3 Apr 2025 13:51:57 +0000 Subject: [PATCH 01/12] feature/fitlien-cashfree (#4) Co-authored-by: AllenTJ7 <163137620+AllenTJ7@users.noreply.github.com> Reviewed-on: https://git.cosqnet.com/cosqnet/fitlien-services/pulls/4 Reviewed-by: Dhansh A S Co-authored-by: Allen T J Co-committed-by: Allen T J --- firebase.json | 18 +++++ functions/.env.example | 3 + functions/src/index.ts | 152 ++++++++++++++++++++++++++++++++++++++++- 3 files changed, 170 insertions(+), 3 deletions(-) diff --git a/firebase.json b/firebase.json index da6f4cb..076f09a 100644 --- a/firebase.json +++ b/firebase.json @@ -21,6 +21,24 @@ "storage": { "rules": "storage.rules" }, + "emulators": { + "functions": { + "port": 5001 + }, + "firestore": { + "port": 8084 + }, + "storage": { + "port": 9199 + }, + "ui": { + "enabled": true, + "port": 4000 + }, + "auth": { + "port": 9099 + } + }, "remoteconfig": { "template": "remoteconfig.template.json" } diff --git a/functions/.env.example b/functions/.env.example index 7c2adec..381bfad 100644 --- a/functions/.env.example +++ b/functions/.env.example @@ -5,3 +5,6 @@ TWILIO_ACCOUNT_SID=#{TWILIO_ACCOUNT_SID}# TWILIO_AUTH_TOKEN=#{TWILIO_AUTH_TOKEN}# TWILIO_PHONE_NUMBER=#{TWILIO_PHONE_NUMBER}# SERVICES_RGN=#{SERVICES_RGN}# +CASHFREE_CLIENT_ID=#{CASHFREE_CLIENT_ID}# +CASHFREE_CLIENT_SECRET=#{CASHFREE_CLIENT_SECRET}# + diff --git a/functions/src/index.ts b/functions/src/index.ts index 33a2aa5..c5f1c80 100644 --- a/functions/src/index.ts +++ b/functions/src/index.ts @@ -8,6 +8,8 @@ import * as os from 'os'; import * as path from 'path'; import * as fs from 'fs'; import * as https from 'https'; +import axios from "axios"; + const formData = require('form-data'); const Mailgun = require('mailgun.js'); const { convert } = require('html-to-text'); @@ -78,7 +80,7 @@ export const sendEmailWithAttachment = onRequest({ } }); export const sendEmailMessage = onRequest({ - region: '#{SERVICES_RGN}#' + region: process.env.SERVICES_RGN }, (request: Request, response: express.Response) => { const mailgun = new Mailgun(formData); const mailGunClient = mailgun.client({ username: 'api', key: process.env.MAILGUN_API_KEY }); @@ -107,7 +109,7 @@ export const sendEmailMessage = onRequest({ }); export const sendSMSMessage = onRequest({ - region: '#{SERVICES_RGN}#' + region: process.env.SERVICES_RGN }, (request: Request, response: express.Response) => { const client = twilio(process.env.TWILIO_ACCOUNT_SID, process.env.TWILIO_AUTH_TOKEN); const { to, body } = request.body; @@ -136,7 +138,7 @@ interface Invitation { export const notifyInvitation = onDocumentCreated({ document: 'notifications/{notificationId}', - region: '#{SERVICES_RGN}#' + region: process.env.SERVICES_RGN }, async (event: any) => { const invitation = event.data?.data() as Invitation; const invitationId = event.params.invitationId; @@ -204,5 +206,149 @@ export const notifyInvitation = onDocumentCreated({ } }); +export const createCashfreeOrder = onRequest({ + region: process.env.SERVICES_RGN +}, async (request: Request, response: express.Response) => { + try { + const authHeader = request.headers.authorization; + if (!authHeader || !authHeader.startsWith('Bearer ')) { + response.status(401).json({ error: 'Unauthorized' }); + return; + } + const idToken = authHeader.split('Bearer ')[1]; + const decodedToken = await admin.auth().verifyIdToken(idToken); + const uid = decodedToken.uid; + const { + amount, + customerName, + customerEmail, + customerPhone, + productInfo + } = request.body; + + if (!amount || !customerEmail || !customerPhone) { + response.status(400).json({ error: 'Missing required fields' }); + return; + } + + const clientId = process.env.CASHFREE_CLIENT_ID; + const clientSecret = process.env.CASHFREE_CLIENT_SECRET; + const isTest = true; + + const apiUrl = isTest + ? 'https://sandbox.cashfree.com/pg/orders' + : 'https://api.cashfree.com/pg/orders'; + + const orderId = `order_${Date.now()}_${uid.substring(0, 6)}`; + + const cashfreeResponse = await axios.post( + apiUrl, + { + order_id: orderId, + order_amount: amount, + order_currency: 'INR', + customer_details: { + customer_id: uid, + customer_name: customerName || 'Fitlien User', + customer_email: customerEmail, + customer_phone: customerPhone + }, + order_meta: { + return_url: `https://fitlien.com/payment/status?order_id={order_id}`, + // notify_url: `https://$filien.web.app/verifyCashfreePayment` + }, + order_note: productInfo || 'Fitlien Membership' + }, + { + headers: { + 'x-api-version': '2022-09-01', + 'x-client-id': clientId, + 'x-client-secret': clientSecret, + 'Content-Type': 'application/json' + } + } + ); + + await admin.firestore().collection('payment_orders').doc(orderId).set({ + userId: uid, + amount: amount, + customerEmail: customerEmail, + customerPhone: customerPhone, + orderStatus: 'CREATED', + paymentGateway: 'Cashfree', + createdAt: new Date(), + ...cashfreeResponse.data + }); + + response.json({ + order_id: cashfreeResponse.data.order_id, + payment_session_id: cashfreeResponse.data.payment_session_id + }); + + logger.info(`Cashfree order created: ${orderId}`); + } catch (error: any) { + logger.error('Cashfree order creation error:', error); + response.status(500).json({ + error: 'Failed to create payment order', + details: error.response?.data || error.message + }); + } +}); + +export const verifyCashfreePayment = onRequest({ + region: process.env.SERVICES_RGN +}, async (request: Request, response: express.Response) => { + try { + const orderId = request.body.order_id || request.query.order_id; + + if (!orderId) { + response.status(400).json({ error: 'Order ID is required' }); + return; + } + + const clientId = process.env.CASHFREE_CLIENT_ID; + const clientSecret = process.env.CASHFREE_CLIENT_SECRET; + const isTest = process.env.CASHFREE_ENVIRONMENT !== 'production'; + + const apiUrl = isTest + ? `https://sandbox.cashfree.com/pg/orders/${orderId}` + : `https://api.cashfree.com/pg/orders/${orderId}`; + + const cashfreeResponse = await axios.get( + apiUrl, + { + headers: { + 'x-api-version': '2022-09-01', + 'x-client-id': clientId, + 'x-client-secret': clientSecret + } + } + ); + + await admin.firestore().collection('payment_orders').doc(orderId).update({ + orderStatus: cashfreeResponse.data.order_status, + paymentDetails: cashfreeResponse.data, + updatedAt: new Date() + }); + + if (request.headers['x-webhook-source'] === 'cashfree') { + response.status(200).send('OK'); + return; + } + + response.json({ + status: cashfreeResponse.data.order_status, + paymentDetails: cashfreeResponse.data + }); + + logger.info(`Cashfree payment verified: ${orderId}`); + } catch (error: any) { + logger.error('Cashfree payment verification error:', error); + response.status(500).json({ + error: 'Failed to verify payment status', + details: error.response?.data || error.message + }); + } +}); From f221f4850ea36a767cf32e22eaec1fe4ad52e5f1 Mon Sep 17 00:00:00 2001 From: DhanshCOSQ Date: Sat, 5 Apr 2025 12:13:49 +0530 Subject: [PATCH 02/12] Signed url complete --- functions/src/index.ts | 86 ++++++++++++++++++++++++++++++------------ 1 file changed, 61 insertions(+), 25 deletions(-) diff --git a/functions/src/index.ts b/functions/src/index.ts index c5f1c80..99a6e85 100644 --- a/functions/src/index.ts +++ b/functions/src/index.ts @@ -9,7 +9,7 @@ import * as path from 'path'; import * as fs from 'fs'; import * as https from 'https'; import axios from "axios"; - +import { getStorage } from 'firebase-admin/storage'; const formData = require('form-data'); const Mailgun = require('mailgun.js'); const { convert } = require('html-to-text'); @@ -79,6 +79,42 @@ export const sendEmailWithAttachment = onRequest({ response.status(500).json({ success: false, error: error instanceof Error ? error.message : String(error) }); } }); + +export const accessFile = onRequest({ + region: '#{SERVICES_RGN}#' +}, async (request: Request, response: express.Response) => { + try { + const filePath = request.query.path as string; + if (!filePath) { + response.status(400).send('File path is required'); + return; + } + + const expirationMs = 30 * 24 * 60 * 60 * 1000; + + const bucket = getStorage().bucket(); + const file = bucket.file(filePath); + + const [exists] = await file.exists(); + if (!exists) { + response.status(404).send('File not found'); + return; + } + + const [signedUrl] = await file.getSignedUrl({ + action: 'read', + expires: Date.now() + expirationMs, + responseDisposition: `attachment; filename="${path.basename(filePath)}"`, + }); + + response.redirect(signedUrl); + logger.info(`File access redirect for ${filePath}`); + } catch (error) { + logger.error('Error accessing file:', error); + response.status(500).send('Error accessing file'); + } +}); + export const sendEmailMessage = onRequest({ region: process.env.SERVICES_RGN }, (request: Request, response: express.Response) => { @@ -220,12 +256,12 @@ export const createCashfreeOrder = onRequest({ const decodedToken = await admin.auth().verifyIdToken(idToken); const uid = decodedToken.uid; - const { - amount, - customerName, - customerEmail, - customerPhone, - productInfo + const { + amount, + customerName, + customerEmail, + customerPhone, + productInfo } = request.body; if (!amount || !customerEmail || !customerPhone) { @@ -236,13 +272,13 @@ export const createCashfreeOrder = onRequest({ const clientId = process.env.CASHFREE_CLIENT_ID; const clientSecret = process.env.CASHFREE_CLIENT_SECRET; const isTest = true; - - const apiUrl = isTest + + const apiUrl = isTest ? 'https://sandbox.cashfree.com/pg/orders' : 'https://api.cashfree.com/pg/orders'; - + const orderId = `order_${Date.now()}_${uid.substring(0, 6)}`; - + const cashfreeResponse = await axios.post( apiUrl, { @@ -270,7 +306,7 @@ export const createCashfreeOrder = onRequest({ } } ); - + await admin.firestore().collection('payment_orders').doc(orderId).set({ userId: uid, amount: amount, @@ -281,16 +317,16 @@ export const createCashfreeOrder = onRequest({ createdAt: new Date(), ...cashfreeResponse.data }); - + response.json({ order_id: cashfreeResponse.data.order_id, payment_session_id: cashfreeResponse.data.payment_session_id }); - + logger.info(`Cashfree order created: ${orderId}`); } catch (error: any) { logger.error('Cashfree order creation error:', error); - response.status(500).json({ + response.status(500).json({ error: 'Failed to create payment order', details: error.response?.data || error.message }); @@ -302,20 +338,20 @@ export const verifyCashfreePayment = onRequest({ }, async (request: Request, response: express.Response) => { try { const orderId = request.body.order_id || request.query.order_id; - + if (!orderId) { response.status(400).json({ error: 'Order ID is required' }); return; } - + const clientId = process.env.CASHFREE_CLIENT_ID; const clientSecret = process.env.CASHFREE_CLIENT_SECRET; const isTest = process.env.CASHFREE_ENVIRONMENT !== 'production'; - - const apiUrl = isTest + + const apiUrl = isTest ? `https://sandbox.cashfree.com/pg/orders/${orderId}` : `https://api.cashfree.com/pg/orders/${orderId}`; - + const cashfreeResponse = await axios.get( apiUrl, { @@ -326,27 +362,27 @@ export const verifyCashfreePayment = onRequest({ } } ); - + await admin.firestore().collection('payment_orders').doc(orderId).update({ orderStatus: cashfreeResponse.data.order_status, paymentDetails: cashfreeResponse.data, updatedAt: new Date() }); - + if (request.headers['x-webhook-source'] === 'cashfree') { response.status(200).send('OK'); return; } - + response.json({ status: cashfreeResponse.data.order_status, paymentDetails: cashfreeResponse.data }); - + logger.info(`Cashfree payment verified: ${orderId}`); } catch (error: any) { logger.error('Cashfree payment verification error:', error); - response.status(500).json({ + response.status(500).json({ error: 'Failed to verify payment status', details: error.response?.data || error.message }); From e553bd673a91112cfaaa1a0a16b0f9075c35ea41 Mon Sep 17 00:00:00 2001 From: DhanshCOSQ Date: Sat, 5 Apr 2025 14:22:47 +0530 Subject: [PATCH 03/12] Time changed to one hour --- functions/src/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/functions/src/index.ts b/functions/src/index.ts index 99a6e85..db89fe4 100644 --- a/functions/src/index.ts +++ b/functions/src/index.ts @@ -90,7 +90,7 @@ export const accessFile = onRequest({ return; } - const expirationMs = 30 * 24 * 60 * 60 * 1000; + const expirationMs = 60 * 60 * 1000; const bucket = getStorage().bucket(); const file = bucket.file(filePath); From f00ff4d1d63debf30f628067d5c2627b19b2cf92 Mon Sep 17 00:00:00 2001 From: DhanshCOSQ Date: Sat, 5 Apr 2025 09:20:27 +0000 Subject: [PATCH 04/12] Signed url complete (#5) Reviewed-on: https://git.cosqnet.com/cosqnet/fitlien-services/pulls/5 Reviewed-by: Benoy Bose Co-authored-by: DhanshCOSQ Co-committed-by: DhanshCOSQ --- functions/src/index.ts | 86 ++++++++++++++++++++++++++++++------------ 1 file changed, 61 insertions(+), 25 deletions(-) diff --git a/functions/src/index.ts b/functions/src/index.ts index c5f1c80..db89fe4 100644 --- a/functions/src/index.ts +++ b/functions/src/index.ts @@ -9,7 +9,7 @@ import * as path from 'path'; import * as fs from 'fs'; import * as https from 'https'; import axios from "axios"; - +import { getStorage } from 'firebase-admin/storage'; const formData = require('form-data'); const Mailgun = require('mailgun.js'); const { convert } = require('html-to-text'); @@ -79,6 +79,42 @@ export const sendEmailWithAttachment = onRequest({ response.status(500).json({ success: false, error: error instanceof Error ? error.message : String(error) }); } }); + +export const accessFile = onRequest({ + region: '#{SERVICES_RGN}#' +}, async (request: Request, response: express.Response) => { + try { + const filePath = request.query.path as string; + if (!filePath) { + response.status(400).send('File path is required'); + return; + } + + const expirationMs = 60 * 60 * 1000; + + const bucket = getStorage().bucket(); + const file = bucket.file(filePath); + + const [exists] = await file.exists(); + if (!exists) { + response.status(404).send('File not found'); + return; + } + + const [signedUrl] = await file.getSignedUrl({ + action: 'read', + expires: Date.now() + expirationMs, + responseDisposition: `attachment; filename="${path.basename(filePath)}"`, + }); + + response.redirect(signedUrl); + logger.info(`File access redirect for ${filePath}`); + } catch (error) { + logger.error('Error accessing file:', error); + response.status(500).send('Error accessing file'); + } +}); + export const sendEmailMessage = onRequest({ region: process.env.SERVICES_RGN }, (request: Request, response: express.Response) => { @@ -220,12 +256,12 @@ export const createCashfreeOrder = onRequest({ const decodedToken = await admin.auth().verifyIdToken(idToken); const uid = decodedToken.uid; - const { - amount, - customerName, - customerEmail, - customerPhone, - productInfo + const { + amount, + customerName, + customerEmail, + customerPhone, + productInfo } = request.body; if (!amount || !customerEmail || !customerPhone) { @@ -236,13 +272,13 @@ export const createCashfreeOrder = onRequest({ const clientId = process.env.CASHFREE_CLIENT_ID; const clientSecret = process.env.CASHFREE_CLIENT_SECRET; const isTest = true; - - const apiUrl = isTest + + const apiUrl = isTest ? 'https://sandbox.cashfree.com/pg/orders' : 'https://api.cashfree.com/pg/orders'; - + const orderId = `order_${Date.now()}_${uid.substring(0, 6)}`; - + const cashfreeResponse = await axios.post( apiUrl, { @@ -270,7 +306,7 @@ export const createCashfreeOrder = onRequest({ } } ); - + await admin.firestore().collection('payment_orders').doc(orderId).set({ userId: uid, amount: amount, @@ -281,16 +317,16 @@ export const createCashfreeOrder = onRequest({ createdAt: new Date(), ...cashfreeResponse.data }); - + response.json({ order_id: cashfreeResponse.data.order_id, payment_session_id: cashfreeResponse.data.payment_session_id }); - + logger.info(`Cashfree order created: ${orderId}`); } catch (error: any) { logger.error('Cashfree order creation error:', error); - response.status(500).json({ + response.status(500).json({ error: 'Failed to create payment order', details: error.response?.data || error.message }); @@ -302,20 +338,20 @@ export const verifyCashfreePayment = onRequest({ }, async (request: Request, response: express.Response) => { try { const orderId = request.body.order_id || request.query.order_id; - + if (!orderId) { response.status(400).json({ error: 'Order ID is required' }); return; } - + const clientId = process.env.CASHFREE_CLIENT_ID; const clientSecret = process.env.CASHFREE_CLIENT_SECRET; const isTest = process.env.CASHFREE_ENVIRONMENT !== 'production'; - - const apiUrl = isTest + + const apiUrl = isTest ? `https://sandbox.cashfree.com/pg/orders/${orderId}` : `https://api.cashfree.com/pg/orders/${orderId}`; - + const cashfreeResponse = await axios.get( apiUrl, { @@ -326,27 +362,27 @@ export const verifyCashfreePayment = onRequest({ } } ); - + await admin.firestore().collection('payment_orders').doc(orderId).update({ orderStatus: cashfreeResponse.data.order_status, paymentDetails: cashfreeResponse.data, updatedAt: new Date() }); - + if (request.headers['x-webhook-source'] === 'cashfree') { response.status(200).send('OK'); return; } - + response.json({ status: cashfreeResponse.data.order_status, paymentDetails: cashfreeResponse.data }); - + logger.info(`Cashfree payment verified: ${orderId}`); } catch (error: any) { logger.error('Cashfree payment verification error:', error); - response.status(500).json({ + response.status(500).json({ error: 'Failed to verify payment status', details: error.response?.data || error.message }); From b4a75f4968408de62aa0e2b70972d4861406c183 Mon Sep 17 00:00:00 2001 From: DhanshCOSQ Date: Sat, 5 Apr 2025 14:58:52 +0530 Subject: [PATCH 05/12] Changed region --- functions/src/index.ts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/functions/src/index.ts b/functions/src/index.ts index db89fe4..a26adc6 100644 --- a/functions/src/index.ts +++ b/functions/src/index.ts @@ -116,7 +116,7 @@ export const accessFile = onRequest({ }); export const sendEmailMessage = onRequest({ - region: process.env.SERVICES_RGN + region: '#{SERVICES_RGN}#' }, (request: Request, response: express.Response) => { const mailgun = new Mailgun(formData); const mailGunClient = mailgun.client({ username: 'api', key: process.env.MAILGUN_API_KEY }); @@ -145,7 +145,7 @@ export const sendEmailMessage = onRequest({ }); export const sendSMSMessage = onRequest({ - region: process.env.SERVICES_RGN + region: '#{SERVICES_RGN}#' }, (request: Request, response: express.Response) => { const client = twilio(process.env.TWILIO_ACCOUNT_SID, process.env.TWILIO_AUTH_TOKEN); const { to, body } = request.body; @@ -174,7 +174,7 @@ interface Invitation { export const notifyInvitation = onDocumentCreated({ document: 'notifications/{notificationId}', - region: process.env.SERVICES_RGN + region: '#{SERVICES_RGN}#' }, async (event: any) => { const invitation = event.data?.data() as Invitation; const invitationId = event.params.invitationId; @@ -243,7 +243,7 @@ export const notifyInvitation = onDocumentCreated({ }); export const createCashfreeOrder = onRequest({ - region: process.env.SERVICES_RGN + region: '#{SERVICES_RGN}#' }, async (request: Request, response: express.Response) => { try { const authHeader = request.headers.authorization; @@ -334,7 +334,7 @@ export const createCashfreeOrder = onRequest({ }); export const verifyCashfreePayment = onRequest({ - region: process.env.SERVICES_RGN + region: '#{SERVICES_RGN}#' }, async (request: Request, response: express.Response) => { try { const orderId = request.body.order_id || request.query.order_id; From fd7e7f528b0fa704ec3ed2e791dca254a2d1df36 Mon Sep 17 00:00:00 2001 From: Benoy Bose Date: Sun, 6 Apr 2025 19:48:37 +0530 Subject: [PATCH 06/12] Update .firebaserc --- .firebaserc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.firebaserc b/.firebaserc index 008864b..74dd134 100644 --- a/.firebaserc +++ b/.firebaserc @@ -1,6 +1,7 @@ { "projects": { "debug": "fitlien-dev", + "qa": "fitlien-qa", "release": "fitlien" } -} +} \ No newline at end of file From 7be90b6284e74cf6004b5d6c14a3a6a5a028a898 Mon Sep 17 00:00:00 2001 From: Benoy Bose Date: Sun, 6 Apr 2025 19:57:50 +0530 Subject: [PATCH 07/12] Adding QA pipeline --- fitlien-services-qa-pipeline.yaml | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 fitlien-services-qa-pipeline.yaml diff --git a/fitlien-services-qa-pipeline.yaml b/fitlien-services-qa-pipeline.yaml new file mode 100644 index 0000000..c9fb9ed --- /dev/null +++ b/fitlien-services-qa-pipeline.yaml @@ -0,0 +1,30 @@ +trigger: + - dev + +pool: + vmImage: "ubuntu-latest" + +variables: + major: $(VERSION_MAJOR) + minor: $(VERSION_MINOR) + prefix: $[format('{0}.{1}', variables['major'], variables['minor'])] + patch: $[counter(variables['prefix'], 100)] + buildNumber: $(major).$(minor).$(patch) + +resources: + repositories: + - repository: templateRepo + endpoint: cosq-network + type: github + name: cosq-network/azure-build-pipeline-templates + +extends: + template: firebase-functions-deploy.yaml@templateRepo + parameters: + nodeVersion: "20" + firebaseTokenSecret: $(FIREBASE_TOKEN) + functionsWorkingDirectory: "$(Build.SourcesDirectory)/functions" + envExamplePath: "$(Build.SourcesDirectory)/functions/.env.example" + envPath: "$(Build.SourcesDirectory)/functions/.env" + buildNumber: $(buildNumber) + buildType: qa From 960fbb1e92799c95dc4982d8dd7b413e45068b43 Mon Sep 17 00:00:00 2001 From: Benoy Bose Date: Sun, 6 Apr 2025 20:38:32 +0530 Subject: [PATCH 08/12] Update fitlien-services-qa-pipeline.yaml --- fitlien-services-qa-pipeline.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fitlien-services-qa-pipeline.yaml b/fitlien-services-qa-pipeline.yaml index c9fb9ed..75d9767 100644 --- a/fitlien-services-qa-pipeline.yaml +++ b/fitlien-services-qa-pipeline.yaml @@ -1,5 +1,5 @@ trigger: - - dev + - main pool: vmImage: "ubuntu-latest" From 8d20162922ae7a03ea6a2ca5e5bf44f5acffaa2a Mon Sep 17 00:00:00 2001 From: Benoy Bose Date: Mon, 7 Apr 2025 19:01:42 +0530 Subject: [PATCH 09/12] Update fitlien-services-qa-pipeline.yaml --- fitlien-services-qa-pipeline.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fitlien-services-qa-pipeline.yaml b/fitlien-services-qa-pipeline.yaml index 75d9767..b9ca163 100644 --- a/fitlien-services-qa-pipeline.yaml +++ b/fitlien-services-qa-pipeline.yaml @@ -1,5 +1,5 @@ trigger: - - main + - qa pool: vmImage: "ubuntu-latest" From f6facf40f8260bda148dd74a542671fea285c122 Mon Sep 17 00:00:00 2001 From: DhanshCOSQ Date: Mon, 7 Apr 2025 14:36:46 +0000 Subject: [PATCH 10/12] Added cors createCashfreeOrder (#7) Reviewed-on: https://git.cosqnet.com/cosqnet/fitlien-services/pulls/7 Co-authored-by: DhanshCOSQ Co-committed-by: DhanshCOSQ --- functions/package-lock.json | 1 + functions/package.json | 1 + functions/src/index.ts | 169 +++++++++++++++++++----------------- 3 files changed, 90 insertions(+), 81 deletions(-) diff --git a/functions/package-lock.json b/functions/package-lock.json index ac67f4d..8a295b3 100644 --- a/functions/package-lock.json +++ b/functions/package-lock.json @@ -10,6 +10,7 @@ "dependencies": { "@types/node-fetch": "^2.6.12", "axios": "^1.8.4", + "cors": "^2.8.5", "firebase-admin": "^12.6.0", "firebase-functions": "^6.0.1", "form-data": "^4.0.1", diff --git a/functions/package.json b/functions/package.json index 5c20815..939628c 100644 --- a/functions/package.json +++ b/functions/package.json @@ -17,6 +17,7 @@ "dependencies": { "@types/node-fetch": "^2.6.12", "axios": "^1.8.4", + "cors": "^2.8.5", "firebase-admin": "^12.6.0", "firebase-functions": "^6.0.1", "form-data": "^4.0.1", diff --git a/functions/src/index.ts b/functions/src/index.ts index a26adc6..b250098 100644 --- a/functions/src/index.ts +++ b/functions/src/index.ts @@ -8,6 +8,7 @@ import * as os from 'os'; import * as path from 'path'; import * as fs from 'fs'; import * as https from 'https'; +import cors from 'cors'; import axios from "axios"; import { getStorage } from 'firebase-admin/storage'; const formData = require('form-data'); @@ -19,6 +20,9 @@ const twilio = require('twilio'); if (!admin.apps.length) { admin.initializeApp(); } + +const corsHandler = cors({ origin: true }); + export const sendEmailWithAttachment = onRequest({ region: '#{SERVICES_RGN}#' }, async (request: Request, response: express.Response) => { @@ -245,92 +249,95 @@ export const notifyInvitation = onDocumentCreated({ export const createCashfreeOrder = onRequest({ region: '#{SERVICES_RGN}#' }, async (request: Request, response: express.Response) => { - try { - const authHeader = request.headers.authorization; - if (!authHeader || !authHeader.startsWith('Bearer ')) { - response.status(401).json({ error: 'Unauthorized' }); - return; - } - const idToken = authHeader.split('Bearer ')[1]; - const decodedToken = await admin.auth().verifyIdToken(idToken); - const uid = decodedToken.uid; - - const { - amount, - customerName, - customerEmail, - customerPhone, - productInfo - } = request.body; - - if (!amount || !customerEmail || !customerPhone) { - response.status(400).json({ error: 'Missing required fields' }); - return; - } - - const clientId = process.env.CASHFREE_CLIENT_ID; - const clientSecret = process.env.CASHFREE_CLIENT_SECRET; - const isTest = true; - - const apiUrl = isTest - ? 'https://sandbox.cashfree.com/pg/orders' - : 'https://api.cashfree.com/pg/orders'; - - const orderId = `order_${Date.now()}_${uid.substring(0, 6)}`; - - const cashfreeResponse = await axios.post( - apiUrl, - { - order_id: orderId, - order_amount: amount, - order_currency: 'INR', - customer_details: { - customer_id: uid, - customer_name: customerName || 'Fitlien User', - customer_email: customerEmail, - customer_phone: customerPhone - }, - order_meta: { - return_url: `https://fitlien.com/payment/status?order_id={order_id}`, - // notify_url: `https://$filien.web.app/verifyCashfreePayment` - }, - order_note: productInfo || 'Fitlien Membership' - }, - { - headers: { - 'x-api-version': '2022-09-01', - 'x-client-id': clientId, - 'x-client-secret': clientSecret, - 'Content-Type': 'application/json' - } + return corsHandler(request, response, async () => { + try { + const authHeader = request.headers.authorization; + if (!authHeader || !authHeader.startsWith('Bearer ')) { + response.status(401).json({ error: 'Unauthorized' }); + return; } - ); - await admin.firestore().collection('payment_orders').doc(orderId).set({ - userId: uid, - amount: amount, - customerEmail: customerEmail, - customerPhone: customerPhone, - orderStatus: 'CREATED', - paymentGateway: 'Cashfree', - createdAt: new Date(), - ...cashfreeResponse.data - }); + const idToken = authHeader.split('Bearer ')[1]; + const decodedToken = await admin.auth().verifyIdToken(idToken); + const uid = decodedToken.uid; - response.json({ - order_id: cashfreeResponse.data.order_id, - payment_session_id: cashfreeResponse.data.payment_session_id - }); + const { + amount, + customerName, + customerEmail, + customerPhone, + productInfo + } = request.body; - logger.info(`Cashfree order created: ${orderId}`); - } catch (error: any) { - logger.error('Cashfree order creation error:', error); - response.status(500).json({ - error: 'Failed to create payment order', - details: error.response?.data || error.message - }); - } + if (!amount || !customerEmail || !customerPhone) { + response.status(400).json({ error: 'Missing required fields' }); + return; + } + + const clientId = process.env.CASHFREE_CLIENT_ID; + const clientSecret = process.env.CASHFREE_CLIENT_SECRET; + const isTest = true; + + const apiUrl = isTest + ? 'https://sandbox.cashfree.com/pg/orders' + : 'https://api.cashfree.com/pg/orders'; + + const orderId = `order_${Date.now()}_${uid.substring(0, 6)}`; + + const cashfreeResponse = await axios.post( + apiUrl, + { + order_id: orderId, + order_amount: amount, + order_currency: 'INR', + customer_details: { + customer_id: uid, + customer_name: customerName || 'Fitlien User', + customer_email: customerEmail, + customer_phone: customerPhone + }, + order_meta: { + return_url: `https://fitlien.com/payment/status?order_id={order_id}`, + // notify_url: `https://$filien.web.app/verifyCashfreePayment` + }, + order_note: productInfo || 'Fitlien Membership' + }, + { + headers: { + 'x-api-version': '2022-09-01', + 'x-client-id': clientId, + 'x-client-secret': clientSecret, + 'Content-Type': 'application/json' + } + } + ); + + await admin.firestore().collection('payment_orders').doc(orderId).set({ + userId: uid, + amount: amount, + customerEmail: customerEmail, + customerPhone: customerPhone, + orderStatus: 'CREATED', + paymentGateway: 'Cashfree', + createdAt: new Date(), + ...cashfreeResponse.data + }); + + response.json({ + order_id: cashfreeResponse.data.order_id, + payment_session_id: cashfreeResponse.data.payment_session_id + }); + + logger.info(`Cashfree order created: ${orderId}`); + } catch (error: any) { + logger.error('Cashfree order creation error:', error); + response.status(500).json({ + error: 'Failed to create payment order', + details: error.response?.data || error.message + }); + } + }); }); export const verifyCashfreePayment = onRequest({ From 439353c593fb1f4b6a0b422c9e081bb335b0f496 Mon Sep 17 00:00:00 2001 From: DhanshCOSQ Date: Mon, 7 Apr 2025 15:08:21 +0000 Subject: [PATCH 11/12] feature/fitlien-add-cors (#8) Reviewed-on: https://git.cosqnet.com/cosqnet/fitlien-services/pulls/8 Co-authored-by: DhanshCOSQ Co-committed-by: DhanshCOSQ --- functions/src/index.ts | 339 +++++++++++++++++++++-------------------- 1 file changed, 177 insertions(+), 162 deletions(-) diff --git a/functions/src/index.ts b/functions/src/index.ts index b250098..4c98cab 100644 --- a/functions/src/index.ts +++ b/functions/src/index.ts @@ -26,147 +26,158 @@ const corsHandler = cors({ origin: true }); export const sendEmailWithAttachment = onRequest({ region: '#{SERVICES_RGN}#' }, async (request: Request, response: express.Response) => { - try { - const { toAddress, subject, message, fileUrl, fileName } = request.body; + return corsHandler(request, response, async () => { + try { + const { toAddress, subject, message, fileUrl, fileName } = request.body; - if (!toAddress || !subject || !message || !fileUrl) { - response.status(400).json({ - error: 'Missing required fields (toAddress, subject, message, fileUrl)' - }); - return; - } - const tempFilePath = path.join(os.tmpdir(), fileName || 'attachment.pdf'); - await new Promise((resolve, reject) => { - const file = fs.createWriteStream(tempFilePath); - https.get(fileUrl, (res) => { - res.pipe(file); - file.on('finish', () => { - file.close(); - resolve(); + if (!toAddress || !subject || !message || !fileUrl) { + response.status(400).json({ + error: 'Missing required fields (toAddress, subject, message, fileUrl)' }); - }).on('error', (err) => { - fs.unlink(tempFilePath, () => { }); - reject(err); - }); - }); - - const mailgun = new Mailgun(formData); - const client = mailgun.client({ username: 'api', key: process.env.MAILGUN_API_KEY }); - - const options = { - wordwrap: 130, - }; - const textMessage = convert(message, options); - const fileBuffer = fs.readFileSync(tempFilePath); - const attachmentFilename = fileName || path.basename(fileUrl.split('?')[0]); - - const data = { - from: process.env.MAILGUN_FROM_ADDRESS, - to: toAddress, - subject: subject, - text: textMessage, - html: message, - attachment: { - data: fileBuffer, - filename: attachmentFilename, - contentType: 'application/pdf', + return; } - }; + const tempFilePath = path.join(os.tmpdir(), fileName || 'attachment.pdf'); + await new Promise((resolve, reject) => { + const file = fs.createWriteStream(tempFilePath); + https.get(fileUrl, (res) => { + res.pipe(file); + file.on('finish', () => { + file.close(); + resolve(); + }); + }).on('error', (err) => { + fs.unlink(tempFilePath, () => { }); + reject(err); + }); + }); - const result = await client.messages.create(process.env.MAILGUN_SERVER, data); - fs.unlinkSync(tempFilePath); + const mailgun = new Mailgun(formData); + const client = mailgun.client({ username: 'api', key: process.env.MAILGUN_API_KEY }); - logger.info('Email with attachment from URL sent successfully'); - response.json({ success: true, result }); - } catch (error) { - logger.error('Error sending email with attachment from URL:', error); - response.status(500).json({ success: false, error: error instanceof Error ? error.message : String(error) }); - } + const options = { + wordwrap: 130, + }; + const textMessage = convert(message, options); + const fileBuffer = fs.readFileSync(tempFilePath); + const attachmentFilename = fileName || path.basename(fileUrl.split('?')[0]); + + const data = { + from: process.env.MAILGUN_FROM_ADDRESS, + to: toAddress, + subject: subject, + text: textMessage, + html: message, + attachment: { + data: fileBuffer, + filename: attachmentFilename, + contentType: 'application/pdf', + } + }; + + const result = await client.messages.create(process.env.MAILGUN_SERVER, data); + fs.unlinkSync(tempFilePath); + + logger.info('Email with attachment from URL sent successfully'); + response.json({ success: true, result }); + } catch (error) { + logger.error('Error sending email with attachment from URL:', error); + response.status(500).json({ success: false, error: error instanceof Error ? error.message : String(error) }); + } + }); }); export const accessFile = onRequest({ region: '#{SERVICES_RGN}#' }, async (request: Request, response: express.Response) => { - try { - const filePath = request.query.path as string; - if (!filePath) { - response.status(400).send('File path is required'); - return; + return corsHandler(request, response, async () => { + + try { + const filePath = request.query.path as string; + if (!filePath) { + response.status(400).send('File path is required'); + return; + } + + const expirationMs = 60 * 60 * 1000; + + const bucket = getStorage().bucket(); + const file = bucket.file(filePath); + + const [exists] = await file.exists(); + if (!exists) { + response.status(404).send('File not found'); + return; + } + + const [signedUrl] = await file.getSignedUrl({ + action: 'read', + expires: Date.now() + expirationMs, + responseDisposition: `attachment; filename="${path.basename(filePath)}"`, + }); + + response.redirect(signedUrl); + logger.info(`File access redirect for ${filePath}`); + } catch (error) { + logger.error('Error accessing file:', error); + response.status(500).send('Error accessing file'); } - - const expirationMs = 60 * 60 * 1000; - - const bucket = getStorage().bucket(); - const file = bucket.file(filePath); - - const [exists] = await file.exists(); - if (!exists) { - response.status(404).send('File not found'); - return; - } - - const [signedUrl] = await file.getSignedUrl({ - action: 'read', - expires: Date.now() + expirationMs, - responseDisposition: `attachment; filename="${path.basename(filePath)}"`, - }); - - response.redirect(signedUrl); - logger.info(`File access redirect for ${filePath}`); - } catch (error) { - logger.error('Error accessing file:', error); - response.status(500).send('Error accessing file'); - } + }); }); export const sendEmailMessage = onRequest({ region: '#{SERVICES_RGN}#' }, (request: Request, response: express.Response) => { - const mailgun = new Mailgun(formData); - const mailGunClient = mailgun.client({ username: 'api', key: process.env.MAILGUN_API_KEY }); + return corsHandler(request, response, async () => { - const toAddress = request.body.toAddress; - const subject = request.body.subject; - const message = request.body.message; - const options = { - wordwrap: 130, - }; + const mailgun = new Mailgun(formData); + const mailGunClient = mailgun.client({ username: 'api', key: process.env.MAILGUN_API_KEY }); - const textMessage = convert(message, options); - mailGunClient.messages.create(process.env.MAILGUN_SERVER, { - from: process.env.MAILGUN_FROM_ADDRESS, - to: toAddress, - subject: subject, - text: textMessage, - html: message - }).then((res: any) => { - logger.info(res); - response.send(res); - }).catch((err: any) => { - logger.error(err); - response.send(err); + const toAddress = request.body.toAddress; + const subject = request.body.subject; + const message = request.body.message; + const options = { + wordwrap: 130, + }; + + const textMessage = convert(message, options); + mailGunClient.messages.create(process.env.MAILGUN_SERVER, { + from: process.env.MAILGUN_FROM_ADDRESS, + to: toAddress, + subject: subject, + text: textMessage, + html: message + }).then((res: any) => { + logger.info(res); + response.send(res); + }).catch((err: any) => { + logger.error(err); + response.send(err); + }); }); }); export const sendSMSMessage = onRequest({ region: '#{SERVICES_RGN}#' }, (request: Request, response: express.Response) => { - const client = twilio(process.env.TWILIO_ACCOUNT_SID, process.env.TWILIO_AUTH_TOKEN); - const { to, body } = request.body; - client.messages - .create({ - body: body, - from: process.env.TWILIO_PHONE_NUMBER, - to: to - }) - .then((message: any) => { - logger.info('SMS sent successfully:', message.sid); - response.json({ success: true, messageId: message.sid }); - }) - .catch((error: any) => { - logger.error('Error sending SMS:', error); - response.status(500).json({ success: false, error: error.message }); - }); + return corsHandler(request, response, async () => { + + const client = twilio(process.env.TWILIO_ACCOUNT_SID, process.env.TWILIO_AUTH_TOKEN); + const { to, body } = request.body; + client.messages + .create({ + body: body, + from: process.env.TWILIO_PHONE_NUMBER, + to: to + }) + .then((message: any) => { + logger.info('SMS sent successfully:', message.sid); + response.json({ success: true, messageId: message.sid }); + }) + .catch((error: any) => { + logger.error('Error sending SMS:', error); + response.status(500).json({ success: false, error: error.message }); + }); + }); }); interface Invitation { @@ -180,6 +191,7 @@ export const notifyInvitation = onDocumentCreated({ document: 'notifications/{notificationId}', region: '#{SERVICES_RGN}#' }, async (event: any) => { + const invitation = event.data?.data() as Invitation; const invitationId = event.params.invitationId; @@ -343,55 +355,58 @@ export const createCashfreeOrder = onRequest({ export const verifyCashfreePayment = onRequest({ region: '#{SERVICES_RGN}#' }, async (request: Request, response: express.Response) => { - try { - const orderId = request.body.order_id || request.query.order_id; + return corsHandler(request, response, async () => { - if (!orderId) { - response.status(400).json({ error: 'Order ID is required' }); - return; - } + try { + const orderId = request.body.order_id || request.query.order_id; - const clientId = process.env.CASHFREE_CLIENT_ID; - const clientSecret = process.env.CASHFREE_CLIENT_SECRET; - const isTest = process.env.CASHFREE_ENVIRONMENT !== 'production'; - - const apiUrl = isTest - ? `https://sandbox.cashfree.com/pg/orders/${orderId}` - : `https://api.cashfree.com/pg/orders/${orderId}`; - - const cashfreeResponse = await axios.get( - apiUrl, - { - headers: { - 'x-api-version': '2022-09-01', - 'x-client-id': clientId, - 'x-client-secret': clientSecret - } + if (!orderId) { + response.status(400).json({ error: 'Order ID is required' }); + return; } - ); - await admin.firestore().collection('payment_orders').doc(orderId).update({ - orderStatus: cashfreeResponse.data.order_status, - paymentDetails: cashfreeResponse.data, - updatedAt: new Date() - }); + const clientId = process.env.CASHFREE_CLIENT_ID; + const clientSecret = process.env.CASHFREE_CLIENT_SECRET; + const isTest = process.env.CASHFREE_ENVIRONMENT !== 'production'; - if (request.headers['x-webhook-source'] === 'cashfree') { - response.status(200).send('OK'); - return; + const apiUrl = isTest + ? `https://sandbox.cashfree.com/pg/orders/${orderId}` + : `https://api.cashfree.com/pg/orders/${orderId}`; + + const cashfreeResponse = await axios.get( + apiUrl, + { + headers: { + 'x-api-version': '2022-09-01', + 'x-client-id': clientId, + 'x-client-secret': clientSecret + } + } + ); + + await admin.firestore().collection('payment_orders').doc(orderId).update({ + orderStatus: cashfreeResponse.data.order_status, + paymentDetails: cashfreeResponse.data, + updatedAt: new Date() + }); + + if (request.headers['x-webhook-source'] === 'cashfree') { + response.status(200).send('OK'); + return; + } + + response.json({ + status: cashfreeResponse.data.order_status, + paymentDetails: cashfreeResponse.data + }); + + logger.info(`Cashfree payment verified: ${orderId}`); + } catch (error: any) { + logger.error('Cashfree payment verification error:', error); + response.status(500).json({ + error: 'Failed to verify payment status', + details: error.response?.data || error.message + }); } - - response.json({ - status: cashfreeResponse.data.order_status, - paymentDetails: cashfreeResponse.data - }); - - logger.info(`Cashfree payment verified: ${orderId}`); - } catch (error: any) { - logger.error('Cashfree payment verification error:', error); - response.status(500).json({ - error: 'Failed to verify payment status', - details: error.response?.data || error.message - }); - } + }); }); From b68bda68c2d35bf23d4b006ffd2df8b8d05c1112 Mon Sep 17 00:00:00 2001 From: DhanshCOSQ Date: Tue, 8 Apr 2025 10:41:35 +0000 Subject: [PATCH 12/12] feature/fitlien-add-cors (#9) Reviewed-on: https://git.cosqnet.com/cosqnet/fitlien-services/pulls/9 Co-authored-by: DhanshCOSQ Co-committed-by: DhanshCOSQ --- functions/.env.example | 1 + functions/src/index.ts | 58 ++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 59 insertions(+) diff --git a/functions/.env.example b/functions/.env.example index 381bfad..7f1bf60 100644 --- a/functions/.env.example +++ b/functions/.env.example @@ -7,4 +7,5 @@ TWILIO_PHONE_NUMBER=#{TWILIO_PHONE_NUMBER}# SERVICES_RGN=#{SERVICES_RGN}# CASHFREE_CLIENT_ID=#{CASHFREE_CLIENT_ID}# CASHFREE_CLIENT_SECRET=#{CASHFREE_CLIENT_SECRET}# +GOOGLE_PLACES_API_KEY=#{GOOGLE_PLACES_API_KEY}# diff --git a/functions/src/index.ts b/functions/src/index.ts index 4c98cab..b369f00 100644 --- a/functions/src/index.ts +++ b/functions/src/index.ts @@ -410,3 +410,61 @@ export const verifyCashfreePayment = onRequest({ } }); }); + +export const getPlacesAutocomplete = onRequest({ + region: '#{SERVICES_RGN}#' +}, async (request: Request, response: express.Response) => { + return corsHandler(request, response, async () => { + try { + const { input, location, radius, types, components, sessiontoken } = request.query; + + if (!input) { + response.status(400).json({ + error: 'Input parameter is required for autocomplete' + }); + return; + } + + const apiKey = process.env.GOOGLE_PLACES_API_KEY; + if (!apiKey) { + logger.error('Google Places API key is not configured'); + response.status(500).json({ error: 'Server configuration error' }); + return; + } + + const url = 'https://maps.googleapis.com/maps/api/place/autocomplete/json'; + const params: any = { + key: apiKey, + input: input + }; + + if (location && radius) { + params.location = location; + params.radius = radius; + } + + if (types) { + params.types = types; + } + + if (components) { + params.components = components; + } + + if (sessiontoken) { + params.sessiontoken = sessiontoken; + } + + const result = await axios.get(url, { params }); + + logger.info('Google Places Autocomplete API request completed successfully'); + response.json(result.data); + } catch (error) { + logger.error('Error fetching place autocomplete suggestions:', error); + response.status(500).json({ + success: false, + error: error instanceof Error ? error.message : String(error) + }); + } + }); +});