@anmiles/google-api-wrapper 5.0.0 → 6.0.0

package/CHANGELOG.md

@@ -5,9 +5,14 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [5.0.0](../../tags/v5.0.0) - 2023-03-20
+## [6.0.0](../../tags/v6.0.0) - 2023-03-20
 ### Added
 - Non-persistence mode for getAuth: ability to not save sensitive credentials into the file
+- `hideProgress` option for `login` that is false by default
+
+### Changed
+- `showProgress` changed to `hideProgress` and it's false by default
+- `persist` changed to `temporary` and it's false by default
 
 ## Removed
 - Removed getter methods from api helpers to be able to re-use auth between api usages. Now better call `getAPI` and then run needed native methods on their own.

package/README.md

@@ -32,22 +32,22 @@ import { getProfiles, getCalendarAPI } from '@anmiles/google-api-wrapper';
 require('./auth');
 
 getProfiles().map(async (profile) => {
-	const youtube = getYoutubeAPI(profile); // auth is persisted by login() function from `auth.js`
-	const videos = await youtube.getPlaylistItems(profile, { playlistId : 'LL', part : [ 'snippet' ], maxResults : 50 });
-	videos.forEach((video) => console.log(`Downloaded: ${video.snippet?.title}`));
+	const calendarAPI = getCalendarAPI(profile); // auth is persisted by login() function from `auth.js`
+	const events = await getItems<GoogleApis.calendar_v3.Schema$Event, GoogleApis.calendar_v3.Params$Resource$Events$List>(calendarAPI.events, { timeMax: new Date().toISOString() });
+	events.forEach((event) => console.log(`Event: ${event.summary}`));
 });
 
 ```
 
-### Example with non-persisted auth
+### Example with temporary auth
 ``` js
 /* videos.js */
 
 import { getProfiles, getYoutubeAPI } from '@anmiles/google-api-wrapper';
 
 getProfiles().map(async (profile) => {
-	const youtube = getYoutubeAPI(profile, { persist: false }); // false by default
-	const videos = await youtube.getPlaylistItems(profile, { playlistId : 'LL', part : [ 'snippet' ], maxResults : 50 });
+	const youtubeAPI = getYoutubeAPI(profile, { temporary: true });
+	const videos = await getItems<GoogleApis.youtube_v3.Schema$PlaylistItem, GoogleApis.youtube_v3.Params$Resource$Playlistitems$List>(youtubeAPI.playlistItems, { playlistId : 'LL', part : [ 'snippet' ], maxResults : 50 });
 	videos.forEach((video) => console.log(`Downloaded: ${video.snippet?.title}`));
 });
 

package/dist/lib/api/shared.d.ts

@@ -1,14 +1,16 @@
 import type GoogleApis from 'googleapis';
-import type { GetItemsOptions } from '../../types';
+import type { CommonOptions } from '../../types';
 export { getItems };
 declare const _default: {
     getItems: typeof getItems;
 };
 export default _default;
