Merge local repository with external GitHub contributions.

Thomas Cesare-Herriau · Thomas Cesare-Herriau · commit 5ed86b51a123 · 2016-11-08T15:02:38.000-08:00
diff --git a/README.md b/README.md
@@ -36,8 +36,8 @@ You just need to include the following script and CSS file in the `<head>` tag o
 below the initialization snippet from the Firebase Console:
 
 ```html
-<script src="https://www.gstatic.com/firebasejs/ui/live/0.5/firebase-ui-auth.js"></script>
-<link type="text/css" rel="stylesheet" href="https://www.gstatic.com/firebasejs/ui/live/0.5/firebase-ui-auth.css" />
+<script src="https://www.gstatic.com/firebasejs/ui/live/1.0/firebase-ui-auth.js"></script>
+<link type="text/css" rel="stylesheet" href="https://www.gstatic.com/firebasejs/ui/live/1.0/firebase-ui-auth.css" />
 ```
 
 You can then serve your app locally using `firebase serve`.
@@ -75,7 +75,7 @@ instance should be passed to the constructor of `firebaseui.auth.AuthUI`. You ca
 object.
 
 The following example shows how to set up a sign-in screen with all supported providers. Please
-refer to the [demo application in the examples folder](examples/demo/) for a more in-depth
+refer to the [demo application in the examples folder](demo/) for a more in-depth
 example, showcasing a Single Page Application mode.
 
 > Firebase and FirebaseUI do not work when executed directly from a file (i.e. opening the file in
@@ -92,8 +92,8 @@ example, showcasing a Single Page Application mode.
        * TODO(DEVELOPER): Paste the initialization snippet from:
        * Firebase Console > Overview > Add Firebase to your web app. *
        ***************************************************************************************** -->
-    <script src="https://www.gstatic.com/firebasejs/ui/live/0.5/firebase-ui-auth.js"></script>
-    <link type="text/css" rel="stylesheet" href="https://www.gstatic.com/firebasejs/ui/live/0.5/firebase-ui-auth.css" />
+    <script src="https://www.gstatic.com/firebasejs/ui/live/1.0/firebase-ui-auth.js"></script>
+    <link type="text/css" rel="stylesheet" href="https://www.gstatic.com/firebasejs/ui/live/1.0/firebase-ui-auth.css" />
     <script type="text/javascript">
       // FirebaseUI config.
       var uiConfig = {
@@ -303,8 +303,8 @@ If the callback returns `false` or nothing, the page is not automatically redire
        * TODO(DEVELOPER): Paste the initialization snippet from:
        * Firebase Console > Overview > Add Firebase to your web app. *
        ***************************************************************************************** -->
-    <script src="https://www.gstatic.com/firebasejs/ui/live/0.5/firebase-ui-auth.js"></script>
-    <link type="text/css" rel="stylesheet" href="https://www.gstatic.com/firebasejs/ui/live/0.5/firebase-ui-auth.css" />
+    <script src="https://www.gstatic.com/firebasejs/ui/live/1.0/firebase-ui-auth.js"></script>
+    <link type="text/css" rel="stylesheet" href="https://www.gstatic.com/firebasejs/ui/live/1.0/firebase-ui-auth.css" />
     <script type="text/javascript">
       // FirebaseUI config.
       var uiConfig = {
@@ -439,7 +439,8 @@ npm run demo
 ```
 
 This will start a local server serving a FirebaseUI demo app with all local
-changes.
+changes. More details can be found in the [demo app folder](demo/), covering
+how to configure the app to be deployed on a Firebase Hosting instance.
 
 ### Running unit tests.
 
@@ -478,8 +479,18 @@ avoid re-rendering the widget in the middle of an action, but if you do, to avoi
 should use the `reset()` method before re-rendering the widget.
 
 ## Release Notes
+
 ### 1.0.0
 
+See the milestone [1.0.0](https://github.com/firebase/firebaseui-web/milestone/2) for the issues
+covered in this release. Below is a summary of the most important ones:
+
+- **FirebaseUI is now open source!** To contribute, please first create an issue describing either
+the bug observed or the feature requested. This way we can discuss the relevance of the feature,
+before you start working on it. It is also usually better to express the bug before working on a
+fix.
+- Added an option to disable Account Chooser. See: [Credential Helper](credential-helper).
+
 ### 0.5.0
 
 See the milestone [0.5.0](https://github.com/firebase/firebaseui-web/milestone/1) for the issues
@@ -490,7 +501,7 @@ dispose of the widget. When the user leaves a page where the FirebaseUI widget w
 instance in the `componentWillUnmount` method of a React component), call the `reset` method of the
 `firebaseui.auth.AuthUI` instance you created. Also, call the `reset` method before rendering
 again the widget if one has already been rendered on the page. Please refer to the
-[demo app](examples/demo/) for guidance on how to use FirebaseUI in a Single Page
+[demo app](demo/) for guidance on how to use FirebaseUI in a Single Page
 Application context.
 - **Custom scopes** can now be added for each provider. See [Custom Scopes](custom-scopes).
 - Several issues, different but related to the `displayName` not being present after sign up with
diff --git a/demo/README.md b/demo/README.md
@@ -18,18 +18,27 @@ Auth > Sign-in methods.
 
 Run:
 
-    git clone https://github.com/firebase/firebaseui-web.git
-    cd firebaseui-web/examples/demo
-    firebase use --add
+```bash
+git clone https://github.com/firebase/firebaseui-web.git
+cd firebaseui-web/demo
+```
+
+This will clone the repository in the current directory.
 
-This will clone the repository in the current directory, and start a wizard to configure firebase
-for your app. Select the project you have created in the prerequisite, and type in `default` or
+If you want to be able to deploy the demo app to one of your own Firebase Hosting instance,
+configure it using the following command:
+
+```bash
+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 `demo/public/sample-config.js` to `demo/public/config.js`:
+Copy `public/sample-config.js` to `public/config.js`:
 
 ```bash
-cp demo/public/sample-config.js demo/public/config.js
+cp public/sample-config.js public/config.js
 ```
 
 Then copy and paste the Web snippet code found in the console (either by clicking "Add Firebase to
@@ -38,5 +47,12 @@ in the `config.js` file.
 
 ## Deploy
 
-Run `firebase serve` to run a server locally (default: http://localhost:5000) or `firebase deploy` to
-deploy the demo.
+To deploy the demo app, run the following command in the root directory of FirebaseUI (use `cd ..`
+first if you are still in the `demo/` folder):
+
+```bash
+npm run demo
+```
+
+This will compile all the files needed to run FirebaseUI, and start a Firebase server locally at
+http://localhost:5000.
diff --git a/demo/public/app.js b/demo/public/app.js
@@ -113,6 +113,24 @@ firebase.auth().onAuthStateChanged(function(user) {
   user ? handleSignedInUser(user) : handleSignedOutUser();
 });
 
+/**
+ * Deletes the user's account.
+ */
+var deleteAccount = function() {
+  firebase.auth().currentUser.delete().catch(function(error) {
+    if (error.code == 'auth/requires-recent-login') {
+      // The user's credential is too old. She needs to sign in again.
+      firebase.auth().signOut().then(function() {
+        // The timeout allows the message to be displayed after the UI has
+        // changed to the signed out state.
+        setTimeout(function() {
+          alert('Please sign in again to delete your account.');
+        }, 1);
+      });
+    }
+  });
+};
+
 
 /**
  * Initializes the app.
@@ -127,7 +145,7 @@ var initApp = function() {
   });
   document.getElementById('delete-account').addEventListener(
       'click', function() {
-        firebase.auth().currentUser.delete();
+        deleteAccount();
       });
 };
 
