Merge branch 'master' into firestore

samtstern · samtstern · commit c9ae91c3c433 · 2017-09-28T13:55:04.000-07:00
Change-Id: I991577c7f32ff1ab08615149b6d98ff59555ea8c
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/)",

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/)",`