cloudcommerce 0.0.57 → 0.0.60

package/packages/passport/lib/firebase.js

@@ -1,6 +1,4 @@
-import 'source-map-support/register.js';
-// eslint-disable-next-line import/no-unresolved
-import { initializeApp } from 'firebase-admin/app';
+import '@cloudcommerce/firebase/lib/init';
 // eslint-disable-next-line import/no-unresolved
 import { getFirestore } from 'firebase-admin/firestore';
 // eslint-disable-next-line import/no-unresolved
@@ -8,7 +6,6 @@ import { getAuth } from 'firebase-admin/auth';
 // eslint-disable-next-line import/no-unresolved
 import { onRequest } from 'firebase-functions/v2/https';
 import config from '@cloudcommerce/firebase/lib/config';
-import getEnv from '@cloudcommerce/firebase/lib/env';
 import servePassportApi from './firebase/serve-passport-api.js';
 
 // References:
@@ -16,7 +13,6 @@ import servePassportApi from './firebase/serve-passport-api.js';
 // https://itnext.io/how-to-use-firebase-auth-with-a-custom-node-backend-99a106376c8a
 // https://www.geeksforgeeks.org/firebase-sign-in-with-google-authentication-in-node-js-using-firebase-ui-and-cookie-sessions/
 // https://firebase.google.com/docs/reference/rest/auth
