@gzhangx/googleapi 0.0.1 → 0.0.2

package/lib/googleApi.d.ts

@@ -1,8 +1,10 @@
-export interface IRefresCreds {
-    refresh_token: string;
+export interface IGClientCreds {
     client_id: string;
     client_secret: string;
 }
+export interface IRefresCreds extends IGClientCreds {
+    refresh_token: string;
+}
 export declare function getFormData(obj: {
     [id: string]: any;
 }): (string | null);
@@ -25,7 +27,16 @@ export interface IGoogleClient {
         read: (range: string) => Promise<any>;
     };
 }
+export interface IGoogleToken {
+    access_token: string;
+    expires_in: number;
+    refresh_token: string;
+    scope: string;
+    token_type: string;
+}
+export declare function getTokenFromCode(creds: IGClientCreds, code: string, redirect_uri: string): Promise<IGoogleToken>;
 export declare function getClient(creds: IRefresCreds): Promise<IGoogleClient>;
+export declare function getClientCredsByEnv(envName: string): IGClientCreds;
 export declare function getClientByEnv(envName: string): Promise<IGoogleClient>;
 export declare function test(d: boolean): Promise<void>;
 export {};

package/lib/googleApi.js

@@ -43,7 +43,7 @@ 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.getClient = exports.getFormData = void 0;
+exports.test = exports.getClientByEnv = exports.getClientCredsByEnv = exports.getClient = exports.getTokenFromCode = exports.getFormData = void 0;
 var axios_1 = __importDefault(require("axios"));
 function getFormData(obj) {
     if (!obj)
@@ -58,6 +58,31 @@ function getFormData(obj) {
     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;
+        return __generator(this, function (_a) {
+            switch (_a.label) {
+                case 0:
+                    client_id = creds.client_id, client_secret = creds.client_secret;
+                    dataStr = getFormData({
+                        client_secret: client_secret,
+                        client_id: client_id,
+                        code: code,
+                        redirect_uri: redirect_uri,
+                        grant_type: 'authorization_code'
+                    });
+                    return [4 /*yield*/, axios_1.default.post('https://oauth2.googleapis.com/token', dataStr, { headers: { "Content-Type": "application/x-www-form-urlencoded" } }).then(function (r) {
+                            return r.data;
+                        })];
+                case 1:
+                    tokenBody = _a.sent();
+                    return [2 /*return*/, tokenBody];
+            }
+        });
+    });
+}
+exports.getTokenFromCode = getTokenFromCode;
 function doRefresh(creds) {
     return __awaiter(this, void 0, void 0, function () {
         var refresh_token, client_id, client_secret, dataStr, refreshBody, access_token, expires_in, token_type, doOp, doPost, doBatchUpdate, append, read;
@@ -161,6 +186,14 @@ function getClient(creds) {
     });
 }
 exports.getClient = getClient;
+function getClientCredsByEnv(envName) {
+    var creds = {
+        client_id: process.env["google.".concat(envName, ".client_id")],
+        client_secret: process.env["google.".concat(envName, ".client_secret")],
+    };
+    return creds;
+}
+exports.getClientCredsByEnv = getClientCredsByEnv;
 function getClientByEnv(envName) {
     return __awaiter(this, void 0, void 0, function () {
         var creds;
@@ -314,3 +347,15 @@ exports.test = test;
 //test().catch(err => {
 //   console.log(err.response.text);
 //})
+/*
+async function test2() {
+    const creds = getClientCredsByEnv('gzperm');
+    await getTokenFromCode(creds, '4/xxxx', 'http://localhost:3000');
+}
+console.log('invoking test2')
+test2().catch(err => {
+    console.log('error');
+    //console.log(err);
+   console.log(err.response.text || err.response.data);
+})
+*/ 

package/lib/index.d.ts

@@ -1,2 +1,2 @@
-import { getFormData, getClient, getClientByEnv } from './googleApi';
-export { getFormData, getClient, getClientByEnv };
+import { getFormData, getClient, getClientByEnv, getTokenFromCode } from './googleApi';
+export { getFormData, getClient, getClientByEnv, getTokenFromCode };

package/lib/index.js

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getClientByEnv = exports.getClient = exports.getFormData = void 0;
+exports.getTokenFromCode = exports.getClientByEnv = exports.getClient = exports.getFormData = void 0;
 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; } });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gzhangx/googleapi",
-  "version": "0.0.1",
+  "version": "0.0.02",
   "description": "google api helper",
   "main": "index.js",
   "scripts": {

package/src/googleApi.ts

@@ -6,12 +6,15 @@
 
 import axios, {Method} from 'axios';
 
-export interface IRefresCreds {
-    refresh_token: string;
+export interface IGClientCreds {
     client_id: string;
     client_secret: string;
 }
 
+export interface IRefresCreds extends IGClientCreds {
+    refresh_token: string;    
+}
+
 
 export function getFormData(obj: { [id: string]: any }): (string|null) {
     if (!obj) return null;
@@ -43,6 +46,30 @@ export interface IGoogleClient {
     };
 }
 
+export interface IGoogleToken {
+    access_token: string;
+    expires_in: number;
+    refresh_token: string;
+    scope: string;
+    token_type: string;  //'Bearer'
+}
+
+export async function getTokenFromCode(creds: IGClientCreds, code:string, redirect_uri:string) : Promise<IGoogleToken> {
+    const { client_id, client_secret } = creds;
+    const dataStr = getFormData({
+        client_secret,
+        client_id,
+        code,
+        redirect_uri,
+        grant_type: 'authorization_code'
+    });
+
+    const tokenBody = await axios.post('https://oauth2.googleapis.com/token', dataStr,
+        { headers: { "Content-Type": "application/x-www-form-urlencoded" } }).then(r => {            
+            return r.data;
+        });
+    return tokenBody;
+}
 async function doRefresh(creds: IRefresCreds): Promise<IGoogleClient> {
     const { refresh_token, client_id, client_secret } = creds;
         
@@ -114,6 +141,14 @@ export async function getClient(creds: IRefresCreds) {
     return client;
 }
 
+export function getClientCredsByEnv(envName: string) {
+    const creds: IGClientCreds = {
+        client_id: process.env[`google.${envName}.client_id`] as string,
+        client_secret: process.env[`google.${envName}.client_secret`] as string,
+    };    
+    return creds;
+}
+
 export async function getClientByEnv(envName: string) {
     const creds: IRefresCreds = {
         client_id: process.env[`google.${envName}.client_id`] as string,
@@ -247,3 +282,15 @@ export async function test(d:boolean) {
 //   console.log(err.response.text);
 //})
 
+/*
+async function test2() {
+    const creds = getClientCredsByEnv('gzperm');    
+    await getTokenFromCode(creds, '4/xxxx', 'http://localhost:3000');
+}
+console.log('invoking test2')
+test2().catch(err => {
+    console.log('error');
+    //console.log(err);
+   console.log(err.response.text || err.response.data);
+})
+*/

package/src/index.ts

@@ -1,3 +1,3 @@
-import { getFormData, getClient, getClientByEnv } from './googleApi'
+import { getFormData, getClient, getClientByEnv, getTokenFromCode } from './googleApi'
 
-export { getFormData, getClient, getClientByEnv }
+export { getFormData, getClient, getClientByEnv,getTokenFromCode }

package/test.bat

@@ -1,2 +1,2 @@
 call node_modules\.bin\tsc
-call node build\index
+call node lib\index