@cloudbase/oauth 1.0.0-alpha.4 → 1.2.0-beta

package/oauthclient/oauthclient.js

@@ -0,0 +1,414 @@
+"use strict";
+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 promise_1 = require("../utils/promise");
+const RequestIdHeaderName = 'x-request-id';
+const DeviceIdHeaderName = 'x-device-id';
+const DeviceIdSectionName = 'device_';
+const toResponseError = (error, options) => {
+    let responseError;
+    const formatOptions = options || {};
+    if (error instanceof Error) {
+        responseError = {
+            error: formatOptions.error || consts_1.ErrorType.LOCAL,
+            error_description: formatOptions.error_description || error.message,
+            error_uri: formatOptions.error_uri,
+            details: formatOptions.details || error.stack,
+        };
+    }
+    else {
+        const formatError = error || {};
+        responseError = {
+            error: formatOptions.error || formatError.error || consts_1.ErrorType.LOCAL,
+            error_description: formatOptions.error_description || formatError.error_description,
+            error_uri: formatOptions.error_uri || formatError.error_uri,
+            details: formatOptions.details || formatError.details,
+        };
+    }
+    return responseError;
+};
+exports.toResponseError = toResponseError;
+/**
+ * Generate request id.
+ * @return {string}
+ */
+function generateRequestId() {
+    return uuid_1.uuidv4();
+}
+exports.generateRequestId = generateRequestId;
+/**
+ * Check if credentials is expired.
+ * @param {Credentials} credentials
+ * @return {boolean}
+ */
+function isCredentialsExpired(credentials) {
+    let isExpired = true;
+    if (credentials && credentials.expires_at && credentials.access_token) {
+        isExpired = credentials.expires_at < new Date();
+    }
+    return isExpired;
+}
+/**
+ * Local credentials.
+ * Local credentials, with memory cache and storage cache.
+ * If the memory cache expires, the storage cache is automatically loaded.
+ */
+class LocalCredentials {
+    /**
+     * constructor
+     * @param {LocalCredentialsOptions} options
+     */
+    constructor(options) {
+        this._credentials = null;
+        this._promiseOnce = new promise_1.PromiseOnce();
+        this._tokenSectionName = options.tokenSectionName;
+        this._storage = options.storage;
+    }
+    /**
+     * setCredentials Provides an alternative fetch api request implementation with auth credentials
+     * @param {Credentials} credentials
+     */
+    async setCredentials(credentials) {
+        if (credentials && credentials.expires_in) {
+            credentials.expires_at = new Date(Date.now() + (credentials.expires_in - 30) * 1000);
+            if (this._storage) {
+                const tokenStr = JSON.stringify(credentials);
+                await this._storage.setItem(this._tokenSectionName, tokenStr);
+            }
+            this._credentials = credentials;
+        }
+        else {
+            if (this._storage) {
+                await this._storage.removeItem(this._tokenSectionName);
+            }
+            this._credentials = null;
+        }
+    }
+    /**
+     * Get credentials.
+     * @return {Promise<Credentials>}
+     */
+    async getCredentials() {
+        return this._promiseOnce.run('getCredentials', async () => {
+            if (isCredentialsExpired(this._credentials)) {
+                this._credentials = await this._getStorageCredentials();
+            }
+            return this._credentials;
+        });
+    }
+    /**
+     * Get storage credentials.
+     */
+    async _getStorageCredentials() {
+        return this._promiseOnce.run('_getStorageCredentials', async () => {
+            let credentials = null;
+            const tokenStr = await this._storage.getItem(this._tokenSectionName);
+            if (tokenStr !== undefined && tokenStr !== null) {
+                try {
+                    credentials = JSON.parse(tokenStr);
+                    if (credentials && credentials.expires_at) {
+                        credentials.expires_at = new Date(credentials.expires_at);
+                    }
+                }
+                catch (error) {
+                    await this._storage.removeItem(this._tokenSectionName);
+                    credentials = null;
+                }
+            }
+            return credentials;
+        });
+    }
+}
+exports.LocalCredentials = LocalCredentials;
+/**
+ * OAuth2Client
+ */
+class OAuth2Client {
+    /**
+     * constructor
+     * @param {OAuth2ClientOptions} options
+     */
+    constructor(options) {
+        this._promiseOnce = new promise_1.PromiseOnce();
+        this._retry = this._formatRetry(options.retry, OAuth2Client._defaultRetry);
+        this._baseRequest = options.request;
+        if (!options.clientSecret) {
+            options.clientSecret = "";
+        }
+        if (options.clientId !== '') {
+            this._basicAuth = "Basic " + btoa(options.clientId + ":" + options.clientSecret);
+        }
+        this._tokenInURL = options.tokenInURL;
+        this._headers = options.headers;
+        // @ts-ignore
+        this._storage = options.storage || defaultStorage;
+        this._localCredentials = new LocalCredentials({
+            tokenSectionName: 'credentials_',
+            storage: this._storage,
+        });
+        this._refreshTokenFunc =
+            options.refreshTokenFunc || this._defaultRefreshTokenFunc;
+    }
+    /**
+     * setCredentials Provides an alternative fetch api request implementation with auth credentials
+     * @param {Credentials} credentials
+     * @return {Promise<void>}
+     */
+    setCredentials(credentials) {
+        return this._localCredentials.setCredentials(credentials);
+    }
+    /**
+     * getAccessToken return a validate access token
+     */
+    async getAccessToken() {
+        const credentials = await this._getCredentials();
+        if (credentials && credentials.access_token) {
+            return Promise.resolve(credentials.access_token);
+        }
+        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
+     * @param {AuthClientRequestOptions} options
+     */
+    async request(url, options) {
+        if (!options) {
+            options = {};
+        }
+        const retry = this._formatRetry(options.retry, this._retry);
+        options.headers = options.headers || {};
+        if (this._headers) {
+            options.headers = {
+                ...this._headers,
+                ...options.headers,
+            };
+        }
+        if (!options.headers[RequestIdHeaderName]) {
+            options.headers[RequestIdHeaderName] = generateRequestId();
+        }
+        if (!options.headers[DeviceIdHeaderName]) {
+            const deviceId = await this._getDeviceId();
+            options.headers[DeviceIdHeaderName] = deviceId;
+        }
+        if (options && options.withBasicAuth && this._basicAuth) {
+            options.headers['Authorization'] = this._basicAuth;
+        }
+        if (options && options.withCredentials) {
+            const credentials = await this._getCredentials();
+            if (credentials) {
+                if (this._tokenInURL) {
+                    if (url.indexOf('?') < 0) {
+                        url += '?';
+                    }
+                    url += 'access_token=' + credentials.access_token;
+                }
+                else {
+                    options.headers['Authorization'] =
+                        credentials.token_type + ' ' + credentials.access_token;
+                }
+            }
+        }
+        let response;
+        const maxRequestTimes = retry + 1;
+        for (let requestTime = 0; requestTime < maxRequestTimes; requestTime++) {
+            try {
+                response = await this._baseRequest(url, options);
+                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') {
+                    return Promise.reject(responseError);
+                }
+            }
+            await this._sleep(OAuth2Client._retryInterval);
+        }
+        return response;
+    }
+    /**
+     * Check retry value.
+     * @param {number} retry
+     * @return {number}
+     */
+    _checkRetry(retry) {
+        let responseError = null;
+        if (typeof retry !== 'number' ||
+            retry < OAuth2Client._minRetry ||
+            retry > OAuth2Client._maxRetry) {
+            responseError = {
+                error: consts_1.ErrorType.UNREACHABLE,
+                error_description: 'wrong options param: retry',
+            };
+        }
+        if (responseError) {
+            throw responseError;
+        }
+        return retry;
+    }
+    /**
+     * Format retry value.
+     * @param {number} retry
+     * @param {number} defaultVale
+     * @return {number}
+     */
+    _formatRetry(retry, defaultVale) {
+        if (typeof retry === 'undefined') {
+            return defaultVale;
+        }
+        else {
+            return this._checkRetry(retry);
+        }
+    }
+    /**
+     * Sleep.
+     * @param {number} ms
+     * @return {Promise<void>}
+     */
+    async _sleep(ms) {
+        return new Promise((resolve) => {
+            setTimeout(() => {
+                resolve();
+            }, ms);
+        });
+    }
+    /**
+     * Refresh expired token.
+     * @param {Credentials} credentials
+     * @return {Promise<Credentials>}
+     */
+    async _refreshToken(credentials) {
+        return this._promiseOnce.run('_refreshToken', async () => {
+            if (!credentials || !credentials.refresh_token) {
+                return this._unAuthenticatedError('no refresh token found in credentials');
+            }
+            try {
+                const newCredentials = await this._refreshTokenFunc(credentials.refresh_token);
+                await this._localCredentials.setCredentials(newCredentials);
+                return newCredentials;
+            }
+            catch (error) {
+                if (error.error === consts_1.ErrorType.INVALID_GRANT) {
+                    await this._localCredentials.setCredentials(null);
+                    return this._unAuthenticatedError(error.error_description);
+                }
+                return Promise.reject(error);
+            }
+        });
+    }
+    /**
+     * anonymous signIn
+     * @param {Credentials} credentials
+     * @return {Promise<Credentials>}
+     */
+    async _anonymousSignIn(credentials) {
+        return this._promiseOnce.run('_anonymous', async () => {
+            if (!credentials || credentials.scope !== 'anonymous') {
+                return this._unAuthenticatedError('no anonymous in credentials');
+            }
+            try {
+                const newCredentials = await this.request('/auth/v1/signin/anonymously', {
+                    method: 'POST',
+                    withBasicAuth: true,
+                    body: {}
+                });
+                await this._localCredentials.setCredentials(newCredentials);
+                return newCredentials;
+            }
+            catch (error) {
+                if (error.error === consts_1.ErrorType.INVALID_GRANT) {
+                    await this._localCredentials.setCredentials(null);
+                    return this._unAuthenticatedError(error.error_description);
+                }
+                return Promise.reject(error);
+            }
+        });
+    }
+    /**
+     * Default refresh token function.
+     * @param {string} refreshToken
+     * @return {Promise<Credentials>}
+     */
+    _defaultRefreshTokenFunc(refreshToken) {
+        if (refreshToken === undefined || refreshToken === '') {
+            return this._unAuthenticatedError('refresh token not found');
+        }
+        return this.request('/auth/v1/token', {
+            method: 'POST',
+            withBasicAuth: true,
+            body: {
+                grant_type: 'refresh_token',
+                refresh_token: refreshToken,
+            },
+        });
+    }
+    /**
+     * Get credentials.
+     */
+    async _getCredentials() {
+        let credentials = await this._localCredentials.getCredentials();
+        if (credentials == null) {
+            return this._unAuthenticatedError("credentials not found");
+        }
+        if (isCredentialsExpired(credentials)) {
+            if (credentials && credentials.scope === 'anonymous') {
+                credentials = await this._anonymousSignIn(credentials);
+            }
+            else {
+                credentials = await this._refreshToken(credentials);
+            }
+        }
+        return credentials;
+    }
+    /**
+     * Get deviceId
+     */
+    async _getDeviceId() {
+        if (this._deviceID) {
+            return this._deviceID;
+        }
+        let deviceId = await this._storage.getItem(DeviceIdSectionName);
+        if (!(typeof deviceId === 'string' &&
+            deviceId.length >= 16 &&
+            deviceId.length <= 48)) {
+            deviceId = uuid_1.uuidv4();
+            await this._storage.setItem(DeviceIdSectionName, deviceId);
+        }
+        this._deviceID = deviceId;
+        return deviceId;
+    }
+    /**
+     * Generate unAuthenticated error.
+     * @param {string} err
+     * @return {Promise<T>}
+     */
+    _unAuthenticatedError(err) {
+        return Promise.reject({
+            error: consts_1.ErrorType.UNAUTHENTICATED,
+            error_description: err,
+        });
+    }
+}
+exports.OAuth2Client = OAuth2Client;
+OAuth2Client._defaultRetry = 2;
+OAuth2Client._minRetry = 0;
+OAuth2Client._maxRetry = 5;
+OAuth2Client._retryInterval = 1000;
+//# sourceMappingURL=oauthclient.js.map

