firebase · M-Hassan90s · Mar 4, 2020 · Mar 13, 2020 · Mar 13, 2020 · Mar 13, 2020
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -0,0 +1,42 @@
+name: Test
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - "**"
+
+env:
+  SAUCE_USERNAME: ${{secrets.SAUCE_USERNAME}}
+  SAUCE_ACCESS_KEY: ${{secrets.SAUCE_ACCESS_KEY}}
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Setup node
+        uses: actions/setup-node@v2-beta
+        with:
+          node-version: '18'
+          check-latest: true
+      - name: node_modules cache
+        id: node_modules_cache
+        uses: actions/cache@v2
+        with:
+          path: ./node_modules
+          key: ${{ runner.os }}-18-node_modules-${{ hashFiles('package-lock.json') }}
+          restore-keys: |
+            ${{ runner.os }}-18-node_modules-
+      - name: NPM install
+        if: steps.node_modules_cache.outputs.cache-hit != 'true'
+        run: npm ci
+      - name: Build & run tests
+        run: npm run test
+      - name: Run tests in Saucelabs
+        run: |
+          ./buildtools/sauce_connect.sh &
+          ./buildtools/run_tests.sh --saucelabs
diff --git a/.gitignore b/.gitignore
@@ -5,6 +5,7 @@ node_modules/
 generated/
 out/
 dist/
+.firebase
 
 # Generated files.
 *.log

diff --git a/.travis.yml b/.travis.yml
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -0,0 +1 @@
+* Fix password policy error message handling in password reset flow (#1047)
diff --git a/README.md b/README.md
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "firebaseui",
-  "version": "4.2.0",
+  "version": "6.0.0",
   "description": "Javascript library for customizable UI on top of Firebase SDK",
   "main": [
     "./dist/firebaseui.js",
@@ -22,6 +22,6 @@
     "out"
   ],
   "dependencies": {
-    "firebase": "^4.1.2"
+    "firebase": "^9.1.3 || ^10.0.0"
   }
 }
diff --git a/buildtools/container/Dockerfile b/buildtools/container/Dockerfile
@@ -1,16 +1,22 @@
-FROM node:8.16.0
+FROM ubuntu:latest
 
 # Install dependencies: curl, git, jq, python2 and jre8.
 RUN apt-get update && \
-    apt-get install -y curl git jq python openjdk-8-jre-headless
+    apt-get install -y curl git jq python-is-python3 openjdk-11-jre-headless nodejs npm wget
 
-# Install npm at 6.10.2.
-RUN npm install --global [email protected]
+# Print Node version and npm version
+RUN node -v
+RUN npm -v
 
 # Install hub
 RUN curl -fsSL --output hub.tgz https://github.com/github/hub/releases/download/v2.11.2/hub-linux-amd64-2.11.2.tgz
 RUN tar --strip-components=2 -C /usr/bin -xf hub.tgz hub-linux-amd64-2.11.2/bin/hub
 
 # Install the lastest Chrome stable version.
-RUN wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb
-RUN dpkg -i google-chrome-stable_current_amd64.deb; apt-get -fy install
+# RUN wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb
+# RUN dpkg -i google-chrome-stable_current_amd64.deb; apt-get -fy install
+
+# Pin Chrome v119 because we're pinning this version in CI.
+# TODO: Install the lastest Chrome stable version once we unpin chrome version in CI.
+RUN wget https://edgedl.me.gvt1.com/edgedl/chrome/chrome-for-testing/119.0.6045.105/linux64/chrome-linux64.zip
+RUN dpkg -i google-chrome-stable_119.0.6045.105_amd64.deb; apt-get -fy install
diff --git a/buildtools/gen_all_tests_js.py b/buildtools/gen_all_tests_js.py
@@ -25,13 +25,13 @@
 
 def main():
   common.cd_to_firebaseui_root()
-  print "var allTests = ["
+  print("var allTests = [")
   _print_test_files_under_root(common.TESTS_BASE_PATH)
