@medusajs/auth 0.0.3 → 0.0.4-next-20240430121402

package/dist/providers/email-password.d.ts

@@ -1,5 +1,5 @@
-import { AbstractAuthModuleProvider } from "@medusajs/utils";
 import { AuthenticationInput, AuthenticationResponse } from "@medusajs/types";
+import { AbstractAuthModuleProvider } from "@medusajs/utils";
 import { AuthUserService } from "../services";
 declare class EmailPasswordProvider extends AbstractAuthModuleProvider {
     static PROVIDER: string;

package/dist/providers/google.d.ts

@@ -1,16 +1,14 @@
-import { AuthenticationInput, AuthenticationResponse, ModulesSdkTypes } from "@medusajs/types";
+import { AuthenticationInput, AuthenticationResponse } from "@medusajs/types";
 import { AbstractAuthModuleProvider } from "@medusajs/utils";
 import { AuthUserService } from "../services";
 type InjectedDependencies = {
     authUserService: AuthUserService;
-    authProviderService: ModulesSdkTypes.InternalModuleService<any>;
 };
 declare class GoogleProvider extends AbstractAuthModuleProvider {
     static PROVIDER: string;
     static DISPLAY_NAME: string;
     protected readonly authUserService_: AuthUserService;
-    protected readonly authProviderService_: ModulesSdkTypes.InternalModuleService<any>;
-    constructor({ authUserService, authProviderService }: InjectedDependencies);
+    constructor({ authUserService }: InjectedDependencies);
     authenticate(req: AuthenticationInput): Promise<AuthenticationResponse>;
     validateCallback(req: AuthenticationInput): Promise<AuthenticationResponse>;
     verify_(refreshToken: string): Promise<{

package/dist/providers/google.js

@@ -8,13 +8,12 @@ const jsonwebtoken_1 = __importDefault(require("jsonwebtoken"));
 const simple_oauth2_1 = require("simple-oauth2");
 const url_1 = __importDefault(require("url"));
 class GoogleProvider extends utils_1.AbstractAuthModuleProvider {
-    constructor({ authUserService, authProviderService }) {
+    constructor({ authUserService }) {
         super(arguments[0], {
             provider: GoogleProvider.PROVIDER,
             displayName: GoogleProvider.DISPLAY_NAME,
         });
         this.authUserService_ = authUserService;
-        this.authProviderService_ = authProviderService;
     }
     async authenticate(req) {
         if (req.query?.error) {
@@ -75,7 +74,10 @@ class GoogleProvider extends utils_1.AbstractAuthModuleProvider {
                 return { success: false, error: error.message };
             }
         }
-        return { success: true, authUser };
+        return {
+            success: true,
+            authUser,
+        };
     }
     // abstractable
     async validateCallbackToken(code, { clientID, callbackURL, clientSecret }) {
@@ -86,7 +88,13 @@ class GoogleProvider extends utils_1.AbstractAuthModuleProvider {
         };
         try {
             const accessToken = await client.getToken(tokenParams);
-            return await this.verify_(accessToken.token.id_token);
+            const { authUser, success } = await this.verify_(accessToken.token.id_token);
+            const { successRedirectUrl } = this.getConfigFromScope();
+            return {
+                success,
+                authUser,
+                successRedirectUrl,
+            };
         }
         catch (error) {
             return { success: false, error: error.message };
@@ -112,7 +120,6 @@ class GoogleProvider extends utils_1.AbstractAuthModuleProvider {
         return protocol + "://" + host + path;
     }
     async getProviderConfig(req) {
-        await this.authProviderService_.retrieve(GoogleProvider.PROVIDER);
         const config = this.getConfigFromScope();
         const callbackURL = config.callbackURL;
         const parsedCallbackUrl = !url_1.default.parse(callbackURL).protocol

package/dist/services/auth-user.d.ts

@@ -1,12 +1,14 @@
 import { AuthTypes, Context, DAL, FindConfig, RepositoryService } from "@medusajs/types";
 import { AuthUser } from "../models";
 type InjectedDependencies = {
+    baseRepository: DAL.RepositoryService;
     authUserRepository: DAL.RepositoryService;
 };
 declare const AuthUserService_base: new <TEntity_1 extends object = any>(container: InjectedDependencies) => import("@medusajs/types").InternalModuleService<TEntity_1, InjectedDependencies>;
 export default class AuthUserService<TEntity extends AuthUser = AuthUser> extends AuthUserService_base<TEntity> {
     protected readonly authUserRepository_: RepositoryService<TEntity>;
+    protected baseRepository_: DAL.RepositoryService;
     constructor(container: InjectedDependencies);
-    retrieveByProviderAndEntityId<TEntityMethod = AuthTypes.AuthUserDTO>(entityId: string, provider: string, config?: FindConfig<TEntityMethod>, sharedContext?: Context): Promise<TEntity>;
+    retrieveByProviderAndEntityId<TEntityMethod = AuthTypes.AuthUserDTO>(entityId: string, provider: string, config?: FindConfig<TEntityMethod>, sharedContext?: Context): Promise<AuthTypes.AuthUserDTO>;
 }
 export {};

package/dist/services/auth-user.js

@@ -19,6 +19,7 @@ class AuthUserService extends utils_1.ModulesSdkUtils.internalModuleServiceFacto
         // @ts-ignore
         super(...arguments);
         this.authUserRepository_ = container.authUserRepository;
+        this.baseRepository_ = container.baseRepository;
     }
     async retrieveByProviderAndEntityId(entityId, provider, config = {}, sharedContext = {}) {
         const queryConfig = utils_1.ModulesSdkUtils.buildQuery({ entity_id: entityId, provider }, { ...config, take: 1 });
@@ -26,7 +27,7 @@ class AuthUserService extends utils_1.ModulesSdkUtils.internalModuleServiceFacto
         if (!result) {
             throw new utils_1.MedusaError(utils_1.MedusaError.Types.NOT_FOUND, `AuthUser with entity_id: "${entityId}" and provider: "${provider}" not found`);
         }
-        return result;
+        return await this.baseRepository_.serialize(result);
     }
 }
 exports.default = AuthUserService;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@medusajs/auth",
-  "version": "0.0.3",
+  "version": "0.0.4-next-20240430121402",
   "description": "Medusa Auth module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -28,7 +28,7 @@
     "watch:test": "tsc --build tsconfig.spec.json --watch",
     "prepublishOnly": "cross-env NODE_ENV=production tsc --build && tsc-alias -p tsconfig.json",
     "build": "rimraf dist && tsc --build && tsc-alias -p tsconfig.json",
-    "test": "jest --runInBand --bail --forceExit -- src/**/__tests__/**/*.ts",
+    "test": "jest --runInBand --bail --passWithNoTests --forceExit -- src",
     "test:integration": "jest --forceExit -- integration-tests/**/__tests__/**/*.ts",
     "migration:generate": " MIKRO_ORM_CLI=./mikro-orm.config.dev.ts mikro-orm migration:generate",
     "migration:initial": " MIKRO_ORM_CLI=./mikro-orm.config.dev.ts mikro-orm migration:create --initial",
@@ -40,7 +40,7 @@
     "@mikro-orm/cli": "5.9.7",
     "cross-env": "^5.2.1",
     "jest": "^29.6.3",
-    "medusa-test-utils": "^1.1.42",
+    "medusa-test-utils": "1.1.44-next-20240430121402",
     "rimraf": "^3.0.2",
     "ts-jest": "^29.1.1",
     "ts-node": "^10.9.1",
@@ -48,9 +48,9 @@
     "typescript": "^5.1.6"
   },
   "dependencies": {
-    "@medusajs/modules-sdk": "^1.12.9",
-    "@medusajs/types": "^1.11.14",
-    "@medusajs/utils": "^1.11.7",
+    "@medusajs/modules-sdk": "1.12.11-next-20240430121402",
+    "@medusajs/types": "1.11.16-next-20240430121402",
+    "@medusajs/utils": "1.11.9-next-20240430121402",
     "@mikro-orm/core": "5.9.7",
     "@mikro-orm/migrations": "5.9.7",
     "@mikro-orm/postgresql": "5.9.7",