feat: Move userpass default definition to defineConfig instead of a hard-coded value (#8557)
This commit is contained in:
1 parent
fc439a32f1
commit
a013c4edc5
7 files changed
+76
-21
No files matched your search
@@ -0,0 +1,7 @@
|
|||||||
|
---
|
||||||
|
"@medusajs/auth": patch
|
||||||
|
"@medusajs/utils": patch
|
||||||
|
"@medusajs/auth-emailpass": patch
|
||||||
|
---
|
||||||
|
|
||||||
|
move emailpass to defaultconfig
|
||||||
@@ -39,7 +39,17 @@ module.exports = {
|
|||||||
medusa_v2: enableMedusaV2,
|
medusa_v2: enableMedusaV2,
|
||||||
},
|
},
|
||||||
modules: {
|
modules: {
|
||||||
[Modules.AUTH]: true,
|
[Modules.AUTH]: {
|
||||||
|
resolve: "@medusajs/auth",
|
||||||
|
options: {
|
||||||
|
providers: [
|
||||||
|
{
|
||||||
|
id: "emailpass",
|
||||||
|
resolve: "@medusajs/auth-emailpass",
|
||||||
|
},
|
||||||
|
],
|
||||||
|
},
|
||||||
|
},
|
||||||
[Modules.USER]: {
|
[Modules.USER]: {
|
||||||
scope: "internal",
|
scope: "internal",
|
||||||
resources: "shared",
|
resources: "shared",
|
||||||
|
|||||||
@@ -11,7 +11,17 @@ describe("defineConfig", function () {
|
|||||||
"featureFlags": {},
|
"featureFlags": {},
|
||||||
"modules": {
|
"modules": {
|
||||||
"apiKey": true,
|
"apiKey": true,
|
||||||
"auth": true,
|
"auth": {
|
||||||
|
"options": {
|
||||||
|
"providers": [
|
||||||
|
{
|
||||||
|
"id": "emailpass",
|
||||||
|
"resolve": "@medusajs/auth-emailpass",
|
||||||
|
},
|
||||||
|
],
|
||||||
|
},
|
||||||
|
"resolve": "@medusajs/auth",
|
||||||
|
},
|
||||||
"cacheService": true,
|
"cacheService": true,
|
||||||
"cart": true,
|
"cart": true,
|
||||||
"currency": true,
|
"currency": true,
|
||||||
@@ -107,7 +117,17 @@ describe("defineConfig", function () {
|
|||||||
"featureFlags": {},
|
"featureFlags": {},
|
||||||
"modules": {
|
"modules": {
|
||||||
"apiKey": true,
|
"apiKey": true,
|
||||||
"auth": true,
|
"auth": {
|
||||||
|
"options": {
|
||||||
|
"providers": [
|
||||||
|
{
|
||||||
|
"id": "emailpass",
|
||||||
|
"resolve": "@medusajs/auth-emailpass",
|
||||||
|
},
|
||||||
|
],
|
||||||
|
},
|
||||||
|
"resolve": "@medusajs/auth",
|
||||||
|
},
|
||||||
"cacheService": true,
|
"cacheService": true,
|
||||||
"cart": true,
|
"cart": true,
|
||||||
"currency": true,
|
"currency": true,
|
||||||
@@ -206,7 +226,17 @@ describe("defineConfig", function () {
|
|||||||
"featureFlags": {},
|
"featureFlags": {},
|
||||||
"modules": {
|
"modules": {
|
||||||
"apiKey": true,
|
"apiKey": true,
|
||||||
"auth": true,
|
"auth": {
|
||||||
|
"options": {
|
||||||
|
"providers": [
|
||||||
|
{
|
||||||
|
"id": "emailpass",
|
||||||
|
"resolve": "@medusajs/auth-emailpass",
|
||||||
|
},
|
||||||
|
],
|
||||||
|
},
|
||||||
|
"resolve": "@medusajs/auth",
|
||||||
|
},
|
||||||
"cacheService": true,
|
"cacheService": true,
|
||||||
"cart": true,
|
"cart": true,
|
||||||
"currency": true,
|
"currency": true,
|
||||||
@@ -305,7 +335,17 @@ describe("defineConfig", function () {
|
|||||||
"featureFlags": {},
|
"featureFlags": {},
|
||||||
"modules": {
|
"modules": {
|
||||||
"apiKey": true,
|
"apiKey": true,
|
||||||
"auth": true,
|
"auth": {
|
||||||
|
"options": {
|
||||||
|
"providers": [
|
||||||
|
{
|
||||||
|
"id": "emailpass",
|
||||||
|
"resolve": "@medusajs/auth-emailpass",
|
||||||
|
},
|
||||||
|
],
|
||||||
|
},
|
||||||
|
"resolve": "@medusajs/auth",
|
||||||
|
},
|
||||||
"cacheService": true,
|
"cacheService": true,
|
||||||
"currency": true,
|
"currency": true,
|
||||||
"customer": true,
|
"customer": true,
|
||||||
|
|||||||
@@ -61,7 +61,6 @@ export function defineConfig(config: Partial<ConfigModule> = {}): ConfigModule {
|
|||||||
const modules: ConfigModule["modules"] = {
|
const modules: ConfigModule["modules"] = {
|
||||||
[Modules.CACHE]: true,
|
[Modules.CACHE]: true,
|
||||||
[Modules.EVENT_BUS]: true,
|
[Modules.EVENT_BUS]: true,
|
||||||
[Modules.AUTH]: true,
|
|
||||||
[Modules.WORKFLOW_ENGINE]: true,
|
[Modules.WORKFLOW_ENGINE]: true,
|
||||||
[Modules.STOCK_LOCATION]: true,
|
[Modules.STOCK_LOCATION]: true,
|
||||||
[Modules.INVENTORY]: true,
|
[Modules.INVENTORY]: true,
|
||||||
@@ -78,6 +77,18 @@ export function defineConfig(config: Partial<ConfigModule> = {}): ConfigModule {
|
|||||||
[Modules.CURRENCY]: true,
|
[Modules.CURRENCY]: true,
|
||||||
[Modules.PAYMENT]: true,
|
[Modules.PAYMENT]: true,
|
||||||
[Modules.ORDER]: true,
|
[Modules.ORDER]: true,
|
||||||
|
[Modules.AUTH]: {
|
||||||
|
resolve: "@medusajs/auth",
|
||||||
|
options: {
|
||||||
|
providers: [
|
||||||
|
{
|
||||||
|
resolve: "@medusajs/auth-emailpass",
|
||||||
|
id: "emailpass",
|
||||||
|
},
|
||||||
|
],
|
||||||
|
},
|
||||||
|
},
|
||||||
|
|
||||||
[Modules.USER]: {
|
[Modules.USER]: {
|
||||||
resolve: "@medusajs/user",
|
resolve: "@medusajs/user",
|
||||||
options: {
|
options: {
|
||||||
|
|||||||
@@ -44,7 +44,6 @@
|
|||||||
"typescript": "^5.1.6"
|
"typescript": "^5.1.6"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@medusajs/auth-emailpass": "0.0.1",
|
|
||||||
"@medusajs/modules-sdk": "^1.12.9",
|
"@medusajs/modules-sdk": "^1.12.9",
|
||||||
"@medusajs/utils": "^1.11.7",
|
"@medusajs/utils": "^1.11.7",
|
||||||
"@mikro-orm/core": "5.9.7",
|
"@mikro-orm/core": "5.9.7",
|
||||||
|
|||||||
@@ -1,5 +1,3 @@
|
|||||||
import EmailPassProvider from "@medusajs/auth-emailpass"
|
|
||||||
|
|
||||||
import { LoaderOptions, ModulesSdkTypes, ModuleProvider } from "@medusajs/types"
|
import { LoaderOptions, ModulesSdkTypes, ModuleProvider } from "@medusajs/types"
|
||||||
import { Lifetime, asFunction, asValue } from "awilix"
|
import { Lifetime, asFunction, asValue } from "awilix"
|
||||||
import { moduleProviderLoader } from "@medusajs/modules-sdk"
|
import { moduleProviderLoader } from "@medusajs/modules-sdk"
|
||||||
@@ -33,18 +31,9 @@ export default async ({
|
|||||||
| ModulesSdkTypes.ModuleServiceInitializeCustomDataLayerOptions
|
| ModulesSdkTypes.ModuleServiceInitializeCustomDataLayerOptions
|
||||||
) & { providers: ModuleProvider[] }
|
) & { providers: ModuleProvider[] }
|
||||||
>): Promise<void> => {
|
>): Promise<void> => {
|
||||||
// Note: For now we want to inject some providers out of the box
|
|
||||||
const providerConfig = [
|
|
||||||
{
|
|
||||||
resolve: EmailPassProvider,
|
|
||||||
id: "emailpass",
|
|
||||||
},
|
|
||||||
...(options?.providers ?? []),
|
|
||||||
]
|
|
||||||
|
|
||||||
await moduleProviderLoader({
|
await moduleProviderLoader({
|
||||||
container,
|
container,
|
||||||
providers: providerConfig,
|
providers: options?.providers || [],
|
||||||
registerServiceFn: registrationFn,
|
registerServiceFn: registrationFn,
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
@@ -4294,7 +4294,7 @@ __metadata:
|
|||||||
languageName: unknown
|
languageName: unknown
|
||||||
linkType: soft
|
linkType: soft
|
||||||
|
|
||||||
"@medusajs/auth-emailpass@0.0.1, @medusajs/auth-emailpass@workspace:packages/modules/providers/auth-emailpass":
|
"@medusajs/auth-emailpass@workspace:packages/modules/providers/auth-emailpass":
|
||||||
version: 0.0.0-use.local
|
version: 0.0.0-use.local
|
||||||
resolution: "@medusajs/auth-emailpass@workspace:packages/modules/providers/auth-emailpass"
|
resolution: "@medusajs/auth-emailpass@workspace:packages/modules/providers/auth-emailpass"
|
||||||
dependencies:
|
dependencies:
|
||||||
@@ -4327,7 +4327,6 @@ __metadata:
|
|||||||
version: 0.0.0-use.local
|
version: 0.0.0-use.local
|
||||||
resolution: "@medusajs/auth@workspace:packages/modules/auth"
|
resolution: "@medusajs/auth@workspace:packages/modules/auth"
|
||||||
dependencies:
|
dependencies:
|
||||||
"@medusajs/auth-emailpass": 0.0.1
|
|
||||||
"@medusajs/modules-sdk": ^1.12.9
|
"@medusajs/modules-sdk": ^1.12.9
|
||||||
"@medusajs/types": ^1.11.14
|
"@medusajs/types": ^1.11.14
|
||||||
"@medusajs/utils": ^1.11.7
|
"@medusajs/utils": ^1.11.7
|
||||||
|
|||||||
Reference in new issue
Block a user