Merge pull request #795 from callstack-internal/hur/fix-46117

Expensify · Sep 10, 2024 · 6c223d9 · 6c223d9
2 parents 9687e27 + 01a0504
commit 6c223d9
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 0 deletions.
diff --git a/__tests__/Str-test.js b/__tests__/Str-test.js
@@ -215,3 +215,19 @@ describe('Str.isValidE164Phone', () => {
         expect(Str.isValidE164Phone('+14404589784')).toBeTruthy();
     });
 });
+
+describe('Str.getExtension', () => {
+    it('Correctly returns extension', () => {
+        expect(Str.getExtension(buildTestURLForType('pdf'))).toBeTruthy();
+        expect(Str.getExtension(buildTestURLForType('PDF'))).toBeTruthy();
+        expect(Str.getExtension(buildTestURLForType('mov'))).toBeTruthy();
+        expect(Str.getExtension(buildTestURLForType('MP4'))).toBeTruthy();
+    });
+
+    it('Returns undefined for data types other than string', () => {
+        expect(Str.getExtension(0)).toBeUndefined();
+        expect(Str.getExtension(null)).toBeUndefined();
+        expect(Str.getExtension(undefined)).toBeUndefined();
+        expect(Str.getExtension([])).toBeUndefined();
+    });
+});
diff --git a/lib/str.ts b/lib/str.ts
@@ -6,6 +6,7 @@ import * as HtmlEntities from 'html-entities';
 import * as Constants from './CONST';
 import * as UrlPatterns from './Url';
 import * as Utils from './utils';
+import Log from './Log';
 
 const REMOVE_SMS_DOMAIN_PATTERN = /@expensify\.sms/gi;
 
@@ -994,6 +995,10 @@ const Str = {
      * without query parameters
      */
     getExtension(url: string): string | undefined {
+        if (typeof url !== 'string') {
+            Log.warn('Str.getExtension: url is not a string', {url});
+            return undefined;
+        }
         return url.split('.').pop()?.split('?')[0]?.toLowerCase();
     },