@gzhangx/googleapi 0.0.6 → 0.0.9

package/lib/googleApi.d.ts

@@ -22,9 +22,6 @@ export interface IGoogleUpdateParms {
     responseValueRenderOption?: 'FORMATTED_VALUE' | 'UNFORMATTED_VALUE' | 'FORMULA';
     responseDateTimeRenderOption?: 'FORMATTED_STRING' | 'SERIAL_NUMBER';
 }
-export declare function getFormData(obj: {
-    [id: string]: any;
-}): (string | null);
 interface IIdRange {
     id: string;
     range: string;
@@ -42,6 +39,10 @@ export interface IGoogleClient {
         doBatchUpdate: (data: any) => Promise<any>;
         append: (range: string, data: any, opts?: any) => Promise<any>;
         read: (range: string) => Promise<any>;
+        sheetInfo: () => Promise<ISheetInfoSimple[]>;
+        createSheet: (sheetId: string, title: string) => Promise<any>;
+        updateValues: (range: string, values: string[][], opts?: IGoogleUpdateParms) => Promise<any>;
+        addSheet: (title: string) => Promise<any>;
     };
 }
 export interface IGoogleToken {

package/lib/googleApi.js

@@ -54,22 +54,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.test = exports.getClientByEnv = exports.getClientCredsByEnv = exports.getClient = exports.getTokenFromCode = exports.getFormData = void 0;
+exports.test = exports.getClientByEnv = exports.getClientCredsByEnv = exports.getClient = exports.getTokenFromCode = void 0;
 var axios_1 = __importDefault(require("axios"));
+var util_1 = require("./util");
 ;
-function getFormData(obj) {
-    if (!obj)
-        return null;
-    var keys = Object.keys(obj);
-    var data = keys.map(function (key) {
-        var v = obj[key];
-        if (typeof v === 'number')
-            v = '' + v;
-        return "".concat(key, "=").concat(encodeURIComponent(obj[key]));
-    }).join('&');
-    return data;
-}
-exports.getFormData = getFormData;
 function getTokenFromCode(creds, code, redirect_uri) {
     return __awaiter(this, void 0, void 0, function () {
         var client_id, client_secret, dataStr, tokenBody;
@@ -77,7 +65,7 @@ function getTokenFromCode(creds, code, redirect_uri) {
             switch (_a.label) {
                 case 0:
                     client_id = creds.client_id, client_secret = creds.client_secret;
-                    dataStr = getFormData({
+                    dataStr = (0, util_1.getFormData)({
                         client_secret: client_secret,
                         client_id: client_id,
                         code: code,
@@ -103,7 +91,7 @@ function doRefresh(creds) {
             switch (_a.label) {
                 case 0:
                     refresh_token = creds.refresh_token, client_id = creds.client_id, client_secret = creds.client_secret;
-                    dataStr = getFormData({
+                    dataStr = (0, util_1.getFormData)({
                         client_secret: client_secret,
                         client_id: client_id,
                         refresh_token: refresh_token,
@@ -143,7 +131,7 @@ function doRefresh(creds) {
                                         }
                                         if (!opts.valueInputOption)
                                             opts.valueInputOption = 'USER_ENTERED';
-                                        return [4 /*yield*/, doPost(id, "/values/".concat(range, ":append?").concat(getFormData(opts)), { values: data })];
+                                        return [4 /*yield*/, doPost(id, "/values/".concat(range, ":append?").concat((0, util_1.getFormData)(opts)), { values: data })];
                                     case 1: return [2 /*return*/, _b.sent()];
                                 }
                             });
@@ -208,7 +196,7 @@ function doRefresh(creds) {
                                         }
                                         if (!opts.valueInputOption)
                                             opts.valueInputOption = 'USER_ENTERED';
-                                        return doOp('put', id, "/values/".concat(range, "?").concat(getFormData(opts)), {
+                                        return doOp('put', id, "/values/".concat(encodeURIComponent(range), "?").concat((0, util_1.getFormData)(opts)), {
                                             values: values,
                                         });
                                     },
@@ -287,12 +275,23 @@ function getClientByEnv(envName) {
 exports.getClientByEnv = getClientByEnv;
 function test(d) {
     return __awaiter(this, void 0, void 0, function () {
-        var cli, id, upres, appres, rres, sheet, _a, _b;
+        var cli, ops, rrr, id, upres, appres, rres, sheet, _a, _b;
         return __generator(this, function (_c) {
             switch (_c.label) {
-                case 0: return [4 /*yield*/, getClientByEnv('gzprem')];
+                case 0: return [4 /*yield*/, getClientByEnv('gzperm')];
                 case 1:
                     cli = _c.sent();
+                    return [4 /*yield*/, cli.getSheetOps('1u_AR8y7iCRPGyDhdOb1cHhjL-vclCIxuLkMhIxd08mU')];
+                case 2:
+                    ops = _c.sent();
+                    console.log('update val');
+                    return [4 /*yield*/, ops.updateValues('Sheet1!G18:G18', [['1']])];
+                case 3:
+                    rrr = _c.sent();
+                    console.log('update done');
+                    console.log(rrr);
+                    if (d)
+                        return [2 /*return*/];
                     if (!cli)
                         return [2 /*return*/, console.log('failed to get client')];
                     id = '1MO27odjCsxk6MWL0DygubU53hrtt3OB8SEnqjpUHJ-U';
@@ -317,7 +316,7 @@ function test(d) {
                                 }
                             ]
                         })];
-                case 2:
+                case 4:
                     _c.sent();
                     console.log('do batch update 2');
                     return [4 /*yield*/, cli.doBatchUpdate(id, {
@@ -366,7 +365,7 @@ function test(d) {
                                 }
                             ]
                         })];
-                case 3:
+                case 5:
                     upres = _c.sent();
                     console.log(upres);
                     console.log('append 1');
@@ -376,7 +375,7 @@ function test(d) {
                         }, [
                             ['aaa', 'bbb1']
                         ])];
-                case 4:
+                case 6:
                     appres = _c.sent();
                     console.log('append res');
                     console.log(appres);
@@ -385,7 +384,7 @@ function test(d) {
                             id: id,
                             range: 'A1:B4'
                         })];
-                case 5:
+                case 7:
                     rres = _c.sent();
                     console.log('read res');
                     console.log(rres);
@@ -409,11 +408,11 @@ function test(d) {
                         ]
                     });
                     return [4 /*yield*/, sheet.append('A:B', [['c', 'D']])];
-                case 6:
+                case 8:
                     _c.sent();
                     _b = (_a = console).log;
                     return [4 /*yield*/, sheet.read('A1:B4')];
-                case 7:
+                case 9:
                     _b.apply(_a, [_c.sent()]);
                     return [2 /*return*/];
             }
@@ -421,8 +420,9 @@ function test(d) {
     });
 }
 exports.test = test;
-//test().catch(err => {
-//   console.log(err.response.text);
+//test(true).catch(err => {
+///console.log(err)
+//console.log(err.response.data);
 //})
 /*
 async function test2() {

package/lib/index.d.ts

@@ -1,2 +1,31 @@
-import { getFormData, getClient, getClientByEnv, getTokenFromCode, getClientCredsByEnv } from './googleApi';
-export { getFormData, getClient, getClientByEnv, getTokenFromCode, getClientCredsByEnv };
+import { getFormData } from './util';
+import { getClient, getClientByEnv, getTokenFromCode, getClientCredsByEnv } from './googleApi';
+declare const google: {
+    getClient: typeof getClient;
+    getClientByEnv: typeof getClientByEnv;
+    getTokenFromCode: typeof getTokenFromCode;
+    getClientCredsByEnv: typeof getClientCredsByEnv;
+};
+import * as msauth from './msGraph/msauth';
+import * as msdir from './msGraph/msdir';
+import * as msExcell from './msGraph/msExcell';
+declare const msGraph: {
+    getMsExcel(tenantClientInfo: msauth.IMsGraphCreds, prm: msdir.IMsGraphDirPrms, opt: msExcell.IMsGraphExcelItemOpt): Promise<msExcell.IMsExcelOps>;
+    getMsDir(creds: msauth.IMsGraphCreds, prms: msdir.IMsGraphDirPrms): Promise<msdir.IMsDirOps>;
+    getDriveUrl: (driveId: string, path: string) => string;
+    getDriveAndByIdUrl: (driveId: string, itemId: string) => string;
+    GGraphError: typeof msauth.GGraphError;
+    encodeSharedUrl(sharingUrl: string): string;
+    getAuth(opt: msauth.IAuthOpt): {
+        getRefreshToken: () => Promise<msauth.IRefreshTokenResult>;
+        getAccessToken: () => Promise<msauth.ITokenInfo>;
+    };
+    getDefaultAuth(opt: msauth.IMsGraphCreds): {
+        getRefreshToken: () => Promise<msauth.IRefreshTokenResult>;
+        getAccessToken: () => Promise<msauth.ITokenInfo>;
+    };
+    getDefaultMsGraphConn(tenantClientInfo: msauth.IMsGraphCreds, logger?: msauth.ILogger): Promise<msauth.IMsGraphOps>;
+    axiosErrorProcessing(err: any): string;
+    getMsGraphConn(opt: msauth.IMsGraphConn): Promise<msauth.IMsGraphOps>;
+};
+export { getFormData, google, msGraph };

package/lib/index.js

@@ -1,9 +1,52 @@
 "use strict";
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getClientCredsByEnv = exports.getTokenFromCode = exports.getClientByEnv = exports.getClient = exports.getFormData = void 0;
+exports.msGraph = exports.google = exports.getFormData = void 0;
+var util_1 = require("./util");
+Object.defineProperty(exports, "getFormData", { enumerable: true, get: function () { return util_1.getFormData; } });
 var googleApi_1 = require("./googleApi");
-Object.defineProperty(exports, "getFormData", { enumerable: true, get: function () { return googleApi_1.getFormData; } });
-Object.defineProperty(exports, "getClient", { enumerable: true, get: function () { return googleApi_1.getClient; } });
-Object.defineProperty(exports, "getClientByEnv", { enumerable: true, get: function () { return googleApi_1.getClientByEnv; } });
-Object.defineProperty(exports, "getTokenFromCode", { enumerable: true, get: function () { return googleApi_1.getTokenFromCode; } });
-Object.defineProperty(exports, "getClientCredsByEnv", { enumerable: true, get: function () { return googleApi_1.getClientCredsByEnv; } });
+var google = {
+    getClient: googleApi_1.getClient,
+    getClientByEnv: googleApi_1.getClientByEnv,
+    getTokenFromCode: googleApi_1.getTokenFromCode,
+    getClientCredsByEnv: googleApi_1.getClientCredsByEnv
+};
+exports.google = google;
+var msauth = __importStar(require("./msGraph/msauth"));
+var msdir = __importStar(require("./msGraph/msdir"));
+var msExcell = __importStar(require("./msGraph/msExcell"));
+var msGraph = __assign(__assign(__assign({}, msauth), msdir), msExcell);
+exports.msGraph = msGraph;

package/lib/msGraph/msExcell.d.ts

@@ -0,0 +1,48 @@
+import { IMsGraphCreds } from "./msauth";
+import { IMsGraphDirPrms } from './msdir';
+export interface IMsGraphExcelItemOpt {
+    fileName?: string;
+    itemId?: string;
+    sheetInfo?: IWorkSheetInfo;
+}
+interface IWorkSheetInfo {
+    '@odata.context': string;
+    value: {
+        '@odata.id': string;
+        id: string;
+        name: string;
+        position: number;
+        visibility: string;
+    }[];
+}
+export interface IReadSheetValues {
+    '@odata.context': string;
+    '@odata.type': string;
+    '@odata.id': string;
+    address: string;
+    addressLocal: string;
+    columnCount: number;
+    cellCount: number;
+    columnHidden: boolean;
+    rowHidden: boolean;
+    numberFormat: string[][];
+    columnIndex: number;
+    text: string[][];
+    formulas: string[][];
+    formulasLocal: string[][];
+    hidden: boolean;
+    rowCount: number;
+    rowIndex: number;
+    valueTypes: string[][];
+    values: string[][];
+}
+export interface IMsExcelOps {
+    getWorkSheets: () => Promise<IWorkSheetInfo>;
+    createSheet: (name: string) => Promise<any>;
+    readAll: (name: string) => Promise<IReadSheetValues>;
+    readRange: (name: string, from: string, to: string) => Promise<IReadSheetValues>;
+    getRangeFormat: (name: string, from: string, to: string) => Promise<IReadSheetValues>;
+    updateRange: (name: string, from: string, to: string, values: string[][]) => Promise<IReadSheetValues>;
+}
+export declare function getMsExcel(tenantClientInfo: IMsGraphCreds, prm: IMsGraphDirPrms, opt: IMsGraphExcelItemOpt): Promise<IMsExcelOps>;
+export {};

package/lib/msGraph/msExcell.js

@@ -0,0 +1,151 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (_) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getMsExcel = void 0;
+var msauth_1 = require("./msauth");
+var msdir_1 = require("./msdir");
+function getMsExcel(tenantClientInfo, prm, opt) {
+    return __awaiter(this, void 0, void 0, function () {
+        function getWorkSheets() {
+            return __awaiter(this, void 0, void 0, function () {
+                return __generator(this, function (_a) {
+                    switch (_a.label) {
+                        case 0: return [4 /*yield*/, ops.doGet(sheetUrl)];
+                        case 1: return [2 /*return*/, _a.sent()];
+                    }
+                });
+            });
+        }
+        function createSheet(name) {
+            return __awaiter(this, void 0, void 0, function () {
+                var _a, found;
+                return __generator(this, function (_b) {
+                    switch (_b.label) {
+                        case 0:
+                            if (!!opt.sheetInfo) return [3 /*break*/, 2];
+                            _a = opt;
+                            return [4 /*yield*/, getWorkSheets()];
+                        case 1:
+                            _a.sheetInfo = _b.sent();
+                            _b.label = 2;
+                        case 2:
+                            found = (opt.sheetInfo.value.find(function (v) { return v.name === name; }));
+                            if (found)
+                                return [2 /*return*/, found];
+                            return [4 /*yield*/, ops.doPost(sheetUrl, {
+                                    name: name
+                                })];
+                        case 3: return [2 /*return*/, _b.sent()];
+                    }
+                });
+            });
+        }
+        function readAll(name) {
+            return __awaiter(this, void 0, void 0, function () {
+                return __generator(this, function (_a) {
+                    return [2 /*return*/, ops.doGet(("".concat(sheetUrl, "('").concat(name, "')/usedRange")))];
+                });
+            });
+        }
+        function readRange(name, from, to) {
+            return __awaiter(this, void 0, void 0, function () {
+                return __generator(this, function (_a) {
+                    return [2 /*return*/, ops.doGet(("".concat(sheetUrl, "/").concat(name, "/range(address='").concat(from, ":").concat(to, "')")))];
+                });
+            });
+        }
+        function getRangeFormat(name, from, to) {
+            return __awaiter(this, void 0, void 0, function () {
+                return __generator(this, function (_a) {
+                    return [2 /*return*/, ops.doGet(("".concat(sheetUrl, "/").concat(name, "/range(address='").concat(from, ":").concat(to, "')/format")))];
+                });
+            });
+        }
+        function updateRange(name, from, to, values) {
+            return __awaiter(this, void 0, void 0, function () {
+                return __generator(this, function (_a) {
+                    return [2 /*return*/, ops.doPatch(("".concat(sheetUrl, "/").concat(name, "/range(address='").concat(from, ":").concat(to, "')")), {
+                            values: values,
+                        })];
+                });
+            });
+        }
+        var ops, error, dirInfo, drItmUrl, r, sheetUrl;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0: return [4 /*yield*/, (0, msauth_1.getDefaultMsGraphConn)(tenantClientInfo, prm.logger)];
+                case 1:
+                    ops = _a.sent();
+                    if (!!opt.itemId) return [3 /*break*/, 5];
+                    if (!!prm.driveId) return [3 /*break*/, 3];
+                    if (!prm.sharedUrl) {
+                        error = "Must specify drive or sharedUrl";
+                        prm.logger(error);
+                        throw {
+                            error: error,
+                            message: error,
+                        };
+                    }
+                    return [4 /*yield*/, (0, msdir_1.getMsDir)(tenantClientInfo, prm)];
+                case 2:
+                    dirInfo = _a.sent();
+                    prm.driveId = dirInfo.driveId;
+                    _a.label = 3;
+                case 3:
+                    drItmUrl = "".concat((0, msdir_1.getDriveUrl)(prm.driveId, opt.fileName));
+                    return [4 /*yield*/, ops.doGet(drItmUrl)];
+                case 4:
+                    r = _a.sent();
+                    opt.itemId = r.id;
+                    prm.logger("query id for ".concat(opt.fileName, " = ").concat(opt.itemId));
+                    _a.label = 5;
+                case 5:
+                    sheetUrl = "".concat((0, msdir_1.getDriveAndByIdUrl)(prm.driveId, opt.itemId), ":/workbook/worksheets");
+                    return [2 /*return*/, {
+                            getWorkSheets: getWorkSheets,
+                            createSheet: createSheet,
+                            readAll: readAll,
+                            readRange: readRange,
+                            getRangeFormat: getRangeFormat,
+                            updateRange: updateRange,
+                        }];
+            }
+        });
+    });
+}
+exports.getMsExcel = getMsExcel;

