From 4ec57d93dd9ad3090d736ea7acf9dcbeb6ccd28d Mon Sep 17 00:00:00 2001 From: Mihajlo Medjedovic Date: Thu, 22 Sep 2022 13:14:56 +0200 Subject: [PATCH] fix: removed shortening --- src/utils/sas9/extractUserNameSas9.ts | 6 +----- src/utils/spec/extractUserNameSas9.spec.ts | 15 ++++----------- 2 files changed, 5 insertions(+), 16 deletions(-) diff --git a/src/utils/sas9/extractUserNameSas9.ts b/src/utils/sas9/extractUserNameSas9.ts index 4761ad7..9509a4b 100644 --- a/src/utils/sas9/extractUserNameSas9.ts +++ b/src/utils/sas9/extractUserNameSas9.ts @@ -5,10 +5,6 @@ export const extractUserNameSas9 = (response: string) => { const username = matched?.[0].slice(17, -1) if (!username) return 'unknown (error fetching username)' - if (!username.trim().includes(' ')) return username.trim() - return username - .split(' ') - .map((name: string) => name.slice(0, 3).toLowerCase()) - .join('') + return username.trim() } diff --git a/src/utils/spec/extractUserNameSas9.spec.ts b/src/utils/spec/extractUserNameSas9.spec.ts index 2388420..91b4a81 100644 --- a/src/utils/spec/extractUserNameSas9.spec.ts +++ b/src/utils/spec/extractUserNameSas9.spec.ts @@ -5,14 +5,14 @@ describe('Extract username SAS9', () => { const response = ` "title": "Log Off SAS User One",` const username = extractUserNameSas9(response) - expect(username).toEqual('sasuseone') + expect(username).toEqual('SAS User One') }) it('should return username with fallback regex', () => { const response = ` "title": "Logout SAS User One",` const username = extractUserNameSas9(response) - expect(username).toEqual('sasuseone') + expect(username).toEqual('SAS User One') }) it('should return username unknown', () => { @@ -22,20 +22,13 @@ describe('Extract username SAS9', () => { expect(username).toEqual('unknown (error fetching username)') }) - it('should return username without shortening (one word user name)', () => { + it('should return username with one word user name', () => { const response = ` "title": "Log Off SasUserOne",` const username = extractUserNameSas9(response) expect(username).toEqual('SasUserOne') }) - it('should return username with falback regex without shortening (one word user name)', () => { - const response = ` "title": "Logout SasUserOne",` - const username = extractUserNameSas9(response) - - expect(username).toEqual('SasUserOne') - }) - it('should return username with unhandled Spanish language', () => { const response = ` "title": "Desconectarse SAS User One",` const username = extractUserNameSas9(response) @@ -43,6 +36,6 @@ describe('Extract username SAS9', () => { // Result won't be perfect but it will work Result will be: ctasasuseone // instead of sasuseone - expect(username).toEqual('ctasasuseone') + expect(username).toEqual('ctarse SAS User One') }) })