@loomcore/api 0.1.21 → 0.1.22

package/dist/controllers/auth.controller.js

@@ -38,13 +38,12 @@ export class AuthController {
         apiUtils.apiResponse(res, 201, { data: user || undefined }, UserSpec, PublicUserSchema);
     }
     async requestTokenUsingRefreshToken(req, res, next) {
-        const userContext = req.userContext;
         const refreshToken = req.query.refreshToken;
-        if (!userContext || !refreshToken || typeof refreshToken !== 'string') {
-            throw new BadRequestError('Missing required fields: userContext and refreshToken are required.');
+        if (!refreshToken || typeof refreshToken !== 'string') {
+            throw new BadRequestError('Missing required fields: refreshToken is required.');
         }
         const deviceId = this.authService.getDeviceIdFromCookie(req);
-        const tokens = await this.authService.requestTokenUsingRefreshToken(userContext, refreshToken, deviceId);
+        const tokens = await this.authService.requestTokenUsingRefreshToken(refreshToken, deviceId);
         if (tokens) {
             apiUtils.apiResponse(res, 200, { data: tokens }, TokenResponseSpec);
         }

package/dist/services/auth.service.d.ts

@@ -21,7 +21,7 @@ export declare class AuthService extends MultiTenantApiService<IUser> {
     } | null>;
     getUserByEmail(email: string): Promise<IUser | null>;
     createUser(userContext: IUserContext, user: Partial<IUser>): Promise<IUser | null>;
-    requestTokenUsingRefreshToken(userContext: IUserContext, refreshToken: string, deviceId: string): Promise<ITokenResponse | null>;
+    requestTokenUsingRefreshToken(refreshToken: string, deviceId: string): Promise<ITokenResponse | null>;
     changeLoggedInUsersPassword(userContext: IUserContext, body: any): Promise<UpdateResult>;
     changePassword(userContext: IUserContext, queryObject: any, password: string): Promise<UpdateResult>;
     createNewTokens(userContext: IUserContext, activeRefreshToken: IRefreshToken): Promise<{
@@ -29,8 +29,8 @@ export declare class AuthService extends MultiTenantApiService<IUser> {
         refreshToken: string;
         expiresOn: number;
     }>;
-    getActiveRefreshToken(userContext: IUserContext, refreshToken: string, deviceId: string): Promise<IRefreshToken | null>;
-    createNewRefreshToken(userId: string, deviceId: string, existingExpiresOn?: number | null, orgId?: string): Promise<IRefreshToken | null>;
+    getActiveRefreshToken(refreshToken: string, deviceId: string): Promise<IRefreshToken | null>;
+    createNewRefreshToken(userId: string, deviceId: string, orgId?: string): Promise<IRefreshToken | null>;
     sendResetPasswordEmail(emailAddress: string): Promise<void>;
     resetPassword(email: string, passwordResetToken: string, password: string): Promise<UpdateResult>;
     deleteRefreshTokensForDevice(deviceId: string): Promise<import("../databases/models/delete-result.js").DeleteResult>;

package/dist/services/auth.service.js

@@ -44,7 +44,7 @@ export class AuthService extends MultiTenantApiService {
     async logUserIn(userContext, deviceId) {
         const payload = userContext;
         const accessToken = this.generateJwt(payload);
-        const refreshTokenObject = await this.createNewRefreshToken(userContext.user._id, deviceId, null, userContext._orgId);
+        const refreshTokenObject = await this.createNewRefreshToken(userContext.user._id, deviceId, userContext._orgId);
         const accessTokenExpiresOn = this.getExpiresOnFromSeconds(config.auth.jwtExpirationInSeconds);
         let loginResponse = null;
         if (refreshTokenObject) {
@@ -88,10 +88,16 @@ export class AuthService extends MultiTenantApiService {
         const createdUser = await this.create(userContext, user);
         return createdUser;
     }
-    async requestTokenUsingRefreshToken(userContext, refreshToken, deviceId) {
+    async requestTokenUsingRefreshToken(refreshToken, deviceId) {
         let tokens = null;
-        const activeRefreshToken = await this.getActiveRefreshToken(userContext, refreshToken, deviceId);
+        const activeRefreshToken = await this.getActiveRefreshToken(refreshToken, deviceId);
         if (activeRefreshToken) {
+            const systemUserContext = getSystemUserContext();
+            const user = await this.getById(systemUserContext, activeRefreshToken.userId);
+            const userContext = {
+                _orgId: user._orgId,
+                user: user
+            };
             tokens = await this.createNewTokens(userContext, activeRefreshToken);
         }
         return tokens;
@@ -121,8 +127,8 @@ export class AuthService extends MultiTenantApiService {
         };
         return tokenResponse;
     }
-    async getActiveRefreshToken(userContext, refreshToken, deviceId) {
-        const refreshTokenResult = await this.refreshTokenService.findOne(userContext, { filters: { token: { eq: refreshToken }, deviceId: { eq: deviceId } } });
+    async getActiveRefreshToken(refreshToken, deviceId) {
+        const refreshTokenResult = await this.refreshTokenService.findOne(EmptyUserContext, { filters: { token: { eq: refreshToken }, deviceId: { eq: deviceId } } });
         let activeRefreshToken = null;
         if (refreshTokenResult) {
             const now = Date.now();
@@ -133,8 +139,8 @@ export class AuthService extends MultiTenantApiService {
         }
         return activeRefreshToken;
     }
-    async createNewRefreshToken(userId, deviceId, existingExpiresOn = null, orgId) {
-        const expiresOn = existingExpiresOn ? existingExpiresOn : this.getExpiresOnFromDays(config.auth.refreshTokenExpirationInDays);
+    async createNewRefreshToken(userId, deviceId, orgId) {
+        const expiresOn = this.getExpiresOnFromDays(config.auth.refreshTokenExpirationInDays);
         const newRefreshToken = {
             _orgId: orgId,
             token: this.generateRefreshToken(),

package/dist/services/multi-tenant-api.service.js

@@ -11,7 +11,7 @@ export class MultiTenantApiService extends GenericApiService {
         }
     }
     prepareQuery(userContext, queryOptions, operations) {
-        if (!config?.app?.isMultiTenant) {
+        if (!config?.app?.isMultiTenant || userContext?.user?._id === 'system') {
             return super.prepareQuery(userContext, queryOptions, operations);
         }
         if (!userContext || !userContext._orgId) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@loomcore/api",
-  "version": "0.1.21",
+  "version": "0.1.22",
   "private": false,
   "description": "Loom Core Api - An opinionated Node.js api using Typescript, Express, and MongoDb or PostgreSQL",
   "scripts": {