Fix scopes and promise handling (#152)

src/cognito/access-control.ts

@@ -21,6 +21,7 @@ export enum Scopes {
   LOCALES_READ = 'locales.read',
   TEXTS_READ = 'texts.read',
   INTERIORS_READ = 'interiors.read',
+  INTERIORS_PUBLIC_READ = 'interiors.public.read',
   INTERIORS_WRITE = 'interiors.write',
 }
 

src/datasources/interior-api.ts

@@ -103,7 +103,10 @@ export class InteriorAPI extends BaseSQLDataSource {
   // ----------------------------
 
   async getInteriors(filter: Maybe<InteriorsFilter>): Promise<Array<Interior>> {
-    ScopeAccess.validate(this.user).all([Scopes.INTERIORS_READ]);
+    ScopeAccess.validate(this.user).some([
+      Scopes.INTERIORS_READ,
+      Scopes.INTERIORS_PUBLIC_READ,
+    ]);
     const sql = /* sql */ `
       SELECT rooms.*, room_types.name roomType FROM rooms
       LEFT JOIN room_types ON rooms.room_type_id = room_types.id
@@ -161,9 +164,9 @@ export class InteriorAPI extends BaseSQLDataSource {
   async getPrintProductInteriorsBatch(
     printIds: number[],
   ): Promise<InteriorWithPrintId[]> {
-    ScopeAccess.validate(this.user).all([
+    ScopeAccess.validate(this.user).some([
       Scopes.INTERIORS_READ,
-      Scopes.PRODUCTS_READ,
+      Scopes.INTERIORS_PUBLIC_READ,
     ]);
     return this.knex
       .select('*')

src/datasources/product-api.ts

@@ -198,7 +198,10 @@ export class ProductAPI extends BaseSQLDataSource {
   // ----------------------------
 
   async getProductsTotal(input: ProductsFilterInput): Promise<number> {
-    ScopeAccess.validate(this.user).some([Scopes.PRODUCTS_READ]);
+    ScopeAccess.validate(this.user).some([
+      Scopes.PRODUCTS_READ,
+      Scopes.PRODUCTS_PUBLIC_READ,
+    ]);
     const query = sql.productsTotal(input);
     const res = await this.cachedRaw(query, null)
       .cache(MINUTE * 5)
@@ -254,7 +257,10 @@ export class ProductAPI extends BaseSQLDataSource {
   }
 
   async getProductByPath(path: string): Promise<Maybe<Product>> {
-    ScopeAccess.validate(this.user).all([Scopes.PRODUCTS_READ]);
+    ScopeAccess.validate(this.user).some([
+      Scopes.PRODUCTS_READ,
+      Scopes.PRODUCTS_PUBLIC_READ,
+    ]);
     const query = sql.productByPath();
 
     const res = await this.knex.raw(query, [path]).then((data) =>

src/resolvers/orders-resolver.ts

@@ -36,8 +36,9 @@ async function getOrdersResult(
   input: GeneralInput,
   { dataSources },
 ): Promise<OrdersResult> {
-  const total = (<OrderAPI>dataSources.orderApi).getOrdersTotal(input);
-  const items = (<OrderAPI>dataSources.orderApi).getOrders(input);
+  const totalPromise = (<OrderAPI>dataSources.orderApi).getOrdersTotal(input);
+  const itemsPromise = (<OrderAPI>dataSources.orderApi).getOrders(input);
+  const [items, total] = await Promise.all([itemsPromise, totalPromise]);
   const offset = input.pagination?.offset ?? 0;
   return {
     items: items,

src/resolvers/products-resolver.ts

@@ -114,8 +114,11 @@ async function getProductsResult(
       extensions: { code: 'BAD_USER_INPUT' },
     });
   }
-  const total = (<ProductAPI>dataSources.productApi).getProductsTotal(input);
-  const items = (<ProductAPI>dataSources.productApi).getProducts(input);
+  const totalPromise = (<ProductAPI>dataSources.productApi).getProductsTotal(
+    input,
+  );
+  const itemsPromise = (<ProductAPI>dataSources.productApi).getProducts(input);
+  const [total, items] = await Promise.all([totalPromise, itemsPromise]);
   const offset = input.pagination?.offset ?? 0;
   return {
     pagination: {
@@ -136,7 +139,7 @@ async function getProductsSearchResult(
   const catApi = <CategoryAPI>dataSources.categoryApi;
   const keywApi = <KeywordAPI>dataSources.keywordApi;
   const designerApi = <DesignerAPI>dataSources.designerApi;
-  const prods = Promise.all([
+  const products = await Promise.all([
     prodApi.searchByName(q),
     prodApi.searchByArtNo(q),
     prodApi.searchByCompleteProductId(q),
@@ -152,15 +155,25 @@ async function getProductsSearchResult(
     return Object.values(products);
   });
 
+  const [batches, keywords, categories, designers, copyrights, references] =
+    await Promise.all([
+      prodApi.searchByBatch(q),
+      keywApi.searchKeywords(q),
+      catApi.searchCategories(q),
+      designerApi.searchDesigners(q),
+      prodApi.searchByCopyright(q),
+      prodApi.searchByReferences(q),
+    ]);
+
   return {
     q: q,
-    products: prods,
-    batches: prodApi.searchByBatch(q),
-    keywords: keywApi.searchKeywords(q),
-    categories: catApi.searchCategories(q),
-    designers: designerApi.searchDesigners(q),
-    copyrights: prodApi.searchByCopyright(q),
-    references: prodApi.searchByReferences(q),
+    products: products,
+    batches: batches,
+    keywords: keywords,
+    categories: categories,
+    designers: designers,
+    copyrights: copyrights,
+    references: references,
   };
 }
 

src/rest/cognitoService.ts

@@ -1,5 +1,4 @@
 import axios from 'axios';
-import { Scopes } from '../cognito/access-control';
 
 export const getClientAccessToken = async (req) => {
   const token = req.headers.authorization || '';
@@ -29,7 +28,6 @@ export const getClientAccessToken = async (req) => {
     data: {
       grant_type: 'client_credentials',
       client_id: clientId,
-      scope: `https://graphql.photowall.com/${Scopes.PRODUCTS_PUBLIC_READ} https://graphql.photowall.com/${Scopes.DESIGNERS_PUBLIC_READ} https://graphql.photowall.com/${Scopes.CATEGORIES_PUBLIC_READ}`,
     },
   });
 

