Merge pull request #2162 from firebase/next

Release firestore-shorten-urls-bitly
firebase · Aug 16, 2024 · e36adba · e36adba
2 parents 6f15c2d + 3e9b635
commit e36adba
Show file tree

Hide file tree

Showing 5 changed files with 63 additions and 123 deletions.
diff --git a/firestore-shorten-urls-bitly/CHANGELOG.md b/firestore-shorten-urls-bitly/CHANGELOG.md
@@ -1,3 +1,7 @@
+## Version 0.1.17
+
+fixed - bump dependencies, fix vulnerabilities
+
 ## Version 0.1.16
 
 fixed - bump dependencies, fix vulnerabilities (#2061)

diff --git a/firestore-shorten-urls-bitly/extension.yaml b/firestore-shorten-urls-bitly/extension.yaml
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 name: firestore-shorten-urls-bitly
-version: 0.1.16
+version: 0.1.17
 specVersion: v1beta
 
 displayName: Shorten URLs in Firestore

diff --git a/firestore-shorten-urls-bitly/functions/package-lock.json b/firestore-shorten-urls-bitly/functions/package-lock.json
diff --git a/firestore-shorten-urls-bitly/functions/package.json b/firestore-shorten-urls-bitly/functions/package.json
@@ -13,13 +13,12 @@
     "generate-readme": "firebase ext:info .. --markdown > ../README.md"
   },
   "dependencies": {
-    "axios": "^1.6.0",
+    "@types/express-serve-static-core": "4.17.30",
+    "@types/node": "^20.10.3",
     "firebase-admin": "^12.1.0",
     "firebase-functions": "^4.9.0",
     "rimraf": "^2.6.3",
-    "typescript": "^4.8.4",
-    "@types/express-serve-static-core": "4.17.30",
-    "@types/node": "^20.10.3"
+    "typescript": "^4.8.4"
   },
   "private": true
 }
diff --git a/firestore-shorten-urls-bitly/functions/src/index.ts b/firestore-shorten-urls-bitly/functions/src/index.ts
@@ -16,29 +16,26 @@
 
 import * as admin from "firebase-admin";
 import * as functions from "firebase-functions";
-import axios, { AxiosInstance } from "axios";
 
 import { FirestoreUrlShortener } from "./abstract-shortener";
 import config from "./config";
 import * as logs from "./logs";
 import * as events from "./events";
+
+interface BitlyResponse {
+  link?: string;
+}
+
 class FirestoreBitlyUrlShortener extends FirestoreUrlShortener {
-  private instance: AxiosInstance;
+  private bitlyAccessToken: string;
 
   constructor(
     urlFieldName: string,
     shortUrlFieldName: string,
     bitlyAccessToken: string
   ) {
     super(urlFieldName, shortUrlFieldName);
-    this.instance = axios.create({
-      headers: {
-        Authorization: `Bearer ${bitlyAccessToken}`,
-        "Content-Type": "application/json",
-      },
-      baseURL: "https://api-ssl.bitly.com/v4/",
-    });
-
+    this.bitlyAccessToken = bitlyAccessToken;
     logs.init();
   }
 
@@ -49,15 +46,27 @@ class FirestoreBitlyUrlShortener extends FirestoreUrlShortener {
     logs.shortenUrl(url);
 
     try {
-      const response: any = await this.instance.post("bitlinks", {
-        long_url: url,
+      const response = await fetch("https://api-ssl.bitly.com/v4/bitlinks", {
+        method: "POST",
+        headers: {
+          Authorization: `Bearer ${this.bitlyAccessToken}`,
+          "Content-Type": "application/json",
+        },
+        body: JSON.stringify({ long_url: url }),
       });
 
-      const { link } = response.data;
+      if (!response.ok) {
+        throw new Error(`Error shortening URL: ${response.statusText}`);
+      }
 
-      logs.shortenUrlComplete(link);
+      const data: BitlyResponse = await response.json();
 
-      await this.updateShortUrl(snapshot, link);
+      if (data.link) {
+        logs.shortenUrlComplete(data.link);
+        await this.updateShortUrl(snapshot, data.link);
+      } else {
+        throw new Error("Bitly response did not contain a link.");
+      }
     } catch (err) {
       logs.error(err);
     }