identity-admin 1.0.0 → 1.2.0

package/lib/router/index.js

@@ -86,8 +86,6 @@ const createRouter = (dashboardController, resourceController, ActionController,
 const createViewRoute = (router, appPath) => {
     router
         .get(`(/*)?`, (req, res, next) => __awaiter(void 0, void 0, void 0, function* () {
-        console.log(req.path);
-        console.log(appPath);
         return res.sendFile(path_1.default.join(appPath, "index.html"));
     }));
 };

package/lib/types/IResourceFile.d.ts

@@ -45,6 +45,7 @@ interface IFilters {
 interface IFieldValue {
     required?: boolean;
     isEditable?: boolean;
+    type?: string;
 }
 interface IVirtualValue {
     type: VirtualFieldTypes;

package/lib/utils/ResponseUtils.d.ts

@@ -1,12 +1,10 @@
 import { ISaveError } from '../repositories/SaveResult';
 import { Response } from 'express';
 export default class ResponseUtils {
-    private static logRepository;
     static send(res: Response, status: number, message: string, data?: object, errors?: ISaveError[]): Response<any, Record<string, any>>;
     static created(res: Response, data: object): void;
     static ok(res: Response, data: object): void;
     static unauthorized(res: Response): void;
     static unprocessable(res: Response, message: string, errors: ISaveError[]): void;
     static notFound(res: Response, message: string, errors: ISaveError[]): void;
-    private static log;
 }

package/lib/utils/ResponseUtils.js

@@ -1,21 +1,7 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-const RequestLogRepository_1 = __importDefault(require("../repositories/RequestLogRepository"));
 class ResponseUtils {
     static send(res, status, message, data, errors) {
-        this.log(res.req, status, message);
         const splittedMessage = message.split(', ');
         return res.format({
             json: () => {
@@ -48,25 +34,5 @@ class ResponseUtils {
     static notFound(res, message, errors) {
         this.send(res, 404, message, {}, errors);
     }
-    static log(req, status, message) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const duration = new Date().getTime() - req.startTime.getTime();
-            const logProps = {
-                method: req.method,
-                endpoint: req.route.path,
-                url: req.originalUrl.split('?')[0],
-                startTime: req.startTime,
-                durationInMilliseconds: duration,
-                query: JSON.stringify(req.query),
-                body: JSON.stringify(req.body),
-                userAgent: req.headers['user-agent'],
-                headers: JSON.stringify(req.headers),
-                status: status,
-                message: message
-            };
-            yield ResponseUtils.logRepository.save(logProps);
-        });
-    }
 }
 exports.default = ResponseUtils;
-ResponseUtils.logRepository = new RequestLogRepository_1.default();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "identity-admin",
-  "version": "1.0.0",
+  "version": "1.2.0",
   "description": "",
   "main": "lib/Dashboard.js",
   "types": "lib/Dashbord.d.ts",
@@ -14,7 +14,14 @@
     "postversion": "git push && git push --tags",
     "test": "jest --config jestconfig.json --runInBand"
   },
-  "author": "",
+  "files": [
+    "lib/**/*"
+  ],
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/identity-skeleton/identity-admin.git"
+  },
+  "author": "mismail",
   "license": "ISC",
   "devDependencies": {
     "@types/express": "^4.17.14",

package/src/Dashboard.ts

@@ -1,74 +0,0 @@
-import { IResourceFile } from "./types/IResourceFile";
-import express, { Application, NextFunction, Request, Response, Router } from "express";
-import { Container } from "inversify";
-import DashboardController from "./controllers/DashboardController";
-import createRouter, { createViewRoute } from "./router";
-import i18n from "i18n";
-import ResourceController from "./controllers/ResourceController";
-import path from 'path';
-import MongoStore from 'connect-mongo';
-import mongoose from "mongoose";
-import DashboardConfig, { AdminCredentials, CookieConfiguration } from "./types/DashbordConfig";
-import ActionController from "./controllers/ActionController";
-
-var session = require('express-session');
-var cookieParser = require('cookie-parser');
-
-
-
-export default class Dashboard {
-  private DEFAULT_ROOT_PATH = "/dashboard";
-
-  constructor(private dashBoardConfig: DashboardConfig) {}
-
-  public build(app: Application) {
-    this.configureLocalization();
-    this.configureAuthentication(app);
-    this.buildRouter(app);
-
-  }
-
-
-  private configureLocalization() {
-    i18n.configure(this.dashBoardConfig.localesOptions ?? {
-      locales: ["en"],
-      directory:__dirname+'/locales',
-    });
-  }
-
-  private buildRouter(app: Application) {
-    const dashboardController = new DashboardController(undefined, undefined, this.dashBoardConfig.resources);
-    const resourceController = new ResourceController(this.dashBoardConfig.resources);
-    const actionController = new ActionController(this.dashBoardConfig.resources)
-    
-    const appPath = path.normalize(path.join(__dirname, '/view'));
-    const router = createRouter(dashboardController, resourceController, actionController, this.dashBoardConfig.authenticate);
-    app.use(express.static(appPath));
-    createViewRoute(router, appPath); 
-
-    app.use(this.dashBoardConfig.rootPath ?? this.DEFAULT_ROOT_PATH, router);
-  }
-
-  private configureAuthentication (app: Application) {
-    if(!this.dashBoardConfig.authenticate || !this.dashBoardConfig.cookiesConfiguration){
-      return;
-    }
-    app.use(cookieParser());
-    this.configureSession(app, this.dashBoardConfig.cookiesConfiguration);
-  }
-
-  private configureSession(app: Application, cookiesConfiguration: CookieConfiguration) {
-    const rootPath = this.dashBoardConfig.rootPath ?? this.DEFAULT_ROOT_PATH;
-    app.use(`${rootPath}`,session({
-      secret: cookiesConfiguration.cookiesSecret,
-      resave: false,
-      saveUninitialized: false,
-      name: cookiesConfiguration.cookieName,
-      cookie: { path: `${rootPath}`, httpOnly: true}
-    }));
-  }
-
-  public static configurBaseLocalization(options: i18n.ConfigurationOptions) {
-    i18n.configure(options);
-  }
-}

package/src/controllers/ActionController.ts

@@ -1,64 +0,0 @@
-import { Request, Response } from 'express';
-import { controller, httpDelete, httpGet, httpPatch, httpPost, request, response } from 'inversify-express-utils';
-import { inject } from 'inversify';
-import isAuth, { defaultHeaders, IRequest } from '../middlewares/isAuth';
-import ResponseUtils from '../utils/ResponseUtils';
-import { __ } from 'i18n';
-import StringUtils from '../utils/StringUtils';
-import Repository, { IDashboardRepository } from '../repositories/Repository';
-import { IResourceFile } from '../types/IResourceFile';
-import { Document } from 'mongoose';
-import { getResource } from '../utils/ResourceUtils';
-
-
-
-export default class ActionController {
-
-    constructor(private resources: IResourceFile[]) {
-    }
-
-    @httpPost('/execute/:actionKey')
-    public async execute(@request() req: IRequest, @response() res: Response) {
-
-        const record = req.body.record
-        const modelName = req.body.modelName
-        const resource: IResourceFile | undefined= getResource(modelName, this.resources);
-
-        if(!resource) {
-            return ResponseUtils.notFound(res, 'Resource not found', []);
-        }
-        const repository = new Repository(resource.properties.resource);
-
-        const actionKey = req.params.actionKey
-        const currentUser = req.user
-
-        var response = {}
-
-        const data = {
-            record,
-            currentUser,
-            resource: {
-                name: modelName,
-                path: StringUtils.lowerCaseFirstLetter(modelName),
-                repository
-            }
-        }
-
-        const extraActions = resource.properties.actions?.extras ?? []
-
-        for (var i = 0; i < extraActions.length; i++) {
-
-            const extraAction = extraActions[i]
-
-            if (extraAction.key === actionKey) {
-                response = await extraAction.handler(req, res, data)
-                break
-            }
-        }
-
-        return ResponseUtils.send(res, 200, 'Ok', {
-            response
-        });
-        
-    }
-}

package/src/controllers/DashboardController.ts

@@ -1,388 +0,0 @@
-import { Request, Response } from 'express';
-import { controller, httpDelete, httpGet, httpPatch, httpPost, interfaces, request, response } from 'inversify-express-utils';
-import { Document, Mongoose } from 'mongoose';
-import ResponseUtils from '../utils/ResponseUtils';
-import { validationResult } from 'express-validator';
-
-import ResourceGenerator from '../helpers/ResourceGenerator';
-import ResourcesHelper from '../helpers/ResourceHelper';
-import StringUtils from '../utils/StringUtils';
-import mongoose from 'mongoose'
-import { injectable, unmanaged } from 'inversify';
-import { IResourceFile } from '../types/IResourceFile';
-import Repository, { IDashboardRepository } from '../repositories/Repository';
-import { getResource } from '../utils/ResourceUtils';
-import { IRequest } from '../middlewares/isAuth';
-
-
-export interface PaginateParams {
-    page: number;
-    perPage: number;
-}
-@injectable()
-export default class DashboardController {
-
-    protected static DEFAULT_PAGE = 1;
-    protected static DEFAULT_PER_PAGE = 30;
-
-    constructor(resource?: IResourceFile, repository?: IDashboardRepository);
-    constructor(resource?: IResourceFile, repository?: IDashboardRepository, resources?: IResourceFile[]);
-    constructor(@unmanaged() private resource?: IResourceFile, @unmanaged() private repository?: IDashboardRepository, @unmanaged() private resources?: IResourceFile[]) {
-        if(!repository && resource) {
-            this.repository = new Repository(resource.properties.resource)
-        }
-    }   
- 
-    
-
-   
-
-    protected validateRequest(@request() req: IRequest, @response() res: Response): boolean {
-        
-        const errors = validationResult(req);
-
-        if (!errors.isEmpty()) {
-            ResponseUtils.send(res, 422, errors.array()[0].msg, errors);
-            return false;
-        }
-
-        return true;
-    }
-
-    protected paginateParams(request: IRequest): PaginateParams {
-
-        const page = request.query.page ? + request.query.page : DashboardController.DEFAULT_PAGE;
-        const perPage = request.query.perPage ? + request.query.perPage : DashboardController.DEFAULT_PER_PAGE;
-
-        return { page, perPage };
-    }
-
-    protected getSearchableSubStringFilter(resource: IResourceFile, filter: { [key: string]: any; }, subString: RegExp): { [key: string]: any; } {
-
-        
-        const schema = resource.properties.resource.schema.paths
-        const searchBy = ResourcesHelper.getSchemaTitle(schema, this.resource)
-       
-        if (searchBy === '_id') {
-
-            if (!mongoose.isValidObjectId(subString.source)) {
-                return filter
-           }
-
-           filter[searchBy] = subString.source
-
-           return filter
-        }
-
-        filter[searchBy] = subString
-        
-        return filter
-    }
-
-   
-    protected getScopeFilter(filter: {[key:string]: any}, scope: string): {[key:string]: any} {
-        return {}
-    }
-
-    protected async getVisibileExtrsActions(currentUser: Document, record: any, resource: any, repository: any, modelName: string) {
-
-        const data = {
-            record: record.toObject(),
-            currentUser,
-            resource: {
-                name: modelName,
-                path: StringUtils.lowerCaseFirstLetter(modelName),
-                repository
-            }
-        }
-
-        if (!resource.properties.actions || !resource.properties.actions.extras) {
-            return undefined
-        }
-
-        var extraActionsArray = []
-        const extraActions = resource.properties.actions.extras
-
-        for (var i = 0; i < extraActions.length; i++) {
-
-            const extraAction = extraActions[i]
- 
-            if (!extraAction.isVisible) {
-                break
-            }
-
-            const isVisible = extraAction.isVisible(data)
-
-            if (isVisible) {
-                extraActionsArray.push(extraAction.key)
-            }
-            
-        }
-
-
-        return extraActionsArray
-
-    }
-
-    @httpGet('/')
-    public async index(@request() req: IRequest, @response() res: Response) {
-
-        if (!this.validateRequest(req, res)) {
-            return
-        }
-        
-        const paginateParams = this.paginateParams(req);
-        const searchableSubString = req.query.filter? new RegExp(req.query.filter as string, 'i'): undefined
-        const scope = req.query.scope as string
-        const currentUser = req.user
-        const modelName = req.params.resource;
-
-        const resource = this.resource ?? getResource(modelName, this.resources ?? []);
-        if(!resource) {
-            return ResponseUtils.notFound(res, 'Resource not found', []);
-        }
-        const repository = this.repository as Repository<Document> ?? new Repository(resource.properties.resource);
-        const modifiedResource = ResourceGenerator.generate(resource) 
-
-        const sort = req.query.order
-        const sortBy = req.query.orderBy as string
-       
-        const sortQuery:  {[key:string]: any} = {}
-        sortQuery[sortBy] = sort
-
-        if (sortBy !== '_id') {
-            sortQuery._id = 'asc'
-        }
-        
-        const populate = req.query.populate as string | undefined;
-
-        var filter:  {[key:string]: any} = {}
-
-        
-
-        const crudOperations = resource.properties.crudOperations
-
-        if (crudOperations && crudOperations.index) {
-            filter = crudOperations.index.before(filter, currentUser)
-        }
-       
-        if (scope) { 
-           filter = this.getScopeFilter(filter, scope)
-        }
-
-        if (searchableSubString) {
-            filter = this.getSearchableSubStringFilter(resource, filter, searchableSubString)
-        }
-
-        var records: any[] = []
-        var pageInfo = undefined
-
-        if (!req.query.page && !req.query.perPage) {
-
-            records = await repository.findMany({
-                sort: sortQuery,
-                filter,
-                populate: modifiedResource.properties.populatedString
-            })
-        }
-
-        else {
-
-            const page = await repository.paginate({
-                sort: sortQuery,
-                filter,
-                paginateParams: paginateParams,
-                populate: modifiedResource.properties.populatedString
-            });
-
-            records = page.records
-            pageInfo = page.pageInfo
-        }
-        
-
-        var documents: any[] = []
-
-        for (var i = 0; i < records.length; i++) {
-
-            const record = records[i]
-
-            const extraActionKeys = await this.getVisibileExtrsActions(currentUser, record, resource, repository, modifiedResource.properties.modelName)
-            
-            if (extraActionKeys) {
-
-                const recordFlatten = record.toObject()
-                recordFlatten.extraActionKeys = extraActionKeys
-                documents.push(recordFlatten)
-            }
-
-            else {
-                documents.push(record)
-            }
-        }
-        
-
-        return ResponseUtils.send(res, 200, 'OK', {
-            records: documents,
-            pageInfo,
-            //options: modifiedResource 
-        });
-        
-    }
-
-    @httpPost('/')
-    public async create(@request() req: IRequest, @response() res: Response) {
-
-        if (!this.validateRequest(req, res)) {
-            return
-        }
-        const modelName = req.params.resource;
-        const resource = this.resource ?? getResource(modelName, this.resources ?? []);
-
-        if(!resource) {
-            return ResponseUtils.notFound(res, 'Resource not found', []);
-        }
-
-        const repository = this.repository! as Repository<Document> ?? new Repository(resource.properties.resource);
-        const modifiedResource = ResourceGenerator.generate(resource)
-
-        var recordParams = req.body;
-        const currentUser = req.user
-
-        const crudOperations = resource.properties.crudOperations
-
-        if (crudOperations && crudOperations.create) {
-            recordParams = crudOperations.create.before(recordParams, currentUser)
-        }
-
-        var record: any
-
-        if (recordParams.password) {
-
-            const user = new Mongoose.prototype.model(modifiedResource.properties.modelName)(recordParams);
-            const set = await user.setPassword(recordParams.password);
-            record = await repository.saveInstance(user);
-        }
-
-        else {
-            record = await repository.save(recordParams);
-        }
-        
-
-        if (!record.isValid() || !record.document) {
-            return ResponseUtils.unprocessable(res, 'Invalid Data', record.getErrors());
-        }
-
-        return ResponseUtils.created(res, {
-            record
-        });
-        
-    }
-
-    @httpPatch('/:id')
-    public async update(@request() req: IRequest, @response() res: Response) {
-
-        if (!this.validateRequest(req, res)) {
-            return
-        }
-        const modelName = req.params.resource;
-        const resource = this.resource ?? getResource(modelName, this.resources ?? []);
-
-        if(!resource) {
-            return ResponseUtils.notFound(res, 'Resource not found', []);
-        }
-        const repository = this.repository! as Repository<Document> ?? new Repository(resource.properties.resource);
-        const recordId = req.params.id as string;
-        var recordParams = req.body ;
-
-        var record = await repository.findById(recordId);
-        
-        if (!record) {
-            return ResponseUtils.send(res, 404, 'record Not Found'); 
-        }
-
-        const recordSaveResult = await repository.update(record, recordParams);
-
-        if (!recordSaveResult.isValid()) {
-            return ResponseUtils.unprocessable(res, 'Invalid Data', recordSaveResult.getErrors());
-        }
-
-        // if (resource.properties.modelName === ModelNames.Settings) {
-        //     await AppSettings.run()
-        // }
-
-        return ResponseUtils.ok(res, {
-            record: recordSaveResult
-        });
-        
-    }
-
-    @httpGet('/:id')
-    public async show(@request() req: IRequest, @response() res: Response) {
-
-        if (!this.validateRequest(req, res)) {
-            return
-        }
-        const modelName = req.params.resource
-        const recordId = req.params.id as string;
-        const resource = this.resource ?? getResource(modelName, this.resources ?? []);
-
-        if(!resource) {
-            return ResponseUtils.notFound(res, 'Resource not found', []);
-        }
-
-        const repository = this.repository! as Repository<Document> ?? new Repository(resource.properties.resource)
-        const modifiedResource = ResourceGenerator.generate(resource)
-
-        var record = await repository.findOne({
-            
-            filter: {
-                _id: recordId
-            },
-            populate: modifiedResource.properties.populatedString
-        })
-        
-        if (!record) {
-            return ResponseUtils.send(res, 404, 'record not found'); 
-        }
-        
-        record = record.toObject()
-        //record = await this.getExtras(record._id.toString(), record, this.getExtraRepository())
-        record = await ResourcesHelper.addExtraFields(modifiedResource.showProperties, modifiedResource.properties.model, record, StringUtils.lowerCaseFirstLetter(modifiedResource.properties.modelName), repository)
-
-        return ResponseUtils.ok(res, {
-            record: record ? record : null,
-           // options: modifiedResource
-        });
-        
-    }
-
-    @httpDelete('/:id')
-    public async delete(@request() req: IRequest, @response() res: Response) {
-
-        if (!this.validateRequest(req, res)) {
-            return
-        }
-        const modelName = req.params.resource
-        const recordId = req.params.id as string;
-        const resource = this.resource ?? getResource(modelName, this.resources ?? []);
-
-        if(!resource) {
-            return ResponseUtils.notFound(res, 'Resource not found', []);
-        }
-
-        const repository = this.repository! as Repository<Document> ?? new Repository(resource.properties.resource);
-
-        const record = await repository.findById(recordId);
-
-        if (!record) {
-            return ResponseUtils.send(res, 404, 'record Not Found'); 
-        }
-
-        await repository.remove({ _id: record._id });
-
-        return ResponseUtils.send(res, 200, 'OK');
-        
-    }
-
-
-}

package/src/controllers/ResourceController.ts

@@ -1,62 +0,0 @@
-import { Request, Response } from 'express';
-import { httpGet, request, response } from 'inversify-express-utils';
-
-
-import ResponseUtils from '../utils/ResponseUtils';
-
-import { __ } from 'i18n';
-import StringUtils from '../utils/StringUtils';
-import { IResourceFile } from '../types/IResourceFile';
-import ResourceGenerator from '../helpers/ResourceGenerator';
-import { inject, injectable } from 'inversify';
-import { IRequest } from '../middlewares/isAuth';
-
-export default class ResourceController {
-
-    constructor(private resourceFiles: IResourceFile[]) {
-
-    }
-
-    @httpGet('/')
-    public async index(@request() req: IRequest, @response() res: Response) {
-
-        var modifiedResource : {[key:string]: any} = {}
-        modifiedResource.modelParents = {}
-
-        for (var i = 0; i < this.resourceFiles.length; i++) {
-
-            const resource = this.resourceFiles[i]
-
-            const adaptedResource = ResourceGenerator.generate(resource)
-            const modelName = StringUtils.lowerCaseFirstLetter(adaptedResource.properties.modelName)
-            modifiedResource[modelName] = adaptedResource
-            
-            if (modifiedResource.modelParents[adaptedResource.properties.parent.name]) {
-                modifiedResource.modelParents[adaptedResource.properties.parent.name].push(modelName)
-            }
-
-            else {
-                modifiedResource.modelParents[adaptedResource.properties.parent.name] = []
-                modifiedResource.modelParents[adaptedResource.properties.parent.name].push(modelName)
-            }
-        }
-
-        return ResponseUtils.send(res, 200, 'OK', {
-            resources: modifiedResource
-        });
-    }
-
-    @httpGet('/:modelName')
-    public async getOne(@request() req: IRequest, @response() res: Response) {
-
-        const modelName = req.params.modelName as string;
-        const resourceName = modelName + 'Resource'
-        const resourceFilePath = '@pbb/materialUi/' + resourceName
-        const resource = await import(resourceFilePath)
-        
-        return ResponseUtils.send(res, 200, 'OK', {
-            options: ResourceGenerator.generate(resource[resourceName]) 
-        });
-    }
-
-}