remove lots of unnecessary stuff (#420)

* remove lots of unnecessary stuff

* Bump version up to 1.0.20

* fix build error

Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com>

Author: nikmel2803

.env.sample

@@ -27,26 +27,6 @@ INVITE_LINK_HASH_SALT=secret_hash_salt
 # Option to enable playground (if true playground will be available at /graphql route)
 PLAYGROUND_ENABLE=false
 
-# SMTP mail settings
-
-## SMTP server adress
-SMTP_HOST=smtp.yandex.ru
-
-## SMTP server port
-SMTP_PORT=465
-
-## SMTP server username (for examle, from your Yandex account)
-SMTP_USERNAME=
-
-## SMTP server password (for examle, from your Yandex account)
-SMTP_PASSWORD=
-
-## Sender name
-SMTP_SENDER_NAME=
-
-## Mail from which letters are sent
-SMTP_SENDER_ADDRESS=
-
 # AMQP URL
 AMQP_URL=amqp://guest:guest@rabbitmq
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "hawk.api",
-  "version": "1.0.19",
+  "version": "1.0.20",
   "main": "index.ts",
   "license": "UNLICENSED",
   "scripts": {
@@ -10,8 +10,7 @@
     "lint-test": "eslint -c ./.eslintrc.js src/ --ext .ts,.js",
     "dev:up": "docker-compose -f docker-compose.dev.yml up -d",
     "dev:down": "docker-compose -f docker-compose.dev.yml down",
-    "build": "tsc && yarn copy-email-templates",
-    "copy-email-templates": "copyfiles src/email/templates/*/*.txt build",
+    "build": "tsc",
     "migrations:create": "docker-compose exec api yarn migrate-mongo create",
     "migrations:up": "docker-compose exec api yarn migrate-mongo up",
     "migrations:down": "docker-compose exec api yarn migrate-mongo down",
@@ -33,11 +32,12 @@
     "@hawk.so/nodejs": "^3.1.1",
     "@hawk.so/types": "^0.1.18",
     "@types/amqp-connection-manager": "^2.0.4",
+    "@types/bson": "^4.0.5",
     "@types/debug": "^4.1.5",
     "@types/escape-html": "^1.0.0",
     "@types/jsonwebtoken": "^8.3.5",
     "@types/mime-types": "^2.1.0",
-    "@types/mongodb": "^3.3.13",
+    "@types/mongodb": "^3.6.20",
     "@types/node": "^14.0.13",
     "@types/node-fetch": "^2.5.4",
     "@types/uuid": "^3.4.6",
@@ -48,7 +48,7 @@
     "aws-sdk": "^2.1174.0",
     "axios": "^0.21.2",
     "body-parser": "^1.19.0",
-    "copyfiles": "^2.1.1",
+    "bson": "^4.6.5",
     "dataloader": "^2.0.0",
     "dotenv": "^8.2.0",
     "escape-html": "^1.0.3",
@@ -59,17 +59,11 @@
     "graphql-scalars": "^1.2.7",
     "graphql-type-json": "^0.3.0",
     "graphql-upload": "^9.0.0",
-    "graphql-voyager": "^1.0.0-rc.31",
     "jsonwebtoken": "^8.5.1",
     "lodash": "^4.17.15",
     "migrate-mongo": "^7.0.1",
     "mime-types": "^2.1.25",
-    "mongodb": "^3.4.0",
-    "mustache": "^3.0.1",
-    "nodemailer": "^6.6.1",
-    "passport": "^0.4.1",
-    "passport-github": "^1.1.0",
-    "passport-jwt": "^4.0.0",
+    "mongodb": "^3.7.3",
     "ts-node-dev": "^1.0.0-pre.44",
     "uuid": "^3.3.3"
   }

src/auth.js

@@ -1,7 +1,6 @@
 import { SchemaDirectiveVisitor } from 'apollo-server-express';
 import { defaultFieldResolver, GraphQLArgument, GraphQLField, GraphQLInterfaceType, GraphQLObjectType } from 'graphql';
 import { save } from '../utils/files';
-import { FileUpload } from 'graphql-upload';
 
 /**
  * Defines directive uploading images
@@ -23,7 +22,7 @@ export default class UploadImageDirective extends SchemaDirectiveVisitor {
 
     details.field.resolve = async (object, args, context, info): Promise<void> => {
       if (args[argument.name]) {
-        const imageMeta = await (args[argument.name] as Promise<FileUpload>);
+        const imageMeta = await (args[argument.name] as Promise<any>);
 
         args[argument.name] = await save(imageMeta.createReadStream(), imageMeta.mimetype);
       }

src/directives/uploadImageDirective.ts

@@ -5,8 +5,6 @@ import * as mongo from './mongo';
 import * as rabbitmq from './rabbitmq';
 import jwt, { Secret } from 'jsonwebtoken';
 import http from 'http';
-import { initializeStrategies } from './passport';
-import { authRouter } from './auth';
 import resolvers from './resolvers';
 import typeDefs from './typeDefs';
 import { ExpressContext } from 'apollo-server-express/dist/ApolloServer';
@@ -16,7 +14,6 @@ import { GraphQLError } from 'graphql';
 import WorkspacesFactory from './models/workspacesFactory';
 import DataLoaders from './dataLoaders';
 import HawkCatcher from '@hawk.so/nodejs';
-import { express as voyagerMiddleware } from 'graphql-voyager/middleware';
 import bodyParser from 'body-parser';
 
 import UploadImageDirective from './directives/uploadImageDirective';
@@ -82,10 +79,7 @@ class HawkAPI {
     });
     this.app.use(express.json());
     this.app.use(bodyParser.urlencoded({ extended: false }));
-    this.app.use('/uploads', express.static(`./${process.env.UPLOADS_DIR || 'uploads'}`));
     this.app.use('/static', express.static(`./static`));
-    this.app.use('/voyager', voyagerMiddleware({ endpointUrl: '/graphql' }));
-    this.app.use(authRouter);
 
     /**
      * Add context to the express request object to use its methods in any requests
@@ -95,8 +89,6 @@ class HawkAPI {
       next();
     });
 
-    initializeStrategies();
-
     this.server = new ApolloServer({
       typeDefs,
       debug: process.env.NODE_ENV === 'development',
@@ -112,11 +104,6 @@ class HawkAPI {
         validate: ValidateDirective,
         requireUserInWorkspace: RequireUserInWorkspaceDirective,
       },
-      subscriptions: {
-        path: '/subscriptions',
-        onConnect: (connectionParams): { headers: { authorization: string } } =>
-          HawkAPI.onWebSocketConnection(connectionParams as Record<string, string>),
-      },
       context: ({ req }): ResolverContextBase => req.context,
       formatError: (error): GraphQLError => {
         if (error.originalError instanceof NonCriticalError) {
@@ -214,21 +201,6 @@ class HawkAPI {
     };
   }
 
-  /**
-   * Fires when coming new Websocket connection
-   * Returns authorization headers for building request context
-   * @param connectionParams - websocket connection params (actually, headers only)
-   * @return - context for subscription request
-   */
-  private static onWebSocketConnection(connectionParams: Record<string, string>): { headers: { authorization: string } } {
-    return {
-      headers: {
-        authorization:
-          connectionParams['authorization'] || connectionParams['Authorization'],
-      },
-    };
-  }
-
   /**
    * Start API server
    */
@@ -242,10 +214,6 @@ class HawkAPI {
           `🚀 Server ready at http://localhost:${this.serverPort}${this.server.graphqlPath
           }`
         );
-        console.log(
-          `🚀 Subscriptions ready at ws://localhost:${this.serverPort}${this.server.subscriptionsPath
-          }`
-        );
         resolve();
       });
     });

