develop

apps/mno/Dockerfile

@@ -1,13 +1,14 @@
-FROM node:18-alpine as development
+FROM node:18-alpine AS development
 WORKDIR /app
 COPY . ./
 RUN npm i  --legacy-peer-deps
+RUN npm i azampay  --legacy-peer-deps
 
-FROM development as build
+FROM development AS build
 WORKDIR /app
 RUN app=mnos npm run package
 
-FROM node:lts-alpine3.16 as release
+FROM node:lts-alpine3.16 AS release
 ENV NODE_ENV production
 RUN apk add --no-cache tzdata
 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone

apps/mno/src/modules/azampay/controllers/azam.controller.ts

@@ -13,7 +13,7 @@ import {
   NameLookupResponse,
   PartnersResponse,
   TransactionStatusResponse,
-} from 'azampay/lib/shared/interfaces/base.interface';
+} from 'azampay';
 import { Response } from 'express';
 import { AzamService } from '../services/azam.service';
 

apps/mno/src/modules/azampay/services/azam.service.ts

@@ -19,7 +19,7 @@ import {
   PostCheckOutInterface,
   TokenResponse,
   TransactionStatusResponse,
-} from 'azampay/lib/shared/interfaces/base.interface';
+} from 'azampay';
 
 @Injectable()
 export class AzamService {

apps/mno/src/modules/selcom/controllers/selcom.controller.ts

@@ -1,9 +1,5 @@
 import { Body, Controller, Post, Res } from '@nestjs/common';
-import {
-  CheckoutResponse,
-  ErrorResponse,
-  MnoCheckout,
-} from 'azampay/lib/shared/interfaces/base.interface';
+import { CheckoutResponse, ErrorResponse, MnoCheckout } from 'azampay';
 import { SelcomService } from '../services/selcom.service';
 import { Response } from 'express';
 

apps/mno/src/modules/selcom/services/selcom.service.ts

@@ -1,10 +1,6 @@
 import { APPENV, phoneNumber } from '@flexpay/common';
 import { HttpStatus, Injectable } from '@nestjs/common';
-import {
-  CheckoutResponse,
-  MnoCheckout,
-  ErrorResponse,
-} from 'azampay/lib/shared/interfaces/base.interface';
+import { CheckoutResponse, MnoCheckout, ErrorResponse } from 'azampay';
 import * as crypto from 'crypto';
 
 // Types
@@ -65,7 +61,7 @@ export class SelcomService {
   selcomPush = async (
     request: MnoCheckout,
   ): Promise<CheckoutResponse | ErrorResponse> => {
-    const { valid, value, withCode } = phoneNumber(request.accountNumber);
+    const { valid, withCode } = phoneNumber(request.accountNumber);
     if (!valid) {
       return {
         statusCode: HttpStatus.BAD_REQUEST,
@@ -82,14 +78,14 @@ export class SelcomService {
     const url = `${APPENV.SELCOM_APIURL}/checkout/wallet-payment`;
 
     const payload: SelcomPayload = {
-      utilityref: value,
+      utilityref: APPENV.SELCOM_VENDOR,
       transid: request.externalId,
       amount: request.amount,
       vendor: APPENV.SELCOM_VENDOR,
       msisdn: withCode,
     };
 
-    const authorization = Buffer.from(apiKey).toString('hex');
+    const authorization = Buffer.from(apiKey, 'ascii').toString('base64');
     const timestamp = new Date().toISOString();
     const signedFields = Object.keys(payload).join(',');
     const digest = this.computeSignature(

docker-compose.yml

@@ -1,35 +1,35 @@
-version: '3.4'
+# version: '3.4'
 services:
-  api:
-    build:
-      context: .
-      dockerfile: ./apps/api/Dockerfile
-      target: development
-    command: npm run start:dev api
+  # api:
+  #   build:
+  #     context: .
+  #     dockerfile: ./apps/api/Dockerfile
+  #     target: development
+  #   command: npm run start:dev api
 
-    env_file:
-      - ./apps/api/.env
-    volumes:
-      - .:/app
-      - /app/node_modules
-    ports:
-      - '2000:1000'
+  #   env_file:
+  #     - ./apps/api/.env
+  #   volumes:
+  #     - .:/app
+  #     - /app/node_modules
+  #   ports:
+  #     - '2000:1000'
 
-    restart: always
+  #   restart: always
 
-  auth:
-    build:
-      context: .
-      dockerfile: ./apps/auth/Dockerfile
-      target: development
-    command: npm run start:dev auth
+  # auth:
+  #   build:
+  #     context: .
+  #     dockerfile: ./apps/auth/Dockerfile
+  #     target: development
+  #   command: npm run start:dev auth
 
-    env_file:
-      - ./.env
-    volumes:
-      - .:/app
-      - /app/node_modules
-    restart: always
+  #   env_file:
+  #     - ./.env
+  #   volumes:
+  #     - .:/app
+  #     - /app/node_modules
+  #   restart: always
 
   mno:
     build:
@@ -44,7 +44,7 @@ services:
       - /app/node_modules
     restart: always
     ports:
-      - 2001:2000
+      - 2001:3001
 
 volumes:
   postdb-data:

libs/common/src/interfaces/mno.interface.ts

@@ -6,7 +6,7 @@ import {
   PostCheckOut,
   RequestOptions,
   TransactionStatus,
-} from 'azampay/lib/shared/interfaces/base.interface';
+} from 'azampay';
 
 export interface RestCheckout {
   checkout: MnoCheckout | BankCheckout;

package.json

@@ -32,7 +32,7 @@
     "@nestjs/typeorm": "^9.0.1",
     "amqp-connection-manager": "^4.1.10",
     "amqplib": "^0.10.3",
-    "azampay": "^0.0.4",
+    "azampay": "^0.0.5",
     "bcrypt": "^5.1.0",
     "class-transformer": "^0.5.1",
     "class-validator": "^0.14.0",