Changes

Author: ilyaskarim

.npmignore

@@ -14,4 +14,5 @@ notice.log
 info.log
 warning.log
 .env
-uploads
+uploads
+storage

docs/context/introduction.md

@@ -34,7 +34,7 @@ Wertik-js provides these built-in context properties
 - res: Res object to send custom response, Varies with GraphQL and RestAPI
 
 #### Create Context Handler
-If you want to pass a function that executes while context creation, You can pass a function in your configuration, This function supports async await. `configuration.context.createContext`, When this function will be called, two paramters will be passed,
+If you want to pass a function that executes while context creation, You can pass a function in your configuration, This function supports async await. `configuration.context.requestContext`, When this function will be called, two paramters will be passed,
 
 - mode: This will be restApi or graphql, When this function runs in graphql then value will be graphql and for restApi it becomes restApi.
 - context: For GraphQL this value is context object and for restApi it is req object so that you can access current context
@@ -45,15 +45,15 @@ For GraphQL resolver:
 
 ```javascript
 function (_, args, context,info) {
-	console.log(context.createContext)
+	console.log(context.requestContext)
 }
 ```
 
 For RestAPI handler:
 
 ```javascript
 function (req,res) {
-	console.log(req.createContext)
+	console.log(req.requestContext)
 }
 ```
 

docs/getting-started/configuration.md

