@anmiles/google-api-wrapper 2.1.3 → 3.0.1

package/CHANGELOG.md

@@ -5,6 +5,15 @@ 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).
 
+## [3.0.1](../../tags/v3.0.1) - 2023-03-12
+### Changed
+- Fixed path to scopes file
+
+## [3.0.0](../../tags/v3.0.0) - 2023-03-13
+### Changed
+- Revised auth instructions
+- Scopes can be set per end-project
+
 ## [2.1.3](../../tags/v2.1.3) - 2023-03-13
 ### Changed
 - Fixed exported types

package/dist/index.d.ts

@@ -2,4 +2,4 @@ export * as calendar from './lib/api/calendar';
 export * as youtube from './lib/api/youtube';
 export { getItems } from './lib/api/shared';
 export { createProfile, getProfiles } from './lib/profiles';
-export { login } from './lib/auth';
+export { login, getAuth } from './lib/auth';

package/dist/index.js

@@ -23,7 +23,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.login = exports.getProfiles = exports.createProfile = exports.getItems = exports.youtube = exports.calendar = void 0;
+exports.getAuth = exports.login = exports.getProfiles = exports.createProfile = exports.getItems = exports.youtube = exports.calendar = void 0;
 exports.calendar = __importStar(require("./lib/api/calendar"));
 exports.youtube = __importStar(require("./lib/api/youtube"));
 var shared_1 = require("./lib/api/shared");
@@ -33,4 +33,5 @@ Object.defineProperty(exports, "createProfile", { enumerable: true, get: functio
 Object.defineProperty(exports, "getProfiles", { enumerable: true, get: function () { return profiles_1.getProfiles; } });
 var auth_1 = require("./lib/auth");
 Object.defineProperty(exports, "login", { enumerable: true, get: function () { return auth_1.login; } });
+Object.defineProperty(exports, "getAuth", { enumerable: true, get: function () { return auth_1.getAuth; } });
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+DAA+C;AAC/C,6DAA6C;AAC7C,2CAA4C;AAAnC,kGAAA,QAAQ,OAAA;AACjB,2CAA4D;AAAnD,yGAAA,aAAa,OAAA;AAAE,uGAAA,WAAW,OAAA;AACnC,mCAAmC;AAA1B,6FAAA,KAAK,OAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+DAA+C;AAC/C,6DAA6C;AAC7C,2CAA4C;AAAnC,kGAAA,QAAQ,OAAA;AACjB,2CAA4D;AAAnD,yGAAA,aAAa,OAAA;AAAE,uGAAA,WAAW,OAAA;AACnC,mCAA4C;AAAnC,6FAAA,KAAK,OAAA;AAAE,+FAAA,OAAO,OAAA"}

package/dist/lib/auth.js

@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getAuth = exports.login = void 0;
 const googleapis_1 = require("googleapis");
+const logger_1 = require("./logger");
 const profiles_1 = require("./profiles");
 const secrets_1 = require("./secrets");
 const auth_1 = __importDefault(require("./auth"));
@@ -12,12 +13,14 @@ exports.default = { login, getAuth };
 async function login(profile) {
     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);
+        (0, logger_1.info)(`${profile} - logged in successfully`);
     }
 }
 exports.login = login;
 async function getAuth(profile) {
-    const secrets = await (0, secrets_1.getSecrets)(profile);
+    const secrets = (0, secrets_1.getSecrets)(profile);
     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);
     googleAuth.setCredentials(tokens);

package/dist/lib/auth.js.map

@@ -1 +1 @@
-{"version":3,"file":"auth.js","sourceRoot":"","sources":["../../src/lib/auth.ts"],"names":[],"mappings":";;;;;;AAAA,2CAAoC;AAEpC,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,MAAM,cAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;KAC5B;AACF,CAAC;AATQ,sBAAK;AAWd,KAAK,UAAU,OAAO,CAAC,OAAe;IACrC,MAAM,OAAO,GAAG,MAAM,IAAA,oBAAU,EAAC,OAAO,CAAC,CAAC;IAE1C,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,CAAC,CAAC;IACzD,UAAU,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;IAClC,OAAO,UAAU,CAAC;AACnB,CAAC;AAvBe,0BAAO"}
+{"version":3,"file":"auth.js","sourceRoot":"","sources":["../../src/lib/auth.ts"],"names":[],"mappings":";;;;;;AAAA,2CAAoC;AAEpC,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,CAAC,CAAC;QAC5B,IAAA,aAAI,EAAC,GAAG,OAAO,2BAA2B,CAAC,CAAC;KAC5C;AACF,CAAC;AAXQ,sBAAK;AAad,KAAK,UAAU,OAAO,CAAC,OAAe;IACrC,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,CAAC,CAAC;IACzD,UAAU,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC;IAClC,OAAO,UAAU,CAAC;AACnB,CAAC;AAzBe,0BAAO"}

package/dist/lib/paths.d.ts