src/types/order-types.ts

@@ -2,7 +2,7 @@ import { PaginationResult } from './types';
 
 export interface OrdersResult {
   pagination: PaginationResult;
-  items: Array<Order> | Promise<Array<Order>>;
+  items: Array<Order>;
 }
 
 export interface Address {

src/types/product-types.ts

@@ -51,17 +51,17 @@ export interface ProductsFilter {
 
 export interface ProductsSearchResult {
   q: string;
-  products: Promise<Array<Product>>;
-  batches: Promise<Array<Batch>>;
-  keywords: Promise<Array<Keyword>>;
-  categories: Promise<Array<Category>>;
-  designers: Promise<Array<Designer>>;
-  copyrights: Promise<Array<Copyright>>;
-  references: Promise<Array<Product>>;
+  products: Array<Product>;
+  batches: Array<Batch>;
+  keywords: Array<Keyword>;
+  categories: Array<Category>;
+  designers: Array<Designer>;
+  copyrights: Array<Copyright>;
+  references: Array<Product>;
 }
 export interface ProductListResult {
   pagination: PaginationResult;
-  items: Array<Product> | Promise<Array<Product>>;
+  items: Array<Product>;
 }
 
 export enum ProductGroup {
@@ -133,7 +133,7 @@ export interface Batch {
 
 export interface Copyright {
   name: string;
-  products: Promise<Array<Product>>;
+  products: Array<Product>;
 }
 
 export interface Facet {

src/types/types.ts

@@ -37,7 +37,7 @@ export interface GeneralInput {
 }
 
 export interface PaginationResult {
-  total: Promise<number> | number;
+  total: number;
   offset: number;
   limit: number;
 }