package/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/package.json

@@ -1,30 +1,18 @@
 {
-	"name": "@cloudbase/oauth",
-	"version": "1.0.0-alpha.4",
-	"description": "cloudbase javascript sdk auth componets",
-	"main": "./dist/index.js",
-	"module": "dist/esm/index.js",
-	"publishConfig": {
+  "name": "@cloudbase/oauth",
+  "version": "1.2.0-beta",
+  "description": "",
+  "main": "index.js",
+  "types": "index.d.ts",
+  "publishConfig": {
 		"access": "public"
 	},
-	"scripts": {
-		"eslint": "eslint \"{src,__tests__}/**/*.ts\"",
-		"eslint:fix": "eslint --fix \"{src,__tests__}/**/*.ts\"",
-		"clean": "rimraf dist",
-		"compile": "tsc",
-		"build": "yarn clean && yarn compile"
-	},
-	"license": "MIT",
-	"devDependencies": {
-		"@typescript-eslint/eslint-plugin": "^2.24.0",
-		"@typescript-eslint/parser": "^2.24.0",
-		"eslint": "^6.8.0",
-		"eslint-config-google": "^0.14.0",
-		"eslint-config-prettier": "^6.10.0",
-		"eslint-plugin-prettier": "^3.1.2",
-		"prettier": "^1.19.1",
-		"rimraf": "^3.0.0",
-		"typescript": "^3.8.3"
-	},
-	"gitHead": "408151ff95f10c324ed4a8826ee77ded1aea4b0e"
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1",
+    "build": "tsc",
+    "prepare": "npm run build"
+  },
+  "keywords": [],
+  "author": "",
+  "license": "ISC"
 }