@@ -1,8 +1,9 @@
-export { ensureDir, ensureFile, getProfilesFile, getSecretsFile, getCredentialsFile };
+export { ensureDir, ensureFile, getProfilesFile, getScopesFile, getSecretsFile, getCredentialsFile };
 declare const _default: {
     ensureDir: typeof ensureDir;
     ensureFile: typeof ensureFile;
     getProfilesFile: typeof getProfilesFile;
+    getScopesFile: typeof getScopesFile;
     getSecretsFile: typeof getSecretsFile;
     getCredentialsFile: typeof getCredentialsFile;
 };
@@ -10,5 +11,6 @@ export default _default;
 declare function ensureDir(dirPath: string): string;
 declare function ensureFile(filePath: string): string;
 declare function getProfilesFile(): string;
+declare function getScopesFile(): string;
 declare function getSecretsFile(profile: string): string;
 declare function getCredentialsFile(profile: string): string;

package/dist/lib/paths.js

@@ -3,11 +3,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getCredentialsFile = exports.getSecretsFile = exports.getProfilesFile = exports.ensureFile = exports.ensureDir = void 0;
+exports.getCredentialsFile = exports.getSecretsFile = exports.getScopesFile = exports.getProfilesFile = exports.ensureFile = exports.ensureDir = void 0;
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
 const paths_1 = __importDefault(require("./paths"));