-  print "];"
+  print("];")
   # The following is required in the context of protractor.
-  print "if (typeof module !== 'undefined' && module.exports) {"
-  print "  module.exports = allTests;"
-  print "}"
+  print("if (typeof module !== 'undefined' && module.exports) {")
+  print("  module.exports = allTests;")
+  print("}")
 
 
 def _print_test_files_under_root(root):
@@ -41,7 +41,7 @@ def _print_test_files_under_root(root):
     root: The path to the directory.
   """
   for file_name in common.get_files_with_suffix(root, "_test.html"):
-    print "  '%s'," % file_name[2:]  # Ignore the beginning './'.
+    print("  '%s'," % file_name[2:])  # Ignore the beginning './'.
 
 
 if __name__ == "__main__":

diff --git a/buildtools/gen_test_html.py b/buildtools/gen_test_html.py
@@ -63,8 +63,9 @@ def _gen_html(js_path, template):
 
     _write_file(related_paths.html, generated_html)
 
-  except:  # pylint: disable=bare-except
-    print "HTML generation failed for: %s" % js_path
+  except Exception as e:  # pylint: disable=bare-except
+    print("HTML generation failed for: %s" % js_path)
+    print(e)
 
 
 def _get_related_paths_from_js_path(js_path):
@@ -86,21 +87,22 @@ def _get_related_paths_from_js_path(js_path):
 
 
 def _extract_closure_package(js_data):
-  """Extracts the package name that is goog.provide()d in the JS file.
+  """Extracts the package name that is goog.provide() or goog.module()
+  in the JS file.
 
   Args:
     js_data: The contents of a JS test (*_test.js) file.
 
   Returns:
-    The closure package goog.provide()d by the file.
+    The closure package goog.provide() or good.module() by the file.
 
   Raises:
-    ValueError: The JS does not contain a goog.provide().
+    ValueError: The JS does not contain a goog.provide() or goog.module().
   """
-  matches = re.search(r"goog\.provide\('(.+)'\);", js_data)
+  matches = re.search(r"goog\.(provide|module)\([\n\s]*'(.+)'\);", js_data)
   if matches is None:
-    raise ValueError("goog.provide() not found in file")
-  return matches.group(1)
+    raise ValueError("goog.provide() or goog.module() not found in file")
+  return matches.group(2)
 
 
 def _read_file(path):

diff --git a/buildtools/generate_test_files.sh b/buildtools/generate_test_files.sh
@@ -24,17 +24,21 @@
 cd "$(dirname $(dirname "$0"))"
 
 echo "Compiling templates..."
