refactor: use local-auth for 3 legged samples (googleapis#2058)

Author: JustinBeckwith

samples/analytics/analytics.js

@@ -14,12 +14,10 @@
 'use strict';
 
 const {google} = require('googleapis');
-const sampleClient = require('../sampleclient');
+const path = require('path');
+const {authenticate} = require('@google-cloud/local-auth');
 
-const analytics = google.analytics({
-  version: 'v3',
-  auth: sampleClient.oAuth2Client,
-});
+const analytics = google.analytics('v3');
 
 // Custom Goals must exist prior to being used as an objectiveMetric
 const objectiveMetric = 'ga:goal1Completions';
@@ -37,6 +35,13 @@ const variations = [
 ];
 
 async function runSample() {
+  // Obtain user credentials to use for the request
+  const auth = await authenticate({
+    keyfilePath: path.join(__dirname, '../oauth2.keys.json'),
+    scopes: 'https://www.googleapis.com/auth/analytics',
+  });
+  google.options({auth});
+
   const res = await analytics.management.experiments.insert({
     accountId: 'your-accountId',
     webPropertyId: 'your-webPropertyId',
@@ -53,9 +58,7 @@ async function runSample() {
   return res.data;
 }
 
-const scopes = ['https://www.googleapis.com/auth/analytics'];
-
-sampleClient
-  .authenticate(scopes)
-  .then(() => runSample())
-  .catch(console.error);
+if (module === require.main) {
+  runSample().catch(console.error);
+}
+module.exports = runSample;

samples/analyticsReporting/batchGet.js

@@ -14,14 +14,19 @@
 'use strict';
 
 const {google} = require('googleapis');
-const sampleClient = require('../sampleclient');
+const path = require('path');
+const {authenticate} = require('@google-cloud/local-auth');
 
-const analyticsreporting = google.analyticsreporting({
-  version: 'v4',
-  auth: sampleClient.oAuth2Client,
-});
+const analyticsreporting = google.analyticsreporting('v4');
 
 async function runSample() {
+  // Obtain user credentials to use for the request
+  const auth = await authenticate({
+    keyfilePath: path.join(__dirname, '../oauth2.keys.json'),
+    scopes: 'https://www.googleapis.com/auth/analytics',
+  });
+  google.options({auth});
+
   const res = await analyticsreporting.reports.batchGet({
     requestBody: {
       reportRequests: [
@@ -52,12 +57,7 @@ async function runSample() {
 
 // if invoked directly (not tests), authenticate and run the samples
 if (module === require.main) {
-  const scopes = ['https://www.googleapis.com/auth/analytics'];
-  sampleClient.authenticate(scopes).then(runSample).catch(console.error);
+  runSample.catch(console.error);
 }
-
 // export functions for testing purposes
-module.exports = {
-  runSample,
-  client: sampleClient.oAuth2Client,
-};
+module.exports = runSample;

samples/blogger/insert.js

@@ -13,15 +13,20 @@
 
 'use strict';
 
+const path = require('path');
 const {google} = require('googleapis');
-const sampleClient = require('../sampleclient');
+const {authenticate} = require('@google-cloud/local-auth');
 
-const blogger = google.blogger({
-  version: 'v3',
-  auth: sampleClient.oAuth2Client,
-});
+const blogger = google.blogger('v3');
 
 async function runSample() {
+  // Obtain user credentials to use for the request
+  const auth = await authenticate({
+    keyfilePath: path.join(__dirname, '../oauth2.keys.json'),
+    scopes: 'https://www.googleapis.com/auth/blogger',
+  });
+  google.options({auth});
+
   const res = await blogger.posts.insert({
     blogId: '4340475495955554224',
     requestBody: {
@@ -35,11 +40,6 @@ async function runSample() {
 }
 
 if (module === require.main) {
-  const scopes = ['https://www.googleapis.com/auth/blogger'];
-  sampleClient.authenticate(scopes).then(runSample).catch(console.error);
+  runSample().catch(console.error);
 }
-
-module.exports = {
-  runSample,
-  client: sampleClient.oAuth2Client,
-};
+module.exports = runSample;

samples/docs/create.js

@@ -13,16 +13,20 @@
 
 'use strict';
 
+const path = require('path');
 const {google} = require('googleapis');
-const util = require('util');
-const sampleClient = require('../sampleclient');
+const {authenticate} = require('@google-cloud/local-auth');
 
-const docs = google.docs({
-  version: 'v1',
-  auth: sampleClient.oAuth2Client,
-});
+const docs = google.docs('v1');
 
 async function runSample() {
+  // Obtain user credentials to use for the request
+  const auth = await authenticate({
+    keyfilePath: path.join(__dirname, '../oauth2.keys.json'),
+    scopes: 'https://www.googleapis.com/auth/documents',
+  });
+  google.options({auth});
+
   // The initial call to create the doc will have a title but no content.
   // This is a limitation of the underlying API.
   const createResponse = await docs.documents.create({
@@ -32,16 +36,17 @@ async function runSample() {
   });
   console.log(createResponse.data);
 
-  // now that we created the doc, let's add content using the 
+  // now that we created the doc, let's add content using the
   // documentId returned from the create call.
   const updateResponse = await docs.documents.batchUpdate({
     documentId: createResponse.data.documentId,
     requestBody: {
-      requests: [{
+      requests: [
+        {
         insertText: {
           // The first text inserted into the document must create a paragraph,
-          // which can't be done with the `location` property.  Use the 
-          // `endOfSegmentLocation` instead, which assumes the Body if 
+          // which can't be done with the `location` property.  Use the
+          // `endOfSegmentLocation` instead, which assumes the Body if
           // unspecified.
           endOfSegmentLocation: {},
           text: 'Hello there!'
@@ -53,18 +58,7 @@ async function runSample() {
   return updateResponse.data;
 }
 
-const scopes = [
-  'https://www.googleapis.com/auth/documents',
-];
-
 if (module === require.main) {
-  sampleClient
-    .authenticate(scopes)
-    .then(runSample)
-    .catch(console.error);
+  runSample().catch(console.error);
 }
-
-module.exports = {
-  runSample,
-  client: sampleClient.oAuth2Client,
-};
+module.exports = runSample;

samples/docs/get.js

@@ -13,35 +13,29 @@
 
 'use strict';
 
-const {google} = require('googleapis');
+const path = require('path');
 const util = require('util');
-const sampleClient = require('../sampleclient');
+const {google} = require('googleapis');
+const {authenticate} = require('@google-cloud/local-auth');
 
-const docs = google.docs({
-  version: 'v1',
-  auth: sampleClient.oAuth2Client,
-});
+const docs = google.docs('v1');
 
 async function runSample() {
+  // Obtain user credentials to use for the request
+  const auth = await authenticate({
+    keyfilePath: path.join(__dirname, '../oauth2.keys.json'),
+    scopes: 'https://www.googleapis.com/auth/documents',
+  });
+  google.options({auth});
+
   const res = await docs.documents.get({
-    documentId: '1XPbMENiP5bWP_cbqc0bEWbq78vmUf-rWQ6aB6FVZJyc'
+    documentId: '1XPbMENiP5bWP_cbqc0bEWbq78vmUf-rWQ6aB6FVZJyc',
   });
   console.log(util.inspect(res.data, false, 17));
   return res.data;
 }
 
-const scopes = [
-  'https://www.googleapis.com/auth/documents',
-];
-
 if (module === require.main) {
-  sampleClient
-    .authenticate(scopes)
-    .then(runSample)
-    .catch(console.error);
+  runSample().catch(console.error);
 }
-
-module.exports = {
-  runSample,
-  client: sampleClient.oAuth2Client,
-};
+module.exports = runSample;

samples/drive/download.js

@@ -14,18 +14,30 @@
 'use strict';
 
 const {google} = require('googleapis');
-const sampleClient = require('../sampleclient');
 const fs = require('fs');
 const os = require('os');
 const uuid = require('uuid');
 const path = require('path');
+const {authenticate} = require('@google-cloud/local-auth');
 
-const drive = google.drive({
-  version: 'v3',
-  auth: sampleClient.oAuth2Client,
-});
+const drive = google.drive('v3');
 
 async function runSample(fileId) {
+  // Obtain user credentials to use for the request
+  const auth = await authenticate({
+    keyfilePath: path.join(__dirname, '../oauth2.keys.json'),
+    scopes: [
+      'https://www.googleapis.com/auth/drive',
+      'https://www.googleapis.com/auth/drive.appdata',
+      'https://www.googleapis.com/auth/drive.file',
+      'https://www.googleapis.com/auth/drive.metadata',
+      'https://www.googleapis.com/auth/drive.metadata.readonly',
+      'https://www.googleapis.com/auth/drive.photos.readonly',
+      'https://www.googleapis.com/auth/drive.readonly',
+    ],
+  });
+  google.options({auth});
+
   // For converting document formats, and for downloading template
   // documents, see the method drive.files.export():
   // https://developers.google.com/drive/api/v3/manage-downloads
@@ -60,29 +72,11 @@ async function runSample(fileId) {
     });
 }
 
-// if invoked directly (not tests), authenticate and run the samples
 if (module === require.main) {
   if (process.argv.length !== 3) {
     throw new Error('Usage: node samples/drive/download.js $FILE_ID');
   }
   const fileId = process.argv[2];
-  const scopes = [
-    'https://www.googleapis.com/auth/drive',
-    'https://www.googleapis.com/auth/drive.appdata',
-    'https://www.googleapis.com/auth/drive.file',
-    'https://www.googleapis.com/auth/drive.metadata',
-    'https://www.googleapis.com/auth/drive.metadata.readonly',
-    'https://www.googleapis.com/auth/drive.photos.readonly',
-    'https://www.googleapis.com/auth/drive.readonly',
-  ];
-  sampleClient
-    .authenticate(scopes)
-    .then(() => runSample(fileId))
-    .catch(console.error);
+  runSample(fileId).catch(console.error);
 }
-
-// export functions for testing purposes
-module.exports = {
-  runSample,
-  client: sampleClient.oAuth2Client,
-};
+module.exports = runSample;

samples/drive/export.js

@@ -14,18 +14,22 @@
 'use strict';
 
 const {google} = require('googleapis');
-const sampleClient = require('../sampleclient');
 const fs = require('fs');
 const os = require('os');
 const path = require('path');
+const {authenticate} = require('@google-cloud/local-auth');
 
-const drive = google.drive({
-  version: 'v3',
-  auth: sampleClient.oAuth2Client,
-});
+const drive = google.drive('v3');
 
 async function runSample() {
   // [START main_body]
+  // Obtain user credentials to use for the request
+  const auth = await authenticate({
+    keyfilePath: path.join(__dirname, '../oauth2.keys.json'),
+    scopes: 'https://www.googleapis.com/auth/drive.readonly',
+  });
+  google.options({auth});
+
   const fileId = '1EkgdLY3T-_9hWml0VssdDWQZLEc8qqpMB77Nvsx6khA';
   const destPath = path.join(os.tmpdir(), 'important.pdf');
   const dest = fs.createWriteStream(destPath);
@@ -43,14 +47,7 @@ async function runSample() {
   // [END main_body]
 }
 
-// if invoked directly (not tests), authenticate and run the samples
 if (module === require.main) {
-  const scopes = ['https://www.googleapis.com/auth/drive.readonly'];
-  sampleClient.authenticate(scopes).then(runSample).catch(console.error);
+  runSample().catch(console.error);
 }
-
-// export functions for testing purposes
-module.exports = {
-  runSample,
-  client: sampleClient.oAuth2Client,
-};
+module.exports = runSample;

samples/drive/list.js

@@ -13,15 +13,20 @@
 
 'use strict';
 
+const path = require('path');
 const {google} = require('googleapis');
-const sampleClient = require('../sampleclient');
+const {authenticate} = require('@google-cloud/local-auth');
 
-const drive = google.drive({
-  version: 'v3',
-  auth: sampleClient.oAuth2Client,
-});
+const drive = google.drive('v3');
 
 async function runSample(query) {
+  // Obtain user credentials to use for the request
+  const auth = await authenticate({
+    keyfilePath: path.join(__dirname, '../oauth2.keys.json'),
+    scopes: 'https://www.googleapis.com/auth/drive.metadata.readonly',
+  });
+  google.options({auth});
+
   const params = {pageSize: 3};
   params.q = query;
   const res = await drive.files.list(params);
@@ -30,11 +35,6 @@ async function runSample(query) {
 }
 
 if (module === require.main) {
-  const scopes = ['https://www.googleapis.com/auth/drive.metadata.readonly'];
-  sampleClient.authenticate(scopes).then(runSample).catch(console.error);
+  runSample().catch(console.error);
 }
-
-module.exports = {
-  runSample,
-  client: sampleClient.oAuth2Client,
-};
+module.exports = runSample;