package/lib/msGraph/msauth.d.ts

@@ -0,0 +1,65 @@
+import { AxiosRequestConfig } from "axios";
+export interface IMsGraphCreds {
+    tenantId: string;
+    client_id: string;
+    refresh_token: string;
+}
+export interface IAuthOpt extends IMsGraphCreds {
+    promptUser: (msg: string | object, info: object) => void;
+    saveToken: (token: IRefreshTokenResult) => Promise<void>;
+    scope?: string;
+    pollTime?: number;
+}
+export interface IRefreshTokenResult {
+    token_type: 'Bearer';
+    scope: string;
+    expires_in: string;
+    ext_expires_in: string;
+    expires_on: string;
+    not_before: string;
+    resource: 'https://graph.microsoft.com';
+    access_token: string;
+    refresh_token: string;
+    id_token: string;
+}
+export interface ITokenInfo {
+    access_token: string;
+    expires_on: number;
+}
+export declare function GGraphError(message?: string): void;
+export declare namespace GGraphError {
+    var prototype: Error;
+}
+export declare function encodeSharedUrl(sharingUrl: string): string;
+export interface IDriveItemInfo {
+    id: string;
+    name: string;
+    parentReference: {
+        driveId: string;
+        id: string;
+    };
+}
+export declare function getAuth(opt: IAuthOpt): {
+    getRefreshToken: () => Promise<IRefreshTokenResult>;
+    getAccessToken: () => Promise<ITokenInfo>;
+};
+export declare function getDefaultAuth(opt: IMsGraphCreds): {
+    getRefreshToken: () => Promise<IRefreshTokenResult>;
+    getAccessToken: () => Promise<ITokenInfo>;
+};
+export interface IMsGraphConn {
+    tenantClientInfo: IMsGraphCreds;
+    tokenInfo?: ITokenInfo;
+    logger: (msg: string) => void;
+}
+export interface IMsGraphOps {
+    doGet: (urlPostFix: string, fmt?: (cfg: AxiosRequestConfig) => AxiosRequestConfig) => Promise<any>;
+    doPost: (urlPostFix: string, data: object) => Promise<any>;
+    doPut: (urlPostFix: string, data: object) => Promise<any>;
+    doPatch: (urlPostFix: string, data: object) => Promise<any>;
+    getSharedItemInfo: (sharedUrl: string) => Promise<IDriveItemInfo>;
+}
+export declare type ILogger = (msg: string) => void;
+export declare function getDefaultMsGraphConn(tenantClientInfo: IMsGraphCreds, logger?: ILogger): Promise<IMsGraphOps>;
+export declare function axiosErrorProcessing(err: any): string;
+export declare function getMsGraphConn(opt: IMsGraphConn): Promise<IMsGraphOps>;