-npm run build build-soy
-cp -r ./out/soy ./generated
-npm run build clean
+npm run build-soy
+mkdir -p ./generated
+cp -r ./out/soy/* ./generated
 
 echo "Generating dependency file..."
-CLOSURE_PATH="google-closure-templates/javascript"
-python node_modules/google-closure-library/closure/bin/build/depswriter.py \
-    --root_with_prefix="soy ../../../../soy" \
-    --root_with_prefix="generated ../../../../generated" \
-    --root_with_prefix="javascript ../../../../javascript" \
-    --root_with_prefix="node_modules/$CLOSURE_PATH ../../../$CLOSURE_PATH" \
+node node_modules/.bin/closure-make-deps \
+    --closure-path="node_modules/google-closure-library/closure/goog" \
+    --file="node_modules/google-closure-library/closure/goog/deps.js" \
+    --root="soy" \
+    --root="generated" \
+    --root="javascript" \
+    --root="node_modules/google-closure-templates/javascript" \
+    --exclude="generated/all_tests.js" \
+    --exclude="generated/deps.js" \
+    --exclude="javascript/externs" \
     > generated/deps.js
 
 echo "Generating test HTML files..."

diff --git a/buildtools/publish.sh b/buildtools/publish.sh
@@ -114,9 +114,9 @@ if [ ! -s CHANGELOG.md ]; then
 fi
 echo "Made sure there is a changelog."
 
-echo "Running npm install..."
-npm install
-echo "Ran npm install."
+echo "Running npm ci..."
+npm ci
+echo "Ran npm ci."
 
 CURRENT_VERSION=$(jq -r ".version" package.json)
 echo "Making a $VERSION version..."

diff --git a/buildtools/publish/npmrc.enc b/buildtools/publish/npmrc.enc
diff --git a/buildtools/run_tests.sh b/buildtools/run_tests.sh
@@ -23,7 +23,7 @@
 # Can take up to two arguments:
 # --saucelabs: Use SauceLabs instead of phantomJS.
 # --tunnelIdentifier=<tunnelId>: when using SauceLabs, specify the tunnel
-#     identifier. Otherwise, uses the environment variable TRAVIS_JOB_NUMBER.
+#     identifier. Otherwise, uses the environment variable GITHUB_RUN_ID.
 #
 # Prefer to use the `npm test` command as explained below.
 #
@@ -45,7 +45,7 @@
 # This will start the HTTP Server locally, and connect through SauceConnect
 # to SauceLabs remote browsers instances.
 #
-# Travis will run `npm test -- --saucelabs`.
+# Github Actions will run `npm test -- --saucelabs`.
 
 cd "$(dirname $(dirname "$0"))"
 BIN_PATH="./node_modules/.bin"
@@ -71,24 +71,28 @@ trap killServer EXIT
 # If --saucelabs option is passed, forward it to the protractor command adding
 # the second argument that is required for local SauceLabs test run.
 if [[ $1 = "--saucelabs" ]]; then
-  # Enable saucelabs tests only when running locally or when Travis enviroment vars are accessible. 
-  if [[ ( "$TRAVIS" = true  &&  "$TRAVIS_SECURE_ENV_VARS" = true ) || ( -z "$TRAVIS" ) ]]; then
+  # Enable saucelabs tests only when running locally or when CI enviroment vars are accessible. 
+  if [[ ((! -z "$SAUCE_USERNAME") && (! -z "$SAUCE_ACCESS_KEY")) || ( -z "$CI" ) ]]; then
     seleniumStarted=false
     sleep 2
     echo "Using SauceLabs."
+    until [ -f '/tmp/sauce-connect-ready' ]
+    do
+      sleep 2
+    done
     # $2 contains the tunnelIdentifier argument if specified, otherwise is empty.
     $PROTRACTOR_BIN_PATH/protractor protractor.conf.js --saucelabs $2
   fi
 else
-  # https://github.com/angular/webdriver-manager/issues/404
-  echo "Updating webdriver-manager dependency."
-  cd ./node_modules/protractor/
-  npm i webdriver-manager@latest
-  cd ../../
   echo "Using Headless Chrome."
   # Updates Selenium Webdriver.
-  echo "$PROTRACTOR_BIN_PATH/webdriver-manager update --gecko=false"
-  $PROTRACTOR_BIN_PATH/webdriver-manager update --gecko=false
+
+  # TODO(jhuleatt) this is failing when `google-chrome --product-version` returns Chrome 115.0.5790.110
+  # so for now, hard code latest
+  # GOOGLE_CHROME_VERSION=$(google-chrome --product-version || echo 'latest')
+  GOOGLE_CHROME_VERSION=$(echo 'latest')
+  echo "$PROTRACTOR_BIN_PATH/webdriver-manager update --versions.chrome=$GOOGLE_CHROME_VERSION --gecko=false"
+  $PROTRACTOR_BIN_PATH/webdriver-manager update --versions.chrome=$GOOGLE_CHROME_VERSION --gecko=false
   # Start Selenium Webdriver.
   echo "$PROTRACTOR_BIN_PATH/webdriver-manager start &>/dev/null &"
   $PROTRACTOR_BIN_PATH/webdriver-manager start &>/dev/null &

diff --git a/buildtools/sauce_connect.sh b/buildtools/sauce_connect.sh
@@ -17,14 +17,16 @@
 # Download and install SauceConnect under Linux 64-bit. To be used when testing
 # with SauceLabs locally. See the instructions in protractor.conf.js file.
 #
-# It should not be used on Travis. Travis already handles SauceConnect.
-#
 # Script copied from the Closure Library repository:
 # https://github.com/google/closure-library/blob/master/scripts/ci/sauce_connect.sh
 #
 
 # Setup and start Sauce Connect locally.
-CONNECT_URL="https://saucelabs.com/downloads/sc-4.4.1-linux.tar.gz"
+if [[ $OSTYPE == 'darwin'* ]]; then
+  CONNECT_URL="https://saucelabs.com/downloads/sc-4.9.2-osx.zip"
+else
+  CONNECT_URL="https://saucelabs.com/downloads/sc-4.9.2-linux.tar.gz"
+fi
 CONNECT_DIR="/tmp/sauce-connect-$RANDOM"
 CONNECT_DOWNLOAD="sc-latest-linux.tar.gz"
 
@@ -35,8 +37,17 @@ mkdir -p $CONNECT_DIR
 cd $CONNECT_DIR
 curl $CONNECT_URL -o $CONNECT_DOWNLOAD 2> /dev/null 1> /dev/null
 mkdir sauce-connect
-tar --extract --file=$CONNECT_DOWNLOAD --strip-components=1 \
+
+if [[ $OSTYPE == 'darwin'* ]]; then
+  unzip -d sauce-connect $CONNECT_DOWNLOAD &&
+    f=(sauce-connect/*) &&
+    mv sauce-connect/*/* sauce-connect &&
+    rmdir "${f[@]}"
+else
+  tar --extract --file=$CONNECT_DOWNLOAD --strip-components=1 \
     --directory=sauce-connect > /dev/null
