@medusajs/medusa 1.2.2-dev.53 → 1.3.1-alpha.63

package/dist/loaders/index.d.ts

@@ -1,10 +1,15 @@
-declare function _default({ directory: rootDirectory, expressApp, isTest }: {
-    directory: any;
-    expressApp: any;
-    isTest: any;
-}): Promise<{
-    container: import("awilix").AwilixContainer<any>;
-    dbConnection: import("typeorm").Connection;
-    app: any;
+import "reflect-metadata";
+import { Connection } from "typeorm";
+import { Express } from "express";
+import { MedusaContainer } from "../types/global";
+declare type Options = {
+    directory: string;
+    expressApp: Express;
+    isTest: boolean;
+};
+declare const _default: ({ directory: rootDirectory, expressApp, isTest }: Options) => Promise<{
+    container: MedusaContainer;
+    dbConnection: Connection;
+    app: Express;
 }>;
 export default _default;

package/dist/loaders/index.js

@@ -58,26 +58,26 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-var awilix_1 = require("awilix");
-var medusa_core_utils_1 = require("medusa-core-utils");
-var medusa_telemetry_1 = require("medusa-telemetry");
+var config_1 = __importDefault(require("./config"));
 require("reflect-metadata");
-var request_ip_1 = __importDefault(require("request-ip"));
-var typeorm_1 = require("typeorm");
+var logger_1 = __importDefault(require("./logger"));
 var api_1 = __importDefault(require("./api"));
 var database_1 = __importDefault(require("./database"));
 var defaults_1 = __importDefault(require("./defaults"));
 var express_1 = __importDefault(require("./express"));
-var logger_1 = __importDefault(require("./logger"));
 var models_1 = __importDefault(require("./models"));
 var passport_1 = __importDefault(require("./passport"));
 var plugins_1 = __importStar(require("./plugins"));
 var redis_1 = __importDefault(require("./redis"));
 var repositories_1 = __importDefault(require("./repositories"));
+var request_ip_1 = __importDefault(require("request-ip"));
 var search_index_1 = __importDefault(require("./search-index"));
 var services_1 = __importDefault(require("./services"));
 var strategies_1 = __importDefault(require("./strategies"));
 var subscribers_1 = __importDefault(require("./subscribers"));
+var typeorm_1 = require("typeorm");
+var awilix_1 = require("awilix");
+var medusa_telemetry_1 = require("medusa-telemetry");
 exports.default = (function (_a) {
     var rootDirectory = _a.directory, expressApp = _a.expressApp, isTest = _a.isTest;
     return __awaiter(void 0, void 0, void 0, function () {
@@ -85,8 +85,9 @@ exports.default = (function (_a) {
         return __generator(this, function (_b) {
             switch (_b.label) {
                 case 0:
-                    configModule = (0, medusa_core_utils_1.getConfigFile)(rootDirectory, "medusa-config").configModule;
+                    configModule = (0, config_1.default)(rootDirectory);
                     container = (0, awilix_1.createContainer)();
+                    container.register('configModule', (0, awilix_1.asValue)(configModule));
                     container.registerAdd = function (name, registration) {
                         var storeKey = name + "_STORE";
                         if (this.registrations[storeKey] === undefined) {
@@ -102,21 +103,20 @@ exports.default = (function (_a) {
                     // Add additional information to context of request
                     expressApp.use(function (req, res, next) {
                         var ipAddress = request_ip_1.default.getClientIp(req);
-                        var context = {
+                        req.request_context = {
                             ip_address: ipAddress,
                         };
-                        req.request_context = context;
                         next();
                     });
                     container.register({
-                        logger: (0, awilix_1.asValue)(logger_1.default),
+                        logger: (0, awilix_1.asValue)(logger_1.default)
                     });
                     return [4 /*yield*/, (0, redis_1.default)({ container: container, configModule: configModule, logger: logger_1.default })];
                 case 1:
                     _b.sent();
                     modelsActivity = logger_1.default.activity("Initializing models");
                     (0, medusa_telemetry_1.track)("MODELS_INIT_STARTED");
-                    (0, models_1.default)({ container: container, activityId: modelsActivity, isTest: isTest });
+                    (0, models_1.default)({ container: container });
                     mAct = logger_1.default.success(modelsActivity, "Models initialized") || {};
                     (0, medusa_telemetry_1.track)("MODELS_INIT_COMPLETED", { duration: mAct.duration });
                     pmActivity = logger_1.default.activity("Initializing plugin models");
@@ -124,7 +124,7 @@ exports.default = (function (_a) {
                     return [4 /*yield*/, (0, plugins_1.registerPluginModels)({
                             rootDirectory: rootDirectory,
                             container: container,
-                            activityId: pmActivity,
+                            configModule: configModule
                         })];
                 case 2:
                     _b.sent();
@@ -132,63 +132,40 @@ exports.default = (function (_a) {
                     (0, medusa_telemetry_1.track)("PLUGIN_MODELS_INIT_COMPLETED", { duration: pmAct.duration });
                     repoActivity = logger_1.default.activity("Initializing repositories");
                     (0, medusa_telemetry_1.track)("REPOSITORIES_INIT_STARTED");
-                    (0, repositories_1.default)({ container: container, activityId: repoActivity, isTest: isTest }) || {};
+                    (0, repositories_1.default)({ container: container });
                     rAct = logger_1.default.success(repoActivity, "Repositories initialized") || {};
                     (0, medusa_telemetry_1.track)("REPOSITORIES_INIT_COMPLETED", { duration: rAct.duration });
                     dbActivity = logger_1.default.activity("Initializing database");
                     (0, medusa_telemetry_1.track)("DATABASE_INIT_STARTED");
-                    return [4 /*yield*/, (0, database_1.default)({
-                            container: container,
-                            configModule: configModule,
-                            activityId: dbActivity,
-                            isTest: isTest,
-                        })];
+                    return [4 /*yield*/, (0, database_1.default)({ container: container, configModule: configModule })];
                 case 3:
                     dbConnection = _b.sent();
                     dbAct = logger_1.default.success(dbActivity, "Database initialized") || {};
                     (0, medusa_telemetry_1.track)("DATABASE_INIT_COMPLETED", { duration: dbAct.duration });
-                    container.register({
-                        manager: (0, awilix_1.asValue)(dbConnection.manager),
-                    });
+                    container.register({ manager: (0, awilix_1.asValue)(dbConnection.manager), });
                     stratActivity = logger_1.default.activity("Initializing strategies");
                     (0, medusa_telemetry_1.track)("STRATEGIES_INIT_STARTED");
-                    (0, strategies_1.default)({
-                        container: container,
-                        configModule: configModule,
-                        activityId: stratActivity,
-                        isTest: isTest,
-                    });
+                    (0, strategies_1.default)({ container: container, configModule: configModule, isTest: isTest });
                     stratAct = logger_1.default.success(stratActivity, "Strategies initialized") || {};
                     (0, medusa_telemetry_1.track)("STRATEGIES_INIT_COMPLETED", { duration: stratAct.duration });
                     servicesActivity = logger_1.default.activity("Initializing services");
                     (0, medusa_telemetry_1.track)("SERVICES_INIT_STARTED");
-                    (0, services_1.default)({
-                        container: container,
-                        configModule: configModule,
-                        activityId: servicesActivity,
-                        isTest: isTest,
-                    });
+                    (0, services_1.default)({ container: container, configModule: configModule, isTest: isTest });
                     servAct = logger_1.default.success(servicesActivity, "Services initialized") || {};
                     (0, medusa_telemetry_1.track)("SERVICES_INIT_COMPLETED", { duration: servAct.duration });
                     expActivity = logger_1.default.activity("Initializing express");
                     (0, medusa_telemetry_1.track)("EXPRESS_INIT_STARTED");
-                    return [4 /*yield*/, (0, express_1.default)({
-                            app: expressApp,
-                            configModule: configModule,
-                            activityId: expActivity,
-                        })];
+                    return [4 /*yield*/, (0, express_1.default)({ app: expressApp, configModule: configModule })];
                 case 4:
                     _b.sent();
-                    return [4 /*yield*/, (0, passport_1.default)({ app: expressApp, container: container, activityId: expActivity })];
+                    return [4 /*yield*/, (0, passport_1.default)({ app: expressApp, container: container, configModule: configModule })];
                 case 5:
                     _b.sent();
                     exAct = logger_1.default.success(expActivity, "Express intialized") || {};
                     (0, medusa_telemetry_1.track)("EXPRESS_INIT_COMPLETED", { duration: exAct.duration });
                     // Add the registered services to the request scope
                     expressApp.use(function (req, res, next) {
-                        container.register({
-                            manager: (0, awilix_1.asValue)((0, typeorm_1.getManager)()),
-                        });
+                        container.register({ manager: (0, awilix_1.asValue)((0, typeorm_1.getManager)()) });
                         req.scope = container.createScope();
                         next();
                     });
@@ -197,6 +174,7 @@ exports.default = (function (_a) {
                     return [4 /*yield*/, (0, plugins_1.default)({
                             container: container,
                             rootDirectory: rootDirectory,
+                            configModule: configModule,
                             app: expressApp,
                             activityId: pluginsActivity,
                         })];
@@ -206,31 +184,28 @@ exports.default = (function (_a) {
                     (0, medusa_telemetry_1.track)("PLUGINS_INIT_COMPLETED", { duration: pAct.duration });
                     subActivity = logger_1.default.activity("Initializing subscribers");
                     (0, medusa_telemetry_1.track)("SUBSCRIBERS_INIT_STARTED");
-                    (0, subscribers_1.default)({ container: container, activityId: subActivity });
+                    (0, subscribers_1.default)({ container: container });
                     subAct = logger_1.default.success(subActivity, "Subscribers initialized") || {};
                     (0, medusa_telemetry_1.track)("SUBSCRIBERS_INIT_COMPLETED", { duration: subAct.duration });
                     apiActivity = logger_1.default.activity("Initializing API");
                     (0, medusa_telemetry_1.track)("API_INIT_STARTED");
-                    return [4 /*yield*/, (0, api_1.default)({
-                            container: container,
-                            rootDirectory: rootDirectory,
-                            app: expressApp,
-                            activityId: apiActivity,
-                        })];
+                    return [4 /*yield*/, (0, api_1.default)({ container: container, app: expressApp, configModule: configModule })];
                 case 7:
                     _b.sent();
                     apiAct = logger_1.default.success(apiActivity, "API initialized") || {};
                     (0, medusa_telemetry_1.track)("API_INIT_COMPLETED", { duration: apiAct.duration });
                     defaultsActivity = logger_1.default.activity("Initializing defaults");
                     (0, medusa_telemetry_1.track)("DEFAULTS_INIT_STARTED");
-                    return [4 /*yield*/, (0, defaults_1.default)({ container: container, activityId: defaultsActivity })];
+                    return [4 /*yield*/, (0, defaults_1.default)({ container: container })];
                 case 8:
                     _b.sent();
                     dAct = logger_1.default.success(defaultsActivity, "Defaults initialized") || {};
                     (0, medusa_telemetry_1.track)("DEFAULTS_INIT_COMPLETED", { duration: dAct.duration });
                     searchActivity = logger_1.default.activity("Initializing search engine indexing");
                     (0, medusa_telemetry_1.track)("SEARCH_ENGINE_INDEXING_STARTED");
-                    (0, search_index_1.default)({ container: container, activityId: searchActivity });
+                    return [4 /*yield*/, (0, search_index_1.default)({ container: container })];
+                case 9:
+                    _b.sent();
                     searchAct = logger_1.default.success(searchActivity, "Indexing completed") || {};
                     (0, medusa_telemetry_1.track)("SEARCH_ENGINE_INDEXING_COMPLETED", { duration: searchAct.duration });
                     return [2 /*return*/, { container: container, dbConnection: dbConnection, app: expressApp }];
@@ -240,8 +215,8 @@ exports.default = (function (_a) {
 });
 function asArray(resolvers) {
     return {
-        resolve: function (container, opts) {
-            return resolvers.map(function (r) { return container.build(r, opts); });
+        resolve: function (container) {
+            return resolvers.map(function (resolver) { return container.build(resolver); });
         },
     };
 }

package/dist/loaders/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/loaders/index.js"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/loaders/index.ts"],"names":[],"mappings":"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"}

package/dist/loaders/logger.d.ts

@@ -1 +1,2 @@
+import logger from "@medusajs/medusa-cli/dist/reporter";
 export default logger;

package/dist/loaders/logger.js.map

@@ -1 +1 @@
-{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../src/loaders/logger.js"],"names":[],"mappings":";;;;;AAAA,gFAAuD;AACvD,kBAAe,kBAAM,CAAA"}
+{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../src/loaders/logger.ts"],"names":[],"mappings":";;;;;AAAA,gFAAuD;AAEvD,kBAAe,kBAAM,CAAA"}

package/dist/loaders/models.d.ts

@@ -1,6 +1,11 @@
-declare function _default({ container }: {
-    container: any;
+import { ClassConstructor, MedusaContainer } from "../types/global";
+import { EntitySchema } from "typeorm";
+declare const _default: ({ container }: {
+    container: MedusaContainer;
 }, config?: {
     register: boolean;
-}): any[];
+}) => (EntitySchema<any> | ClassConstructor<unknown>)[];
+/**
+ * Registers all models in the model directory
+ */
 export default _default;

package/dist/loaders/models.js

@@ -19,11 +19,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
+var format_registration_name_1 = __importDefault(require("../utils/format-registration-name"));
 var glob_1 = __importDefault(require("glob"));
 var path_1 = __importDefault(require("path"));
 var typeorm_1 = require("typeorm");
 var awilix_1 = require("awilix");
-var format_registration_name_1 = __importDefault(require("../utils/format-registration-name"));
 /**
  * Registers all models in the model directory
  */
@@ -32,25 +32,27 @@ exports.default = (function (_a, config) {
     if (config === void 0) { config = { register: true }; }
     var corePath = "../models/*.js";
     var coreFull = path_1.default.join(__dirname, corePath);
-    var toReturn = [];
-    var core = glob_1.default.sync(coreFull, { cwd: __dirname });
+    var models = [];
+    var core = glob_1.default.sync(coreFull, { cwd: __dirname, ignore: ["index.js", "index.ts"] });
     core.forEach(function (fn) {
         var loaded = require(fn);
-        Object.entries(loaded).map(function (_a) {
-            var _b;
-            var _c = __read(_a, 2), key = _c[0], val = _c[1];
-            if (typeof val === "function" || val instanceof typeorm_1.EntitySchema) {
-                if (config.register) {
-                    var name = (0, format_registration_name_1.default)(fn);
-                    container.register((_b = {},
-                        _b[name] = (0, awilix_1.asClass)(val),
-                        _b));
-                    container.registerAdd("db_entities", (0, awilix_1.asValue)(val));
+        if (loaded) {
+            Object.entries(loaded).map(function (_a) {
+                var _b;
+                var _c = __read(_a, 2), val = _c[1];
+                if (typeof val === "function" || val instanceof typeorm_1.EntitySchema) {
+                    if (config.register) {
+                        var name = (0, format_registration_name_1.default)(fn);
+                        container.register((_b = {},
+                            _b[name] = (0, awilix_1.asClass)(val),
+                            _b));
+                        container.registerAdd("db_entities", (0, awilix_1.asValue)(val));
+                    }
+                    models.push(val);
                 }
-                toReturn.push(val);
-            }
-        });
+            });
+        }
     });
-    return toReturn;
+    return models;
 });
 //# sourceMappingURL=models.js.map

package/dist/loaders/models.js.map

@@ -1 +1 @@
-{"version":3,"file":"models.js","sourceRoot":"","sources":["../../src/loaders/models.js"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;AAAA,8CAAuB;AACvB,8CAAuB;AACvB,mCAAsC;AACtC,iCAAyC;AAEzC,+FAAsE;AAEtE;;GAEG;AACH,mBAAe,UAAC,EAAa,EAAE,MAA2B;QAAxC,SAAS,eAAA;IAAI,uBAAA,EAAA,WAAW,QAAQ,EAAE,IAAI,EAAE;IACxD,IAAM,QAAQ,GAAG,gBAAgB,CAAA;IACjC,IAAM,QAAQ,GAAG,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAA;IAE/C,IAAM,QAAQ,GAAG,EAAE,CAAA;IAEnB,IAAM,IAAI,GAAG,cAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,GAAG,EAAE,SAAS,EAAE,CAAC,CAAA;IACpD,IAAI,CAAC,OAAO,CAAC,UAAC,EAAE;QACd,IAAM,MAAM,GAAG,OAAO,CAAC,EAAE,CAAC,CAAA;QAE1B,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,UAAC,EAAU;;gBAAV,KAAA,aAAU,EAAT,GAAG,QAAA,EAAE,GAAG,QAAA;YACnC,IAAI,OAAO,GAAG,KAAK,UAAU,IAAI,GAAG,YAAY,sBAAY,EAAE;gBAC5D,IAAI,MAAM,CAAC,QAAQ,EAAE;oBACnB,IAAM,IAAI,GAAG,IAAA,kCAAsB,EAAC,EAAE,CAAC,CAAA;oBACvC,SAAS,CAAC,QAAQ;wBAChB,GAAC,IAAI,IAAG,IAAA,gBAAO,EAAC,GAAG,CAAC;4BACpB,CAAA;oBAEF,SAAS,CAAC,WAAW,CAAC,aAAa,EAAE,IAAA,gBAAO,EAAC,GAAG,CAAC,CAAC,CAAA;iBACnD;gBAED,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;aACnB;QACH,CAAC,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;IAEF,OAAO,QAAQ,CAAA;AACjB,CAAC,EAAA"}
+{"version":3,"file":"models.js","sourceRoot":"","sources":["../../src/loaders/models.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;AAAA,+FAAsE;AACtE,8CAAuB;AACvB,8CAAuB;AAEvB,mCAAsC;AACtC,iCAA0D;AAE1D;;GAEG;AACH,mBAAe,UAAC,EAA6C,EAAE,MAA2B;QAAxE,SAAS,eAAA;IAAoC,uBAAA,EAAA,WAAW,QAAQ,EAAE,IAAI,EAAE;IACxF,IAAM,QAAQ,GAAG,gBAAgB,CAAA;IACjC,IAAM,QAAQ,GAAG,cAAI,CAAC,IAAI,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAA;IAE/C,IAAM,MAAM,GAAiD,EAAE,CAAA;IAE/D,IAAM,IAAI,GAAG,cAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAE,GAAG,EAAE,SAAS,EAAE,MAAM,EAAE,CAAC,UAAU,EAAE,UAAU,CAAC,EAAE,CAAC,CAAA;IACtF,IAAI,CAAC,OAAO,CAAC,UAAC,EAAE;QACd,IAAM,MAAM,GAAG,OAAO,CAAC,EAAE,CAA6C,CAAA;QACtE,IAAI,MAAM,EAAE;YACX,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,UAAC,EAA2D;;oBAA3D,KAAA,aAA2D,EAAxD,GAAG,QAAA;gBAC/B,IAAI,OAAO,GAAG,KAAK,UAAU,IAAI,GAAG,YAAY,sBAAY,EAAE;oBAC5D,IAAI,MAAM,CAAC,QAAQ,EAAE;wBACnB,IAAM,IAAI,GAAG,IAAA,kCAAsB,EAAC,EAAE,CAAC,CAAA;wBACvC,SAAS,CAAC,QAAQ;4BAChB,GAAC,IAAI,IAAG,IAAA,gBAAO,EAAC,GAAgC,CAAC;gCACjD,CAAA;wBAEF,SAAS,CAAC,WAAW,CAAC,aAAa,EAAE,IAAA,gBAAO,EAAC,GAAG,CAAC,CAAC,CAAA;qBACnD;oBAED,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;iBACjB;YACH,CAAC,CAAC,CAAA;SACH;IACH,CAAC,CAAC,CAAA;IAEF,OAAO,MAAM,CAAA;AACf,CAAC,EAAA"}

package/dist/loaders/passport.d.ts

@@ -1,5 +1,8 @@
-declare function _default({ app, container }: {
-    app: any;
-    container: any;
-}): Promise<void>;
+import { Express } from 'express';
+import { ConfigModule, MedusaContainer } from "../types/global";
+declare const _default: ({ app, container, configModule }: {
+    app: Express;
+    container: MedusaContainer;
+    configModule: ConfigModule;
+}) => Promise<void>;
 export default _default;

package/dist/loaders/passport.js

@@ -40,44 +40,46 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 var passport_1 = __importDefault(require("passport"));
-var passport_local_1 = require("passport-local");
 var passport_http_bearer_1 = require("passport-http-bearer");
 var passport_jwt_1 = require("passport-jwt");
-var config_1 = __importDefault(require("../config"));
+var passport_local_1 = require("passport-local");
 exports.default = (function (_a) {
-    var app = _a.app, container = _a.container;
+    var app = _a.app, container = _a.container, configModule = _a.configModule;
     return __awaiter(void 0, void 0, void 0, function () {
-        var authService, userService;
+        var authService, jwt_secret;
         return __generator(this, function (_b) {
             authService = container.resolve("authService");
-            userService = container.resolve("userService");
             // For good old email password authentication
             passport_1.default.use(new passport_local_1.Strategy({
                 usernameField: "email",
                 passwordField: "password",
             }, function (email, password, done) { return __awaiter(void 0, void 0, void 0, function () {
-                var _a, success, user;
+                var _a, success, user, error_1;
                 return __generator(this, function (_b) {
-                    try {
-                        _a = authService.authenticate(email, password), success = _a.success, user = _a.user;
-                        if (success) {
-                            return [2 /*return*/, done(null, user)];
-                        }
-                        else {
-                            return [2 /*return*/, done("Incorrect Username / Password")];
-                        }
-                    }
-                    catch (error) {
-                        return [2 /*return*/, done(error)];
+                    switch (_b.label) {
+                        case 0:
+                            _b.trys.push([0, 2, , 3]);
+                            return [4 /*yield*/, authService.authenticate(email, password)];
+                        case 1:
+                            _a = _b.sent(), success = _a.success, user = _a.user;
+                            if (success) {
+                                return [2 /*return*/, done(null, user)];
+                            }
+                            else {
+                                return [2 /*return*/, done("Incorrect Username / Password")];
+                            }
+                            return [3 /*break*/, 3];
+                        case 2:
+                            error_1 = _b.sent();
+                            return [2 /*return*/, done(error_1)];
+                        case 3: return [2 /*return*/];
                     }
-                    return [2 /*return*/];
                 });
             }); }));
-            // After a user has authenticated a JWT will be placed on a cookie, all
-            // calls will be authenticated based on the JWT
+            jwt_secret = configModule.projectConfig.jwt_secret;
             passport_1.default.use(new passport_jwt_1.Strategy({
                 jwtFromRequest: function (req) { return req.session.jwt; },
-                secretOrKey: config_1.default.jwtSecret,
+                secretOrKey: jwt_secret,
             }, function (jwtPayload, done) { return __awaiter(void 0, void 0, void 0, function () {
                 return __generator(this, function (_a) {
                     return [2 /*return*/, done(null, jwtPayload)];

package/dist/loaders/passport.js.map

@@ -1 +1 @@
-{"version":3,"file":"passport.js","sourceRoot":"","sources":["../../src/loaders/passport.js"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,sDAA+B;AAC/B,iDAA0D;AAC1D,6DAAiE;AACjE,6CAAsD;AACtD,qDAA8B;AAE9B,mBAAe,UAAO,EAAkB;QAAhB,GAAG,SAAA,EAAE,SAAS,eAAA;;;;YAC9B,WAAW,GAAG,SAAS,CAAC,OAAO,CAAC,aAAa,CAAC,CAAA;YAC9C,WAAW,GAAG,SAAS,CAAC,OAAO,CAAC,aAAa,CAAC,CAAA;YAEpD,6CAA6C;YAC7C,kBAAQ,CAAC,GAAG,CACV,IAAI,yBAAa,CACf;gBACE,aAAa,EAAE,OAAO;gBACtB,aAAa,EAAE,UAAU;aAC1B,EACD,UAAO,KAAK,EAAE,QAAQ,EAAE,IAAI;;;oBAC1B,IAAI;wBACI,KAAoB,WAAW,CAAC,YAAY,CAAC,KAAK,EAAE,QAAQ,CAAC,EAA3D,OAAO,aAAA,EAAE,IAAI,UAAA,CAA8C;wBACnE,IAAI,OAAO,EAAE;4BACX,sBAAO,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,EAAA;yBACxB;6BAAM;4BACL,sBAAO,IAAI,CAAC,+BAA+B,CAAC,EAAA;yBAC7C;qBACF;oBAAC,OAAO,KAAK,EAAE;wBACd,sBAAO,IAAI,CAAC,KAAK,CAAC,EAAA;qBACnB;;;iBACF,CACF,CACF,CAAA;YAED,uEAAuE;YACvE,+CAA+C;YAC/C,kBAAQ,CAAC,GAAG,CACV,IAAI,uBAAW,CACb;gBACE,cAAc,EAAE,UAAC,GAAG,IAAK,OAAA,GAAG,CAAC,OAAO,CAAC,GAAG,EAAf,CAAe;gBACxC,WAAW,EAAE,gBAAM,CAAC,SAAS;aAC9B,EACD,UAAO,UAAU,EAAE,IAAI;;oBACrB,sBAAO,IAAI,CAAC,IAAI,EAAE,UAAU,CAAC,EAAA;;iBAC9B,CACF,CACF,CAAA;YAED,kEAAkE;YAClE,kBAAQ,CAAC,GAAG,CACV,IAAI,+BAAc,CAAC,UAAO,KAAK,EAAE,IAAI;;;;gCACtB,qBAAM,WAAW,CAAC,oBAAoB,CAAC,KAAK,CAAC,EAAA;;4BAApD,IAAI,GAAG,SAA6C;4BAC1D,IAAI,IAAI,CAAC,OAAO,EAAE;gCAChB,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,CAAA;6BACtB;iCAAM;gCACL,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;6BACjB;;;;iBACF,CAAC,CACH,CAAA;YAED,GAAG,CAAC,GAAG,CAAC,kBAAQ,CAAC,UAAU,EAAE,CAAC,CAAA;YAC9B,GAAG,CAAC,GAAG,CAAC,kBAAQ,CAAC,OAAO,EAAE,CAAC,CAAA;;;;CAC5B,EAAA"}
+{"version":3,"file":"passport.js","sourceRoot":"","sources":["../../src/loaders/passport.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,sDAA+B;AAI/B,6DAAiE;AACjE,6CAAsD;AACtD,iDAA0D;AAE1D,mBAAe,UAAO,EAA2G;QAAzG,GAAG,SAAA,EAAE,SAAS,eAAA,EAAE,YAAY,kBAAA;;;;YAC5C,WAAW,GAAG,SAAS,CAAC,OAAO,CAAc,aAAa,CAAC,CAAA;YAEjE,6CAA6C;YAC7C,kBAAQ,CAAC,GAAG,CACV,IAAI,yBAAa,CACf;gBACE,aAAa,EAAE,OAAO;gBACtB,aAAa,EAAE,UAAU;aAC1B,EACD,UAAO,KAAK,EAAE,QAAQ,EAAE,IAAI;;;;;;4BAEE,qBAAM,WAAW,CAAC,YAAY,CAAC,KAAK,EAAE,QAAQ,CAAC,EAAA;;4BAAnE,KAAoB,SAA+C,EAAjE,OAAO,aAAA,EAAE,IAAI,UAAA;4BACrB,IAAI,OAAO,EAAE;gCACX,sBAAO,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,EAAA;6BACxB;iCAAM;gCACL,sBAAO,IAAI,CAAC,+BAA+B,CAAC,EAAA;6BAC7C;;;;4BAED,sBAAO,IAAI,CAAC,OAAK,CAAC,EAAA;;;;iBAErB,CACF,CACF,CAAA;YAIO,UAAU,GAAK,YAAY,CAAC,aAAa,WAA/B,CAA+B;YACjD,kBAAQ,CAAC,GAAG,CACV,IAAI,uBAAW,CACb;gBACE,cAAc,EAAE,UAAC,GAAG,IAAK,OAAA,GAAG,CAAC,OAAO,CAAC,GAAG,EAAf,CAAe;gBACxC,WAAW,EAAE,UAAU;aACxB,EACD,UAAO,UAAU,EAAE,IAAI;;oBACrB,sBAAO,IAAI,CAAC,IAAI,EAAE,UAAU,CAAC,EAAA;;iBAC9B,CACF,CACF,CAAA;YAED,kEAAkE;YAClE,kBAAQ,CAAC,GAAG,CACV,IAAI,+BAAc,CAAC,UAAO,KAAK,EAAE,IAAI;;;;gCACtB,qBAAM,WAAW,CAAC,oBAAoB,CAAC,KAAK,CAAC,EAAA;;4BAApD,IAAI,GAAG,SAA6C;4BAC1D,IAAI,IAAI,CAAC,OAAO,EAAE;gCAChB,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,CAAA;6BACtB;iCAAM;gCACL,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;6BACjB;;;;iBACF,CAAC,CACH,CAAA;YAED,GAAG,CAAC,GAAG,CAAC,kBAAQ,CAAC,UAAU,EAAE,CAAC,CAAA;YAC9B,GAAG,CAAC,GAAG,CAAC,kBAAQ,CAAC,OAAO,EAAE,CAAC,CAAA;;;;CAC5B,EAAA"}

package/dist/loaders/plugins.d.ts

@@ -1,11 +1,39 @@
-export function registerPluginModels({ rootDirectory, container }: {
-    rootDirectory: any;
-    container: any;
-}): Promise<void>;
-declare function _default({ rootDirectory, container, app, activityId }: {
-    rootDirectory: any;
-    container: any;
-    app: any;
-    activityId: any;
-}): Promise<void>;
+import { Express } from "express";
+import { ConfigModule, MedusaContainer } from "../types/global";
+declare type Options = {
+    rootDirectory: string;
+    container: MedusaContainer;
+    configModule: ConfigModule;
+    app: Express;
+    activityId: string;
+};
+declare type PluginDetails = {
+    resolve: string;
+    name: string;
+    id: string;
+    options: Record<string, unknown>;
+    version: string;
+};
+declare const _default: ({ rootDirectory, container, app, configModule, activityId, }: Options) => Promise<void>;
+/**
+ * Registers all services in the services directory
+ */
 export default _default;
+export declare function registerPluginModels({ rootDirectory, container, configModule, }: {
+    rootDirectory: string;
+    container: MedusaContainer;
+    configModule: ConfigModule;
+}): Promise<void>;
+/**
+ * Registers a service at the right location in our container. If the service is
+ * a BaseService instance it will be available directly from the container.
+ * PaymentService instances are added to the paymentProviders array in the
+ * container. Names are camelCase formatted and namespaced by the folder i.e:
+ * services/example-payments -> examplePaymentsService
+ * @param {object} pluginDetails - the plugin details including plugin options,
+ *    version, id, resolved path, etc. See resolvePlugin
+ * @param {object} container - the container where the services will be
+ *    registered
+ * @return {void}
+ */
+export declare function registerServices(pluginDetails: PluginDetails, container: MedusaContainer): Promise<void>;