-type CommonApi<TArgs, TResponse> = {
-    list: (params: TArgs & {
+type CommonApi<TItem> = {
+    list: (params?: {
         pageToken: string | undefined;
-    }, options?: GoogleApis.Common.MethodOptions | undefined) => Promise<GoogleApis.Common.GaxiosResponse<TResponse>>;
+    }, options?: GoogleApis.Common.MethodOptions) => Promise<GoogleApis.Common.GaxiosResponse<CommonResponse<TItem>>>;
+} & {
+    list: (callback: (err: Error | null, res?: GoogleApis.Common.GaxiosResponse<CommonResponse<TItem>> | null) => void) => void;
 };
 type CommonResponse<TItem> = {
     items?: TItem[];
@@ -17,4 +19,4 @@ type CommonResponse<TItem> = {
     };
     nextPageToken?: string | null | undefined;
 };
-declare function getItems<TApi extends CommonApi<TArgs, TResponse>, TItem, TArgs, TResponse extends CommonResponse<TItem>>(api: TApi, args: TArgs, options?: GetItemsOptions): Promise<TItem[]>;
+declare function getItems<TItem>(api: CommonApi<TItem>, params: any, options?: CommonOptions): Promise<TItem[]>;

package/dist/lib/api/shared.js

@@ -5,18 +5,18 @@ const logger_1 = require("../logger");
 const sleep_1 = require("../sleep");
 exports.default = { getItems };
 const requestInterval = 300;
-async function getItems(api, args, options) {
+async function getItems(api, params, options) {
     var _a, _b;
     const items = [];
     let pageToken = undefined;
     do {
-        const response = await api.list({ ...args, pageToken });
+        const response = await api.list({ ...params, pageToken });
         (_a = response.data.items) === null || _a === void 0 ? void 0 : _a.forEach((item) => items.push(item));
-        if (options === null || options === void 0 ? void 0 : options.showProgress) {
+        if (!(options === null || options === void 0 ? void 0 : options.hideProgress)) {
             (0, logger_1.log)(`Getting items (${items.length} of ${((_b = response.data.pageInfo) === null || _b === void 0 ? void 0 : _b.totalResults) || 'many'})...`);
         }
-        pageToken = response.data.nextPageToken;
         await (0, sleep_1.sleep)(requestInterval);
+        pageToken = response.data.nextPageToken;
     } while (pageToken);
     return items;
 }

package/dist/lib/api/shared.js.map

@@ -1 +1 @@
-{"version":3,"file":"shared.js","sourceRoot":"","sources":["../../../src/lib/api/shared.ts"],"names":[],"mappings":";;;AAEA,sCAAgC;AAChC,oCAAiC;AAGjC,kBAAe,EAAE,QAAQ,EAAE,CAAC;AAiB5B,MAAM,eAAe,GAAG,GAAG,CAAC;AAE5B,KAAK,UAAU,QAAQ,CAKrB,GAAS,EAAE,IAAW,EAAE,OAAyB;;IAClD,MAAM,KAAK,GAAY,EAAE,CAAC;IAE1B,IAAI,SAAS,GAA8B,SAAS,CAAC;IAErD,GAAG;QACF,MAAM,QAAQ,GAAgD,MAAM,GAAG,CAAC,IAAI,CAAC,EAAE,GAAG,IAAI,EAAE,SAAS,EAAE,CAAC,CAAC;QACrG,MAAA,QAAQ,CAAC,IAAI,CAAC,KAAK,0CAAE,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QAEzD,IAAI,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,YAAY,EAAE;YAC1B,IAAA,YAAG,EAAC,kBAAkB,KAAK,CAAC,MAAM,OAAO,CAAA,MAAA,QAAQ,CAAC,IAAI,CAAC,QAAQ,0CAAE,YAAY,KAAI,MAAM,MAAM,CAAC,CAAC;SAC/F;QAED,SAAS,GAAG,QAAQ,CAAC,IAAI,CAAC,aAAa,CAAC;QACxC,MAAM,IAAA,aAAK,EAAC,eAAe,CAAC,CAAC;KAC7B,QAAQ,SAAS,EAAE;IAEpB,OAAO,KAAK,CAAC;AACd,CAAC;AA3CQ,4BAAQ"}
+{"version":3,"file":"shared.js","sourceRoot":"","sources":["../../../src/lib/api/shared.ts"],"names":[],"mappings":";;;AAEA,sCAAgC;AAChC,oCAAiC;AAGjC,kBAAe,EAAE,QAAQ,EAAE,CAAC;AAE5B,MAAM,eAAe,GAAG,GAAG,CAAC;AAmB5B,KAAK,UAAU,QAAQ,CAAQ,GAAqB,EAAE,MAAW,EAAE,OAAuB;;IACzF,MAAM,KAAK,GAAY,EAAE,CAAC;IAE1B,IAAI,SAAS,GAA8B,SAAS,CAAC;IAErD,GAAG;QACF,MAAM,QAAQ,GAA4D,MAAM,GAAG,CAAC,IAAI,CAAC,EAAE,GAAG,MAAM,EAAE,SAAS,EAAE,CAAC,CAAC;QACnH,MAAA,QAAQ,CAAC,IAAI,CAAC,KAAK,0CAAE,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;QAEzD,IAAI,CAAC,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,YAAY,CAAA,EAAE;YAC3B,IAAA,YAAG,EAAC,kBAAkB,KAAK,CAAC,MAAM,OAAO,CAAA,MAAA,QAAQ,CAAC,IAAI,CAAC,QAAQ,0CAAE,YAAY,KAAI,MAAM,MAAM,CAAC,CAAC;SAC/F;QAED,MAAM,IAAA,aAAK,EAAC,eAAe,CAAC,CAAC;QAC7B,SAAS,GAAG,QAAQ,CAAC,IAAI,CAAC,aAAa,CAAC;KACxC,QAAQ,SAAS,EAAE;IAEpB,OAAO,KAAK,CAAC;AACd,CAAC;AAxCQ,4BAAQ"}

package/dist/lib/auth.d.ts

@@ -1,10 +1,10 @@
 import type GoogleApis from 'googleapis';
-import type { AuthOptions } from '../types';
+import type { CommonOptions, AuthOptions } from '../types';
 export { login, getAuth };
 declare const _default: {
     login: typeof login;
     getAuth: typeof getAuth;
 };
 export default _default;
-declare function login(profile?: string): Promise<void>;
+declare function login(profile?: string, options?: CommonOptions & AuthOptions): Promise<void>;
 declare function getAuth(profile: string, options?: AuthOptions): Promise<GoogleApis.Common.OAuth2Client>;

package/dist/lib/auth.js

@@ -10,12 +10,16 @@ const profiles_1 = require("./profiles");
 const secrets_1 = require("./secrets");
 const auth_1 = __importDefault(require("./auth"));
 exports.default = { login, getAuth };
-async function login(profile) {
+async function login(profile, options) {
     const profiles = (0, profiles_1.getProfiles)().filter((p) => !profile || p === profile);
     for (const profile of profiles) {
-        (0, logger_1.warn)(`${profile} - logging in...`);
-        await auth_1.default.getAuth(profile, { persist: true });
-        (0, logger_1.info)(`${profile} - logged in successfully`);
+        if (!(options === null || options === void 0 ? void 0 : options.hideProgress)) {
+            (0, logger_1.warn)(`${profile} - logging in...`);
+        }
+        await auth_1.default.getAuth(profile, options);
+        if (!(options === null || options === void 0 ? void 0 : options.hideProgress)) {
+            (0, logger_1.info)(`${profile} - logged in successfully`);
+        }
     }
 }
 exports.login = login;
@@ -24,6 +28,7 @@ async function getAuth(profile, options) {
     const googleAuth = new googleapis_1.google.auth.OAuth2(secrets.web.client_id, secrets.web.client_secret, secrets.web.redirect_uris[0]);
     const tokens = await (0, secrets_1.getCredentials)(profile, googleAuth, options);
     googleAuth.setCredentials(tokens);
+    googleapis_1.google.options({ auth: googleAuth });
     return googleAuth;
 }
 exports.getAuth = getAuth;

package/dist/lib/auth.js.map

@@ -1 +1 @@
-{"version":3,"file":"auth.js","sourceRoot":"","sources":["../../src/lib/auth.ts"],"names":[],"mappings":";;;;;;AAAA,2CAAoC;AAGpC,qCAAsC;AACtC,yCAAyC;AACzC,uCAAuD;AAEvD,kDAA0B;AAG1B,kBAAe,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC;AAElC,KAAK,UAAU,KAAK,CAAC,OAAgB;IACpC,MAAM,QAAQ,GAAG,IAAA,sBAAW,GAAE,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,OAAO,IAAI,CAAC,KAAK,OAAO,CAAC,CAAC;IAExE,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE;QAC/B,IAAA,aAAI,EAAC,GAAG,OAAO,kBAAkB,CAAC,CAAC;QACnC,MAAM,cAAI,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,OAAO,EAAG,IAAI,EAAE,CAAC,CAAC;QAChD,IAAA,aAAI,EAAC,GAAG,OAAO,2BAA2B,CAAC,CAAC;KAC5C;AACF,CAAC;AAXQ,sBAAK;AAad,KAAK,UAAU,OAAO,CAAC,OAAe,EAAE,OAAqB;IAC5D,MAAM,OAAO,GAAG,IAAA,oBAAU,EAAC,OAAO,CAAC,CAAC;IAEpC,MAAM,UAAU,GAAG,IAAI,mBAAM,CAAC,IAAI,CAAC,MAAM,CACxC,OAAO,CAAC,GAAG,CAAC,SAAS,EACrB,OAAO,CAAC,GAAG,CAAC,aAAa,EACzB,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC,CAAC,CAC5B,CAAC;IAEF,MAAM,MAAM,GAAG,MAAM,IAAA,wBAAc,EAAC,OAAO,EAAE,UAAU,EAAE,OAAO,CAAC,CAAC;IAClE,UAAU,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;IAClC,OAAO,UAAU,CAAC;AACnB,CAAC;AAzBe,0BAAO"}
+{"version":3,"file":"auth.js","sourceRoot":"","sources":["../../src/lib/auth.ts"],"names":[],"mappings":";;;;;;AAAA,2CAAoC;AAGpC,qCAAsC;AACtC,yCAAyC;AACzC,uCAAuD;AAEvD,kDAA0B;AAG1B,kBAAe,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC;AAElC,KAAK,UAAU,KAAK,CAAC,OAAgB,EAAE,OAAqC;IAC3E,MAAM,QAAQ,GAAG,IAAA,sBAAW,GAAE,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,OAAO,IAAI,CAAC,KAAK,OAAO,CAAC,CAAC;IAExE,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE;QAC/B,IAAI,CAAC,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,YAAY,CAAA,EAAE;YAC3B,IAAA,aAAI,EAAC,GAAG,OAAO,kBAAkB,CAAC,CAAC;SACnC;QAED,MAAM,cAAI,CAAC,OAAO,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QAErC,IAAI,CAAC,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,YAAY,CAAA,EAAE;YAC3B,IAAA,aAAI,EAAC,GAAG,OAAO,2BAA2B,CAAC,CAAC;SAC5C;KACD;AACF,CAAC;AAjBQ,sBAAK;AAmBd,KAAK,UAAU,OAAO,CAAC,OAAe,EAAE,OAAqB;IAC5D,MAAM,OAAO,GAAG,IAAA,oBAAU,EAAC,OAAO,CAAC,CAAC;IAEpC,MAAM,UAAU,GAAG,IAAI,mBAAM,CAAC,IAAI,CAAC,MAAM,CACxC,OAAO,CAAC,GAAG,CAAC,SAAS,EACrB,OAAO,CAAC,GAAG,CAAC,aAAa,EACzB,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC,CAAC,CAC5B,CAAC;IAEF,MAAM,MAAM,GAAG,MAAM,IAAA,wBAAc,EAAC,OAAO,EAAE,UAAU,EAAE,OAAO,CAAC,CAAC;IAClE,UAAU,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;IAClC,mBAAM,CAAC,OAAO,CAAC,EAAE,IAAI,EAAG,UAAU,EAAE,CAAC,CAAC;IACtC,OAAO,UAAU,CAAC;AACnB,CAAC;AAhCe,0BAAO"}

package/dist/lib/secrets.js

@@ -50,9 +50,9 @@ function getSecrets(profile) {
 exports.getSecrets = getSecrets;
 async function getCredentials(profile, auth, options) {
     const credentialsFile = (0, paths_1.getCredentialsFile)(profile);
-    return (options === null || options === void 0 ? void 0 : options.persist)
-        ? (0, jsonLib_1.getJSONAsync)(credentialsFile, () => secrets_1.default.createCredentials(profile, auth))
-        : secrets_1.default.createCredentials(profile, auth);
+    return (options === null || options === void 0 ? void 0 : options.temporary)
+        ? secrets_1.default.createCredentials(profile, auth)
+        : (0, jsonLib_1.getJSONAsync)(credentialsFile, () => secrets_1.default.createCredentials(profile, auth));
 }
 exports.getCredentials = getCredentials;
 async function createCredentials(profile, auth) {

package/dist/lib/secrets.js.map

@@ -1 +1 @@
-{"version":3,"file":"secrets.js","sourceRoot":"","sources":["../../src/lib/secrets.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"secrets.js","sourceRoot":"","sources":["../../src/lib/secrets.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,gDAAwB;AACxB,qDAAuC;AAGvC,uCAAkD;AAClD,qCAAuC;AACvC,mCAA4E;AAE5E,wDAAgC;AAGhC,kBAAe,EAAE,SAAS,EAAE,UAAU,EAAE,cAAc,EAAE,iBAAiB,EAAE,YAAY,EAAE,eAAe,EAAE,cAAc,EAAE,CAAC;AAE3H,MAAM,YAAY,GAAG,IAAI,CAAC;AAC1B,MAAM,WAAW,GAAI,oBAAoB,YAAY,gBAAgB,CAAC;AAEtE,SAAS,SAAS;IACjB,MAAM,UAAU,GAAG,IAAA,qBAAa,GAAE,CAAC;IACnC,MAAM,MAAM,GAAO,IAAA,iBAAO,EAAW,UAAU,EAAE,GAAG,EAAE,CAAC,IAAA,cAAK,EAAC,iBAAO,CAAC,cAAc,CAAC,UAAU,CAAC,CAAU,CAAC,CAAC;IAC3G,OAAO,MAAM,CAAC;AACf,CAAC;AAED,SAAS,UAAU,CAAC,OAAe;IAClC,MAAM,WAAW,GAAK,IAAA,sBAAc,EAAC,OAAO,CAAC,CAAC;IAC9C,MAAM,aAAa,GAAG,IAAA,iBAAO,EAAU,WAAW,EAAE,GAAG,EAAE,CAAC,IAAA,cAAK,EAAC,iBAAO,CAAC,eAAe,CAAC,OAAO,EAAE,WAAW,CAAC,CAAU,CAAC,CAAC;IACzH,iBAAO,CAAC,YAAY,CAAC,OAAO,EAAE,aAAa,EAAE,WAAW,CAAC,CAAC;IAC1D,OAAO,aAAa,CAAC;AACtB,CAAC;AAjBQ,gCAAU;AAmBnB,KAAK,UAAU,cAAc,CAAC,OAAe,EAAE,IAAoC,EAAE,OAAqB;IACzG,MAAM,eAAe,GAAG,IAAA,0BAAkB,EAAC,OAAO,CAAC,CAAC;IAEpD,OAAO,CAAA,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,SAAS;QACxB,CAAC,CAAC,iBAAO,CAAC,iBAAiB,CAAC,OAAO,EAAE,IAAI,CAAC;QAC1C,CAAC,CAAC,IAAA,sBAAY,EAAC,eAAe,EAAE,GAAG,EAAE,CAAC,iBAAO,CAAC,iBAAiB,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC,CAAC;AAClF,CAAC;AAzBoB,wCAAc;AA2BnC,KAAK,UAAU,iBAAiB,CAAC,OAAe,EAAE,IAAkC;IACnF,MAAM,KAAK,GAAG,iBAAO,CAAC,SAAS,EAAE,CAAC;IAElC,OAAO,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;QAC9B,MAAM,OAAO,GAAG,IAAI,CAAC,eAAe,CAAC;YACpC,qCAAqC;YACrC,WAAW,EAAG,SAAS;YACvB,KAAK;SACL,CAAC,CAAC;QAEH,MAAM,MAAM,GAAG,cAAI,CAAC,YAAY,CAAC,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,EAAE;YAC5D,QAAQ,CAAC,GAAG,CAAC,+GAA+G,CAAC,CAAC;YAE9H,IAAI,OAAO,CAAC,GAAG,EAAE;gBAChB,MAAM,GAAG,GAAI,IAAI,GAAG,CAAC,UAAU,OAAO,CAAC,OAAO,CAAC,IAAI,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;gBACrE,MAAM,IAAI,GAAG,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;gBAE1C,IAAI,CAAC,IAAI,EAAE;oBACV,OAAO;iBACP;gBAED,MAAM,CAAC,KAAK,EAAE,CAAC;gBACf,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;gBAC7C,OAAO,CAAC,MAAM,CAAC,CAAC;aAChB;QACF,CAAC,CAAC,CAAC;QAEH,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC;QAC5B,IAAA,aAAI,EAAC,eAAe,SAAS,CAAC,MAAM,CAAC,OAAO,CAAC,6CAA6C,SAAS,CAAC,MAAM,CAAC,OAAO,CAAC,wBAAwB,SAAS,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC;IACjL,CAAC,CAAC,CAAC;AACJ,CAAC;AAED,SAAS,YAAY,CAAC,OAAe,EAAE,aAAsB,EAAE,WAAmB;IACjF,IAAI,aAAa,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC,CAAC,KAAK,WAAW,EAAE;QACvD,OAAO,IAAI,CAAC;KACZ;IACD,IAAA,cAAK,EAAC,qDAAqD,WAAW,MAAM,iBAAO,CAAC,eAAe,CAAC,OAAO,EAAE,WAAW,CAAC,EAAE,CAAC,CAAC;AAC9H,CAAC;AAED,SAAS,cAAc,CAAC,UAAkB;IACzC,OAAO;QACN,QAAQ,UAAU,aAAa;QAC/B,iDAAiD,UAAU,kCAAkC;KAC7F,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AACd,CAAC;AAED,SAAS,eAAe,CAAC,OAAe,EAAE,WAAmB;IAC5D,OAAO;QACN,QAAQ,WAAW,aAAa;QAChC,2BAA2B;QAC3B,wDAAwD;QACxD,yBAAyB;QACzB,2DAA2D;QAC3D,yDAAyD;QACzD,+DAA+D;QAC/D,sCAAsC;QACtC,0BAA0B;QAC1B,yDAAyD;QACzD,iDAAiD;QACjD,qDAAqD;QACrD,2BAA2B;QAC3B,wBAAwB;QACxB,wCAAwC;QACxC,0GAA0G;QAC1G,mCAAmC;QACnC,oCAAoC;QACpC,uBAAuB,iBAAO,CAAC,SAAS,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE;QACtD,mCAAmC;QACnC,yBAAyB;QACzB,wBAAwB;QACxB,mCAAmC;QACnC,oDAAoD;QACpD,6CAA6C;QAC7C,+DAA+D;QAC/D,mDAAmD;QACnD,yCAAyC;QACzC,wCAAwC,WAAW,EAAE;QACrD,wBAAwB;QACxB,uEAAuE,OAAO,OAAO;QACrF,8BAA8B;KAC9B,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AACd,CAAC"}

package/dist/types/common.d.ts

@@ -0,0 +1,3 @@
+export interface CommonOptions {
+    hideProgress?: boolean;
+}

package/dist/types/{api.js → common.js}

@@ -1,3 +1,3 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-//# sourceMappingURL=api.js.map
+//# sourceMappingURL=common.js.map

package/dist/types/common.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"common.js","sourceRoot":"","sources":["../../src/types/common.ts"],"names":[],"mappings":""}

package/dist/types/index.d.ts

@@ -1,2 +1,2 @@
-export * from './api';
+export * from './common';
 export * from './secrets';

package/dist/types/index.js

@@ -14,6 +14,6 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./api"), exports);
+__exportStar(require("./common"), exports);
 __exportStar(require("./secrets"), exports);
 //# sourceMappingURL=index.js.map

package/dist/types/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/types/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,wCAAsB;AACtB,4CAA0B"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/types/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,2CAAyB;AACzB,4CAA0B"}

package/dist/types/secrets.d.ts

@@ -10,5 +10,5 @@ export interface Secrets {
     };
 }
 export interface AuthOptions {
-    persist?: boolean;
+    temporary?: boolean;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@anmiles/google-api-wrapper",
-  "version": "5.0.0",
+  "version": "6.0.0",
   "description": "Provides quick interface for getting google API data",
   "keywords": [
     "google",

package/src/lib/__tests__/auth.test.ts

@@ -30,6 +30,7 @@ jest.mock('googleapis', () => ({
 		auth : {
 			OAuth2 : jest.fn().mockImplementation(() => googleAuth),
 		},
+		options : jest.fn(),
 	},
 }));
 
@@ -58,15 +59,38 @@ describe('src/lib/auth', () => {
 			expect(profiles.getProfiles).toBeCalledWith();
 		});
 
-		it('should auth all profiles with persistence', async () => {
+		it('should auth all profiles', async () => {
 			await original.login();
 
 			allProfiles.forEach((profile) => {
-				expect(auth.getAuth).toBeCalledWith(profile, { persist : true });
+				expect(auth.getAuth).toBeCalledWith(profile, undefined);
 			});
 		});
 
-		it('should show auth progress for all profiles', async () => {
+		it('should auth only specified profile', async () => {
+			await original.login('username1');
+
+			expect(auth.getAuth).toBeCalledWith('username1', undefined);
+			expect(auth.getAuth).not.toBeCalledWith('username2', undefined);
+		});
+
+		it('should pass temporariness for all profiles', async () => {
+			await original.login(undefined, { temporary : true });
+
+			expect(auth.getAuth).toBeCalledWith('username1', { temporary : true });
+			expect(auth.getAuth).toBeCalledWith('username2', { temporary : true });
+
+		});
+
+		it('should pass temporariness only for specified profile', async () => {
+			await original.login('username1', { temporary : true });
+
+			expect(auth.getAuth).toBeCalledWith('username1', { temporary : true });
+			expect(auth.getAuth).not.toBeCalledWith('username2', { temporary : true });
+
+		});
+
+		it('should show auth progress for all profiles by default', async () => {
 			await original.login();
 
 			expect(logger.warn).toBeCalledWith('username1 - logging in...');
@@ -75,11 +99,18 @@ describe('src/lib/auth', () => {
 			expect(logger.info).toBeCalledWith('username2 - logged in successfully');
 		});
 
-		it('should auth only specified profile', async () => {
+		it('should show auth progress for specified profile by default', async () => {
 			await original.login('username1');
 
-			expect(auth.getAuth).toBeCalledWith('username1', { persist : true });
-			expect(auth.getAuth).not.toBeCalledWith('username2', { persist : true });
+			expect(logger.warn).toBeCalledWith('username1 - logging in...');
+			expect(logger.info).toBeCalledWith('username1 - logged in successfully');
+		});
+
+		it('should not show auth progress if hidden', async () => {
+			await original.login(undefined, { hideProgress : true });
+			await original.login('username1', { hideProgress : true });
+
+			expect(logger.info).not.toBeCalled();
 		});
 	});
 
@@ -104,15 +135,16 @@ describe('src/lib/auth', () => {
 			expect(googleAuth.setCredentials).toBeCalledWith(credentials);
 		});
 
-		it('should pass persistence', async () => {
-			await original.getAuth(profile, { persist : true });
+		it('should pass temporariness', async () => {
+			await original.getAuth(profile, { temporary : true });
 
-			expect(secrets.getCredentials).toBeCalledWith(profile, googleAuth, { persist : true });
+			expect(secrets.getCredentials).toBeCalledWith(profile, googleAuth, { temporary : true });
 		});
 
-		it('should return google auth', async () => {
-			const result = await original.getAuth(profile);
-			expect(result).toEqual(googleAuth);
+		it('should set google auth', async () => {
+			await original.getAuth(profile);
+
+			expect(google.options).toBeCalledWith({ auth : googleAuth });
 		});
 	});
 });

package/src/lib/__tests__/secrets.test.ts

@@ -176,27 +176,28 @@ describe('src/lib/secrets', () => {
 			json = credentialsJSON;
 		});
 
-		it('should not get json from credentials file if persisting enabled', async () => {
-			await original.getCredentials(profile, auth, { persist : true });
+		it('should get json from credentials file by default', async () => {
+			await original.getCredentials(profile, auth);
 
 			expect(getJSONAsyncSpy).toBeCalled();
 			expect(getJSONAsyncSpy.mock.calls[0][0]).toEqual(credentialsFile);
 		});
 
-		it('should not get json from credentials file if persisting disabled', async () => {
-			await original.getCredentials(profile, auth, { persist : false });
+		it('should get json from credentials file if temporariness explicitly unset', async () => {
+			await original.getCredentials(profile, auth, { temporary : false });
 
-			expect(getJSONAsyncSpy).not.toBeCalled();
+			expect(getJSONAsyncSpy).toBeCalled();
+			expect(getJSONAsyncSpy.mock.calls[0][0]).toEqual(credentialsFile);
 		});
 
-		it('should not get json from credentials file if persisting not specified', async () => {
-			await original.getCredentials(profile, auth);
+		it('should not get json from credentials file if temporariness set', async () => {
+			await original.getCredentials(profile, auth, { temporary : true });
 
 			expect(getJSONAsyncSpy).not.toBeCalled();
 		});
 
-		it('should fallback to createCredentials if persisting enabled', async () => {
-			await original.getCredentials(profile, auth, { persist : true });
+		it('should fallback to createCredentials by default', async () => {
+			await original.getCredentials(profile, auth);
 
 			const fallback = getJSONAsyncSpy.mock.calls[0][1];
 			await fallback();
@@ -204,32 +205,35 @@ describe('src/lib/secrets', () => {
 			expect(secrets.createCredentials).toBeCalledWith(profile, auth);
 		});
 
-		it('should call createCredentials directly if persisting disabled', async () => {
-			await original.getCredentials(profile, auth, { persist : false });
+		it('should call createCredentials directly if temporariness explicitly unset', async () => {
+			await original.getCredentials(profile, auth, { temporary : false });
+
+			const fallback = getJSONAsyncSpy.mock.calls[0][1];
+			await fallback();
 
 			expect(secrets.createCredentials).toBeCalledWith(profile, auth);
 		});
 
-		it('should call createCredentials directly if persisting not specified', async () => {
-			await original.getCredentials(profile, auth);
+		it('should call createCredentials directly if temporariness set', async () => {
+			await original.getCredentials(profile, auth, { temporary : true });
 
 			expect(secrets.createCredentials).toBeCalledWith(profile, auth);
 		});
 
-		it('should return credentials if persisting enabled', async () => {
-			const result = await original.getCredentials(profile, auth, { persist : true });
+		it('should return credentials by default', async () => {
+			const result = await original.getCredentials(profile, auth);
 
 			expect(result).toEqual(credentialsJSON);
 		});
 
-		it('should return nothing if persisting disabled', async () => {
-			const result = await original.getCredentials(profile, auth, { persist : false });
+		it('should return credentials if temporariness explicitly unset', async () => {
+			const result = await original.getCredentials(profile, auth, {  temporary : false });
 
-			expect(result).toBeUndefined();
+			expect(result).toEqual(credentialsJSON);
 		});
 
-		it('should return nothing if persisting not specified', async () => {
-			const result = await original.getCredentials(profile, auth);
+		it('should return nothing if temporariness set', async () => {
+			const result = await original.getCredentials(profile, auth, {  temporary : true });
 
 			expect(result).toBeUndefined();
 		});

package/src/lib/api/__tests__/calendar.test.ts

@@ -24,10 +24,10 @@ describe('src/lib/api/calendar', () => {
 			expect(auth.getAuth).toBeCalledWith(profile, undefined);
 		});
 
-		it('should pass persistence', async () => {
-			await getAPI(profile, { persist : true });
+		it('should pass temporariness', async () => {
+			await getAPI(profile, { temporary : true });
 
-			expect(auth.getAuth).toBeCalledWith(profile, { persist : true });
+			expect(auth.getAuth).toBeCalledWith(profile, { temporary : true });
 		});
 
 		it('should get calendar api', async () => {

package/src/lib/api/__tests__/shared.test.ts

@@ -64,8 +64,8 @@ describe('src/lib/api/shared', () => {
 			});
 		});
 
-		it('should output progress if requested', async () => {
-			await original.getItems(api, args, { showProgress : true });
+		it('should output progress by default', async () => {
+			await original.getItems(api, args);
 
 			expect(logger.log).toBeCalledTimes(response.length);
 			expect(logger.log).toBeCalledWith('Getting items (2 of 4)...');
@@ -73,8 +73,8 @@ describe('src/lib/api/shared', () => {
 			expect(logger.log).toBeCalledWith('Getting items (4 of 4)...');
 		});
 
-		it('should not output progress by default', async () => {
-			await original.getItems(api, args);
+		it('should not output progress if hidden', async () => {
+			await original.getItems(api, args, { hideProgress : true });
 
 			expect(logger.log).not.toBeCalled();
 		});

package/src/lib/api/__tests__/youtube.test.ts

@@ -24,10 +24,10 @@ describe('src/lib/api/youtube', () => {
 			expect(auth.getAuth).toBeCalledWith(profile, undefined);
 		});
 
-		it('should pass persistence', async () => {
-			await getAPI(profile, { persist : true });
+		it('should pass temporariness', async () => {
+			await getAPI(profile, { temporary : true });
 
-			expect(auth.getAuth).toBeCalledWith(profile, { persist : true });
+			expect(auth.getAuth).toBeCalledWith(profile, { temporary : true });
 		});
 
 		it('should get youtube api', async () => {

package/src/lib/api/shared.ts

@@ -1,16 +1,20 @@
 import type GoogleApis from 'googleapis';
-import type { GetItemsOptions } from '../../types';
+import type { CommonOptions } from '../../types';
 import { log } from '../logger';
 import { sleep } from '../sleep';
 
 export { getItems };
 export default { getItems };
 
-type CommonApi<TArgs, TResponse> = {
+const requestInterval = 300;
+
+type CommonApi<TItem> = {
 	list: (
-		params: TArgs & {pageToken: string | undefined},
-		options?: GoogleApis.Common.MethodOptions | undefined
-	) => Promise<GoogleApis.Common.GaxiosResponse<TResponse>>
+		params?: { pageToken: string | undefined },
+		options?: GoogleApis.Common.MethodOptions
+	) => Promise<GoogleApis.Common.GaxiosResponse<CommonResponse<TItem>>>
+} & {
+	list: (callback: (err: Error | null, res?: GoogleApis.Common.GaxiosResponse<CommonResponse<TItem>> | null) => void) => void
 };
 
 type CommonResponse<TItem> = {
@@ -21,28 +25,21 @@ type CommonResponse<TItem> = {
 	nextPageToken?: string | null | undefined
 };
 
-const requestInterval = 300;
-
-async function getItems<
-	TApi extends CommonApi<TArgs, TResponse>,
-	TItem,
-	TArgs,
-	TResponse extends CommonResponse<TItem>
->(api: TApi, args: TArgs, options?: GetItemsOptions): Promise<TItem[]> {
+async function getItems<TItem>(api: CommonApi<TItem>, params: any, options?: CommonOptions): Promise<TItem[]> {
 	const items: TItem[] = [];
 
 	let pageToken: string | null | undefined = undefined;
 
 	do {
-		const response: GoogleApis.Common.GaxiosResponse<TResponse> = await api.list({ ...args, pageToken });
+		const response: GoogleApis.Common.GaxiosResponse<CommonResponse<TItem>> = await api.list({ ...params, pageToken });
 		response.data.items?.forEach((item) => items.push(item));
 
-		if (options?.showProgress) {
+		if (!options?.hideProgress) {
 			log(`Getting items (${items.length} of ${response.data.pageInfo?.totalResults || 'many'})...`);
 		}
 
-		pageToken = response.data.nextPageToken;
 		await sleep(requestInterval);
+		pageToken = response.data.nextPageToken;
 	} while (pageToken);
 
 	return items;

package/src/lib/auth.ts

@@ -1,6 +1,6 @@
 import { google } from 'googleapis';
 import type GoogleApis from 'googleapis';
-import type { AuthOptions } from '../types';
+import type { CommonOptions, AuthOptions } from '../types';
 import { info, warn } from './logger';
 import { getProfiles } from './profiles';
 import { getCredentials, getSecrets } from './secrets';
@@ -10,13 +10,19 @@ import auth from './auth';
 export { login, getAuth };
 export default { login, getAuth };
 
-async function login(profile?: string): Promise<void> {
+async function login(profile?: string, options?: CommonOptions & AuthOptions): Promise<void> {
 	const profiles = getProfiles().filter((p) => !profile || p === profile);
 
 	for (const profile of profiles) {
-		warn(`${profile} - logging in...`);
-		await auth.getAuth(profile, { persist : true });
-		info(`${profile} - logged in successfully`);
+		if (!options?.hideProgress) {
+			warn(`${profile} - logging in...`);
+		}
+
+		await auth.getAuth(profile, options);
+
+		if (!options?.hideProgress) {
+			info(`${profile} - logged in successfully`);
+		}
 	}
 }
 
@@ -31,5 +37,6 @@ async function getAuth(profile: string, options?: AuthOptions): Promise<GoogleAp
 
 	const tokens = await getCredentials(profile, googleAuth, options);
 	googleAuth.setCredentials(tokens);
+	google.options({ auth : googleAuth });
 	return googleAuth;
 }

package/src/lib/secrets.ts

@@ -30,9 +30,9 @@ function getSecrets(profile: string): Secrets {
 async function getCredentials(profile: string, auth: GoogleApis.Common.OAuth2Client, options?: AuthOptions): Promise<GoogleApis.Auth.Credentials> {
 	const credentialsFile = getCredentialsFile(profile);
 
-	return options?.persist
-		? getJSONAsync(credentialsFile, () => secrets.createCredentials(profile, auth))
-		: secrets.createCredentials(profile, auth);
+	return options?.temporary
+		? secrets.createCredentials(profile, auth)
+		: getJSONAsync(credentialsFile, () => secrets.createCredentials(profile, auth));
 }
 
 async function createCredentials(profile: string, auth: GoogleApis.Auth.OAuth2Client): Promise<GoogleApis.Auth.Credentials> {

package/src/types/common.ts

@@ -0,0 +1,3 @@
+export interface CommonOptions {
+	hideProgress?: boolean
+}

package/src/types/index.ts

@@ -1,2 +1,2 @@
-export * from './api';
+export * from './common';
 export * from './secrets';

package/src/types/secrets.ts

@@ -11,6 +11,6 @@ export interface Secrets {
 }
 
 export interface AuthOptions {
-	persist?: boolean
+	temporary?: boolean
 }
 

package/dist/types/api.d.ts

@@ -1,3 +0,0 @@
-export interface GetItemsOptions {
-    showProgress?: boolean;
-}

package/dist/types/api.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"api.js","sourceRoot":"","sources":["../../src/types/api.ts"],"names":[],"mappings":""}

package/src/types/api.ts

@@ -1,3 +0,0 @@
-export interface GetItemsOptions {
-	showProgress?: boolean
-}