package/utils/promise.d.ts

@@ -0,0 +1,18 @@
+/**
+ * Promise Once
+ */
+export declare class PromiseOnce {
+    /**
+     * Run Once promise.
+     * @param {string} key
+     * @param {Function} fn
+     * @return {Promise<T>}
+     */
+    run<T>(key: string, fn: () => Promise<T>): Promise<T>;
+    /**
+     * Run idle promise.
+     * @return {Promise<void>}
+     */
+    private _runIdlePromise;
+    private _fnPromiseMap;
+}

package/utils/promise.js

@@ -0,0 +1,48 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PromiseOnce = void 0;
+/**
+ * Promise Once
+ */
+class PromiseOnce {
+    constructor() {
+        this._fnPromiseMap = new Map();
+    }
+    /**
+     * Run Once promise.
+     * @param {string} key
+     * @param {Function} fn
+     * @return {Promise<T>}
+     */
+    async run(key, fn) {
+        let result = this._fnPromiseMap.get(key);
+        if (!result) {
+            result = new Promise(async (resolve, reject) => {
+                try {
+                    // The idle promise must be run to prevent _fnPromiseMap from
+                    // storing the current promise function.
+                    await this._runIdlePromise();
+                    const fnResult = fn();
+                    resolve(await fnResult);
+                }
+                catch (error) {
+                    reject(error);
+                }
+                finally {
+                    this._fnPromiseMap.delete(key);
+                }
+            });
+            this._fnPromiseMap.set(key, result);
+        }
+        return result;
+    }
+    /**
+     * Run idle promise.
+     * @return {Promise<void>}
+     */
+    _runIdlePromise() {
+        return Promise.resolve();
+    }
+}
+exports.PromiseOnce = PromiseOnce;
+//# sourceMappingURL=promise.js.map