+fi
+
 rm $CONNECT_DOWNLOAD
 
 function removeFiles() {
@@ -46,8 +57,13 @@ function removeFiles() {
 
 trap removeFiles EXIT
 
-# This will be used by Protractor to connect to SauceConnect.
-TUNNEL_IDENTIFIER="tunnelId-$RANDOM"
+# This will be used by Protractor to connect to SauceConnect
+if [[(! -z "$GITHUB_RUN_ID")]]; then
+  TUNNEL_IDENTIFIER="$GITHUB_RUN_ID"
+else
+  TUNNEL_IDENTIFIER="tunnelId-$RANDOM"
+fi
+
 echo ""
 echo "========================================================================="
 echo "    Tunnel Identifier to pass to Protractor:"
@@ -60,4 +76,4 @@ echo "Starting Sauce Connect..."
 
 # Start SauceConnect.
 sauce-connect/bin/sc -u $SAUCE_USERNAME -k $SAUCE_ACCESS_KEY \
-    -i $TUNNEL_IDENTIFIER
+    -i $TUNNEL_IDENTIFIER -f $BROWSER_PROVIDER_READY_FILE
diff --git a/cut b/cut
diff --git a/demo/README.md b/demo/README.md
@@ -51,6 +51,17 @@ Then copy and paste the Web snippet code found in the console (either by clickin
 your web app" button in your Project overview, or clicking the "Web setup" button in the Auth page)
 in the `config.js` file.
 
+## Integrate One-tap sign-up with FirebaseUI (optional)
+
+If you want to integrate with
+[One-tap sign-up](https://developers.google.com/identity/one-tap/web/overview),
+you will also need the Google OAuth web client ID corresponding to that project
+which can be retrieved from the Google Cloud Console. This value will need to be
+populated in `CLIENT_ID`.
+The domain of the page has to also be whitelisted. Learn more on how to
+[get started with One-tap sign-up](https://developers.google.com/identity/one-tap/web/get-started).
+Skip this step, if you don't want to use One-tap sign-up with FirebaseUI.
+
 ## Deploy
 
 ### Option 1: Compile and use local FirebaseUI files