src/index.ts

@@ -7,7 +7,6 @@ import {
   PayloadOfDepositByUser,
   PayloadOfWorkspacePlanPurchase
 } from '@hawk.so/types';
-import cloudPaymentsApi, { CloudPaymentsJsonData } from '../utils/cloudPaymentsApi';
 import checksumService from '../utils/checksumService';
 import { UserInputError } from 'apollo-server-express';
 
@@ -155,7 +154,7 @@ export default {
         throw new UserInputError('There is no saved card with provided id');
       }
 
-      const jsonData: CloudPaymentsJsonData = {
+      const jsonData: any = {
         checksum: args.input.checksum,
       };
 
@@ -193,15 +192,7 @@ export default {
         amount = AMOUNT_FOR_CARD_VALIDATION;
       }
 
-      const result = await cloudPaymentsApi.payByToken({
-        AccountId: user.id,
-        Amount: amount,
-        Token: token,
-        Currency: 'USD',
-        JsonData: jsonData,
-      });
-
-      const operation = await factories.businessOperationsFactory.getBusinessOperationByTransactionId(result.Model.TransactionId.toString());
+      const operation = await factories.businessOperationsFactory.getBusinessOperationByTransactionId("foo");
 
       return {
         recordId: operation?._id,

src/passport.js

@@ -127,53 +127,6 @@ module.exports = {
       return release;
     },
   },
-  Subscription: {
-    eventOccurred: {
-      /**
-       * Subscribes user to events from his projects
-       * @param {ResolverObj} _obj
-       * @param {Object} _args - request variables (not used)
-       * @param {UserInContext} user - current authorized user {@see ../index.js}
-       * @param {ContextFactories} factories - factories for working with models
-       * @return {AsyncIterator<EventSchema>}
-       */
-      subscribe: async (_obj, _args, { user, factories }) => {
-        const userId = user.id;
-        const userModel = await factories.usersFactory.findById(userId);
-        // eslint-disable-next-line no-async-promise-executor
-        const eventsCollections = new Promise(async resolve => {
-          // @todo optimize query for getting all user's projects
-
-          // Find all user's workspaces
-          const allWorkspacesIds = await userModel.getWorkspacesIds();
-          const allProjects = [];
-
-          // Find all user's projects
-          await asyncForEach(allWorkspacesIds, async workspaceId => {
-            const allProjectsInWorkspace = await new ProjectToWorkspace(workspaceId).getProjects();
-
-            allProjects.push(...allProjectsInWorkspace);
-          });
-
-          resolve(allProjects.map(project =>
-            mongo.databases.events
-              .collection('events:' + project.id)
-          ));
-        });
-
-        return watchController.getAsyncIteratorForCollectionChangesEvents(eventsCollections);
-      },
-
-      /**
-       * Sends data to user about new events
-       * @param {Object} payload - subscription event payload (from mongoDB watch)
-       * @return {EventSchema}
-       */
-      resolve: (payload) => {
-        return payload.fullDocument;
-      },
-    },
-  },
   Mutation: {
     /**
      * Mark event as visited for current user

src/resolvers/billingNew.ts

@@ -3,7 +3,6 @@ import PlanModel from '../models/plan';
 import * as telegram from '../utils/telegram';
 import HawkCatcher from '@hawk.so/nodejs';
 import escapeHTML from 'escape-html';
-import cloudPaymentsApi from '../utils/cloudPaymentsApi';
 import { emailNotification, TaskPriorities } from '../utils/emailNotifications';
 import { SenderWorkerTaskType } from '../types/userNotifications';
 import ProjectToWorkspace from '../models/projectToWorkspace';

src/resolvers/event.js

@@ -394,13 +394,6 @@ type DailyEventInfo {
   lastRepetitionTime: Float!
 }
 
-type Subscription {
-  """
-  Sends new events from all user projects
-  """
-  eventOccurred: Event! @requireAuth
-}
-
 """
 Event information per day with these events
 """