fix: handle Windows-style line endings (\r\n) correctly (#1140)

* fix: handle Windows-style line endings (\r\n) correctly * chore: log session
teableio · Dec 6, 2024 · 1f58963 · 1f58963
1 parent 2b8665a
commit 1f58963
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 2 deletions.
diff --git a/apps/nestjs-backend/src/features/auth/session/session-store.service.ts b/apps/nestjs-backend/src/features/auth/session/session-store.service.ts
@@ -1,5 +1,5 @@
 /* eslint-disable @typescript-eslint/naming-convention */
-import { Injectable } from '@nestjs/common';
+import { Injectable, Logger } from '@nestjs/common';
 import { Store } from 'express-session';
 import { pick } from 'lodash';
 import { CacheService } from '../../../cache/cache.service';
@@ -13,6 +13,7 @@ const SESSION_STORE_KEYS = ['passport', 'cookie'] as const;
 export class SessionStoreService extends Store {
   private readonly ttl: number;
   private readonly userSessionExpire: number;
+  private readonly logger = new Logger(SessionStoreService.name);
 
   constructor(
     private readonly cacheService: CacheService,
@@ -43,15 +44,18 @@ export class SessionStoreService extends Store {
   private async getCache(sid: string) {
     const expire = await this.cacheService.get(`auth:session-expire:${sid}`);
     if (expire) {
+      this.logger.log(`Session ${sid} is expired`);
       return null;
     }
     const session = await this.cacheService.get(`auth:session-store:${sid}`);
     if (!session) {
+      this.logger.log(`Session ${sid} not found`);
       return null;
     }
     const userId = session.passport.user.id;
     const userSessions = (await this.cacheService.get(`auth:session-user:${userId}`)) ?? {};
     if (!userSessions[sid]) {
+      this.logger.log(`Session ${sid} not found in userSessions`);
       await this.cacheService.del(`auth:session-store:${sid}`);
       return null;
     }
@@ -62,6 +66,7 @@ export class SessionStoreService extends Store {
       delete userSessions[sid];
       await this.cacheService.del(`auth:session-store:${sid}`);
       await this.cacheService.set(`auth:session-user:${userId}`, userSessions, this.ttl);
+      this.logger.log(`Session ${sid} expired, remove from userSessions`);
       return null;
     }
     return session;

diff --git a/packages/core/src/utils/clipboard.spec.ts b/packages/core/src/utils/clipboard.spec.ts
@@ -74,6 +74,11 @@ describe('clipboard', () => {
       const data = parseClipboardText('text1\n\n"text2"');
       expect(data).toEqual([['text1'], [''], ['"text2"']]);
     });
+
+    it('content has windows newline', () => {
+      const data = parseClipboardText('text1"\r\ntext2');
+      expect(data).toEqual([['text1"'], ['text2']]);
+    });
   });
 
   describe('stringify', () => {

diff --git a/packages/core/src/utils/clipboard.ts b/packages/core/src/utils/clipboard.ts
@@ -54,13 +54,19 @@ export const parseClipboardText = (content: string) => {
           endOfCell = true;
           break;
         }
-      } else if (content[cursor] === _newline) {
+      } else if (
+        content[cursor] === _newline ||
+        `${content[cursor]}${content[cursor + 1]}` === _newline
+      ) {
         if (quoted) {
           cell += _newline;
         } else {
           endOfCell = true;
           endOfRow = true;
         }
+        if (`${content[cursor]}${content[cursor + 1]}` === _newline) {
+          cursor++;
+        }
       } else {
         cell += content[cursor];
       }