Merge branch 'firestore' of sso://devrel/samples/firebase/snippets-node into firestore

abeisgoat · abeisgoat · commit 998fab240633 · 2017-10-02T14:24:32.000-07:00
diff --git a/auth/get_service_account_tokens.js b/auth/get_service_account_tokens.js
@@ -13,21 +13,21 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
+'use strict';
 // [START get_service_account_tokens]
-var admin = require("firebase-admin");
+const admin = require('firebase-admin');
 
-var serviceAccount = require("path/to/serviceAccountKey.json");
-var credential = admin.credential.cert(serviceAccount);
+const serviceAccount = require('path/to/serviceAccountKey.json');
+const credential = admin.credential.cert(serviceAccount);
 
-credential.getAccessToken().then(function(accessTokenInfo) {
-  var accessToken = accessTokenInfo.access_token;
-  var expirationTime = accessTokenInfo.expires_in;
+credential.getAccessToken().then((accessTokenInfo) => {
+  const accessToken = accessTokenInfo.access_token;
+  const expirationTime = accessTokenInfo.expires_in;
 
   // Attach accessToken to HTTPS request in the "Authorization: Bearer" header
   // After expirationTime, you must generate a new access token
   // [START_EXCLUDE]
-  console.log("The token " + accessToken + " expires in " + expirationTime);
+  console.log(`The token ${accessToken} expires in ${expirationTime}`);
   // [END_EXCLUDE]
 });
 // [END get_service_account_tokens]
diff --git a/auth/package.json b/auth/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "snippets-node",
+  "name": "snippets-node-auth",
   "version": "1.0.0",
   "description": "Code snippets used in Node.js documentation on firebase.google.com",
   "author": "Firebase (https://firebase.google.com/)",
diff --git a/firestore/full-text-search/functions/package.json b/firestore/full-text-search/functions/package.json
@@ -3,9 +3,9 @@
   "description": "Full text search for Firestore",
   "dependencies": {
     "algoliasearch": "^3.24.0",
-    "firebase-admin": "^4.1.2",
-    "firebase-functions": "^0.5.8",
-    "@google-cloud/firestore": "file:../../firestore-0.6.6.tgz"
+    "firebase-admin": "^5.4.0",
+    "firebase-functions": "^0.7.0",
+    "@google-cloud/firestore": "^0.8.0"
   },
   "private": true,
   "devDependencies": {
diff --git a/firestore/main/RELEASING.md b/firestore/main/RELEASING.md
diff --git a/firestore/main/package.json b/firestore/main/package.json
@@ -10,8 +10,8 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@google-cloud/firestore": "file:firestore.tgz",
-    "firebase-admin": "file:firebase-admin.tgz"
+    "@google-cloud/firestore": "^0.8.0",
+    "firebase-admin": "^5.4.0"
   },
   "devDependencies": {
     "mocha": "^3.3.0"
diff --git a/firestore/presence/README.md b/firestore/presence/README.md
@@ -0,0 +1,3 @@
+# Firestore Presence
+
+Demonstrates using Realtime Database presence with Cloud Firestore.
diff --git a/firestore/presence/functions/.gitignore b/firestore/presence/functions/.gitignore
@@ -0,0 +1 @@
+test.js
diff --git a/firestore/presence/functions/package.json b/firestore/presence/functions/package.json
@@ -0,0 +1,13 @@
+{
+  "name": "presence",
+  "description": "Presence for Firestore",
+  "dependencies": {
+    "firebase-admin": "^5.4.0",
+    "firebase-functions": "^0.7.0",
+    "@google-cloud/firestore": "^0.8.0"
+  },
+  "private": true,
+  "devDependencies": {
+    "prettier": "^1.6.1"
+  }
+}

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "name": "snippets-node",`
	`2`	`+ "name": "snippets-node-auth",`
`3`	`3`	`"version": "1.0.0",`
`4`	`4`	`"description": "Code snippets used in Node.js documentation on firebase.google.com",`
`5`	`5`	`"author": "Firebase (https://firebase.google.com/)",`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+# Firestore Presence`
	`2`	`+`
	`3`	`+Demonstrates using Realtime Database presence with Cloud Firestore.`