Add more functionality to compat layer

Author: avolkovi

packages-exp/auth-compat-exp/demo/README.md

@@ -1,4 +1,4 @@
-# Firebase-Auth for web - Auth Demo (Auth Next)
+# Firebase-Auth for web - Auth Demo (Auth Compatibility Layer)
 
 ## Prerequisite
 
@@ -15,7 +15,7 @@ Run:
 
 ```bash
 git clone https://github.com/firebase/firebase-js-sdk.git
-cd firebase-js-sdk/packages-exp/auth-exp/demo
+cd firebase-js-sdk/packages-exp/auth-compat-exp/demo
 ```
 
 This will clone the repository in the current directory.
@@ -30,26 +30,39 @@ firebase use --add
 Select the project you have created in the prerequisite, and type in `default` or
 any other name as the alias to use for this project.
 
-Copy `src/sample-config.js` to `src/config.js`:
+Copy `public/sample-config.js` to `public/config.js`:
 
 ```bash
-cp src/sample-config.js src/config.js
+cp public/sample-config.js public/config.js
 ```
 
 Then copy and paste the Web snippet config found in the console (either by clicking "Add Firebase to
 your web app" button in your Project overview, or clicking the "Web setup" button in the Auth page)
 in the `config.js` file.
 
+In the `functions` folder you'll need to install the admin SDK:
+
+```bash
+cd functions
+yarn install
+```
+
 ## Deploy
 
 Before deploying, you may need to build the auth-exp package:
 ```bash
 yarn build:deps
 ```
 
-This can take some time, and you only need to do it if you've modified the auth-exp package.
+You'll also need to build a fully resolved firebase-app.js and firebase-auth.js from auth-compat-exp:
+
+```bash
+yarn build
+```
+
+This can take some time, and you only need to do it if you've modified the auth-exp or auth-compta-exp packages.
 
-To run the app locally, simply issue the following command in the `auth-exp/demo` directory:
+To run the app locally, simply issue the following command in the `auth-compat-exp/demo` directory:
 
 ```bash
 yarn run demo

packages-exp/auth-compat-exp/demo/yarn.lock

@@ -2,7 +2,7 @@
 # yarn lockfile v1
 
 
-"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.8.3":
+"@babel/code-frame@^7.0.0":
   version "7.10.4"
   resolved "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz#168da1a36e90da68ae8d49c0f1b48c7c6249213a"
   integrity sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==
@@ -1498,11 +1498,6 @@ combined-stream@^1.0.6, combined-stream@~1.0.6:
   dependencies:
     delayed-stream "~1.0.0"
 
-commander@^2.20.0:
-  version "2.20.3"
-  resolved "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
-  integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
-
 [email protected]:
   version "1.1.0"
   resolved "https://registry.npmjs.org/commenting/-/commenting-1.1.0.tgz#fae14345c6437b8554f30bc6aa6c1e1633033590"
@@ -2421,11 +2416,6 @@ has-flag@^3.0.0:
   resolved "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
   integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0=
 
-has-flag@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"
-  integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
-
 has-symbols@^1.0.0, has-symbols@^1.0.1:
   version "1.0.1"
   resolved "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz#9f5214758a44196c406d9bd76cebf81ec2dd31e8"
@@ -2896,14 +2886,6 @@ jest-worker@^24.0.0:
     merge-stream "^2.0.0"
     supports-color "^6.1.0"
 
-jest-worker@^26.0.0:
-  version "26.1.0"
-  resolved "https://registry.npmjs.org/jest-worker/-/jest-worker-26.1.0.tgz#65d5641af74e08ccd561c240e7db61284f82f33d"
-  integrity sha512-Z9P5pZ6UC+kakMbNJn+tA2RdVdNX5WH1x+5UCBZ9MxIK24pjYtFt96fK+UwBTrjLYm232g1xz0L3eTh51OW+yQ==
-  dependencies:
-    merge-stream "^2.0.0"
-    supports-color "^7.0.0"
-
 js-tokens@^4.0.0:
   version "4.0.0"
   resolved "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
@@ -4103,13 +4085,6 @@ quick-lru@^4.0.1:
   resolved "https://registry.npmjs.org/quick-lru/-/quick-lru-4.0.1.tgz#5b8878f113a58217848c6482026c73e1ba57727f"
   integrity sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g==
 
-randombytes@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz#df6f84372f0270dc65cdf6291349ab7a473d4f2a"
-  integrity sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==
-  dependencies:
-    safe-buffer "^5.1.0"
-
 read-cmd-shim@^1.0.1:
   version "1.0.5"
   resolved "https://registry.npmjs.org/read-cmd-shim/-/read-cmd-shim-1.0.5.tgz#87e43eba50098ba5a32d0ceb583ab8e43b961c16"
@@ -4435,16 +4410,6 @@ [email protected]:
     "@rollup/pluginutils" "^3.0.9"
     source-map-resolve "^0.6.0"
 
-[email protected]:
-  version "6.1.0"
-  resolved "https://registry.npmjs.org/rollup-plugin-terser/-/rollup-plugin-terser-6.1.0.tgz#071866585aea104bfbb9dd1019ac523e63c81e45"
-  integrity sha512-4fB3M9nuoWxrwm39habpd4hvrbrde2W2GG4zEGPQg1YITNkM3Tqur5jSuXlWNzbv/2aMLJ+dZJaySc3GCD8oDw==
-  dependencies:
-    "@babel/code-frame" "^7.8.3"
-    jest-worker "^26.0.0"
-    serialize-javascript "^3.0.0"
-    terser "^4.7.0"
-
 [email protected]:
   version "0.27.0"
   resolved "https://registry.npmjs.org/rollup-plugin-typescript2/-/rollup-plugin-typescript2-0.27.0.tgz#95ff96f9e07d5000a9d2df4d76b548f9a1f83511"
@@ -4501,7 +4466,7 @@ rxjs@^6.4.0:
   dependencies:
     tslib "^1.9.0"
 
-safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@^5.2.0, safe-buffer@~5.2.0:
+safe-buffer@^5.0.1, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@^5.2.0, safe-buffer@~5.2.0:
   version "5.2.1"
   resolved "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
   integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
@@ -4538,13 +4503,6 @@ serialize-javascript@^2.1.2:
   resolved "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-2.1.2.tgz#ecec53b0e0317bdc95ef76ab7074b7384785fa61"
   integrity sha512-rs9OggEUF0V4jUSecXazOYsLfu7OGK2qIn3c7IPBiffz32XniEp/TX9Xmc9LQfK2nQ2QKHvZ2oygKUGU0lG4jQ==
 
-serialize-javascript@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-3.1.0.tgz#8bf3a9170712664ef2561b44b691eafe399214ea"
-  integrity sha512-JIJT1DGiWmIKhzRsG91aS6Ze4sFUrYbltlkg2onR5OrnNM02Kl/hnY/T4FN2omvyeBbQmMJv+K4cPOpGzOTFBg==
-  dependencies:
-    randombytes "^2.1.0"
-
 set-blocking@^2.0.0, set-blocking@~2.0.0:
   version "2.0.0"
   resolved "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
@@ -4671,14 +4629,6 @@ source-map-resolve@^0.6.0:
     atob "^2.1.2"
     decode-uri-component "^0.2.0"
 
-source-map-support@~0.5.12:
-  version "0.5.19"
-  resolved "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.19.tgz#a98b62f86dcaf4f67399648c085291ab9e8fed61"
-  integrity sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==
-  dependencies:
-    buffer-from "^1.0.0"
-    source-map "^0.6.0"
-
 source-map-url@^0.4.0:
   version "0.4.0"
   resolved "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3"
@@ -4689,7 +4639,7 @@ source-map@^0.5.6:
   resolved "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
   integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=
 
-source-map@^0.6.0, source-map@^0.6.1, source-map@~0.6.1:
+source-map@^0.6.1:
   version "0.6.1"
   resolved "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263"
   integrity sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==
@@ -4960,13 +4910,6 @@ supports-color@^6.1.0:
   dependencies:
     has-flag "^3.0.0"
 
-supports-color@^7.0.0:
-  version "7.1.0"
-  resolved "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz#68e32591df73e25ad1c4b49108a2ec507962bfd1"
-  integrity sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==
-  dependencies:
-    has-flag "^4.0.0"
-
 tar@^4.4.10, tar@^4.4.12, tar@^4.4.8:
   version "4.4.13"
   resolved "https://registry.npmjs.org/tar/-/tar-4.4.13.tgz#43b364bc52888d555298637b10d60790254ab525"
@@ -4997,15 +4940,6 @@ temp-write@^3.4.0:
     temp-dir "^1.0.0"
     uuid "^3.0.1"
 
-terser@^4.7.0:
-  version "4.8.0"
-  resolved "https://registry.npmjs.org/terser/-/terser-4.8.0.tgz#63056343d7c70bb29f3af665865a46fe03a0df17"
-  integrity sha512-EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw==
-  dependencies:
-    commander "^2.20.0"
-    source-map "~0.6.1"
-    source-map-support "~0.5.12"
-
 text-extensions@^1.0.0:
   version "1.9.0"
   resolved "https://registry.npmjs.org/text-extensions/-/text-extensions-1.9.0.tgz#1853e45fee39c945ce6f6c36b2d659b5aabc2a26"

packages-exp/auth-compat-exp/index.ts

@@ -16,6 +16,7 @@
  */
 
 import firebase from '@firebase/app';
+import * as impl from '@firebase/auth-exp/internal';
 import { _FirebaseNamespace } from '@firebase/app-types/private';
 import * as externs from '@firebase/auth-types-exp';
 import {
@@ -24,8 +25,11 @@ import {
   InstantiationMode
 } from '@firebase/component';
 import '@firebase/installations';
-import { name, version } from './package.json';
+import { version } from './package.json';
 import { Auth } from './src/auth';
+import { RecaptchaVerifier } from './src/recaptcha_verifier';
+import { EmailAuthProvider } from './src/email_auth_provider';
+import { PhoneMultiFactorGenerator } from './src/phone_multi_factor_generator';
 
 const AUTH_TYPE = 'auth';
 
@@ -53,17 +57,17 @@ function registerAuth(instance: _FirebaseNamespace): void {
             VERIFY_AND_CHANGE_EMAIL: externs.Operation.VERIFY_AND_CHANGE_EMAIL,
             VERIFY_EMAIL: externs.Operation.VERIFY_EMAIL
           }
-        }
-        // TODO(avolkovi): Expose the other top level properties
-        //   EmailAuthProvider,
-        //   FacebookAuthProvider,
-        //   GithubAuthProvider,
-        //   GoogleAuthProvider,
-        //   OAuthProvider,
+        },
+        EmailAuthProvider,
+        FacebookAuthProvider: impl.FacebookAuthProvider,
+        GithubAuthProvider: impl.GithubAuthProvider,
+        GoogleAuthProvider: impl.GoogleAuthProvider,
+        OAuthProvider: impl.OAuthProvider,
         //   SAMLAuthProvider,
-        //   PhoneAuthProvider,
-        //   RecaptchaVerifier,
-        //   TwitterAuthProvider,
+        PhoneAuthProvider: impl.PhoneAuthProvider,
+        PhoneMultiFactorGenerator,
+        RecaptchaVerifier,
+        TwitterAuthProvider: impl.TwitterAuthProvider,
         //   Auth: {
         //     Persistence
         //   }
@@ -74,7 +78,7 @@ function registerAuth(instance: _FirebaseNamespace): void {
       .setMultipleInstances(false)
   );
 
-  instance.registerVersion(name, version);
+  instance.registerVersion("auth", version);
 }
 
 registerAuth(firebase as _FirebaseNamespace);

packages-exp/auth-compat-exp/src/auth.ts

@@ -83,7 +83,7 @@ export class Auth extends impl.AuthImplCompat<User> implements compat.FirebaseAu
     email: string,
     password: string
   ): Promise<compat.UserCredential> {
-    return convertCredential(
+    return convertCredential(this._asExtern(),
       impl.createUserWithEmailAndPassword(this._asExtern(), email, password)
     );
   }
@@ -104,7 +104,7 @@ export class Auth extends impl.AuthImplCompat<User> implements compat.FirebaseAu
         user: null
       };
     }
-    return convertCredential(Promise.resolve(credential));
+    return convertCredential(this._asExtern(),Promise.resolve(credential));
   }
   onAuthStateChanged(
     nextOrObserver: Observer<unknown> | ((a: compat.User | null) => unknown),
@@ -176,44 +176,44 @@ export class Auth extends impl.AuthImplCompat<User> implements compat.FirebaseAu
     return this.signInWithCredential(credential);
   }
   signInAnonymously(): Promise<compat.UserCredential> {
-    return convertCredential(impl.signInAnonymously(this._asExtern()));
+    return convertCredential(this._asExtern(),impl.signInAnonymously(this._asExtern()));
   }
   signInWithCredential(
     credential: compat.AuthCredential
   ): Promise<compat.UserCredential> {
-    return convertCredential(
+    return convertCredential(this._asExtern(),
       impl.signInWithCredential(
         this._asExtern(),
         credential as externs.AuthCredential
       )
     );
   }
   signInWithCustomToken(token: string): Promise<compat.UserCredential> {
-    return convertCredential(
+    return convertCredential(this._asExtern(),
       impl.signInWithCustomToken(this._asExtern(), token)
     );
   }
   signInWithEmailAndPassword(
     email: string,
     password: string
   ): Promise<compat.UserCredential> {
-    return convertCredential(
+    return convertCredential(this._asExtern(),
       impl.signInWithEmailAndPassword(this._asExtern(), email, password)
     );
   }
   signInWithEmailLink(
     email: string,
     emailLink?: string
   ): Promise<compat.UserCredential> {
-    return convertCredential(
+    return convertCredential(this._asExtern(),
       impl.signInWithEmailLink(this._asExtern(), email, emailLink)
     );
   }
   signInWithPhoneNumber(
     phoneNumber: string,
     applicationVerifier: compat.ApplicationVerifier
   ): Promise<compat.ConfirmationResult> {
-    return convertConfirmationResult(
+    return convertConfirmationResult(this._asExtern(),
       impl.signInWithPhoneNumber(
         this._asExtern(),
         phoneNumber,
@@ -224,7 +224,7 @@ export class Auth extends impl.AuthImplCompat<User> implements compat.FirebaseAu
   signInWithPopup(
     provider: compat.AuthProvider
   ): Promise<compat.UserCredential> {
-    return convertCredential(
+    return convertCredential(this._asExtern(),
       impl.signInWithPopup(
         this._asExtern(),
         provider as externs.AuthProvider,

packages-exp/auth-compat-exp/src/email_auth_provider.ts

@@ -0,0 +1,38 @@
+/**
+ * @license
+ * Copyright 2020 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 firebase from '@firebase/app';
+import * as impl from '@firebase/auth-exp/internal';
+import * as compat from '@firebase/auth-types';
+import * as externs from '@firebase/auth-types-exp';
+
+export class EmailAuthProvider implements compat.EmailAuthProvider {
+  static readonly PROVIDER_ID = externs.ProviderId.PASSWORD;
+  static readonly EMAIL_PASSWORD_SIGN_IN_METHOD =
+    externs.SignInMethod.EMAIL_PASSWORD;
+  static readonly EMAIL_LINK_SIGN_IN_METHOD = externs.SignInMethod.EMAIL_LINK;
+  readonly providerId = EmailAuthProvider.PROVIDER_ID;
+
+  static credential(email: string, password: string): compat.AuthCredential {
+    return impl.EmailAuthProvider.credential(email, password);
+  }
+
+  static credentialWithLink(email: string, emailLink: string): compat.AuthCredential {
+    // TODO: support multiple app instances or revert this API change
+    return impl.EmailAuthProvider.credentialWithLink(firebase.auth!() as unknown as externs.Auth, email, emailLink);
+  }
+}