package/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/utils/uuid.d.ts

@@ -0,0 +1,5 @@
+/**
+ * Generate uuidv4 string.
+ * @return {string}
+ */
+export declare function uuidv4(): string;

package/utils/uuid.js

@@ -0,0 +1,16 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.uuidv4 = void 0;
+/**
+ * Generate uuidv4 string.
+ * @return {string}
+ */
+function uuidv4() {
+    return 'xxxxxxxxxxxx4xxxyxxxxxxxxxxxxxxx'.replace(/[xy]/g, (c) => {
+        const r = (Math.random() * 16) | 0;
+        const v = c == 'x' ? r : (r & 0x3) | 0x8;
+        return v.toString(16);
+    });
+}
+exports.uuidv4 = uuidv4;
+//# sourceMappingURL=uuid.js.map

package/utils/uuid.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"uuid.js","sourceRoot":"","sources":["../../src/utils/uuid.ts"],"names":[],"mappings":";;;AAAA;;;GAGG;AACH,SAAgB,MAAM;IAClB,OAAO,kCAAkC,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC,EAAE,EAAE;QAC7D,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,EAAE,CAAC,GAAG,CAAC,CAAC;QACnC,MAAM,CAAC,GAAG,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,GAAG,GAAG,CAAC;QACzC,OAAO,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;IAC1B,CAAC,CAAC,CAAC;AACP,CAAC;AAND,wBAMC"}