@@ -21,7 +21,7 @@ export default {
     data: {
       myName: "My powerful app",
     },
-    createContext: async function (mode, context) {
+    requestContext: async function (mode, context) {
       return {
         value: "Value 1",
       };

package.json

@@ -1,6 +1,6 @@
 {
   "name": "wertik-js",
-  "version": "1.9.9",
+  "version": "1.9.90",
   "main": "lib/main.js",
   "repository": "https://github.com/Uconnect-Technologies/wertik-js.git",
   "welcomeResponse": "Welcome to wertik, You are successfully running Wertik.",

src/framework/defaults/defaultConfigurations/defaultConfiguration.ts

@@ -9,15 +9,16 @@ export default {
     dbHost: "localhost",
     dbPort: "3306",
   },
-
   frontendAppUrl: "http://localhost:8080/",
   frontendAppActivationUrl: "http://localhost:8080/activate-account",
   frontendAppPasswordResetUrl: "http://localhost:8080/reset-password",
   context: {
-    data: {
-      myName: "My powerful app",
+    initializeContext: function (mode, context) {
+      return {
+        someKey: "somekeyvalue"
+      }
     },
-    createContext: async function (mode, context) {
+    requestContext: async function (mode, context) {
       return {
         value: "Value 1",
       };
@@ -77,11 +78,6 @@ export default {
       restApi: {
         endpoints: [
           {
-            docs: {
-              title: "Apple module response.",
-              description: "Just a message.",
-              response: `@apiSuccess {Object} returns an object {message: true}.`,
-            },
             path: "/apple/response",
             methodType: "get",
             handler: function (req, res) {

src/framework/graphql/index.ts

@@ -17,8 +17,13 @@ const { ApolloServer } = require("apollo-server-express");
 export default async function (options: IGraphQLInitialize) {
   const { mailerInstance, configuration, dbTables, models, sendEmail, emailTemplates, database, websockets, logger } = options;
   const apolloGraphqlOptions = get(options, "apolloGraphqlOptions", defaultApolloGraphqlOptions);
+  let initializeContext = get(configuration, "context.initializeContext", async function () {});
+  initializeContext = await initializeContext("graphql",{
+    dbTables,
+    models,
+    database,
+  });
   let { graphql } = configuration;
-  const port = get(graphql, "port", 4000);
   if (get(graphql, "disable", true) === true) {
     return null;
   }
@@ -54,10 +59,10 @@ export default async function (options: IGraphQLInitialize) {
         res,
         websockets,
         logger,
-        ...get(configuration.context, "data", {}),
+        initializeContext: initializeContext
       };
-      let createContext = await get(configuration.context, "createContext", () => {})("graphql", cxt);
-      cxt["createContext"] = createContext;
+      let requestContext = await get(configuration.context, "requestContext", () => {})("graphql", cxt);
+      cxt["requestContext"] = requestContext;
       return cxt;
     },
     ...apolloGraphqlOptions,

src/framework/restApi/customApi.ts

@@ -3,14 +3,13 @@ import restApiErrorResponse from "./restApiErrorResponse";
 import restApiSuccessResponse from "./restApiSuccessResponse";
 
 export default (expressApp, restApiEndpointsElement, module) => {
-  const versionPath = "api/v1";
   const type = get(restApiEndpointsElement, "methodType", "get");
   const handler = get(restApiEndpointsElement, "handler", null);
   const path = get(restApiEndpointsElement, "path", "");
   const types = ["get", "post", "put", "delete", "copy", "head", "options", "link", "unlink", "purge", "lock", "unlock", "view"];
 
-  if (types.indexOf(type) > -1) {
-    let apiPath = `/${versionPath}/${kebabCase(module.name)}/${path}`;
+  if (types.indexOf(type) > -1 && path.length>0) {
+    let apiPath = `${path}`;
     let find = "//";
     let re = new RegExp(find, "g");
     apiPath = apiPath.replace(re, "/");

src/framework/restApi/index.ts

@@ -42,12 +42,32 @@ import customApi from "./customApi";
 */
 
 //expressApp,configuration,dbTables, models, allEmailTemplates,sendEmail,database,WertikEventEmitter
-export default function (options: IRestApiInitialize) {
-  const { configuration, dbTables, models, sendEmail, emailTemplates, expressApp, database, runEvent, multerInstance, mailerInstance, websockets, logger } = options;
+export default async function (options: IRestApiInitialize) {
+  const {
+    configuration,
+    dbTables,
+    models,
+    sendEmail,
+    emailTemplates,
+    expressApp,
+    database,
+    runEvent,
+    multerInstance,
+    mailerInstance,
+    websockets,
+    logger,
+  } = options;
   let { restApi } = configuration;
   if (get(restApi, "disable", true) === true) {
     return expressApp;
   }
+  let initializeContext = get(configuration, "context.initializeContext", async function () {});
+  initializeContext = await initializeContext("restApi",{
+    dbTables,
+    models,
+    expressApp,
+    database,
+  });
   expressApp.use(cors());
   expressApp.use(bodyParser.urlencoded({ extended: false }));
   expressApp.use(bodyParser.json());
@@ -70,19 +90,20 @@ export default function (options: IRestApiInitialize) {
     req.dbTables = dbTables;
     req.models = models;
     req.websockets = websockets;
-    req.context = get(configuration.context, "data", {});
+    // req.context = get(configuration.context, "data", {});
     req.sendEmail = sendEmail;
     req.emailTemplates = emailTemplates;
     req.multerInstance = multerInstance;
     req.logger = logger;
-    let createContext = await get(configuration.context, "createContext", () => {})("restApi", req);
-    req.createContext = createContext;
+    let requestContext = await get(configuration.context, "requestContext", () => {})("restApi", req);
+    req.requestContext = requestContext;
+    req.initializeContext = initializeContext;
     next();
   });
 
   require("./versions/v1/loadAllModules").default(expressApp, configuration, customApi);
 
-  expressApp.get("/", (req, res) => {
+  expressApp.get("/w/info", (req, res) => {
     res.status(200).json({
       message: require("./../../../package.json").welcomeResponse,
       version: require("./../../../package.json").version,

src/framework/types/configuration.ts

@@ -39,17 +39,9 @@ export interface IConfigurationCustomModuleGraphql {
   query: IConfigurationCustomModuleGraphqlQuery;
 }
 
-export interface IConfigurationCustomModuleRestApiDocs {
-  description: string;
-  params: string;
-  response: string;
-  title: string;
-}
-
 export interface IConfigurationCustomModuleRestApiEndpoint {
   path: string;
   methodType: string;
-  docs: IConfigurationCustomModuleRestApiDocs;
   handler: Function;
 }
 
@@ -191,8 +183,8 @@ export interface IConfigurationEvents {
 }
 
 export interface IConfigurationContext {
-  data: Object;
-  createContext: Function;
+  initializeContext: Function;
+  requestContext: Function;
 }
 
 export interface IConfigurationRestApi {