@cloudbase/oauth 0.1.1-alpha → 0.1.1-alpha.2

package/{oauthclient → dist/oauthclient}/oauthclient.js

@@ -3,11 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.OAuth2Client = exports.LocalCredentials = exports.generateRequestId = exports.toResponseError = void 0;
 const consts_1 = require("./consts");
 const uuid_1 = require("../utils/uuid");
-const single_promise_1 = require("../utils/single-promise");
+const promise_1 = require("../utils/promise");
 const RequestIdHeaderName = 'x-request-id';
 const DeviceIdHeaderName = 'x-device-id';
 const DeviceIdSectionName = 'device_';
-exports.toResponseError = (error, options) => {
+const toResponseError = (error, options) => {
     let responseError;
     const formatOptions = options || {};
     if (error instanceof Error) {
@@ -29,12 +29,13 @@ exports.toResponseError = (error, options) => {
     }
     return responseError;
 };
+exports.toResponseError = toResponseError;
 /**
  * Generate request id.
  * @return {string}
  */
 function generateRequestId() {
-    return uuid_1.uuidv4();
+    return (0, uuid_1.uuidv4)();
 }
 exports.generateRequestId = generateRequestId;
 /**
@@ -61,7 +62,7 @@ class LocalCredentials {
      */
     constructor(options) {
         this._credentials = null;
-        this._singlePromise = new single_promise_1.SinglePromise();
+        this._promiseOnce = new promise_1.PromiseOnce();
         this._tokenSectionName = options.tokenSectionName;
         this._storage = options.storage;
     }
@@ -87,10 +88,10 @@ class LocalCredentials {
     }
     /**
      * Get credentials.
-     * @return {Promise<Credentials | null>}
+     * @return {Promise<Credentials>}
      */
     async getCredentials() {
-        return this._singlePromise.run('getCredentials', async () => {
+        return this._promiseOnce.run('getCredentials', async () => {
             if (isCredentialsExpired(this._credentials)) {
                 this._credentials = await this._getStorageCredentials();
             }
@@ -101,7 +102,7 @@ class LocalCredentials {
      * Get storage credentials.
      */
     async _getStorageCredentials() {
-        return this._singlePromise.run('_getStorageCredentials', async () => {
+        return this._promiseOnce.run('_getStorageCredentials', async () => {
             let credentials = null;
             const tokenStr = await this._storage.getItem(this._tokenSectionName);
             if (tokenStr !== undefined && tokenStr !== null) {
@@ -130,7 +131,7 @@ class OAuth2Client {
      * @param {OAuth2ClientOptions} options
      */
     constructor(options) {
-        this._singlePromise = new single_promise_1.SinglePromise();
+        this._promiseOnce = new promise_1.PromiseOnce();
         this._retry = this._formatRetry(options.retry, OAuth2Client._defaultRetry);
         this._baseRequest = options.request;
         if (!options.clientSecret) {
@@ -168,6 +169,16 @@ class OAuth2Client {
         }
         return Promise.reject({ error: consts_1.ErrorType.UNAUTHENTICATED });
     }
+    /**
+     * getScope return a validate access token
+     */
+    async getScope() {
+        let credentials = await this._localCredentials.getCredentials();
+        if (credentials == null) {
+            return this._unAuthenticatedError("credentials not found");
+        }
+        return credentials.scope;
+    }
     /**
      * request http like simple fetch api, exp:request('/v1/user/me', {withCredentials:true})
      * @param {string} url
@@ -210,7 +221,7 @@ class OAuth2Client {
                 }
             }
         }
-        let response = null;
+        let response;
         const maxRequestTimes = retry + 1;
         for (let requestTime = 0; requestTime < maxRequestTimes; requestTime++) {
             try {
@@ -218,6 +229,10 @@ class OAuth2Client {
                 break;
             }
             catch (responseError) {
+                if (options.withCredentials && responseError && responseError.error === consts_1.ErrorType.UNAUTHENTICATED) {
+                    await this.setCredentials(null);
+                    return Promise.reject(responseError);
+                }
                 if (requestTime === retry ||
                     !responseError ||
                     responseError.error !== 'unreachable') {
@@ -280,7 +295,7 @@ class OAuth2Client {
      * @return {Promise<Credentials>}
      */
     async _refreshToken(credentials) {
-        return this._singlePromise.run('_refreshToken', async () => {
+        return this._promiseOnce.run('_refreshToken', async () => {
             if (!credentials || !credentials.refresh_token) {
                 return this._unAuthenticatedError('no refresh token found in credentials');
             }
@@ -304,7 +319,7 @@ class OAuth2Client {
      * @return {Promise<Credentials>}
      */
     async _anonymousSignIn(credentials) {
-        return this._singlePromise.run('_anonymous', async () => {
+        return this._promiseOnce.run('_anonymous', async () => {
             if (!credentials || credentials.scope !== 'anonymous') {
                 return this._unAuthenticatedError('no anonymous in credentials');
             }
@@ -373,7 +388,7 @@ class OAuth2Client {
         if (!(typeof deviceId === 'string' &&
             deviceId.length >= 16 &&
             deviceId.length <= 48)) {
-            deviceId = uuid_1.uuidv4();
+            deviceId = (0, uuid_1.uuidv4)();
             await this._storage.setItem(DeviceIdSectionName, deviceId);
         }
         this._deviceID = deviceId;

package/dist/oauthclient/oauthclient.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"oauthclient.js","sourceRoot":"","sources":["../../src/oauthclient/oauthclient.ts"],"names":[],"mappings":"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"}

package/dist/package.json

@@ -0,0 +1,32 @@
+{
+  "name": "@cloudbase/oauth",
+  "version": "0.1.1-alpha.1",
+  "description": "auth apis for cloudbase",
+  "author": "xbase",
+  "main": "./dist/index.js",
+  "types": "./dist/index.d.ts",
+  "typesVersions": {
+    ">=4.1": {
+      "*": [
+        "ts4.1/*"
+      ]
+    }
+  },
+  "license": "MIT",
+  "scripts": {
+    "eslint": "eslint \"{src,__tests__}/**/*.ts\"",
+    "eslint:fix": "eslint --fix \"{src,__tests__}/**/*.ts\"",
+    "clean": "rm -rf dist",
+    "compile": "tsc",
+    "build": "yarn clean && yarn compile && cp package.json dist/ && cp *.md dist/"
+  },
+  "engines": {
+    "node": "^12.14.1 || >=14.0.0"
+  },
+  "devDependencies": {
+    "@typescript-eslint/eslint-plugin": "^4.30.0",
+    "@typescript-eslint/parser": "^4.30.0",
+    "eslint": "^7.32.0",
+    "typescript": "^4.6.3"
+  }
+}

package/{utils/single-promise.d.ts → dist/utils/promise.d.ts}

@@ -1,9 +1,9 @@
 /**
- * Single Promise
+ * Promise Once
  */
-export declare class SinglePromise {
+export declare class PromiseOnce {
     /**
-     * Run single promise.
+     * Run Once promise.
      * @param {string} key
      * @param {Function} fn
      * @return {Promise<T>}

package/{utils/single-promise.js → dist/utils/promise.js}

@@ -1,15 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SinglePromise = void 0;
+exports.PromiseOnce = void 0;
 /**
- * Single Promise
+ * Promise Once
  */
-class SinglePromise {
+class PromiseOnce {
     constructor() {
         this._fnPromiseMap = new Map();
     }
     /**
-     * Run single promise.
+     * Run Once promise.
      * @param {string} key
      * @param {Function} fn
      * @return {Promise<T>}
@@ -44,5 +44,5 @@ class SinglePromise {
         return Promise.resolve();
     }
 }
-exports.SinglePromise = SinglePromise;
-//# sourceMappingURL=single-promise.js.map
+exports.PromiseOnce = PromiseOnce;
+//# sourceMappingURL=promise.js.map

package/dist/utils/promise.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"promise.js","sourceRoot":"","sources":["../../src/utils/promise.ts"],"names":[],"mappings":";;;AAAA;;GAEG;AACH,MAAa,WAAW;IAAxB;QAoCY,kBAAa,GAA8B,IAAI,GAAG,EAAE,CAAC;IACjE,CAAC;IApCG;;;;;OAKG;IACH,KAAK,CAAC,GAAG,CAAI,GAAW,EAAE,EAAoB;QAC1C,IAAI,MAAM,GAAiB,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACvD,IAAI,CAAC,MAAM,EAAE;YACT,MAAM,GAAG,IAAI,OAAO,CAAM,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE;gBAChD,IAAI;oBACA,6DAA6D;oBAC7D,wCAAwC;oBACxC,MAAM,IAAI,CAAC,eAAe,EAAE,CAAC;oBAC7B,MAAM,QAAQ,GAAe,EAAE,EAAE,CAAC;oBAClC,OAAO,CAAC,MAAM,QAAQ,CAAC,CAAC;iBAC3B;gBAAC,OAAO,KAAK,EAAE;oBACZ,MAAM,CAAC,KAAK,CAAC,CAAC;iBACjB;wBAAS;oBACN,IAAI,CAAC,aAAa,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;iBAClC;YACL,CAAC,CAAC,CAAC;YACH,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;SACvC;QACD,OAAO,MAAM,CAAC;IAClB,CAAC;IAED;;;OAGG;IACK,eAAe;QACnB,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;IAC7B,CAAC;CAGJ;AArCD,kCAqCC"}

package/docs/dev.md

@@ -0,0 +1,71 @@
+## 开发指南
+
+此项目是由[Lerna](https://github.com/lerna/lerna)管理的 [monorepos](https://github.com/babel/babel/blob/master/doc/design/monorepo.md)，需要在开发之前安装Lerna：
+```bash
+npm install --global lerna
+```
+
+### 安装依赖
+clone项目到本地后首先执行以下命令：
+```bash
+lerna bootstrap
+```
+
+### 构建
+在根目录下运行：
+```bash
+npm run build
+```
+
+### 测试
+#### E2E测试
+```bash
+npm run test:e2e
+```
+
+#### Web端仿真测试
+##### 准备工作
+项目根目录下创建文件`test.config.js`，配置测试所需的信息，如下：
+```js
+/**
+ * 测试配置
+ */
+module.exports = {
+  // 环境id
+  env: '',
+  // 微信公众号appid，仅当需要测试微信登录时配置
+  appid: '',
+  // 获取自定义登录ticket的函数http访问地址，仅当需要测试自定义登录时配置
+  authFnUrl: '',
+  // 用户名密码登录-用户名，仅当需要测试用户名登录时配置
+  authUsername: '',
+  // 用户名密码登录-密码，仅当需要测试用户名登录时配置
+  authPassword: ''
+}
+```
+
+**请注意**，`auth`相关的测试case同时只能开启一种登录类型，请修改`test/web/index.js`文件的`init()`函数中的登录类型。
+
+##### 启动dev server
+Web仿真测试会在本机的80端口开启一个server，需要 sudo 权限：
+```bash
+sudo npm run test:web
+```
+
+##### 启动测试
+浏览器或微信开发者工具（公众号网页开发模式）打开链接`jimmytest-088bef.tcb.qcloud.la`即可开启仿真测试页面，测试结果在控制台打印。
+
+### 发布
+#### 发布beta版本
+```bash
+npm run publish:beta
+```
+#### 发布正式版本
+```bash
+npm run publish
+```
+
+发布过程中需要为每个包选择版本号。
+
+#### 添加新包
+项目下新增包时，需要lerna add 新包名 --scope=@cloudbase/js-sdk

package/docs/errlog.md

@@ -0,0 +1,79 @@
+## 更友好的错误提示
+
+@cloudbase/js-sdk在开发环境下会将调用 API 的错误信息以更友好的方式打印到控制台，如下图所示：
+![](https://main.qcloudimg.com/raw/5e8d21f2784f03501a27eba39ceb27a8.png)
+
+图中打印的错误是当前的登录类型受到函数的安全规则限制，导致没有调用函数的权限。错误信息分为两部分：
+1. 上半部分的黑色字体提示包含了后端 API 返回的错误信息以及基于此报错的一些解决方案提示；
+2. 下半部分的红色字体是经优化后的错误堆栈，由于原始错误堆栈层次太深导致debug非常困难，所以此处打印的错误堆栈的第一条直接定位到 SDK 源码，第二条定位到调用报错 API 的业务源码。
+
+### 使用方式
+优化的错误提示仅在开发环境中使用，根据`process.env.NODE_ENV`判断是否为开发环境。此外，定位到 SDK 源码需要借助sourcemap。
+
+以上两点依赖构建工具的部分特性，目前仅支持 Webpack 和 Rollup。
+
+#### Webpack
+在 Webpack 4+ 版本中可以配置`mode`选项为`development`，如下：
+```js
+module.exports = {
+  mode: 'development'
+}
+```
+
+如果是旧版本的 Webpack 需要使用[DefinePlugin](https://webpack.js.org/plugins/define-plugin/)：
+```js
+const webpack = require('webpack')
+
+module.exports = {
+  plugins: [
+    new webpack.DefinePlugin({
+      'process.env.NODE_ENV': JSON.stringify('development')
+    })
+    // ...其他插件
+  ]
+  // ...其他配置
+}
+```
+
+然后为js的编译选项加入sourcemap预处理，这里需要使用[source-map-loader](https://github.com/webpack-contrib/source-map-loader)：
+```js
+module.exports = {
+  module: {
+    rules: [
+      {
+        test: /\.js$/,
+        enforce: 'pre',
+        use: ['source-map-loader']
+      }
+      // ...其他rules
+    ]
+  }
+  // ...其他配置
+}
+```
+
+配置完成后启动webpack-dev-server即可。
+
+#### Rollup
+Rollup需要使用两个插件：
+- [rollup-plugin-replace](https://github.com/rollup/rollup-plugin-replace)用来注入`process.env.NODE_ENV`
+- [rollup-plugin-sourcemaps](https://github.com/maxdavidson/rollup-plugin-sourcemaps)用来加载sourcemap
+
+配置如下：
+```js
+import sourcemaps from 'rollup-plugin-sourcemaps';
+import replace from 'rollup-plugin-replace';
+export default {
+  plugins: [
+    sourcemaps(),
+    replace({
+      'process.env.NODE_ENV': JSON.stringify('development')
+    })
+    // ...其他插件
+  ]
+  // ...其他配置
+};
+```
+
+配置完成使用[rollup-plugin-serve](https://github.com/thgh/rollup-plugin-serve)启动dev server即可。
+

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cloudbase/oauth",
-  "version": "0.1.1-alpha",
+  "version": "0.1.1-alpha.2",
   "description": "auth apis for cloudbase",
   "author": "xbase",
   "main": "./dist/index.js",
@@ -26,6 +26,7 @@
   "devDependencies": {
     "@typescript-eslint/eslint-plugin": "^4.30.0",
     "@typescript-eslint/parser": "^4.30.0",
-    "eslint": "^7.32.0"
+    "eslint": "^7.32.0",
+    "typescript": "^4.6.3"
   }
 }

package/publish.sh

@@ -0,0 +1,2 @@
+yarn build
+cd dist && npm publish --access public

package/src/app/index.ts

@@ -0,0 +1,83 @@
+import {defaultRequest, RequestFn as requestFn, RequestOptions as requestOptions} from "./request";
+import {OpenURIWithCallback as openURIWithCallback, defaultOpenURIWithCallback} from "./openuri";
+import {DefaultStorage, Storage as storage} from "./storage";
+
+export interface Options {
+    env: string,
+    region?: string,
+    apiOrigin?: string;
+    clientId?: string;
+    clientSecret?: string;
+    custom?: any;
+
+    // plugins can set platform functions
+    request?: requestFn;
+    storage?: storage;
+    openURIWithCallback?: openURIWithCallback;
+}
+
+export function initializeApp(
+    options: Options,
+): App {
+    return new AppImpl(options);
+}
+
+export interface App {
+    readonly options: Options;
+}
+
+export class AppImpl implements App {
+    private readonly _options: Options;
+    private readonly _container = new Map<string, any>();
+
+    constructor(options: Options) {
+        if (!options.region) {
+            options.region = 'ap-shanghai'
+        }
+        if (!options.apiOrigin) {
+            options.apiOrigin = `https://${options.env}.${options.region}.tcb-api.tencentcloudapi.com`
+        }
+        let storageEnv = options.env
+        if (!options.clientId) {
+            options.clientId = ''
+        } else {
+            storageEnv = options.clientId
+        }
+        if (!options.storage) {
+            options.storage = new DefaultStorage({env: storageEnv});
+        }
+        if (!options.openURIWithCallback) {
+            options.openURIWithCallback = defaultOpenURIWithCallback;
+        }
+        let baseRequest = options.request
+        if (!baseRequest) {
+            baseRequest = defaultRequest
+        }
+        const apiOrigin = options.apiOrigin
+        options.request = async <T>(
+            url: string,
+            options?: RequestOptions,
+        ): Promise<T> => {
+            if (url.startsWith('/')) {
+                url = apiOrigin + url;
+            }
+            return baseRequest<T>(url, options)
+        }
+        this._options = options;
+    }
+
+    get options(): Options {
+        return this._options;
+    }
+
+    get container(): Map<string, any> {
+        return this._container;
+    }
+}
+
+
+export type RequestFn = requestFn
+export type RequestOptions = requestOptions
+export type OpenURIWithCallback = openURIWithCallback
+export type Storage = storage
+

package/src/app/internal.ts

@@ -0,0 +1,26 @@
+import {App, AppImpl} from "./index";
+
+/**
+ *
+ * @param app - App instance
+ * @param name - service name
+ * @param creator - new T
+ *
+ * @returns the provider for the service with the matching name
+ *
+ * @internal
+ */
+export function _getComponent<T>(
+    app: App,
+    name: string,
+    creator: () => T
+): T {
+    const container = (app as AppImpl).container
+    let component = container.get(name)
+    if (component) {
+        return component as T
+    }
+    component = creator()
+    container.set(name, component)
+    return component
+}

package/src/app/openuri.ts

@@ -0,0 +1,111 @@
+export type OpenURIWithCallback = (url: string, opts?: OpenURIOptions) => Promise<{ [key: string]: string }>;
+
+export interface OpenURIOptions {
+    width: string;
+    height: string;
+}
+
+/**
+ * default use iframe to open url can return callback
+ * for example : open https://example.com/callback?rediret_uri=http://127.0.0.1:8080/
+ *     the it is done, it will callback http://127.0.0.1:8080/?data1=x&data2=3
+ *
+ * for example : open https://example.com/callback?rediret_uri=http://127.0.0.1:8080/?__iframe==on
+ *      window.addEventListener('message', function(e) {
+        console.log(e)
+        alert('data from domain2 ---> ' + e.data);
+    }, false);
+ *
+ */
+export const defaultOpenURIWithCallback: OpenURIWithCallback = (url: string, opts?: OpenURIOptions): Promise<{ [key: string]: string }> => {
+    let iframeTag = '__iframe';
+    if (window.location.search.indexOf(iframeTag) > 0) {
+        document.body.style.display = 'none';
+    }
+    if (!opts) {
+        opts = {
+            width: '355px',
+            height: '355px'
+        }
+    }
+    if (document.getElementById('_iframe_panel_wrap') === null) {
+        var elementDiv = document.createElement('div');
+        elementDiv.style.cssText =
+            'background-color: rgba(0, 0, 0, 0.7);position: fixed;left: 0px;right: 0px;top: 0px;bottom: 0px;padding: 9vw 0 0 0;display: none;z-index:100;';
+        elementDiv.setAttribute('id', '_iframe_panel_wrap');
+        document.body.appendChild(elementDiv);
+    }
+    const target = document.getElementById('_iframe_panel_wrap'),
+        iframe = document.createElement('iframe')
+    target.innerHTML = '';
+    const openURL = new URL(url);
+    const redirectUri = openURL.searchParams.get('redirect_uri')
+    if (redirectUri) {
+        const redirectUrl = new URL(redirectUri);
+        redirectUrl.searchParams.append(iframeTag, "on")
+        openURL.searchParams.set('redirect_uri', redirectUrl.href)
+        url = openURL.href
+    }
+    iframe.setAttribute('src', url)
+    iframe.setAttribute('id', '_iframe_panel_wrap_iframe')
+    iframe.style.cssText = `min-width:${opts.width};display:block;height:${opts.height};margin:0 auto;background-color: rgb(255, 255, 255);border: none;`;
+    target.appendChild(iframe);
+    target.style.display = 'block';
+
+    let callBack = new Callback()
+    // handle callback from iframe post message
+    window.addEventListener('message', e => {
+        if (e.origin == openURL.origin && callBack.callFunc) {
+            target.style.display = 'none';
+            const data = JSON.parse(e.data);
+            try {
+                callBack.callFunc(data)
+            } catch (e) {
+            }
+        }
+    }, false);
+    return new Promise<{ [key: string]: string }>((resolve, reject) => {
+        callBack.callFunc = data => {
+            if (data.error) {
+                return reject(data)
+            }
+            return resolve(data)
+        }
+        // handle callback from iframe redirect uri
+        iframe.onload = () => {
+            try {
+                var windowLocation = window.location;
+                var iframeLocation = iframe.contentWindow.location;
+                if (
+                    iframeLocation.host +
+                    iframeLocation.pathname ===
+                    windowLocation.host +
+                    windowLocation.pathname
+                ) {
+                    target.style.display = 'none';
+                    const iframeUrlParams = new URLSearchParams(iframeLocation.search);
+                    const data: { [key: string]: string } = {};
+                    iframeUrlParams.forEach((v, k) => {
+                        data[k] = v;
+                    })
+                    if (data.error) {
+                        return reject({
+                            error: iframeUrlParams.get('error'),
+                            error_description: iframeUrlParams.get('error_description')
+                        })
+                    }
+                    return resolve(data)
+                } else {
+                    target.style.display = 'block';
+                }
+            } catch (error) {
+                target.style.display = 'block';
+            }
+        };
+    })
+}
+
+
+class Callback {
+    public callFunc: (data?: { [key: string]: string }) => void;
+}