chore: resolve commnets

Author: boikoa-gl

src/fpnv/fpnv-api-client-internal.ts

@@ -0,0 +1,71 @@
+/*!
+ * @license
+ * Copyright 2025 Google LLC
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { PrefixedFirebaseError } from '../utils/error';
+
+export interface FirebasePhoneNumberTokenInfo {
+  /** Documentation URL. */
+  url: string;
+  /** verify API name. */
+  verifyApiName: string;
+  /** The JWT full name. */
+  jwtName: string;
+  /** The JWT short name. */
+  shortName: string;
+  /** The JWT typ" (Type) */
+  typ: string;
+}
+
+export const CLIENT_CERT_URL = 'https://www.googleapis.com/robot/v1/metadata/x509/securetoken@system.gserviceaccount.com';
+
+export const PN_TOKEN_INFO: FirebasePhoneNumberTokenInfo = {
+  url: 'https://firebase.google.com/docs/phone-number-verification',
+  verifyApiName: 'verifyToken()',
+  jwtName: 'Firebase Phone Verification token',
+  shortName: 'FPNV token',
+  typ: 'JWT',
+};
+
+export const FPNV_ERROR_CODE_MAPPING = {
+  INVALID_ARGUMENT: 'invalid-argument',
+  INVALID_TOKEN: 'invalid-token',
+  EXPIRED_TOKEN: 'expired-token',
+} satisfies Record<string, FpnvErrorCode>;
+
+export type FpnvErrorCode =
+  | 'invalid-argument'
+  | 'invalid-token'
+  | 'expired-token'
+
+/**
+ * Firebase Phone Number Verification error code structure. This extends `PrefixedFirebaseError`.
+ *
+ * @param code - The error code.
+ * @param message - The error message.
+ * @constructor
+ */
+export class FirebasePnvError extends PrefixedFirebaseError {
+  constructor(code: FpnvErrorCode, message: string) {
+    super('fpnv', code, message);
+
+    /* tslint:disable:max-line-length */
+    // Set the prototype explicitly. See the following link for more details:
+    // https://github.com/Microsoft/TypeScript/wiki/Breaking-Changes#extending-built-ins-like-error-array-and-map-may-no-longer-work
+    /* tslint:enable:max-line-length */
+    (this as any).__proto__ = FirebasePnvError.prototype;
+  }
+}

src/fpnv/fpnv-api.ts

@@ -20,20 +20,61 @@
  * Interface representing a Fpnv token.
  */
 export interface FpnvToken {
-    aud: string;
-    auth_time: number;
+    /**
+     * The issuer identifier for the issuer of the response.
+     * This value is a URL with the format
+     * `https://firebaseappcheck.googleapis.com/<PROJECT_NUMBER>`, where `<PROJECT_NUMBER>` is the
+     * same project number specified in the {@link aud} property.
+     */
+    iss: string;
+
+    /**
+     * The audience for which this token is intended.
+     * This value is a JSON array of two strings, the first is the project number of your
+     * Firebase project, and the second is the project ID of the same project.
+     */
+    aud: string[];
+
+    /**
+     * The Fpnv token's expiration time, in seconds since the Unix epoch. That is, the
+     * time at which this Fpnv token expires and should no longer be considered valid.
+     */
     exp: number;
+
+    /**
+     * The Fpnv token's issued-at time, in seconds since the Unix epoch. That is, the
+     * time at which this Fpnv token was issued and should start to be considered
+     * valid.
+     */
     iat: number;
-    iss: string;
+
+    /**
+     * The phone number of User.
+     */
     sub: string;
 
+    /**
+     * Unique ID.
+     */
+    jti: string;
+
+    /**
+     * Unique ID.
+     */
+    nonce: string;
+
+    /**
+     * The corresponding user's phone number.
+     * This value is not actually one of the JWT token claims. It is added as a
+     * convenience, and is set as the value of the {@link sub} property.
+     */
     getPhoneNumber(): string;
 
     /**
-     * Other arbitrary claims included in the ID token.
+     * Other arbitrary claims included in the token.
      */
     [key: string]: any;
 }
 
-export { FpnvErrorCode, FirebasePnvError } from '../utils/error';
+export { FpnvErrorCode, FirebasePnvError } from './fpnv-api-client-internal';
 

src/fpnv/fpnv.ts

@@ -17,35 +17,42 @@
 
 import { App } from '../app';
 import { FpnvToken } from './fpnv-api';
-import {
-  FirebasePhoneNumberTokenVerifier,
-  createFPNTVerifier,
-} from './token-verifier';
+import { FirebasePhoneNumberTokenVerifier } from './token-verifier';
+import { CLIENT_CERT_URL, PN_TOKEN_INFO } from './fpnv-api-client-internal';
 
 /**
  * Fpnv service bound to the provided app.
  */
-export class Fpnv  {
-  private readonly app_: App;
-
+export class Fpnv {
+  private readonly appInternal: App;
   protected readonly fpnvVerifier: FirebasePhoneNumberTokenVerifier;
 
+  /**
+   * @param app - The app for this `Fpnv` service.
+   * @constructor
+   * @internal
+   */
   constructor(app: App) {
 
-    this.app_ = app;
-    this.fpnvVerifier = createFPNTVerifier(app);
+    this.appInternal = app;
+    this.fpnvVerifier = new FirebasePhoneNumberTokenVerifier(
+      CLIENT_CERT_URL,
+      'https://fpnv.googleapis.com/projects/',
+      PN_TOKEN_INFO,
+      app
+    );
   }
 
   /**
-   * Returns the app associated with this Auth instance.
+   * Returns the app associated with this `Fpnv` instance.
    *
-   * @returns The app associated with this Auth instance.
+   * @returns The app associated with this `Fpnv` instance.
    */
   get app(): App {
-    return this.app_;
+    return this.appInternal;
   }
 
-  public async verifyToken(idToken: string): Promise<FpnvToken> {
-    return await this.fpnvVerifier.verifyJWT(idToken);
+  public async verifyToken(fpnvJwt: string): Promise<FpnvToken> {
+    return await this.fpnvVerifier.verifyJWT(fpnvJwt);
   }
 }