package/.eslintignore

@@ -1,2 +0,0 @@
-dist/
-node_modules/

package/.eslintrc

@@ -1,26 +0,0 @@
-{
-    "extends": [
-        "eslint-config-alloy/typescript"
-    ],
-    "rules": {
-        "indent": [
-            "warn",
-            2
-        ],
-        "guard-for-in": 0,
-        "no-param-reassign": 0,
-        "no-undefined": 0,
-        "@typescript-eslint/explicit-member-accessibility": 0,
-        "@typescript-eslint/no-loss-of-precision": 0,
-        "@typescript-eslint/no-duplicate-imports": 0,
-        "@typescript-eslint/consistent-type-assertions": 0,
-        "@typescript-eslint/member-ordering": 0
-    },
-    "parserOptions": {
-        "ecmaVersion": 6,
-        "sourceType": "module",
-        "ecmaFeatures": {
-            "modules": true
-        }
-    }
-}

package/CHANGELOG.md

@@ -1,30 +0,0 @@
-## 更新日志
-
-
-### 1.3.3beta
-
-1. 三方登录开放 `provider_access_token` 和 `provider_id_token`
-
-
-### 1.2.3
-
-1. OAuth2Client 增加 hasCredentials 方法，判断是否存在 credentials（不校验有限性也不触发 refresh token）
-2. 增加 LocalCredentials 管理 credentials， 简化 OAuth2Client 代码逻辑
-
-### 1.1.3
-
-1. 修复 getAccessToken 方法获取不到 refresh 之后的 token 的 bug
-2. 增加 SinglePromise 模块
-
-### 1.0.12
-
-1. 添加 ErrorType enum
-
-### 1.0.11
-
-1. OAuth2Client 中 refresh token，如果请求返回的 error 为 invalid_grant 时，删除本地 token
-2. OAuth2Client 中，对 defaultRequest 的 options 数据进行拷贝，避免修改了传入的参数数据
-
-### 1.0.9
-
-1. 代码格式化

package/Dockerfile

@@ -1,15 +0,0 @@
-# FROM base_npm:latest
-
-# # ARG NPM_TOKEN
-# RUN mkdir -p /usr/src/app
-# WORKDIR /usr/src/app/
-
-# COPY package.json  .
-# ADD . /usr/src/app
-# RUN npm set registry https://npm.xbase.xyz
-# RUN npm install
-# RUN npm run build
-
-# # @todo use semantic-release with gitlab ci to auto release with branch
-# # RUN npm view @xbase/sdk version
-# RUN npm publish