-initializeApp();
 const authFirebase = getAuth();
 const firestore = getFirestore();
 const options = {
@@ -26,8 +22,7 @@ const options = {
 
 // eslint-disable-next-line import/prefer-default-export
 export const passport = onRequest(options, (req, res) => {
-  const { apiAuth } = getEnv();
   const { storeId } = config.get();
-  servePassportApi(req, res, apiAuth, firestore, authFirebase, storeId);
+  servePassportApi(req, res, firestore, authFirebase, storeId);
 });
 // # sourceMappingURL=firebase.js.map

package/packages/passport/lib/firebase.js.map

@@ -1 +1 @@
-{"version":3,"file":"firebase.js","sourceRoot":"","sources":["../src/firebase.ts"],"names":[],"mappings":"AAAA,OAAO,gCAAgC,CAAC;AACxC,gDAAgD;AAChD,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,gDAAgD;AAChD,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AACxD,gDAAgD;AAChD,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAC9C,gDAAgD;AAChD,OAAO,EAAgB,SAAS,EAAE,MAAM,6BAA6B,CAAC;AACtE,OAAO,MAAM,MAAM,oCAAoC,CAAC;AACxD,OAAO,MAAM,MAAM,iCAAiC,CAAC;AACrD,OAAO,gBAAgB,MAAM,+BAA+B,CAAC;AAE7D,cAAc;AACd,8DAA8D;AAC9D,qFAAqF;AACrF,8HAA8H;AAC9H,uDAAuD;AAEvD,aAAa,EAAE,CAAC;AAChB,MAAM,YAAY,GAAG,OAAO,EAAE,CAAC;AAC/B,MAAM,SAAS,GAAG,YAAY,EAAE,CAAC;AAEjC,MAAM,OAAO,GAAG;IACd,GAAG,MAAM,CAAC,GAAG,EAAE,CAAC,oBAAoB;IACpC,MAAM,EAAE,QAAQ;CACD,CAAC;AAElB,wDAAwD;AACxD,MAAM,CAAC,MAAM,QAAQ,GAAG,SAAS,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;IACtD,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,EAAE,CAAC;IAC7B,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,CAAC,GAAG,EAAE,CAAC;IACjC,gBAAgB,CACd,GAAG,EACH,GAAG,EACH,OAAO,EACP,SAAS,EACT,YAAY,EACZ,OAAO,CACR,CAAC;AACJ,CAAC,CAAC,CAAC"}
+{"version":3,"file":"firebase.js","sourceRoot":"","sources":["../src/firebase.ts"],"names":[],"mappings":"AAAA,OAAO,kCAAkC,CAAC;AAC1C,gDAAgD;AAChD,OAAO,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AACxD,gDAAgD;AAChD,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAC9C,gDAAgD;AAChD,OAAO,EAAgB,SAAS,EAAE,MAAM,6BAA6B,CAAC;AACtE,OAAO,MAAM,MAAM,oCAAoC,CAAC;AACxD,OAAO,gBAAgB,MAAM,+BAA+B,CAAC;AAE7D,cAAc;AACd,8DAA8D;AAC9D,qFAAqF;AACrF,8HAA8H;AAC9H,uDAAuD;AAEvD,MAAM,YAAY,GAAG,OAAO,EAAE,CAAC;AAC/B,MAAM,SAAS,GAAG,YAAY,EAAE,CAAC;AAEjC,MAAM,OAAO,GAAG;IACd,GAAG,MAAM,CAAC,GAAG,EAAE,CAAC,oBAAoB;IACpC,MAAM,EAAE,QAAQ;CACD,CAAC;AAElB,wDAAwD;AACxD,MAAM,CAAC,MAAM,QAAQ,GAAG,SAAS,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,GAAG,EAAE,EAAE;IACtD,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,CAAC,GAAG,EAAE,CAAC;IACjC,gBAAgB,CACd,GAAG,EACH,GAAG,EACH,SAAS,EACT,YAAY,EACZ,OAAO,CACR,CAAC;AACJ,CAAC,CAAC,CAAC"}

package/packages/passport/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/passport",
   "type": "module",
-  "version": "0.0.57",
+  "version": "0.0.60",
   "description": "E-Com Plus Cloud Commerce customers authentication (passport) API",
   "main": "lib/index.js",
   "exports": {

package/packages/passport/src/firebase/handle-passport.ts

@@ -5,13 +5,11 @@ import type { Firestore } from 'firebase-admin/firestore';
 import { Auth } from 'firebase-admin/auth';
 import { logger } from 'firebase-functions';
 import api from '@cloudcommerce/api';
+import getEnv from '@cloudcommerce/firebase/lib/env';
 
-const findCustomerByEmail = async (
-  email: string | undefined,
-  apiAuth: { authenticationId: string, apiKey: string },
-) => {
+const findCustomerByEmail = async (email: string | undefined) => {
   try {
-    const { data } = await api.get(`customers?main_email=${email}`, apiAuth);
+    const { data } = await api.get(`customers?main_email=${email}`);
     if (data.result.length) {
       return data.result[0];
     }
@@ -38,12 +36,9 @@ const checkFirebaseAuth = async (
   }
 };
 
-const createCustomer = async (
-  customer: Customers,
-  apiAuth: { authenticationId: string, apiKey: string },
-) => {
+const createCustomer = async (customer: Customers) => {
   try {
-    const { data } = await api.post('customers', customer, apiAuth);
+    const { data } = await api.post('customers', customer);
     return data._id;
   } catch (e) {
     logger.error(e);
@@ -54,12 +49,12 @@ const createCustomer = async (
 const generateAccessToken = async (
   firestore: Firestore,
   customerId: string,
-  apiAuth: { authenticationId: string, apiKey: string },
 ): Promise<null | {
   customer_id: string,
   access_token: string,
   expires: string,
 }> => {
+  const { apiAuth } = getEnv();
   const docRef = firestore.doc(`customerTokens/${customerId}`);
   const doc = await docRef.get();
   const expires: string | undefined = doc.data()?.expires;
@@ -91,18 +86,14 @@ const generateAccessToken = async (
 
 const getAuthCustomerApi = async (
   firestore: Firestore,
-  apiAuth: { authenticationId: string, apiKey: string },
   authtoken: string | string[] | undefined,
   authFirebase: Auth,
 ) => {
   const customerFirebaseAuth = await checkFirebaseAuth(authFirebase, authtoken);
   if (customerFirebaseAuth !== null && customerFirebaseAuth.email) {
-    const customer = await findCustomerByEmail(
-      customerFirebaseAuth.email,
-      apiAuth,
-    );
+    const customer = await findCustomerByEmail(customerFirebaseAuth.email);
     if (customer !== null) {
-      return generateAccessToken(firestore, customer._id, apiAuth);
+      return generateAccessToken(firestore, customer._id);
     }
     const newCustomer = {
       display_name: customerFirebaseAuth.name || '',
@@ -116,9 +107,9 @@ const getAuthCustomerApi = async (
         user_id: customerFirebaseAuth.user_id,
       }],
     } as Customers;
-    const customerId = await createCustomer(newCustomer, apiAuth);
+    const customerId = await createCustomer(newCustomer);
     if (customerId) {
-      return generateAccessToken(firestore, customerId, apiAuth);
+      return generateAccessToken(firestore, customerId);
     }
   }
   // TODO: Find customer by phone number, generate token if found, otherwise unauthorize

package/packages/passport/src/firebase/serve-passport-api.ts

@@ -12,7 +12,6 @@ import {
 export default async (
   req: Request,
   res: Response,
-  apiAuth: { authenticationId: string, apiKey: string },
   firestore: Firestore,
   authFirebase: Auth,
   storeId: number,
@@ -44,7 +43,6 @@ export default async (
     try {
       const authCustomerApi = await getAuthCustomerApi(
         firestore,
-        apiAuth,
         authtoken,
         authFirebase,
       );

package/packages/passport/src/firebase.ts

@@ -1,6 +1,4 @@
-import 'source-map-support/register.js';
-// eslint-disable-next-line import/no-unresolved
-import { initializeApp } from 'firebase-admin/app';
+import '@cloudcommerce/firebase/lib/init';
 // eslint-disable-next-line import/no-unresolved
 import { getFirestore } from 'firebase-admin/firestore';
 // eslint-disable-next-line import/no-unresolved
@@ -8,7 +6,6 @@ import { getAuth } from 'firebase-admin/auth';
 // eslint-disable-next-line import/no-unresolved
 import { HttpsOptions, onRequest } from 'firebase-functions/v2/https';
 import config from '@cloudcommerce/firebase/lib/config';
-import getEnv from '@cloudcommerce/firebase/lib/env';
 import servePassportApi from './firebase/serve-passport-api';
 
 // References:
@@ -17,7 +14,6 @@ import servePassportApi from './firebase/serve-passport-api';
 // https://www.geeksforgeeks.org/firebase-sign-in-with-google-authentication-in-node-js-using-firebase-ui-and-cookie-sessions/
 // https://firebase.google.com/docs/reference/rest/auth
 
-initializeApp();
 const authFirebase = getAuth();
 const firestore = getFirestore();
 
@@ -28,12 +24,10 @@ const options = {
 
 // eslint-disable-next-line import/prefer-default-export
 export const passport = onRequest(options, (req, res) => {
-  const { apiAuth } = getEnv();
   const { storeId } = config.get();
   servePassportApi(
     req,
     res,
-    apiAuth,
     firestore,
     authFirebase,
     storeId,

package/packages/ssr/lib/firebase.js

@@ -1,12 +1,9 @@
 /* eslint-disable import/prefer-default-export */
-import 'source-map-support/register.js';
-// eslint-disable-next-line import/no-unresolved
-import { initializeApp } from 'firebase-admin/app';
+import '@cloudcommerce/firebase/lib/init';
 // eslint-disable-next-line import/no-unresolved
 import { onRequest } from 'firebase-functions/v2/https';
 import config from '@cloudcommerce/firebase/lib/config';
 
-initializeApp();
 const options = config.get().httpsFunctionOptions;
 
 export const ssr = onRequest(options, (request, response) => {

package/packages/ssr/lib/firebase.js.map

@@ -1 +1 @@
-{"version":3,"file":"firebase.js","sourceRoot":"","sources":["../src/firebase.ts"],"names":[],"mappings":"AAAA,iDAAiD;AAEjD,OAAO,gCAAgC,CAAC;AACxC,gDAAgD;AAChD,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,gDAAgD;AAChD,OAAO,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AACxD,OAAO,MAAM,MAAM,oCAAoC,CAAC;AAExD,aAAa,EAAE,CAAC;AAChB,MAAM,OAAO,GAAG,MAAM,CAAC,GAAG,EAAE,CAAC,oBAAoB,CAAC;AAElD,MAAM,CAAC,MAAM,GAAG,GAAG,SAAS,CAAC,OAAO,EAAE,CAAC,OAAO,EAAE,QAAQ,EAAE,EAAE;IAC1D,QAAQ,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC;AACvC,CAAC,CAAC,CAAC"}
+{"version":3,"file":"firebase.js","sourceRoot":"","sources":["../src/firebase.ts"],"names":[],"mappings":"AAAA,iDAAiD;AAEjD,OAAO,kCAAkC,CAAC;AAC1C,gDAAgD;AAChD,OAAO,EAAE,SAAS,EAAE,MAAM,6BAA6B,CAAC;AACxD,OAAO,MAAM,MAAM,oCAAoC,CAAC;AAExD,MAAM,OAAO,GAAG,MAAM,CAAC,GAAG,EAAE,CAAC,oBAAoB,CAAC;AAElD,MAAM,CAAC,MAAM,GAAG,GAAG,SAAS,CAAC,OAAO,EAAE,CAAC,OAAO,EAAE,QAAQ,EAAE,EAAE;IAC1D,QAAQ,CAAC,IAAI,CAAC,qBAAqB,CAAC,CAAC;AACvC,CAAC,CAAC,CAAC"}

package/packages/ssr/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/ssr",
   "type": "module",
-  "version": "0.0.57",
+  "version": "0.0.60",
   "description": "E-Com Plus Cloud Commerce storefront SSR",
   "main": "lib/index.js",
   "exports": {

package/packages/ssr/src/firebase.ts

@@ -1,13 +1,10 @@
 /* eslint-disable import/prefer-default-export */
 
-import 'source-map-support/register.js';
-// eslint-disable-next-line import/no-unresolved
-import { initializeApp } from 'firebase-admin/app';
+import '@cloudcommerce/firebase/lib/init';
 // eslint-disable-next-line import/no-unresolved
 import { onRequest } from 'firebase-functions/v2/https';
 import config from '@cloudcommerce/firebase/lib/config';
 
-initializeApp();
 const options = config.get().httpsFunctionOptions;
 
 export const ssr = onRequest(options, (request, response) => {

package/packages/storefront/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/storefront",
   "type": "module",
-  "version": "0.0.57",
+  "version": "0.0.60",
   "description": "E-Com Plus Cloud Commerce storefront with Astro",
   "main": "src/index.js",
   "repository": {
@@ -19,17 +19,18 @@
     "build": "echo '@ecomplus/storefront'"
   },
   "dependencies": {
-    "@astrojs/mdx": "^0.10.0",
+    "@astrojs/mdx": "^0.10.2",
     "@astrojs/node": "^1.0.0",
     "@astrojs/partytown": "^1.0.0",
     "@astrojs/prefetch": "^0.0.7",
     "@astrojs/sitemap": "^1.0.0",
-    "@astrojs/tailwind": "^1.0.0",
     "@astrojs/vue": "^1.0.0",
     "@cloudcommerce/api": "workspace:*",
     "@picocss/pico": "^1.5.3",
-    "astro": "^1.0.6",
+    "astro": "^1.1.1",
     "rollup": "^2.78.1",
+    "unocss": "^0.45.13",
+    "vite": "^3.0.9",
     "vue": "^3.2.37"
   }
 }

package/packages/types/index.ts

@@ -25,7 +25,7 @@ import type { CreateTransactionParams } from './modules/create_transaction:param
 import type { CreateTransactionResponse } from './modules/create_transaction:response';
 import type { CheckoutBody } from './modules/@checkout:params';
 
-type AppEventsTopic = 'orders-new'
+type ApiEventName = 'orders-new'
   | 'orders-anyStatusSet'
   | 'orders-paid'
   | 'orders-readyForShipping'
@@ -37,7 +37,21 @@ type AppEventsTopic = 'orders-new'
   | 'products-priceSet'
   | 'carts-new'
   | 'carts-customerSet'
-  | 'customers-new';
+  | 'customers-new'
+  | 'applications-dataSet';
+
+type AppEventsPayload = {
+  evName: ApiEventName,
+  apiEvent: EventsResult<'events/orders'>['result'][0],
+  apiDoc: Record<string, any>,
+  app: {
+    _id: Applications['_id'],
+    app_id: Applications['app_id'],
+    data: Applications['data'],
+    hidden_data: Applications['hidden_data'],
+  },
+  isInternal?: boolean,
+};
 
 type AppModuleName = 'apply_discount'
   | 'calculate_shipping'
@@ -69,7 +83,8 @@ export type {
   ResourceId,
   ResourceListResult,
   EventsResult,
-  AppEventsTopic,
+  ApiEventName,
+  AppEventsPayload,
   AppModuleName,
   AppModuleBody,
   ApplyDiscountParams,

package/packages/types/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cloudcommerce/types",
   "type": "module",
-  "version": "0.0.57",
+  "version": "0.0.60",
   "description": "E-Com Plus Cloud Commerce reusable type definitions",
   "main": "index.ts",
   "repository": {