-exports.default = { ensureDir, ensureFile, getProfilesFile, getSecretsFile, getCredentialsFile };
+exports.default = { ensureDir, ensureFile, getProfilesFile, getScopesFile, getSecretsFile, getCredentialsFile };
 const dirPaths = {
     input: 'input',
     secrets: 'secrets',
@@ -31,6 +31,10 @@ function getProfilesFile() {
     return path_1.default.join(dirPaths.input, 'profiles.json');
 }
 exports.getProfilesFile = getProfilesFile;
+function getScopesFile() {
+    return path_1.default.join(dirPaths.input, 'scopes.json');
+}
+exports.getScopesFile = getScopesFile;
 function getSecretsFile(profile) {
     return path_1.default.join(dirPaths.secrets, `${profile}.json`);
 }

package/dist/lib/paths.js.map

@@ -1 +1 @@
-{"version":3,"file":"paths.js","sourceRoot":"","sources":["../../src/lib/paths.ts"],"names":[],"mappings":";;;;;;AAAA,4CAAoB;AACpB,gDAAwB;AACxB,oDAA4B;AAG5B,kBAAe,EAAE,SAAS,EAAE,UAAU,EAAE,eAAe,EAAE,cAAc,EAAE,kBAAkB,EAAE,CAAC;AAE9F,MAAM,QAAQ,GAAG;IAChB,KAAK,EAAK,OAAO;IACjB,OAAO,EAAG,SAAS;CACnB,CAAC;AAEF,SAAS,SAAS,CAAC,OAAe;IACjC,IAAI,CAAC,YAAE,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE;QAC5B,YAAE,CAAC,SAAS,CAAC,OAAO,EAAE,EAAE,SAAS,EAAG,IAAI,EAAE,CAAC,CAAC;KAC5C;IACD,OAAO,OAAO,CAAC;AAChB,CAAC;AAbQ,8BAAS;AAelB,SAAS,UAAU,CAAC,QAAgB;IACnC,eAAK,CAAC,SAAS,CAAC,cAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC;IAExC,IAAI,CAAC,YAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE;QAC7B,YAAE,CAAC,aAAa,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;KAC/B;IACD,OAAO,QAAQ,CAAC;AACjB,CAAC;AAtBmB,gCAAU;AAwB9B,SAAS,eAAe;IACvB,OAAO,cAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,eAAe,CAAC,CAAC;AACnD,CAAC;AA1B+B,0CAAe;AA4B/C,SAAS,cAAc,CAAC,OAAe;IACtC,OAAO,cAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,GAAG,OAAO,OAAO,CAAC,CAAC;AACvD,CAAC;AA9BgD,wCAAc;AAgC/D,SAAS,kBAAkB,CAAC,OAAe;IAC1C,OAAO,cAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,GAAG,OAAO,mBAAmB,CAAC,CAAC;AACnE,CAAC;AAlCgE,gDAAkB"}
+{"version":3,"file":"paths.js","sourceRoot":"","sources":["../../src/lib/paths.ts"],"names":[],"mappings":";;;;;;AAAA,4CAAoB;AACpB,gDAAwB;AACxB,oDAA4B;AAG5B,kBAAe,EAAE,SAAS,EAAE,UAAU,EAAE,eAAe,EAAE,aAAa,EAAE,cAAc,EAAE,kBAAkB,EAAE,CAAC;AAE7G,MAAM,QAAQ,GAAG;IAChB,KAAK,EAAK,OAAO;IACjB,OAAO,EAAG,SAAS;CACnB,CAAC;AAEF,SAAS,SAAS,CAAC,OAAe;IACjC,IAAI,CAAC,YAAE,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE;QAC5B,YAAE,CAAC,SAAS,CAAC,OAAO,EAAE,EAAE,SAAS,EAAG,IAAI,EAAE,CAAC,CAAC;KAC5C;IACD,OAAO,OAAO,CAAC;AAChB,CAAC;AAbQ,8BAAS;AAelB,SAAS,UAAU,CAAC,QAAgB;IACnC,eAAK,CAAC,SAAS,CAAC,cAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC;IAExC,IAAI,CAAC,YAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE;QAC7B,YAAE,CAAC,aAAa,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC;KAC/B;IACD,OAAO,QAAQ,CAAC;AACjB,CAAC;AAtBmB,gCAAU;AAwB9B,SAAS,eAAe;IACvB,OAAO,cAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,eAAe,CAAC,CAAC;AACnD,CAAC;AA1B+B,0CAAe;AA4B/C,SAAS,aAAa;IACrB,OAAO,cAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,aAAa,CAAC,CAAC;AACjD,CAAC;AA9BgD,sCAAa;AAgC9D,SAAS,cAAc,CAAC,OAAe;IACtC,OAAO,cAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,GAAG,OAAO,OAAO,CAAC,CAAC;AACvD,CAAC;AAlC+D,wCAAc;AAoC9E,SAAS,kBAAkB,CAAC,OAAe;IAC1C,OAAO,cAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,GAAG,OAAO,mBAAmB,CAAC,CAAC;AACnE,CAAC;AAtC+E,gDAAkB"}

package/dist/lib/secrets.d.ts

@@ -2,15 +2,19 @@ import type GoogleApis from 'googleapis';
 import type { Secrets } from '../types';
 export { getSecrets, getCredentials };
 declare const _default: {
+    getScopes: typeof getScopes;
     getSecrets: typeof getSecrets;
     getCredentials: typeof getCredentials;
     createCredentials: typeof createCredentials;
     checkSecrets: typeof checkSecrets;
     getSecretsError: typeof getSecretsError;
+    getScopesError: typeof getScopesError;
 };
 export default _default;
-declare function getSecrets(profile: string): Promise<Secrets>;
+declare function getScopes(): string[];
+declare function getSecrets(profile: string): Secrets;
 declare function getCredentials(profile: string, auth: GoogleApis.Common.OAuth2Client): Promise<GoogleApis.Auth.Credentials>;
 declare function createCredentials(profile: string, auth: GoogleApis.Auth.OAuth2Client): Promise<GoogleApis.Auth.Credentials>;
 declare function checkSecrets(profile: string, secretsObject: Secrets, secretsFile: string): true | void;
+declare function getScopesError(scopesFile: string): string;
 declare function getSecretsError(profile: string, secretsFile: string): string;

package/dist/lib/secrets.js

@@ -33,11 +33,15 @@ const jsonLib_1 = require("./jsonLib");
 const logger_1 = require("./logger");
 const paths_1 = require("./paths");
 const secrets_1 = __importDefault(require("./secrets"));
-exports.default = { getSecrets, getCredentials, createCredentials, checkSecrets, getSecretsError };
+exports.default = { getScopes, getSecrets, getCredentials, createCredentials, checkSecrets, getSecretsError, getScopesError };
 const callbackPort = 6006;
 const callbackURI = `http://localhost:${callbackPort}/oauthcallback`;
-const scope = ['https://www.googleapis.com/auth/youtube.readonly'];
-async function getSecrets(profile) {
+function getScopes() {
+    const scopesFile = (0, paths_1.getScopesFile)();
+    const scopes = (0, jsonLib_1.getJSON)(scopesFile, () => (0, logger_1.error)(secrets_1.default.getScopesError(scopesFile)));
+    return scopes;
+}
+function getSecrets(profile) {
     const secretsFile = (0, paths_1.getSecretsFile)(profile);
     const secretsObject = (0, jsonLib_1.getJSON)(secretsFile, () => (0, logger_1.error)(secrets_1.default.getSecretsError(profile, secretsFile)));
     secrets_1.default.checkSecrets(profile, secretsObject, secretsFile);
@@ -50,6 +54,7 @@ async function getCredentials(profile, auth) {
 }
 exports.getCredentials = getCredentials;
 async function createCredentials(profile, auth) {
+    const scope = secrets_1.default.getScopes();
     return new Promise((resolve) => {
         const authUrl = auth.generateAuthUrl({
             // eslint-disable-next-line camelcase
@@ -57,7 +62,7 @@ async function createCredentials(profile, auth) {
             scope,
         });
         const server = http_1.default.createServer(async (request, response) => {
-            response.end('<h1>Please close this page and return to application</h1>');
+            response.end('<h1>Please close this page and return to application. Wait for application to be finished automatically.</h1>');
             if (request.url) {
                 const url = new URL(`http://${request.headers.host}${request.url}`);
                 const code = url.searchParams.get('code');
@@ -79,16 +84,45 @@ function checkSecrets(profile, secretsObject, secretsFile) {
     }
     (0, logger_1.error)(`Error in credentials file: redirect URI should be ${callbackURI}.\n${secrets_1.default.getSecretsError(profile, secretsFile)}`);
 }
+function getScopesError(scopesFile) {
+    return [
+        `File ${scopesFile} not found!`,
+        `This application had to have pre-defined file ${scopesFile} that will declare needed scopes`,
+    ].join('\n');
+}
 function getSecretsError(profile, secretsFile) {
     return [
         `File ${secretsFile} not found!`,
-        'To obtain it, please create correct OAuth client ID:',
-        '\tGo to https://console.cloud.google.com/apis/credentials/oauthclient',
-        '\t[if applicable] Click "+ Create credentials" and choose "OAuth client ID',
-        '\tSet application type "Web application"',
-        `\tAdd authorized redirect URI: ${callbackURI}`,
-        '\tClick "Create"',
-        `\tClick "Download JSON" and download credentials to ./secrets/${profile}.json`,
+        'Here is how to obtain it:',
+        '\tGo to https://console.cloud.google.com/projectcreate',
+        '\t\tChoose project name',
+        '\t\tClick "CREATE" and wait for project to become created',
+        '\tGo to https://console.cloud.google.com/apis/dashboard',
+        '\t\tSelect just created project in the top left dropdown list',
+        '\t\tClick "ENABLE APIS AND SERVICES"',
+        '\t\t\tClick API you need',
+        '\t\t\tClick "ENABLE" and wait for API to become enabled',
+        '\t\tClick "Credentials" tab on the left sidebar',
+        '\t\t\tClick "CONFIGURE CONSENT SCREEN" on the right',
+        '\t\t\t\tChoose "External"',
+        '\t\t\t\tClick "CREATE"',
+        '\t\t\t\tChoose app name, i.e. "NodeJS"',
+        '\t\t\t\tSpecify your email as user support email and as developer contact information on the very bottom',
+        '\t\t\t\tClick "Save and continue"',
+        '\t\t\tClick "Add or remove scopes"',
+        `\t\t\t\tAdd scopes: ${secrets_1.default.getScopes().join(',')}`,
+        '\t\t\t\tClick "Save and continue"',
+        '\t\t\tClick "Add users"',
+        '\t\t\t\tAdd your email',
+        '\t\t\t\tClick "Save and continue"',
+        '\t\t\tClick "Back to dashboard" on the very bottom',
+        '\t\tClick "Credentials" on the left sidebar',
+        '\t\t\tClick "CREATE CREDENTIALS" and choose "OAuth client ID"',
+        '\t\t\t\tSelect application type "Web application"',
+        '\t\t\t\tSpecify app name, i.e. "NodeJS"',
+        `\t\t\t\tAdd authorized redirect URI: ${callbackURI}`,
+        '\t\t\t\tClick "CREATE"',
+        `\t\t\t\tClick "DOWNLOAD JSON" and download credentials to ./secrets/${profile}.json`,
         'Then start this script again',
     ].join('\n');
 }

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":"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"}

package/package.json

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

package/src/index.ts

@@ -2,4 +2,4 @@ export * as calendar from './lib/api/calendar';
 export * as youtube from './lib/api/youtube';
 export { getItems } from './lib/api/shared';
 export { createProfile, getProfiles } from './lib/profiles';
-export { login } from './lib/auth';
+export { login, getAuth } from './lib/auth';

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

@@ -1,5 +1,6 @@
 import { google } from 'googleapis';
 import type GoogleApis from 'googleapis';
+import logger from '../logger';
 import profiles from '../profiles';
 import secrets from '../secrets';
 
@@ -10,12 +11,17 @@ jest.mock<typeof auth>('../auth', () => ({
 	getAuth : jest.fn().mockImplementation(async () => googleAuth),
 }));
 
+jest.mock<Partial<typeof logger>>('../logger', () => ({
+	info : jest.fn(),
+	warn : jest.fn(),
+}));
+
 jest.mock<Partial<typeof profiles>>('../profiles', () => ({
 	getProfiles : jest.fn().mockImplementation(() => allProfiles),
 }));
 
 jest.mock<Partial<typeof secrets>>('../secrets', () => ({
-	getSecrets     : jest.fn().mockImplementation(async () => secretsObject),
+	getSecrets     : jest.fn().mockImplementation(() => secretsObject),
 	getCredentials : jest.fn().mockImplementation(async () => credentials),
 }));
 
@@ -60,6 +66,15 @@ describe('src/lib/auth', () => {
 			});
 		});
 
+		it('should show auth progress for all profiles', async () => {
+			await original.login();
+
+			expect(logger.warn).toBeCalledWith('username1 - logging in...');
+			expect(logger.warn).toBeCalledWith('username2 - logging in...');
+			expect(logger.info).toBeCalledWith('username1 - logged in successfully');
+			expect(logger.info).toBeCalledWith('username2 - logged in successfully');
+		});
+
 		it('should auth only specified profile', async () => {
 			await original.login('username1');
 

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

@@ -7,6 +7,7 @@ jest.mock<typeof paths>('../paths', () => ({
 	ensureDir          : jest.fn().mockImplementation((dirPath) => dirPath),
 	ensureFile         : jest.fn().mockImplementation((filePath) => filePath),
 	getProfilesFile    : jest.fn().mockImplementation(() => profilesFile),
+	getScopesFile      : jest.fn().mockImplementation(() => scopesFile),
 	getSecretsFile     : jest.fn().mockImplementation(() => secretsFile),
 	getCredentialsFile : jest.fn().mockImplementation(() => credentialsFile),
 }));
@@ -27,6 +28,7 @@ const dirPath  = 'dirPath';
 const filePath = 'parentDir/filePath';
 
 const profilesFile    = 'input/profiles.json';
+const scopesFile      = 'scopes.json';
 const secretsFile     = 'secrets/username.json';
 const credentialsFile = 'secrets/username.credentials.json';
 
@@ -98,6 +100,14 @@ describe('src/lib/paths', () => {
 		});
 	});
 
+	describe('getScopesFile', () => {
+		it('should return scopes file', () => {
+			const result = original.getScopesFile();
+
+			expect(result).toEqual(scopesFile);
+		});
+	});
+
 	describe('getSecretsFile', () => {
 		it('should return secrets file', () => {
 			const result = original.getSecretsFile(profile);

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

@@ -9,10 +9,12 @@ import type { Secrets } from '../../types';
 import secrets from '../secrets';
 const original = jest.requireActual('../secrets').default as typeof secrets;
 jest.mock<typeof secrets>('../secrets', () => ({
-	getSecrets        : jest.fn(),
-	getCredentials    : jest.fn(),
+	getScopes      		 : jest.fn().mockImplementation(() => scopesJSON),
+	getSecrets      		: jest.fn().mockImplementation(() => secretsJSON),
+	getCredentials   	: jest.fn(),
 	createCredentials : jest.fn(),
-	checkSecrets      : jest.fn(),
+	checkSecrets   	  : jest.fn(),
+	getScopesError   	: jest.fn().mockImplementation(() => scopesError),
 	getSecretsError   : jest.fn().mockImplementation(() => secretsError),
 }));
 
@@ -36,7 +38,7 @@ jest.mock<Partial<typeof colorette>>('colorette', () => ({
 }));
 
 jest.mock<Partial<typeof jsonLib>>('../jsonLib', () => ({
-	getJSON      : jest.fn().mockImplementation(() => json),
+	getJSON   	  : jest.fn().mockImplementation(() => json),
 	getJSONAsync : jest.fn().mockImplementation(async () => json),
 }));
 
@@ -48,22 +50,29 @@ jest.mock<Partial<typeof logger>>('../logger', () => ({
 }));
 
 const profile          = 'username1';
+const scopesFile       = 'scopes.json';
 const secretsFile      = 'secrets/username1.json';
 const credentialsFile  = 'secrets/username1.credentials.json';
 const wrongRedirectURI = 'wrong_redirect_uri';
 
+const scopesError  = 'scopesError';
 const secretsError = 'secretsError';
 
+const scopesJSON: string[] = [
+	'https://www.googleapis.com/auth/calendar.calendars.readonly',
+	'https://www.googleapis.com/auth/calendar.events.readonly',
+];
+
 const secretsJSON: Secrets = {
 	web : {
 		/* eslint-disable camelcase */
-		client_id                   : 'client_id.apps.googleusercontent.com',
-		project_id                  : 'project_id',
-		auth_uri                    : 'https://accounts.google.com/o/oauth2/auth',
-		token_uri                   : 'https://oauth2.googleapis.com/token',
+		client_id               				: 'client_id.apps.googleusercontent.com',
+		project_id            				  : 'project_id',
+		auth_uri               					: 'https://accounts.google.com/o/oauth2/auth',
+		token_uri               				: 'https://oauth2.googleapis.com/token',
 		auth_provider_x509_cert_url : 'https://www.googleapis.com/oauth2/v1/certs',
-		client_secret               : 'client_secret',
-		redirect_uris               : [ 'http://localhost:6006/oauthcallback' ],
+		client_secret            			: 'client_secret',
+		redirect_uris            			: [ 'http://localhost:6006/oauthcallback' ],
 		/* eslint-enable camelcase */
 	},
 };
@@ -78,7 +87,7 @@ const code    = 'code';
 const authUrl = 'https://authUrl';
 const auth    = {
 	generateAuthUrl : jest.fn().mockReturnValue(authUrl),
-	getToken        : jest.fn().mockReturnValue({ tokens : credentialsJSON }),
+	getToken      		: jest.fn().mockReturnValue({ tokens : credentialsJSON }),
 } as unknown as GoogleApis.Common.OAuth2Client;
 
 let request: http.IncomingMessage;
@@ -100,6 +109,33 @@ const close  = jest.fn().mockImplementation(() => {
 });
 
 describe('src/lib/secrets', () => {
+	describe('getScopes', () => {
+		const getJSONSpy = jest.spyOn(jsonLib, 'getJSON');
+
+		beforeEach(() => {
+			json = scopesJSON;
+		});
+
+		it('should get json from scopes file', async () => {
+			await original.getScopes();
+
+			expect(getJSONSpy).toBeCalled();
+			expect(getJSONSpy.mock.calls[0][0]).toEqual(scopesFile);
+		});
+
+		it('should fallback to error', async () => {
+			await original.getScopes();
+
+			expect(getJSONSpy.mock.calls[0][1]).toThrowError(scopesError);
+		});
+
+		it('should return scopes', async () => {
+			const result = await original.getScopes();
+
+			expect(result).toEqual(scopesJSON);
+		});
+	});
+
 	describe('getSecrets', () => {
 		const getJSONSpy = jest.spyOn(jsonLib, 'getJSON');
 
@@ -172,7 +208,7 @@ describe('src/lib/secrets', () => {
 
 		beforeEach(() => {
 			request = {
-				url     : `/request.url?code=${code}`,
+				url   	 : `/request.url?code=${code}`,
 				headers : {
 					host : 'localhost:6006',
 				},
@@ -187,7 +223,10 @@ describe('src/lib/secrets', () => {
 			expect(auth.generateAuthUrl).toBeCalledWith({
 				// eslint-disable-next-line camelcase
 				access_type : 'offline',
-				scope       : [ 'https://www.googleapis.com/auth/youtube.readonly' ],
+				scope      	: [
+					'https://www.googleapis.com/auth/calendar.calendars.readonly',
+					'https://www.googleapis.com/auth/calendar.events.readonly',
+				],
 			});
 		});
 
@@ -205,7 +244,7 @@ describe('src/lib/secrets', () => {
 
 			await original.createCredentials(profile, auth);
 
-			expect(logger.info).toBeCalledWith(`Please open yellow:https://authUrl in your browser using google profile for yellow:${profile} and allow access to yellow:https://www.googleapis.com/auth/youtube.readonly`);
+			expect(logger.info).toBeCalledWith(`Please open yellow:https://authUrl in your browser using google profile for yellow:${profile} and allow access to yellow:https://www.googleapis.com/auth/calendar.calendars.readonly,https://www.googleapis.com/auth/calendar.events.readonly`);
 		});
 
 		it('should ask to close webpage', async () => {
@@ -213,7 +252,7 @@ describe('src/lib/secrets', () => {
 
 			await original.createCredentials(profile, auth);
 
-			expect(response.end).toBeCalledWith('<h1>Please close this page and return to application</h1>');
+			expect(response.end).toBeCalledWith('<h1>Please close this page and return to application. Wait for application to be finished automatically.</h1>');
 		});
 
 		it('should close server if request.url is truthy', async () => {
@@ -287,17 +326,48 @@ describe('src/lib/secrets', () => {
 		});
 	});
 
+	describe('getScopesError', () => {
+		it('should return error message with instructions', () => {
+			const result = original.getScopesError(scopesFile);
+			expect(result).toEqual(`File ${scopesFile} not found!\n\
+This application had to have pre-defined file ${scopesFile} that will declare needed scopes`);
+		});
+	});
+
 	describe('getSecretsError', () => {
 		it('should return error message with instructions', () => {
 			const result = original.getSecretsError(profile, secretsFile);
 			expect(result).toEqual(`File ${secretsFile} not found!\n\
-To obtain it, please create correct OAuth client ID:\n\
-\tGo to https://console.cloud.google.com/apis/credentials/oauthclient\n\
-\t[if applicable] Click "+ Create credentials" and choose "OAuth client ID\n\
-\tSet application type "Web application"\n\
-\tAdd authorized redirect URI: http://localhost:6006/oauthcallback\n\
-\tClick "Create"\n\
-\tClick "Download JSON" and download credentials to ./secrets/${profile}.json\n\
+Here is how to obtain it:\n\
+	Go to https://console.cloud.google.com/projectcreate\n\
+		Choose project name\n\
+		Click "CREATE" and wait for project to become created\n\
+	Go to https://console.cloud.google.com/apis/dashboard\n\
+		Select just created project in the top left dropdown list\n\
+		Click "ENABLE APIS AND SERVICES"\n\
+			Click API you need\n\
+			Click "ENABLE" and wait for API to become enabled\n\
+		Click "Credentials" tab on the left sidebar\n\
+			Click "CONFIGURE CONSENT SCREEN" on the right\n\
+				Choose "External"\n\
+				Click "CREATE"\n\
+				Choose app name, i.e. "NodeJS"\n\
+				Specify your email as user support email and as developer contact information on the very bottom\n\
+				Click "Save and continue"\n\
+			Click "Add or remove scopes"\n\
+				Add scopes: https://www.googleapis.com/auth/calendar.calendars.readonly,https://www.googleapis.com/auth/calendar.events.readonly\n\
+				Click "Save and continue"\n\
+			Click "Add users"\n\
+				Add your email\n\
+				Click "Save and continue"\n\
+			Click "Back to dashboard" on the very bottom\n\
+		Click "Credentials" on the left sidebar\n\
+			Click "CREATE CREDENTIALS" and choose "OAuth client ID"\n\
+				Select application type "Web application"\n\
+				Specify app name, i.e. "NodeJS"\n\
+				Add authorized redirect URI: http://localhost:6006/oauthcallback\n\
+				Click "CREATE"\n\
+				Click "DOWNLOAD JSON" and download credentials to ./secrets/${profile}.json\n\
 Then start this script again`);
 		});
 	});

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

@@ -36,11 +36,11 @@ const googleAuth = {
 	setCredentials : jest.fn(),
 };
 
-const calendars: Array<{ summary?: string, description?: string, hidden?: boolean }> = [
-	{ summary : 'calendar 1', description : 'calendar 1 description', hidden : false },
-	{ summary : 'calendar 2', description : 'calendar 2 description', hidden : undefined },
-	{ summary : 'calendar 3', description : undefined, hidden : true },
-	{ summary : 'calendar 4', description : undefined, hidden : undefined },
+const calendars: Array<{ id?: string | null | undefined, summary?: string, description?: string, hidden?: boolean }> = [
+	{ id : 'id1', summary : 'calendar 1', description : 'calendar 1 description', hidden : false },
+	{ id : 'id2', summary : 'calendar 2', description : 'calendar 2 description', hidden : undefined },
+	{ id : null, summary : 'calendar 3', description : undefined, hidden : true },
+	{ id : 'id4', summary : 'calendar 4', description : undefined, hidden : undefined },
 ];
 
 const calendarsResponse = [
@@ -49,11 +49,11 @@ const calendarsResponse = [
 	[ calendars[2], calendars[3] ],
 ];
 
-const events: Array<{ summary?: string, source?: { url?: string, title?: string} }> = [
-	{ summary : 'event 1', source : { title : 'source 1', url : 'https://example.com' } },
-	{ summary : 'event 2', source : { title : 'source 2', url : undefined } },
-	{ summary : 'event 3', source : { title : undefined, url : undefined } },
-	{ summary : 'event 4', source : undefined },
+const events: Array<{ id?: string | null | undefined, summary?: string, source?: { url?: string, title?: string} }> = [
+	{ id : 'id1', summary : 'event 1', source : { title : 'source 1', url : 'https://example.com' } },
+	{ id : null, summary : 'event 2', source : { title : 'source 2', url : undefined } },
+	{ id : 'id3', summary : 'event 3', source : { title : undefined, url : undefined } },
+	{ id : 'id4', summary : 'event 4', source : undefined },
 ];
 
 const eventsResponse = [

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

@@ -36,11 +36,11 @@ const googleAuth = {
 	setCredentials : jest.fn(),
 };
 
-const playlistItems: Array<{ snippet?: { title?: string, resourceId?: { videoId?: string } } }> = [
-	{ snippet : { title : 'video1', resourceId : { videoId : 'video1Id' } } },
-	{ snippet : { title : 'video2', resourceId : { videoId : undefined } } },
-	{ snippet : { title : undefined, resourceId : undefined } },
-	{ snippet : undefined },
+const playlistItems: Array<{ id?: string | null | undefined, snippet?: { title?: string, resourceId?: { videoId?: string } } }> = [
+	{ id : 'id1', snippet : { title : 'video1', resourceId : { videoId : 'video1Id' } } },
+	{ id : null, snippet : { title : 'video2', resourceId : { videoId : undefined } } },
+	{ id : 'id3', snippet : { title : undefined, resourceId : undefined } },
+	{ id : 'id4', snippet : undefined },
 ];
 
 const playlistItemsResponse = [

package/src/lib/auth.ts

@@ -1,5 +1,6 @@
 import { google } from 'googleapis';
 import type GoogleApis from 'googleapis';
+import { info, warn } from './logger';
 import { getProfiles } from './profiles';
 import { getCredentials, getSecrets } from './secrets';
 
@@ -12,12 +13,14 @@ async function login(profile?: string): Promise<void> {
 	const profiles = getProfiles().filter((p) => !profile || p === profile);
 
 	for (const profile of profiles) {
+		warn(`${profile} - logging in...`);
 		await auth.getAuth(profile);
+		info(`${profile} - logged in successfully`);
 	}
 }
 
 async function getAuth(profile: string): Promise<GoogleApis.Common.OAuth2Client> {
-	const secrets = await getSecrets(profile);
+	const secrets = getSecrets(profile);
 
 	const googleAuth = new google.auth.OAuth2(
 		secrets.web.client_id,

package/src/lib/paths.ts

@@ -2,8 +2,8 @@ import fs from 'fs';
 import path from 'path';
 import paths from './paths';
 
-export { ensureDir, ensureFile, getProfilesFile, getSecretsFile, getCredentialsFile };
-export default { ensureDir, ensureFile, getProfilesFile, getSecretsFile, getCredentialsFile };
+export { ensureDir, ensureFile, getProfilesFile, getScopesFile, getSecretsFile, getCredentialsFile };
+export default { ensureDir, ensureFile, getProfilesFile, getScopesFile, getSecretsFile, getCredentialsFile };
 
 const dirPaths = {
 	input   : 'input',
@@ -30,6 +30,10 @@ function getProfilesFile() {
 	return path.join(dirPaths.input, 'profiles.json');
 }
 
+function getScopesFile() {
+	return path.join(dirPaths.input, 'scopes.json');
+}
+
 function getSecretsFile(profile: string) {
 	return path.join(dirPaths.secrets, `${profile}.json`);
 }

package/src/lib/secrets.ts

@@ -4,18 +4,23 @@ import type GoogleApis from 'googleapis';
 import type { Secrets } from '../types';
 import { getJSON, getJSONAsync } from './jsonLib';
 import { info, error } from './logger';
-import { getSecretsFile, getCredentialsFile } from './paths';
+import { getScopesFile, getSecretsFile, getCredentialsFile } from './paths';
 
 import secrets from './secrets';
 
 export { getSecrets, getCredentials };
-export default { getSecrets, getCredentials, createCredentials, checkSecrets, getSecretsError };
+export default { getScopes, getSecrets, getCredentials, createCredentials, checkSecrets, getSecretsError, getScopesError };
 
 const callbackPort = 6006;
 const callbackURI  = `http://localhost:${callbackPort}/oauthcallback`;
-const scope        = [ 'https://www.googleapis.com/auth/youtube.readonly' ];
 
-async function getSecrets(profile: string): Promise<Secrets> {
+function getScopes(): string[] {
+	const scopesFile = getScopesFile();
+	const scopes     = getJSON<string[]>(scopesFile, () => error(secrets.getScopesError(scopesFile)) as never);
+	return scopes;
+}
+
+function getSecrets(profile: string): Secrets {
 	const secretsFile   = getSecretsFile(profile);
 	const secretsObject = getJSON<Secrets>(secretsFile, () => error(secrets.getSecretsError(profile, secretsFile)) as never);
 	secrets.checkSecrets(profile, secretsObject, secretsFile);
@@ -28,6 +33,8 @@ async function getCredentials(profile: string, auth: GoogleApis.Common.OAuth2Cli
 }
 
 async function createCredentials(profile: string, auth: GoogleApis.Auth.OAuth2Client): Promise<GoogleApis.Auth.Credentials> {
+	const scope = secrets.getScopes();
+
 	return new Promise((resolve) => {
 		const authUrl = auth.generateAuthUrl({
 			// eslint-disable-next-line camelcase
@@ -36,7 +43,7 @@ async function createCredentials(profile: string, auth: GoogleApis.Auth.OAuth2Cl
 		});
 
 		const server = http.createServer(async (request, response) => {
-			response.end('<h1>Please close this page and return to application</h1>');
+			response.end('<h1>Please close this page and return to application. Wait for application to be finished automatically.</h1>');
 
 			if (request.url) {
 				const url  = new URL(`http://${request.headers.host}${request.url}`);
@@ -64,16 +71,46 @@ function checkSecrets(profile: string, secretsObject: Secrets, secretsFile: stri
 	error(`Error in credentials file: redirect URI should be ${callbackURI}.\n${secrets.getSecretsError(profile, secretsFile)}`);
 }
 
+function getScopesError(scopesFile: string) {
+	return [
+		`File ${scopesFile} not found!`,
+		`This application had to have pre-defined file ${scopesFile} that will declare needed scopes`,
+	].join('\n');
+}
+
 function getSecretsError(profile: string, secretsFile: string) {
 	return [
 		`File ${secretsFile} not found!`,
-		'To obtain it, please create correct OAuth client ID:',
-		'\tGo to https://console.cloud.google.com/apis/credentials/oauthclient',
-		'\t[if applicable] Click "+ Create credentials" and choose "OAuth client ID',
-		'\tSet application type "Web application"',
-		`\tAdd authorized redirect URI: ${callbackURI}`,
-		'\tClick "Create"',
-		`\tClick "Download JSON" and download credentials to ./secrets/${profile}.json`,
+		'Here is how to obtain it:',
+		'\tGo to https://console.cloud.google.com/projectcreate',
+		'\t\tChoose project name',
+		'\t\tClick "CREATE" and wait for project to become created',
+		'\tGo to https://console.cloud.google.com/apis/dashboard',
+		'\t\tSelect just created project in the top left dropdown list',
+		'\t\tClick "ENABLE APIS AND SERVICES"',
+		'\t\t\tClick API you need',
+		'\t\t\tClick "ENABLE" and wait for API to become enabled',
+		'\t\tClick "Credentials" tab on the left sidebar',
+		'\t\t\tClick "CONFIGURE CONSENT SCREEN" on the right',
+		'\t\t\t\tChoose "External"',
+		'\t\t\t\tClick "CREATE"',
+		'\t\t\t\tChoose app name, i.e. "NodeJS"',
+		'\t\t\t\tSpecify your email as user support email and as developer contact information on the very bottom',
+		'\t\t\t\tClick "Save and continue"',
+		'\t\t\tClick "Add or remove scopes"',
+		`\t\t\t\tAdd scopes: ${secrets.getScopes().join(',')}`,
+		'\t\t\t\tClick "Save and continue"',
+		'\t\t\tClick "Add users"',
+		'\t\t\t\tAdd your email',
+		'\t\t\t\tClick "Save and continue"',
+		'\t\t\tClick "Back to dashboard" on the very bottom',
+		'\t\tClick "Credentials" on the left sidebar',
+		'\t\t\tClick "CREATE CREDENTIALS" and choose "OAuth client ID"',
+		'\t\t\t\tSelect application type "Web application"',
+		'\t\t\t\tSpecify app name, i.e. "NodeJS"',
+		`\t\t\t\tAdd authorized redirect URI: ${callbackURI}`,
+		'\t\t\t\tClick "CREATE"',
+		`\t\t\t\tClick "DOWNLOAD JSON" and download credentials to ./secrets/${profile}.json`,
 		'Then start this script again',
 	].join('\n');
 }