@cloudbase/oauth - npm Package Compare versions

Comparing version 0.0.3-alpha.0 to 0.0.4-alpha.0

dist/auth/apis.d.ts

@@ -5,2 +5,3 @@ import { GetVerificationRequest, GetVerificationResponse, UserProfile, UserInfo, SignInRequest, SignUpRequest, VerifyRequest, VerifyResponse, GenProviderRedirectUriRequest, GenProviderRedirectUriResponse, GrantProviderTokenRequest, GrantProviderTokenResponse, PatchProviderTokenRequest, PatchProviderTokenResponse, SignInWithProviderRequest, BindWithProviderRequest, TransByProviderRequest, GrantTokenRequest, UserProfileProvider, UnbindProviderRequest, CheckPasswordrRequest, BindPhoneRequest, SetPasswordRequest, ChangeBindedProviderRequest, ChangeBindedProviderResponse, QueryUserProfileReq } from './models';
 import { Credentials } from '../oauth2client/models';
+import { ICloudbase } from '@cloudbase/types';
 export interface AuthOptions {
@@ -12,2 +13,3 @@ apiOrigin: string;
     storage?: SimpleStorage;
+    _fromApp?: ICloudbase;
 }
@@ -20,3 +22,3 @@ export declare class Auth {
     protected signUp(params: SignUpRequest): Promise<Credentials>;
-    signOut(): Promise<void>;
+    signOut(): Promise<any>;
     getVerification(params: GetVerificationRequest): Promise<GetVerificationResponse>;
@@ -32,2 +34,4 @@ verify(params: VerifyRequest): Promise<VerifyResponse>;
     hasLoginState(): Promise<boolean>;
+    hasLoginStateSync(): Credentials | null;
+    getLoginState(): Promise<Credentials | null>;
     transByProvider(params: TransByProviderRequest): Promise<Credentials>;
@@ -34,0 +38,0 @@ grantToken(params: GrantTokenRequest): Promise<Credentials>;

dist/auth/apis.js

@@ -265,7 +265,22 @@ 'use strict';
         return __awaiter(this, void 0, void 0, function () {
+            var userInfo;
             return __generator(this, function (_a) {
-                return [2, this._config.request(consts_1.ApiUrls.USER_ME_URL, {
-                        method: 'GET',
-                        withCredentials: true,
-                    })];
+                switch (_a.label) {
+                    case 0: return [4, this._config.request(consts_1.ApiUrls.USER_ME_URL, {
+                            method: 'GET',
+                            withCredentials: true,
+                        })];
+                    case 1:
+                        userInfo = _a.sent();
+                        if (userInfo.picture) {
+                            userInfo.avatarUrl = userInfo.picture;
+                        }
+                        if (userInfo.sub) {
+                            userInfo.uid = userInfo.sub;
+                        }
+                        if (userInfo.name) {
+                            userInfo.username = userInfo.name;
+                        }
+                        return [2, userInfo];
+                }
             });
@@ -293,2 +308,13 @@ });
     };
+    Auth.prototype.hasLoginStateSync = function () {
+        var credentials = this._config.credentialsClient.getCredentialsSync();
+        return credentials;
+    };
+    Auth.prototype.getLoginState = function () {
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                return [2, this._config.credentialsClient.getCredentialsAsync()];
+            });
+        });
+    };
     Auth.prototype.transByProvider = function (params) {
@@ -424,2 +450,2 @@ return __awaiter(this, void 0, void 0, function () {
 exports.Auth = Auth;
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"apis.js","sourceRoot":"","sources":["../../src/auth/apis.ts"],"names":[],"mappings":"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","sourcesContent":["'use strict';\n\nimport {ApiUrls} from './consts';\nimport {\n    GetVerificationRequest,\n    GetVerificationResponse,\n    UserProfile,\n    UserInfo,\n    SignInRequest,\n    SignUpRequest,\n    VerifyRequest,\n    VerifyResponse,\n    GenProviderRedirectUriRequest,\n    GenProviderRedirectUriResponse,\n    GrantProviderTokenRequest,\n    GrantProviderTokenResponse,\n    PatchProviderTokenRequest,\n    PatchProviderTokenResponse,\n    SignInWithProviderRequest,\n    BindWithProviderRequest,\n    TransByProviderRequest,\n    GrantTokenRequest,\n    UserProfileProvider,\n    UnbindProviderRequest,\n    CheckPasswordrRequest,\n    BindPhoneRequest,\n    SetPasswordRequest,\n    ChangeBindedProviderRequest,\n    ChangeBindedProviderResponse,\n    QueryUserProfileReq,\n} from './models';\nimport {SimpleStorage, RequestFunction} from '../oauth2client/interface';\nimport {OAuth2Client, defaultStorage} from '../oauth2client/oauth2client';\nimport {Credentials} from '../oauth2client/models';\nimport {Captcha} from '../captcha/captcha';\n\nexport interface AuthOptions {\n    apiOrigin: string;\n    clientId: string;\n    credentialsClient?: OAuth2Client;\n    request?: RequestFunction;\n    storage?: SimpleStorage;\n}\n\n/**\n * Auth\n */\nexport class Auth {\n    private _config: AuthOptions;\n\n    /**\n     * constructor\n     * @param {AuthOptions} opts\n     */\n    constructor(opts: AuthOptions) {\n        let request = opts.request;\n        let oAuth2Client = opts.credentialsClient;\n        if (!oAuth2Client) {\n            const initOptions = {\n                apiOrigin: opts.apiOrigin,\n                clientId: opts.clientId,\n                storage: opts.storage,\n            };\n            oAuth2Client = new OAuth2Client(initOptions);\n        }\n        if (!request) {\n            const baseRequest = oAuth2Client.request.bind(oAuth2Client);\n            const captcha = new Captcha({\n                clientId: opts.clientId,\n                request: baseRequest,\n                storage: opts.storage,\n            })\n            request = captcha.request.bind(captcha)\n        }\n        this._config = {\n            apiOrigin: opts.apiOrigin,\n            clientId: opts.clientId,\n            request: request,\n            credentialsClient: oAuth2Client,\n            storage: opts.storage || defaultStorage,\n        };\n    }\n\n    /**\n     * Sign in.\n     * @param {SignInRequest} params A SignInRequest Object.\n     * @return {Promise<Credentials>} A Promise<Credentials> object.\n     */\n    public async signIn(params: SignInRequest): Promise<Credentials> {\n        params.client_id = this._config.clientId;\n        const credentials: Credentials = await this._config.request<Credentials>(\n            ApiUrls.AUTH_SIGN_IN_URL,\n            {\n                method: 'POST',\n                body: params\n            },\n        );\n        await this._config.credentialsClient.setCredentials(credentials);\n        return Promise.resolve(credentials);\n    }\n\n    /**\n     * Sign in Anonymously\n     * @return {Promise<Credentials>} A Promise<Credentials> object.\n     */\n    public async signInAnonymously(): Promise<Credentials> {\n        const credentials: Credentials = await this._config.request<Credentials>(\n            ApiUrls.AUTH_SIGN_IN_ANONYMOUSLY_URL,\n            {\n                method: 'POST',\n                body: {\n                    client_id: this._config.clientId\n                }\n            },\n        );\n        await this._config.credentialsClient.setCredentials(credentials);\n        return Promise.resolve(credentials);\n    }\n\n    /**\n     * Sign up.\n     * @param {SignUpRequest} params A SignUpRequest Object.\n     * @return {Promise<Credentials>} A Promise<Credentials> object.\n     */\n    protected async signUp(params: SignUpRequest): Promise<Credentials> {\n        params.client_id = this._config.clientId;\n        const data: Credentials = await this._config.request<Credentials>(\n            ApiUrls.AUTH_SIGN_UP_URL,\n            {\n                method: 'POST',\n                body: params,\n            },\n        );\n        await this._config.credentialsClient.setCredentials(data);\n        return Promise.resolve(data);\n    }\n\n    /**\n     * Sign out.\n     * @return {Object} A Promise<void> object.\n     */\n    public async signOut(): Promise<void> {\n        const accessToken: string = await this._config.credentialsClient.getAccessToken();\n        const data = await this._config.request<void>(ApiUrls.AUTH_REVOKE_URL, {\n            method: 'POST',\n            body: {\n                client_id: this._config.clientId,\n                token: accessToken,\n            },\n        });\n        await this._config.credentialsClient.setCredentials();\n        return Promise.resolve(data);\n    }\n\n    /**\n     * Get the verification.\n     * @param {GetVerificationRequest} params A GetVerificationRequest Object.\n     * @return {Promise<GetVerificationResponse>} A Promise<GetVerificationResponse> object.\n     */\n    public async getVerification(\n        params: GetVerificationRequest,\n    ): Promise<GetVerificationResponse> {\n        params.client_id = this._config.clientId;\n        return this._config.request<GetVerificationResponse>(\n            ApiUrls.VERIFICATION_URL,\n            {\n                method: 'POST',\n                body: params,\n                withCaptcha: true\n            },\n        );\n    }\n\n    /**\n     *  Verify the code\n     * @param {VerifyRequest} params A VerifyRequest Object.\n     * @return {Promise<VerifyResponse>} A Promise<VerifyResponse> object.\n     */\n    public async verify(params: VerifyRequest): Promise<VerifyResponse> {\n        params.client_id = this._config.clientId;\n        return this._config.request<VerifyResponse>(ApiUrls.VERIFY_URL, {\n            method: 'POST',\n            body: params,\n        });\n    }\n\n    /**\n     * Gen provider redirect uri.\n     * @param {GenProviderRedirectUriRequest} params A GenProviderRedirectUriRequest object.\n     * @return {Promise<GenProviderRedirectUriResponse>} A Promise<GenProviderRedirectUriResponse> object.\n     */\n    public async genProviderRedirectUri(\n        params: GenProviderRedirectUriRequest,\n    ): Promise<GenProviderRedirectUriResponse> {\n        let url = `${ApiUrls.PROVIDER_URI_URL}?client_id=${\n            this._config.clientId\n        }&provider_id=${params.provider_id}&redirect_uri=${encodeURIComponent(\n            params.provider_redirect_uri,\n        )}&state=${params.state}`;\n        const other_params = params.other_params;\n        if (other_params) {\n            if (\n                typeof other_params.sign_out_uri === 'string' &&\n                other_params.sign_out_uri.length > 0\n            ) {\n                url += `&other_params[sign_out_uri]=${other_params.sign_out_uri}`;\n            }\n        }\n        return this._config.request<GenProviderRedirectUriResponse>(url, {\n            method: 'GET',\n        });\n    }\n\n    /**\n     * Grant provider token.\n     * @param {GrantProviderTokenRequest} params A GrantProviderTokenRequest object.\n     * @return {Promise<GrantProviderTokenResponse>} A Promise<GrantProviderTokenResponse> object.\n     */\n    public async grantProviderToken(\n        params: GrantProviderTokenRequest,\n    ): Promise<GrantProviderTokenResponse> {\n        params.client_id = this._config.clientId;\n        return this._config.request<GrantProviderTokenResponse>(\n            ApiUrls.PROVIDER_TOKEN_URL,\n            {\n                method: 'POST',\n                body: params,\n            },\n        );\n    }\n\n    /**\n     * Grant provider token.\n     * @param {PatchProviderTokenRequest} params A PatchProviderTokenRequest object.\n     * @return {Promise<PatchProviderTokenResponse>} A Promise<PatchProviderTokenResponse> object.\n     */\n    public async patchProviderToken(\n        params: PatchProviderTokenRequest,\n    ): Promise<PatchProviderTokenResponse> {\n        params.client_id = this._config.clientId;\n        return this._config.request<PatchProviderTokenResponse>(\n            ApiUrls.PROVIDER_TOKEN_URL,\n            {\n                method: 'PATCH',\n                body: params,\n            },\n        );\n    }\n\n    /**\n     * Signin with provider request.\n     * @param {SignInWithProviderRequest} params A SignInWithProviderRequest object.\n     * @return {Promise<Credentials>} A Promise<Credentials> object.\n     */\n    public async signInWithProvider(\n        params: SignInWithProviderRequest,\n    ): Promise<Credentials> {\n        params.client_id = this._config.clientId;\n        const credentials: Credentials = await this._config.request<Credentials>(\n            ApiUrls.AUTH_SIGN_IN_WITH_PROVIDER_URL,\n            {\n                method: 'POST',\n                body: params,\n            },\n        );\n        await this._config.credentialsClient.setCredentials(credentials);\n        return Promise.resolve(credentials);\n    }\n\n    /**\n     * Bind with provider\n     * @param {BindWithProviderRequest} params A BindWithProviderRequest object.\n     * @return {Promise<void>} A Promise<any> object.\n     */\n    public async bindWithProvider(\n        params: BindWithProviderRequest,\n    ): Promise<void> {\n        params.client_id = this._config.clientId;\n        return this._config.request<any>(ApiUrls.PROVIDER_BIND_URL, {\n            method: 'POST',\n            body: params,\n            withCredentials: true,\n        });\n    }\n\n    /**\n     * Get the user profile.\n     * @return {Promise<UserProfile>} A Promise<UserProfile> object.\n     */\n    public async getUserProfile(): Promise<UserProfile> {\n        return this.getUserInfo();\n    }\n\n    /**\n     * Get the user info.\n     * @return {Promise<UserInfo>} A Promise<UserProfile> object.\n     */\n    public async getUserInfo(): Promise<UserInfo> {\n        return this._config.request<UserInfo>(ApiUrls.USER_ME_URL, {\n            method: 'GET',\n            withCredentials: true,\n        });\n    }\n\n    /**\n     * hasLoginState check if has login state\n     * @return {Promise<boolean>} A Promise<boolean> object.\n     */\n    public async hasLoginState(): Promise<boolean> {\n        try {\n            await this._config.credentialsClient.getAccessToken()\n            return true\n        } catch (error) {\n            return false\n        }\n    }\n\n    /**\n     * Trans by provider.\n     * @param {TransByProviderRequest} params A TransByProviderRequest object.\n     * @return {Promise<Credentials>} A Promise<Credentials> object.\n     */\n    public async transByProvider(\n        params: TransByProviderRequest,\n    ): Promise<Credentials> {\n        return this._config.request<Credentials>(\n            ApiUrls.USER_TRANS_BY_PROVIDER_URL,\n            {\n                method: 'PATCH',\n                body: params,\n                withCredentials: true,\n            },\n        );\n    }\n\n    /**\n     * Grant token.\n     * @param {GrantTokenRequest} params A GrantTokenRequest object.\n     * @return {Promise<Credentials>} A Promise<Credentials> object.\n     */\n    public async grantToken(params: GrantTokenRequest): Promise<Credentials> {\n        params.client_id = this._config.clientId;\n        return this._config.request<Credentials>(ApiUrls.AUTH_TOKEN_URL, {\n            method: 'POST',\n            body: params,\n        });\n    }\n\n    /**\n     * Get the provide list.\n     * @return {Promise<UserProfileProvider>} A Promise<UserProfileProvider> object.\n     */\n    public async getProviders(): Promise<UserProfileProvider> {\n        return this._config.request<UserProfileProvider>(ApiUrls.PROVIDER_LIST, {\n            method: 'GET',\n            withCredentials: true,\n        });\n    }\n\n    /**\n     * unbind provider.\n     * @param {UnbindProviderRequest} params\n     * @return {Promise<any>}\n     */\n    public async unbindProvider(params: UnbindProviderRequest): Promise<void> {\n        params.client_id = this._config.clientId;\n        return this._config.request<any>(\n            `${ApiUrls.PROVIDER_UNBIND_URL}/${params.provider_id}`,\n            {\n                method: 'DELETE',\n                withCredentials: true,\n            },\n        );\n    }\n\n    /**\n     * check Password.\n     * @param {CheckPasswordrRequest} params\n     * @return {Promise<any>}\n     */\n    public async checkPassword(params: CheckPasswordrRequest): Promise<void> {\n        return this._config.request<any>(`${ApiUrls.CHECK_PWD_URL}`, {\n            method: 'POST',\n            withCredentials: true,\n            body: params,\n        });\n    }\n\n    /**\n     * check Password.\n     * @param {CheckPasswordrRequest} params\n     * @return {Promise<any>}\n     */\n    public async bindPhone(params: BindPhoneRequest): Promise<void> {\n        return this._config.request<any>(`${ApiUrls.BIND_PHONE_URL}`, {\n            method: 'PATCH',\n            withCredentials: true,\n            body: params,\n        });\n    }\n\n    /**\n     * Set Password.\n     * @param {SetPasswordrRequest} params\n     * @return {Promise<any>}\n     */\n    public async setPassword(params: SetPasswordRequest): Promise<void> {\n        return this._config.request<any>(`${ApiUrls.AUTH_SET_PASSWORD}`, {\n            method: 'PATCH',\n            withCredentials: true,\n            body: params,\n        });\n    }\n\n    /**\n     * Get the current user verification.\n     * @param {GetVerificationRequest} params A GetVerificationRequest Object.\n     * @return {Promise<GetVerificationResponse>} A Promise<GetVerificationResponse> object.\n     */\n    public async getCurUserVerification(\n        params: GetVerificationRequest,\n    ): Promise<GetVerificationResponse> {\n        params.client_id = this._config.clientId;\n        params.target = 'CUR_USER';\n        return this._config.request<GetVerificationResponse>(\n            ApiUrls.VERIFICATION_URL,\n            {\n                method: 'POST',\n                body: params,\n                withCredentials: true,\n                withCaptcha: true\n            },\n        );\n    }\n\n    /**\n     * change binded provider.\n     * @param {GetVerificationRequest} params A GetVerificationRequest Object.\n     * @return {Promise<GetVerificationResponse>} A Promise<GetVerificationResponse> object.\n     */\n    public async changeBindedProvider(\n        params: ChangeBindedProviderRequest,\n    ): Promise<ChangeBindedProviderResponse> {\n        params.client_id = this._config.clientId;\n        return this._config.request<ChangeBindedProviderResponse>(\n            `${ApiUrls.PROVIDER_LIST}/${params.provider_id}/trans`,\n            {\n                method: 'POST',\n                body: {\n                    provider_trans_token: params.trans_token,\n                },\n                withCredentials: true,\n            },\n        );\n    }\n\n    /**\n     * Patch the user profile.\n     * @param {UserProfile} params A UserProfile Object.\n     * @return {Promise<UserProfile>} A Promise<UserProfile> object.\n     */\n    public async setUserProfile(params: UserProfile): Promise<UserProfile> {\n        return this._config.request<UserProfile>(ApiUrls.USER_PRIFILE_URL, {\n            method: 'PATCH',\n            body: params,\n            withCredentials: true,\n        });\n    }\n\n    /**\n     * Patch the user profile.\n     * @param {QueryUserProfileReq} appended_params A QueryUserProfileReq Object.\n     * @return {Promise<UserProfile>} A Promise<UserProfile> object.\n     */\n    public async queryUserProfile(\n        appended_params: QueryUserProfileReq,\n    ): Promise<UserProfile> {\n        const url = `${ApiUrls.USER_QUERY_URL}${appended_params}`;\n        return this._config.request<UserProfile>(url, {\n            method: 'GET',\n            withCredentials: true,\n        });\n    }\n}\n"]}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"apis.js","sourceRoot":"","sources":["../../src/auth/apis.ts"],"names":[],"mappings":"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","sourcesContent":["'use strict';\n\nimport { ApiUrls } from './consts';\nimport {\n  GetVerificationRequest,\n  GetVerificationResponse,\n  UserProfile,\n  UserInfo,\n  SignInRequest,\n  SignUpRequest,\n  VerifyRequest,\n  VerifyResponse,\n  GenProviderRedirectUriRequest,\n  GenProviderRedirectUriResponse,\n  GrantProviderTokenRequest,\n  GrantProviderTokenResponse,\n  PatchProviderTokenRequest,\n  PatchProviderTokenResponse,\n  SignInWithProviderRequest,\n  BindWithProviderRequest,\n  TransByProviderRequest,\n  GrantTokenRequest,\n  UserProfileProvider,\n  UnbindProviderRequest,\n  CheckPasswordrRequest,\n  BindPhoneRequest,\n  SetPasswordRequest,\n  ChangeBindedProviderRequest,\n  ChangeBindedProviderResponse,\n  QueryUserProfileReq,\n} from './models';\nimport { SimpleStorage, RequestFunction } from '../oauth2client/interface';\nimport { OAuth2Client, defaultStorage } from '../oauth2client/oauth2client';\nimport { Credentials } from '../oauth2client/models';\nimport { Captcha } from '../captcha/captcha';\nimport { ICloudbase } from '@cloudbase/types';\n\n\nexport interface AuthOptions {\n  apiOrigin: string;\n  clientId: string;\n  credentialsClient?: OAuth2Client;\n  request?: RequestFunction;\n  storage?: SimpleStorage;\n  _fromApp?: ICloudbase // 所属cloudbase app对象\n}\n\n/**\n * Auth\n */\nexport class Auth {\n  private _config: AuthOptions;\n\n  /**\n   * constructor\n   * @param {AuthOptions} opts\n   */\n  constructor(opts: AuthOptions) {\n    let request = opts.request;\n    let oAuth2Client = opts.credentialsClient;\n    if (!oAuth2Client) {\n      const initOptions = {\n        apiOrigin: opts.apiOrigin,\n        clientId: opts.clientId,\n        storage: opts.storage,\n      };\n      oAuth2Client = new OAuth2Client(initOptions);\n    }\n    if (!request) {\n      const baseRequest = oAuth2Client.request.bind(oAuth2Client);\n      const captcha = new Captcha({\n        clientId: opts.clientId,\n        request: baseRequest,\n        storage: opts.storage,\n      })\n      request = captcha.request.bind(captcha)\n    }\n    this._config = {\n      apiOrigin: opts.apiOrigin,\n      clientId: opts.clientId,\n      request: request,\n      credentialsClient: oAuth2Client,\n      storage: opts.storage || defaultStorage,\n    };\n  }\n\n  /**\n   * Sign in.\n   * @param {SignInRequest} params A SignInRequest Object.\n   * @return {Promise<Credentials>} A Promise<Credentials> object.\n   */\n  public async signIn(params: SignInRequest): Promise<Credentials> {\n    params.client_id = this._config.clientId;\n    const credentials: Credentials = await this._config.request<Credentials>(\n      ApiUrls.AUTH_SIGN_IN_URL,\n      {\n        method: 'POST',\n        body: params\n      },\n    );\n    await this._config.credentialsClient.setCredentials(credentials);\n    return Promise.resolve(credentials);\n  }\n\n  /**\n   * Sign in Anonymously\n   * @return {Promise<Credentials>} A Promise<Credentials> object.\n   */\n  public async signInAnonymously(): Promise<Credentials> {\n    const credentials: Credentials = await this._config.request<Credentials>(\n      ApiUrls.AUTH_SIGN_IN_ANONYMOUSLY_URL,\n      {\n        method: 'POST',\n        body: {\n          client_id: this._config.clientId\n        }\n      },\n    );\n    await this._config.credentialsClient.setCredentials(credentials);\n    return Promise.resolve(credentials);\n  }\n\n  /**\n   * Sign up.\n   * @param {SignUpRequest} params A SignUpRequest Object.\n   * @return {Promise<Credentials>} A Promise<Credentials> object.\n   */\n  protected async signUp(params: SignUpRequest): Promise<Credentials> {\n    params.client_id = this._config.clientId;\n    const data: Credentials = await this._config.request<Credentials>(\n      ApiUrls.AUTH_SIGN_UP_URL,\n      {\n        method: 'POST',\n        body: params,\n      },\n    );\n    await this._config.credentialsClient.setCredentials(data);\n    return Promise.resolve(data);\n  }\n\n  /**\n   * Sign out.\n   * @return {Object} A Promise<void> object.\n   */\n  public async signOut(): Promise<any> {\n    const accessToken: string = await this._config.credentialsClient.getAccessToken();\n    const data = await this._config.request(ApiUrls.AUTH_REVOKE_URL, {\n      method: 'POST',\n      body: {\n        client_id: this._config.clientId,\n        token: accessToken,\n      },\n    });\n    await this._config.credentialsClient.setCredentials();\n    return Promise.resolve(data);\n  }\n\n  /**\n   * Get the verification.\n   * @param {GetVerificationRequest} params A GetVerificationRequest Object.\n   * @return {Promise<GetVerificationResponse>} A Promise<GetVerificationResponse> object.\n   */\n  public async getVerification(\n    params: GetVerificationRequest,\n  ): Promise<GetVerificationResponse> {\n    params.client_id = this._config.clientId;\n    return this._config.request<GetVerificationResponse>(\n      ApiUrls.VERIFICATION_URL,\n      {\n        method: 'POST',\n        body: params,\n        withCaptcha: true\n      },\n    );\n  }\n\n  /**\n   *  Verify the code\n   * @param {VerifyRequest} params A VerifyRequest Object.\n   * @return {Promise<VerifyResponse>} A Promise<VerifyResponse> object.\n   */\n  public async verify(params: VerifyRequest): Promise<VerifyResponse> {\n    params.client_id = this._config.clientId;\n    return this._config.request<VerifyResponse>(ApiUrls.VERIFY_URL, {\n      method: 'POST',\n      body: params,\n    });\n  }\n\n  /**\n   * Gen provider redirect uri.\n   * @param {GenProviderRedirectUriRequest} params A GenProviderRedirectUriRequest object.\n   * @return {Promise<GenProviderRedirectUriResponse>} A Promise<GenProviderRedirectUriResponse> object.\n   */\n  public async genProviderRedirectUri(\n    params: GenProviderRedirectUriRequest,\n  ): Promise<GenProviderRedirectUriResponse> {\n    let url = `${ApiUrls.PROVIDER_URI_URL}?client_id=${this._config.clientId\n      }&provider_id=${params.provider_id}&redirect_uri=${encodeURIComponent(\n        params.provider_redirect_uri,\n      )}&state=${params.state}`;\n    const other_params = params.other_params;\n    if (other_params) {\n      if (\n        typeof other_params.sign_out_uri === 'string' &&\n        other_params.sign_out_uri.length > 0\n      ) {\n        url += `&other_params[sign_out_uri]=${other_params.sign_out_uri}`;\n      }\n    }\n    return this._config.request<GenProviderRedirectUriResponse>(url, {\n      method: 'GET',\n    });\n  }\n\n  /**\n   * Grant provider token.\n   * @param {GrantProviderTokenRequest} params A GrantProviderTokenRequest object.\n   * @return {Promise<GrantProviderTokenResponse>} A Promise<GrantProviderTokenResponse> object.\n   */\n  public async grantProviderToken(\n    params: GrantProviderTokenRequest,\n  ): Promise<GrantProviderTokenResponse> {\n    params.client_id = this._config.clientId;\n    return this._config.request<GrantProviderTokenResponse>(\n      ApiUrls.PROVIDER_TOKEN_URL,\n      {\n        method: 'POST',\n        body: params,\n      },\n    );\n  }\n\n  /**\n   * Grant provider token.\n   * @param {PatchProviderTokenRequest} params A PatchProviderTokenRequest object.\n   * @return {Promise<PatchProviderTokenResponse>} A Promise<PatchProviderTokenResponse> object.\n   */\n  public async patchProviderToken(\n    params: PatchProviderTokenRequest,\n  ): Promise<PatchProviderTokenResponse> {\n    params.client_id = this._config.clientId;\n    return this._config.request<PatchProviderTokenResponse>(\n      ApiUrls.PROVIDER_TOKEN_URL,\n      {\n        method: 'PATCH',\n        body: params,\n      },\n    );\n  }\n\n  /**\n   * Signin with provider request.\n   * @param {SignInWithProviderRequest} params A SignInWithProviderRequest object.\n   * @return {Promise<Credentials>} A Promise<Credentials> object.\n   */\n  public async signInWithProvider(\n    params: SignInWithProviderRequest,\n  ): Promise<Credentials> {\n    params.client_id = this._config.clientId;\n    const credentials: Credentials = await this._config.request<Credentials>(\n      ApiUrls.AUTH_SIGN_IN_WITH_PROVIDER_URL,\n      {\n        method: 'POST',\n        body: params,\n      },\n    );\n    await this._config.credentialsClient.setCredentials(credentials);\n    return Promise.resolve(credentials);\n  }\n\n  /**\n   * Bind with provider\n   * @param {BindWithProviderRequest} params A BindWithProviderRequest object.\n   * @return {Promise<void>} A Promise<any> object.\n   */\n  public async bindWithProvider(\n    params: BindWithProviderRequest,\n  ): Promise<void> {\n    params.client_id = this._config.clientId;\n    return this._config.request<any>(ApiUrls.PROVIDER_BIND_URL, {\n      method: 'POST',\n      body: params,\n      withCredentials: true,\n    });\n  }\n\n  /**\n   * Get the user profile.\n   * @return {Promise<UserProfile>} A Promise<UserProfile> object.\n   */\n  public async getUserProfile(): Promise<UserProfile> {\n    return this.getUserInfo();\n  }\n\n  /**\n   * Get the user info.\n   * @return {Promise<UserInfo>} A Promise<UserProfile> object.\n   */\n  public async getUserInfo(): Promise<UserInfo> {\n    const userInfo = await this._config.request<UserInfo>(ApiUrls.USER_ME_URL, {\n      method: 'GET',\n      withCredentials: true,\n    });\n    if (userInfo.picture) {\n      userInfo.avatarUrl = userInfo.picture;\n    }\n\n    if (userInfo.sub) {\n      userInfo.uid = userInfo.sub\n    }\n\n    if (userInfo.name) {\n      userInfo.username = userInfo.name\n    }\n    return userInfo;\n  }\n\n  /**\n   * hasLoginState check if has login state\n   * @return {Promise<boolean>} A Promise<boolean> object.\n   */\n  public async hasLoginState(): Promise<boolean> {\n    try {\n      await this._config.credentialsClient.getAccessToken()\n      return true\n    } catch (error) {\n      return false\n    }\n  }\n\n  public hasLoginStateSync(): Credentials | null {\n    const credentials = this._config.credentialsClient.getCredentialsSync()\n    return credentials\n  }\n\n  public async getLoginState(): Promise<Credentials | null> {\n    return this._config.credentialsClient.getCredentialsAsync()\n  }\n\n  /**\n   * Trans by provider.\n   * @param {TransByProviderRequest} params A TransByProviderRequest object.\n   * @return {Promise<Credentials>} A Promise<Credentials> object.\n   */\n  public async transByProvider(\n    params: TransByProviderRequest,\n  ): Promise<Credentials> {\n    return this._config.request<Credentials>(\n      ApiUrls.USER_TRANS_BY_PROVIDER_URL,\n      {\n        method: 'PATCH',\n        body: params,\n        withCredentials: true,\n      },\n    );\n  }\n\n  /**\n   * Grant token.\n   * @param {GrantTokenRequest} params A GrantTokenRequest object.\n   * @return {Promise<Credentials>} A Promise<Credentials> object.\n   */\n  public async grantToken(params: GrantTokenRequest): Promise<Credentials> {\n    params.client_id = this._config.clientId;\n    return this._config.request<Credentials>(ApiUrls.AUTH_TOKEN_URL, {\n      method: 'POST',\n      body: params,\n    });\n  }\n\n  /**\n   * Get the provide list.\n   * @return {Promise<UserProfileProvider>} A Promise<UserProfileProvider> object.\n   */\n  public async getProviders(): Promise<UserProfileProvider> {\n    return this._config.request<UserProfileProvider>(ApiUrls.PROVIDER_LIST, {\n      method: 'GET',\n      withCredentials: true,\n    });\n  }\n\n  /**\n   * unbind provider.\n   * @param {UnbindProviderRequest} params\n   * @return {Promise<any>}\n   */\n  public async unbindProvider(params: UnbindProviderRequest): Promise<void> {\n    params.client_id = this._config.clientId;\n    return this._config.request<any>(\n      `${ApiUrls.PROVIDER_UNBIND_URL}/${params.provider_id}`,\n      {\n        method: 'DELETE',\n        withCredentials: true,\n      },\n    );\n  }\n\n  /**\n   * check Password.\n   * @param {CheckPasswordrRequest} params\n   * @return {Promise<any>}\n   */\n  public async checkPassword(params: CheckPasswordrRequest): Promise<void> {\n    return this._config.request<any>(`${ApiUrls.CHECK_PWD_URL}`, {\n      method: 'POST',\n      withCredentials: true,\n      body: params,\n    });\n  }\n\n  /**\n   * check Password.\n   * @param {CheckPasswordrRequest} params\n   * @return {Promise<any>}\n   */\n  public async bindPhone(params: BindPhoneRequest): Promise<void> {\n    return this._config.request<any>(`${ApiUrls.BIND_PHONE_URL}`, {\n      method: 'PATCH',\n      withCredentials: true,\n      body: params,\n    });\n  }\n\n  /**\n   * Set Password.\n   * @param {SetPasswordrRequest} params\n   * @return {Promise<any>}\n   */\n  public async setPassword(params: SetPasswordRequest): Promise<void> {\n    return this._config.request<any>(`${ApiUrls.AUTH_SET_PASSWORD}`, {\n      method: 'PATCH',\n      withCredentials: true,\n      body: params,\n    });\n  }\n\n  /**\n   * Get the current user verification.\n   * @param {GetVerificationRequest} params A GetVerificationRequest Object.\n   * @return {Promise<GetVerificationResponse>} A Promise<GetVerificationResponse> object.\n   */\n  public async getCurUserVerification(\n    params: GetVerificationRequest,\n  ): Promise<GetVerificationResponse> {\n    params.client_id = this._config.clientId;\n    params.target = 'CUR_USER';\n    return this._config.request<GetVerificationResponse>(\n      ApiUrls.VERIFICATION_URL,\n      {\n        method: 'POST',\n        body: params,\n        withCredentials: true,\n        withCaptcha: true\n      },\n    );\n  }\n\n  /**\n   * change binded provider.\n   * @param {GetVerificationRequest} params A GetVerificationRequest Object.\n   * @return {Promise<GetVerificationResponse>} A Promise<GetVerificationResponse> object.\n   */\n  public async changeBindedProvider(\n    params: ChangeBindedProviderRequest,\n  ): Promise<ChangeBindedProviderResponse> {\n    params.client_id = this._config.clientId;\n    return this._config.request<ChangeBindedProviderResponse>(\n      `${ApiUrls.PROVIDER_LIST}/${params.provider_id}/trans`,\n      {\n        method: 'POST',\n        body: {\n          provider_trans_token: params.trans_token,\n        },\n        withCredentials: true,\n      },\n    );\n  }\n\n  /**\n   * Patch the user profile.\n   * @param {UserProfile} params A UserProfile Object.\n   * @return {Promise<UserProfile>} A Promise<UserProfile> object.\n   */\n  public async setUserProfile(params: UserProfile): Promise<UserProfile> {\n    return this._config.request<UserProfile>(ApiUrls.USER_PRIFILE_URL, {\n      method: 'PATCH',\n      body: params,\n      withCredentials: true,\n    });\n  }\n\n  /**\n   * Patch the user profile.\n   * @param {QueryUserProfileReq} appended_params A QueryUserProfileReq Object.\n   * @return {Promise<UserProfile>} A Promise<UserProfile> object.\n   */\n  public async queryUserProfile(\n    appended_params: QueryUserProfileReq,\n  ): Promise<UserProfile> {\n    const url = `${ApiUrls.USER_QUERY_URL}${appended_params}`;\n    return this._config.request<UserProfile>(url, {\n      method: 'GET',\n      withCredentials: true,\n    });\n  }\n}\n"]}

dist/auth/models.d.ts

@@ -94,2 +94,3 @@ interface BaseRequest {
     picture?: string;
+    avatarUrl?: string;
     username?: string;
@@ -105,2 +106,4 @@ email?: string;
     created_from?: string;
+    sub?: string;
+    uid?: string;
 }
@@ -107,0 +110,0 @@ export declare type UserInfo = UserProfile;

dist/auth/models.js

 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibW9kZWxzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2F1dGgvbW9kZWxzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiIiLCJzb3VyY2VzQ29udGVudCI6WyJpbnRlcmZhY2UgQmFzZVJlcXVlc3Qge1xuICBjbGllbnRfaWQ/OiBzdHJpbmc7XG59XG5cbmV4cG9ydCBpbnRlcmZhY2UgU2lnbkluUmVxdWVzdCBleHRlbmRzIEJhc2VSZXF1ZXN0IHtcbiAgdXNlcm5hbWU/OiBzdHJpbmc7XG4gIHBhc3N3b3JkPzogc3RyaW5nO1xuICB2ZXJpZmljYXRpb25fY29kZT86IHN0cmluZztcbiAgdmVyaWZpY2F0aW9uX3Rva2VuPzogc3RyaW5nO1xufVxuXG5leHBvcnQgaW50ZXJmYWNlIFNpZ25JbldpdGhQcm92aWRlclJlcXVlc3QgZXh0ZW5kcyBCYXNlUmVxdWVzdCB7XG4gIHByb3ZpZGVyX3Rva2VuOiBzdHJpbmc7XG59XG5cbmV4cG9ydCBpbnRlcmZhY2UgU2lnblVwUmVxdWVzdCBleHRlbmRzIEJhc2VSZXF1ZXN0IHtcbiAgcGhvbmVfbnVtYmVyPzogc3RyaW5nO1xuICBlbWFpbD86IHN0cmluZztcblxuICB2ZXJpZmljYXRpb25fY29kZT86IHN0cmluZztcbiAgdmVyaWZpY2F0aW9uX3Rva2VuPzogc3RyaW5nO1xuICBwcm92aWRlcl90b2tlbj86IHN0cmluZztcblxuICBwYXNzd29yZD86IHN0cmluZztcbiAgbmFtZT86IHN0cmluZztcbiAgZ2VuZGVyPzogc3RyaW5nO1xuICBwaWN0dXJlPzogc3RyaW5nO1xuICBsb2NhbGU/OiBzdHJpbmc7XG59XG5cbmV4cG9ydCBpbnRlcmZhY2UgR2V0VmVyaWZpY2F0aW9uUmVxdWVzdCBleHRlbmRzIEJhc2VSZXF1ZXN0IHtcbiAgcGhvbmVfbnVtYmVyPzogc3RyaW5nO1xuICBlbWFpbD86IHN0cmluZztcbiAgdGFyZ2V0Pzogc3RyaW5nIHwgJ0FOWSc7XG4gIHVzYWdlPzogc3RyaW5nO1xufVxuXG5leHBvcnQgaW50ZXJmYWNlIEdldFZlcmlmaWNhdGlvblJlc3BvbnNlIHtcbiAgdmVyaWZpY2F0aW9uX2lkPzogc3RyaW5nO1xuICBpc191c2VyPzogYm9vbGVhbiB8IGZhbHNlO1xufVxuXG5leHBvcnQgaW50ZXJmYWNlIFZlcmlmeVJlc3BvbnNlIHtcbiAgdmVyaWZpY2F0aW9uX3Rva2VuPzogc3RyaW5nO1xufVxuXG5leHBvcnQgaW50ZXJmYWNlIFZlcmlmeVJlcXVlc3QgZXh0ZW5kcyBCYXNlUmVxdWVzdCB7XG4gIHZlcmlmaWNhdGlvbl9jb2RlOiBzdHJpbmc7XG4gIHZlcmlmaWNhdGlvbl9pZD86IHN0cmluZztcbn1cblxuZXhwb3J0IGludGVyZmFjZSBQcm92aWRlckJpbmRSZXF1ZXN0IHtcbiAgcHJvdmlkZXJfdG9rZW46IHN0cmluZztcbn1cblxuZXhwb3J0IGludGVyZmFjZSBHcmFudFByb3ZpZGVyVG9rZW5SZXF1ZXN0IGV4dGVuZHMgQmFzZVJlcXVlc3Qge1xuICBwcm92aWRlcl9pZDogc3RyaW5nO1xuICBwcm92aWRlcl9yZWRpcmVjdF91cmk/OiBzdHJpbmc7XG4gIHByb3ZpZGVyX2NvZGU/OiBzdHJpbmc7XG4gIHByb3ZpZGVyX2FjY2Vzc190b2tlbj86IHN0cmluZztcbiAgcHJvdmlkZXJfaWRfdG9rZW4/OiBzdHJpbmc7XG59XG5cbmV4cG9ydCBpbnRlcmZhY2UgR3JhbnRQcm92aWRlclRva2VuUmVzcG9uc2Uge1xuICBwcm92aWRlcl90b2tlbjogc3RyaW5nO1xuICBleHBpcmVzX2luOiBudW1iZXI7XG59XG5cbmV4cG9ydCBpbnRlcmZhY2UgUGF0Y2hQcm92aWRlclRva2VuUmVxdWVzdCBleHRlbmRzIEJhc2VSZXF1ZXN0IHtcbiAgcHJvdmlkZXJfdG9rZW46IHN0cmluZztcbiAgcHJvdmlkZXJfcGFyYW1zOiB7XG4gICAgZW5jcnlwdGVkRGF0YTogc3RyaW5nO1xuICAgIGl2OiBzdHJpbmc7XG4gIH07XG59XG5cbmV4cG9ydCBpbnRlcmZhY2UgUGF0Y2hQcm92aWRlclRva2VuUmVzcG9uc2Uge1xuICBwcm92aWRlcl90b2tlbjogc3RyaW5nO1xuICBleHBpcmVzX2luOiBudW1iZXI7XG4gIHByb3ZpZGVyX3Byb2ZpbGU6IFByb3ZpZGVyUHJvZmlsZTtcbn1cblxuZXhwb3J0IGludGVyZmFjZSBHZW5Qcm92aWRlclJlZGlyZWN0VXJpUmVxdWVzdCB7XG4gIHByb3ZpZGVyX2lkOiBzdHJpbmc7XG4gIHByb3ZpZGVyX3JlZGlyZWN0X3VyaTogc3RyaW5nO1xuICBzdGF0ZTogc3RyaW5nO1xuICBvdGhlcl9wYXJhbXM/OiB7XG4gICAgc2lnbl9vdXRfdXJpPzogc3RyaW5nO1xuICB9O1xufVxuXG5leHBvcnQgaW50ZXJmYWNlIEdlblByb3ZpZGVyUmVkaXJlY3RVcmlSZXNwb25zZSB7XG4gIHVyaTogc3RyaW5nO1xuICBzaWdub3V0X3VyaT86IHN0cmluZztcbn1cblxuZXhwb3J0IGludGVyZmFjZSBCaW5kV2l0aFByb3ZpZGVyUmVxdWVzdCBleHRlbmRzIEJhc2VSZXF1ZXN0IHtcbiAgcHJvdmlkZXJfdG9rZW46IHN0cmluZztcbn1cblxuZXhwb3J0IGludGVyZmFjZSBCaW5kV2l0aFByb3ZpZGVyUmVxdWVzdCB7XG4gIHByb3ZpZGVyX3Rva2VuOiBzdHJpbmc7XG59XG5cbmV4cG9ydCBpbnRlcmZhY2UgVXNlclByb2ZpbGVQcm92aWRlciB7XG4gIGlkPzogc3RyaW5nO1xuICBwcm92aWRlcl91c2VyX2lkPzogc3RyaW5nO1xuICBuYW1lPzogc3RyaW5nO1xufVxuXG5leHBvcnQgaW50ZXJmYWNlIFVzZXJQcm9maWxlIHtcbiAgbmFtZT86IHN0cmluZztcbiAgcGljdHVyZT86IHN0cmluZztcbiAgdXNlcm5hbWU/OiBzdHJpbmc7XG4gIGVtYWlsPzogc3RyaW5nO1xuICBlbWFpbF92ZXJpZmllZD86IGJvb2xlYW47XG4gIHBob25lX251bWJlcj86IHN0cmluZztcbiAgcHJvdmlkZXJzPzogW1VzZXJQcm9maWxlUHJvdmlkZXJdO1xuICBnZW5kZXI/OiBzdHJpbmc7XG4gIGJpcnRoZGF0ZT86IHN0cmluZztcbiAgem9uZWluZm8/OiBzdHJpbmc7XG4gIGxvY2FsZT86IHN0cmluZztcbiAgY3JlYXRlZF9mcm9tPzogc3RyaW5nO1xufVxuXG5leHBvcnQgdHlwZSBVc2VySW5mbyA9IFVzZXJQcm9maWxlO1xuXG5leHBvcnQgaW50ZXJmYWNlIFByb3ZpZGVyUHJvZmlsZSB7XG4gIHByb3ZpZGVyX2lkOiBzdHJpbmc7XG4gIHBob25lX251bWJlcj86IHN0cmluZztcbn1cblxuZXhwb3J0IGludGVyZmFjZSBUcmFuc0J5UHJvdmlkZXJSZXF1ZXN0IHtcbiAgcHJvdmlkZXJfdG9rZW46IHN0cmluZztcbn1cblxuZXhwb3J0IGludGVyZmFjZSBHcmFudFRva2VuUmVxdWVzdCBleHRlbmRzIEJhc2VSZXF1ZXN0IHtcbiAgY2xpZW50X3NlY3JldD86IHN0cmluZztcbiAgY29kZT86IHN0cmluZztcbiAgZ3JhbnRfdHlwZT86IHN0cmluZztcbiAgcmVkaXJlY3RfdXJpPzogc3RyaW5nO1xuICBub25jZT86IHN0cmluZztcbiAgcmVmcmVzaF90b2tlbj86IHN0cmluZztcbiAgc2NvcGU/OiBzdHJpbmc7XG59XG5cbmV4cG9ydCBpbnRlcmZhY2UgVW5iaW5kUHJvdmlkZXJSZXF1ZXN0IGV4dGVuZHMgQmFzZVJlcXVlc3Qge1xuICBwcm92aWRlcl9pZDogc3RyaW5nO1xufVxuXG5leHBvcnQgaW50ZXJmYWNlIENoZWNrUGFzc3dvcmRyUmVxdWVzdCBleHRlbmRzIEJhc2VSZXF1ZXN0IHtcbiAgcGFzc3dvcmQ6IHN0cmluZztcbn1cblxuZXhwb3J0IGludGVyZmFjZSBCaW5kUGhvbmVSZXF1ZXN0IGV4dGVuZHMgQmFzZVJlcXVlc3Qge1xuICBwaG9uZV9udW1iZXI6IHN0cmluZztcbiAgc3Vkb190b2tlbjogc3RyaW5nO1xuICB2ZXJpZmljYXRpb25fdG9rZW46IHN0cmluZztcbn1cblxuZXhwb3J0IGludGVyZmFjZSBTZXRQYXNzd29yZFJlcXVlc3QgZXh0ZW5kcyBCYXNlUmVxdWVzdCB7XG4gIG5ld19wYXNzd29yZDogc3RyaW5nO1xuICBzdWRvX3Rva2VuOiBzdHJpbmc7XG59XG5cbmV4cG9ydCBpbnRlcmZhY2UgQ2hhbmdlQmluZGVkUHJvdmlkZXJSZXF1ZXN0IGV4dGVuZHMgQmFzZVJlcXVlc3Qge1xuICB0cmFuc190b2tlbjogc3RyaW5nO1xuICBwcm92aWRlcl9pZDogc3RyaW5nO1xufVxuXG5leHBvcnQgdHlwZSBDaGFuZ2VCaW5kZWRQcm92aWRlclJlc3BvbnNlID0gQmFzZVJlcXVlc3RcblxuZXhwb3J0IGludGVyZmFjZSBRdWVyeVVzZXJQcm9maWxlUmVxIGV4dGVuZHMgQmFzZVJlcXVlc3Qge1xuICBhcHBlbmRlZF9wYXJhbXM6IHN0cmluZztcbn1cbiJdfQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibW9kZWxzLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2F1dGgvbW9kZWxzLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiIiLCJzb3VyY2VzQ29udGVudCI6WyJpbnRlcmZhY2UgQmFzZVJlcXVlc3Qge1xuICBjbGllbnRfaWQ/OiBzdHJpbmc7XG59XG5cbmV4cG9ydCBpbnRlcmZhY2UgU2lnbkluUmVxdWVzdCBleHRlbmRzIEJhc2VSZXF1ZXN0IHtcbiAgdXNlcm5hbWU/OiBzdHJpbmc7XG4gIHBhc3N3b3JkPzogc3RyaW5nO1xuICB2ZXJpZmljYXRpb25fY29kZT86IHN0cmluZztcbiAgdmVyaWZpY2F0aW9uX3Rva2VuPzogc3RyaW5nO1xufVxuXG5leHBvcnQgaW50ZXJmYWNlIFNpZ25JbldpdGhQcm92aWRlclJlcXVlc3QgZXh0ZW5kcyBCYXNlUmVxdWVzdCB7XG4gIHByb3ZpZGVyX3Rva2VuOiBzdHJpbmc7XG59XG5cbmV4cG9ydCBpbnRlcmZhY2UgU2lnblVwUmVxdWVzdCBleHRlbmRzIEJhc2VSZXF1ZXN0IHtcbiAgcGhvbmVfbnVtYmVyPzogc3RyaW5nO1xuICBlbWFpbD86IHN0cmluZztcblxuICB2ZXJpZmljYXRpb25fY29kZT86IHN0cmluZztcbiAgdmVyaWZpY2F0aW9uX3Rva2VuPzogc3RyaW5nO1xuICBwcm92aWRlcl90b2tlbj86IHN0cmluZztcblxuICBwYXNzd29yZD86IHN0cmluZztcbiAgbmFtZT86IHN0cmluZztcbiAgZ2VuZGVyPzogc3RyaW5nO1xuICBwaWN0dXJlPzogc3RyaW5nO1xuICBsb2NhbGU/OiBzdHJpbmc7XG59XG5cbmV4cG9ydCBpbnRlcmZhY2UgR2V0VmVyaWZpY2F0aW9uUmVxdWVzdCBleHRlbmRzIEJhc2VSZXF1ZXN0IHtcbiAgcGhvbmVfbnVtYmVyPzogc3RyaW5nO1xuICBlbWFpbD86IHN0cmluZztcbiAgdGFyZ2V0Pzogc3RyaW5nIHwgJ0FOWSc7XG4gIHVzYWdlPzogc3RyaW5nO1xufVxuXG5leHBvcnQgaW50ZXJmYWNlIEdldFZlcmlmaWNhdGlvblJlc3BvbnNlIHtcbiAgdmVyaWZpY2F0aW9uX2lkPzogc3RyaW5nO1xuICBpc191c2VyPzogYm9vbGVhbiB8IGZhbHNlO1xufVxuXG5leHBvcnQgaW50ZXJmYWNlIFZlcmlmeVJlc3BvbnNlIHtcbiAgdmVyaWZpY2F0aW9uX3Rva2VuPzogc3RyaW5nO1xufVxuXG5leHBvcnQgaW50ZXJmYWNlIFZlcmlmeVJlcXVlc3QgZXh0ZW5kcyBCYXNlUmVxdWVzdCB7XG4gIHZlcmlmaWNhdGlvbl9jb2RlOiBzdHJpbmc7XG4gIHZlcmlmaWNhdGlvbl9pZD86IHN0cmluZztcbn1cblxuZXhwb3J0IGludGVyZmFjZSBQcm92aWRlckJpbmRSZXF1ZXN0IHtcbiAgcHJvdmlkZXJfdG9rZW46IHN0cmluZztcbn1cblxuZXhwb3J0IGludGVyZmFjZSBHcmFudFByb3ZpZGVyVG9rZW5SZXF1ZXN0IGV4dGVuZHMgQmFzZVJlcXVlc3Qge1xuICBwcm92aWRlcl9pZDogc3RyaW5nO1xuICBwcm92aWRlcl9yZWRpcmVjdF91cmk/OiBzdHJpbmc7XG4gIHByb3ZpZGVyX2NvZGU/OiBzdHJpbmc7XG4gIHByb3ZpZGVyX2FjY2Vzc190b2tlbj86IHN0cmluZztcbiAgcHJvdmlkZXJfaWRfdG9rZW4/OiBzdHJpbmc7XG59XG5cbmV4cG9ydCBpbnRlcmZhY2UgR3JhbnRQcm92aWRlclRva2VuUmVzcG9uc2Uge1xuICBwcm92aWRlcl90b2tlbjogc3RyaW5nO1xuICBleHBpcmVzX2luOiBudW1iZXI7XG59XG5cbmV4cG9ydCBpbnRlcmZhY2UgUGF0Y2hQcm92aWRlclRva2VuUmVxdWVzdCBleHRlbmRzIEJhc2VSZXF1ZXN0IHtcbiAgcHJvdmlkZXJfdG9rZW46IHN0cmluZztcbiAgcHJvdmlkZXJfcGFyYW1zOiB7XG4gICAgZW5jcnlwdGVkRGF0YTogc3RyaW5nO1xuICAgIGl2OiBzdHJpbmc7XG4gIH07XG59XG5cbmV4cG9ydCBpbnRlcmZhY2UgUGF0Y2hQcm92aWRlclRva2VuUmVzcG9uc2Uge1xuICBwcm92aWRlcl90b2tlbjogc3RyaW5nO1xuICBleHBpcmVzX2luOiBudW1iZXI7XG4gIHByb3ZpZGVyX3Byb2ZpbGU6IFByb3ZpZGVyUHJvZmlsZTtcbn1cblxuZXhwb3J0IGludGVyZmFjZSBHZW5Qcm92aWRlclJlZGlyZWN0VXJpUmVxdWVzdCB7XG4gIHByb3ZpZGVyX2lkOiBzdHJpbmc7XG4gIHByb3ZpZGVyX3JlZGlyZWN0X3VyaTogc3RyaW5nO1xuICBzdGF0ZTogc3RyaW5nO1xuICBvdGhlcl9wYXJhbXM/OiB7XG4gICAgc2lnbl9vdXRfdXJpPzogc3RyaW5nO1xuICB9O1xufVxuXG5leHBvcnQgaW50ZXJmYWNlIEdlblByb3ZpZGVyUmVkaXJlY3RVcmlSZXNwb25zZSB7XG4gIHVyaTogc3RyaW5nO1xuICBzaWdub3V0X3VyaT86IHN0cmluZztcbn1cblxuZXhwb3J0IGludGVyZmFjZSBCaW5kV2l0aFByb3ZpZGVyUmVxdWVzdCBleHRlbmRzIEJhc2VSZXF1ZXN0IHtcbiAgcHJvdmlkZXJfdG9rZW46IHN0cmluZztcbn1cblxuZXhwb3J0IGludGVyZmFjZSBCaW5kV2l0aFByb3ZpZGVyUmVxdWVzdCB7XG4gIHByb3ZpZGVyX3Rva2VuOiBzdHJpbmc7XG59XG5cbmV4cG9ydCBpbnRlcmZhY2UgVXNlclByb2ZpbGVQcm92aWRlciB7XG4gIGlkPzogc3RyaW5nO1xuICBwcm92aWRlcl91c2VyX2lkPzogc3RyaW5nO1xuICBuYW1lPzogc3RyaW5nO1xufVxuXG5leHBvcnQgaW50ZXJmYWNlIFVzZXJQcm9maWxlIHtcbiAgbmFtZT86IHN0cmluZztcbiAgcGljdHVyZT86IHN0cmluZztcbiAgYXZhdGFyVXJsPzogc3RyaW5nO1xuICB1c2VybmFtZT86IHN0cmluZztcbiAgZW1haWw/OiBzdHJpbmc7XG4gIGVtYWlsX3ZlcmlmaWVkPzogYm9vbGVhbjtcbiAgcGhvbmVfbnVtYmVyPzogc3RyaW5nO1xuICBwcm92aWRlcnM/OiBbVXNlclByb2ZpbGVQcm92aWRlcl07XG4gIGdlbmRlcj86IHN0cmluZztcbiAgYmlydGhkYXRlPzogc3RyaW5nO1xuICB6b25laW5mbz86IHN0cmluZztcbiAgbG9jYWxlPzogc3RyaW5nO1xuICBjcmVhdGVkX2Zyb20/OiBzdHJpbmc7XG4gIHN1Yj86IHN0cmluZ1xuICB1aWQ/OiBzdHJpbmdcbn1cblxuZXhwb3J0IHR5cGUgVXNlckluZm8gPSBVc2VyUHJvZmlsZTtcblxuZXhwb3J0IGludGVyZmFjZSBQcm92aWRlclByb2ZpbGUge1xuICBwcm92aWRlcl9pZDogc3RyaW5nO1xuICBwaG9uZV9udW1iZXI/OiBzdHJpbmc7XG59XG5cbmV4cG9ydCBpbnRlcmZhY2UgVHJhbnNCeVByb3ZpZGVyUmVxdWVzdCB7XG4gIHByb3ZpZGVyX3Rva2VuOiBzdHJpbmc7XG59XG5cbmV4cG9ydCBpbnRlcmZhY2UgR3JhbnRUb2tlblJlcXVlc3QgZXh0ZW5kcyBCYXNlUmVxdWVzdCB7XG4gIGNsaWVudF9zZWNyZXQ/OiBzdHJpbmc7XG4gIGNvZGU/OiBzdHJpbmc7XG4gIGdyYW50X3R5cGU/OiBzdHJpbmc7XG4gIHJlZGlyZWN0X3VyaT86IHN0cmluZztcbiAgbm9uY2U/OiBzdHJpbmc7XG4gIHJlZnJlc2hfdG9rZW4/OiBzdHJpbmc7XG4gIHNjb3BlPzogc3RyaW5nO1xufVxuXG5leHBvcnQgaW50ZXJmYWNlIFVuYmluZFByb3ZpZGVyUmVxdWVzdCBleHRlbmRzIEJhc2VSZXF1ZXN0IHtcbiAgcHJvdmlkZXJfaWQ6IHN0cmluZztcbn1cblxuZXhwb3J0IGludGVyZmFjZSBDaGVja1Bhc3N3b3JkclJlcXVlc3QgZXh0ZW5kcyBCYXNlUmVxdWVzdCB7XG4gIHBhc3N3b3JkOiBzdHJpbmc7XG59XG5cbmV4cG9ydCBpbnRlcmZhY2UgQmluZFBob25lUmVxdWVzdCBleHRlbmRzIEJhc2VSZXF1ZXN0IHtcbiAgcGhvbmVfbnVtYmVyOiBzdHJpbmc7XG4gIHN1ZG9fdG9rZW46IHN0cmluZztcbiAgdmVyaWZpY2F0aW9uX3Rva2VuOiBzdHJpbmc7XG59XG5cbmV4cG9ydCBpbnRlcmZhY2UgU2V0UGFzc3dvcmRSZXF1ZXN0IGV4dGVuZHMgQmFzZVJlcXVlc3Qge1xuICBuZXdfcGFzc3dvcmQ6IHN0cmluZztcbiAgc3Vkb190b2tlbjogc3RyaW5nO1xufVxuXG5leHBvcnQgaW50ZXJmYWNlIENoYW5nZUJpbmRlZFByb3ZpZGVyUmVxdWVzdCBleHRlbmRzIEJhc2VSZXF1ZXN0IHtcbiAgdHJhbnNfdG9rZW46IHN0cmluZztcbiAgcHJvdmlkZXJfaWQ6IHN0cmluZztcbn1cblxuZXhwb3J0IHR5cGUgQ2hhbmdlQmluZGVkUHJvdmlkZXJSZXNwb25zZSA9IEJhc2VSZXF1ZXN0XG5cbmV4cG9ydCBpbnRlcmZhY2UgUXVlcnlVc2VyUHJvZmlsZVJlcSBleHRlbmRzIEJhc2VSZXF1ZXN0IHtcbiAgYXBwZW5kZWRfcGFyYW1zOiBzdHJpbmc7XG59XG4iXX0=

dist/index.js

 "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) {
@@ -14,2 +25,8 @@ if (k2 === undefined) k2 = k;
 });
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
 var __importStar = (this && this.__importStar) || function (mod) {
@@ -22,4 +39,46 @@ if (mod && mod.__esModule) return mod;
 };
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+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.authModels = void 0;
+var app_1 = require("@cloudbase/app");
+var utilities_1 = require("@cloudbase/utilities");
+var stopOAuthLoginWithAuth = utilities_1.helpers.stopOAuthLoginWithAuth;
 var consts_1 = require("./oauth2client/consts");
@@ -29,13 +88,141 @@ Object.defineProperty(exports, "Syntax", { enumerable: true, get: function () { return consts_1.Syntax; } });
 var oauth2client_1 = require("./oauth2client/oauth2client");
-Object.defineProperty(exports, "defaultStorage", { enumerable: true, get: function () { return oauth2client_1.defaultStorage; } });
-Object.defineProperty(exports, "defaultRequest", { enumerable: true, get: function () { return oauth2client_1.defaultRequest; } });
-Object.defineProperty(exports, "toResponseError", { enumerable: true, get: function () { return oauth2client_1.toResponseError; } });
-Object.defineProperty(exports, "generateRequestId", { enumerable: true, get: function () { return oauth2client_1.generateRequestId; } });
-Object.defineProperty(exports, "OAuth2Client", { enumerable: true, get: function () { return oauth2client_1.OAuth2Client; } });
+var oauth2client_2 = require("./oauth2client/oauth2client");
+Object.defineProperty(exports, "defaultStorage", { enumerable: true, get: function () { return oauth2client_2.defaultStorage; } });
+Object.defineProperty(exports, "defaultRequest", { enumerable: true, get: function () { return oauth2client_2.defaultRequest; } });
+Object.defineProperty(exports, "toResponseError", { enumerable: true, get: function () { return oauth2client_2.toResponseError; } });
+Object.defineProperty(exports, "generateRequestId", { enumerable: true, get: function () { return oauth2client_2.generateRequestId; } });
+Object.defineProperty(exports, "OAuth2Client", { enumerable: true, get: function () { return oauth2client_2.OAuth2Client; } });
 var interface_1 = require("./oauth2client/interface");
 Object.defineProperty(exports, "AuthClient", { enumerable: true, get: function () { return interface_1.AuthClient; } });
 var apis_1 = require("./auth/apis");
-Object.defineProperty(exports, "Auth", { enumerable: true, get: function () { return apis_1.Auth; } });
+var apis_2 = require("./auth/apis");
+Object.defineProperty(exports, "Auth", { enumerable: true, get: function () { return apis_2.Auth; } });
 var authModels = __importStar(require("./auth/models"));
 exports.authModels = authModels;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUFBLGdEQUF3RDtBQUFoRCxnR0FBQSxNQUFNLE9BQUE7QUFBRSxtR0FBQSxTQUFTLE9BQUE7QUFFekIsNERBT3FDO0FBTm5DLDhHQUFBLGNBQWMsT0FBQTtBQUNkLDhHQUFBLGNBQWMsT0FBQTtBQUVkLCtHQUFBLGVBQWUsT0FBQTtBQUNmLGlIQUFBLGlCQUFpQixPQUFBO0FBQ2pCLDRHQUFBLFlBQVksT0FBQTtBQUdkLHNEQUFtRTtBQUEzRCx1R0FBQSxVQUFVLE9BQUE7QUFTbEIsb0NBQThDO0FBQXpCLDRGQUFBLElBQUksT0FBQTtBQUV6Qix3REFBNEM7QUFDcEMsZ0NBQVUiLCJzb3VyY2VzQ29udGVudCI6WyJleHBvcnQge1N5bnRheCwgRXJyb3JUeXBlfSBmcm9tICcuL29hdXRoMmNsaWVudC9jb25zdHMnO1xuXG5leHBvcnQge1xuICBkZWZhdWx0U3RvcmFnZSxcbiAgZGVmYXVsdFJlcXVlc3QsXG4gIFRvUmVzcG9uc2VFcnJvck9wdGlvbnMsXG4gIHRvUmVzcG9uc2VFcnJvcixcbiAgZ2VuZXJhdGVSZXF1ZXN0SWQsXG4gIE9BdXRoMkNsaWVudCxcbn0gZnJvbSAnLi9vYXV0aDJjbGllbnQvb2F1dGgyY2xpZW50JztcblxuZXhwb3J0IHtBdXRoQ2xpZW50LCBTaW1wbGVTdG9yYWdlfSBmcm9tICcuL29hdXRoMmNsaWVudC9pbnRlcmZhY2UnO1xuXG5leHBvcnQge1xuICBDcmVkZW50aWFscyxcbiAgUmVzcG9uc2VFcnJvcixcbiAgT0F1dGgyQ2xpZW50T3B0aW9ucyxcbiAgQXV0aENsaWVudFJlcXVlc3RPcHRpb25zLFxufSBmcm9tICcuL29hdXRoMmNsaWVudC9tb2RlbHMnO1xuXG5leHBvcnQge0F1dGhPcHRpb25zLCBBdXRofSBmcm9tICcuL2F1dGgvYXBpcyc7XG5cbmltcG9ydCAqIGFzIGF1dGhNb2RlbHMgZnJvbSAnLi9hdXRoL21vZGVscyc7XG5leHBvcnQge2F1dGhNb2RlbHN9O1xuIl19
+var COMPONENT_NAME = 'oauth';
+var CloudbaseOAuth = (function () {
+    function CloudbaseOAuth(authOptions) {
+        var apiOrigin = authOptions.apiOrigin, clientId = authOptions.clientId, _fromApp = authOptions._fromApp;
+        this._fromApp = _fromApp;
+        this.oauth2client = new oauth2client_1.OAuth2Client({
+            apiOrigin: apiOrigin,
+            clientId: clientId
+        });
+        this.authApi = new apis_1.Auth(__assign({ credentialsClient: this.oauth2client }, authOptions));
+    }
+    CloudbaseOAuth.prototype.checkFromAuthV1OrV2 = function () {
+        return __awaiter(this, void 0, void 0, function () {
+            var _fromApp, authInstance, oauthInstance, authLogin, _a, oauthLogin, _b;
+            return __generator(this, function (_c) {
+                switch (_c.label) {
+                    case 0:
+                        _fromApp = this._fromApp;
+                        authInstance = _fromApp.authInstance;
+                        oauthInstance = _fromApp.oauthInstance || _fromApp.oauth();
+                        _a = authInstance;
+                        if (!_a) return [3, 2];
+                        return [4, authInstance.getLoginState()];
+                    case 1:
+                        _a = (_c.sent());
+                        _c.label = 2;
+                    case 2:
+                        authLogin = _a;
+                        if (authLogin) {
+                            return [2, 'auth'];
+                        }
+                        _b = oauthInstance;
+                        if (!_b) return [3, 4];
+                        return [4, oauthInstance.hasLoginState()];
+                    case 3:
+                        _b = (_c.sent());
+                        _c.label = 4;
+                    case 4:
+                        oauthLogin = _b;
+                        if (oauthLogin) {
+                            return [2, 'oauth'];
+                        }
+                        return [2, ''];
+                }
+            });
+        });
+    };
+    CloudbaseOAuth.prototype.signIn = function (params) {
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                return [2, this.authApi.signIn(params)];
+            });
+        });
+    };
+    CloudbaseOAuth.prototype.signOut = function () {
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                return [2, this.authApi.signOut()];
+            });
+        });
+    };
+    CloudbaseOAuth.prototype.hasLoginState = function () {
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                return [2, this.authApi.hasLoginState()];
+            });
+        });
+    };
+    CloudbaseOAuth.prototype.getUserInfo = function () {
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                return [2, this.authApi.getUserInfo()];
+            });
+        });
+    };
+    CloudbaseOAuth.prototype.getLoginState = function () {
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                return [2, this.authApi.getLoginState()];
+            });
+        });
+    };
+    CloudbaseOAuth.prototype.hasLoginStateSync = function () {
+        return this.authApi.hasLoginStateSync();
+    };
+    CloudbaseOAuth.prototype.signInAnonymously = function () {
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                return [2, this.authApi.signInAnonymously()];
+            });
+        });
+    };
+    __decorate([
+        stopOAuthLoginWithAuth(),
+        __metadata("design:type", Function),
+        __metadata("design:paramtypes", [Object]),
+        __metadata("design:returntype", Promise)
+    ], CloudbaseOAuth.prototype, "signIn", null);
+    __decorate([
+        stopOAuthLoginWithAuth(),
+        __metadata("design:type", Function),
+        __metadata("design:paramtypes", []),
+        __metadata("design:returntype", Promise)
+    ], CloudbaseOAuth.prototype, "signInAnonymously", null);
+    return CloudbaseOAuth;
+}());
+var component = {
+    name: COMPONENT_NAME,
+    namespace: 'oauth',
+    entity: function () {
+        if (this.oauthInstance) {
+            return this.oauthInstance;
+        }
+        var env = this.config.env;
+        this.oauthInstance = new CloudbaseOAuth({
+            clientId: env,
+            apiOrigin: app_1.getBaseEndPoint(),
+            _fromApp: this
+        });
+        return this.oauthInstance;
+    }
+};
+try {
+    cloudbase.registerComponent(component);
+}
+catch (e) { }
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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","sourcesContent":["import { ICloudbaseComponent } from '@cloudbase/types/component';\nimport { ICloudbase } from '@cloudbase/types';\nimport { getBaseEndPoint } from '@cloudbase/app'\nimport { helpers } from '@cloudbase/utilities'\nconst { stopOAuthLoginWithAuth } = helpers\n\nexport { Syntax, ErrorType } from './oauth2client/consts';\n\nimport { OAuth2Client } from './oauth2client/oauth2client'\n\nexport {\n  defaultStorage,\n  defaultRequest,\n  ToResponseErrorOptions,\n  toResponseError,\n  generateRequestId,\n  OAuth2Client,\n} from './oauth2client/oauth2client';\n\nexport { AuthClient, SimpleStorage } from './oauth2client/interface';\n\nimport { Credentials } from './oauth2client/models'\nexport {\n  Credentials,\n  ResponseError,\n  OAuth2ClientOptions,\n  AuthClientRequestOptions,\n} from './oauth2client/models';\n\nimport { AuthOptions, Auth } from './auth/apis'\n\nexport { AuthOptions, Auth } from './auth/apis';\n\nimport * as authModels from './auth/models';\nexport { authModels };\n\ndeclare const cloudbase: ICloudbase;\n\nconst COMPONENT_NAME = 'oauth';\n\nclass CloudbaseOAuth {\n  public oauth2client: OAuth2Client\n  public authApi: Auth\n  private _fromApp: ICloudbase\n\n  constructor(authOptions: AuthOptions) {\n    const { apiOrigin, clientId, _fromApp } = authOptions\n    this._fromApp = _fromApp\n    this.oauth2client = new OAuth2Client({\n      apiOrigin,\n      clientId\n    })\n\n    this.authApi = new Auth({\n      credentialsClient: this.oauth2client,\n      ...authOptions\n    })\n  }\n\n  public async checkFromAuthV1OrV2() {\n    const { _fromApp } = this\n    const authInstance = _fromApp.authInstance\n    const oauthInstance = _fromApp.oauthInstance || (_fromApp as any).oauth()\n    const authLogin = authInstance && await authInstance.getLoginState()\n    if (authLogin) {\n      return 'auth'\n    }\n    const oauthLogin = oauthInstance && await oauthInstance.hasLoginState()\n    if (oauthLogin) {\n      return 'oauth'\n    }\n    return ''\n  }\n\n\n  /**\n   * 登录\n   * @param {authModels.SignInRequest} params\n   * @returns {Promise<Credentials>}\n   * @memberof CloudbaseOAuth\n   */\n  @stopOAuthLoginWithAuth()\n  public async signIn(params: authModels.SignInRequest): Promise<Credentials> {\n    return this.authApi.signIn(params)\n  }\n\n  public async signOut(): Promise<any> {\n    return this.authApi.signOut()\n  }\n\n  /**\n   * check 当前是否已 oauth 登录\n   * @returns {Promise<boolean>}\n   * @memberof CloudbaseOAuth\n   */\n  public async hasLoginState(): Promise<boolean> {\n    return this.authApi.hasLoginState()\n  }\n\n  public async getUserInfo(): Promise<authModels.UserProfile> {\n    return this.authApi.getUserInfo()\n  }\n\n  /**\n   * 获取 oauth 登录态\n   * @returns {Promise<boolean>}\n   * @memberof CloudbaseOAuth\n   */\n  public async getLoginState(): Promise<Credentials> {\n    return this.authApi.getLoginState()\n  }\n\n  public hasLoginStateSync(): Credentials {\n    return this.authApi.hasLoginStateSync()\n  }\n\n  /**\n   * 匿名登录\n   * @returns {Promise<Credentials>}\n   * @memberof CloudbaseOAuth\n   */\n  @stopOAuthLoginWithAuth()\n  public async signInAnonymously(): Promise<Credentials> {\n    return this.authApi.signInAnonymously()\n  }\n}\n\nconst component: ICloudbaseComponent = {\n  name: COMPONENT_NAME,\n  namespace: 'oauth',\n  entity: function () {\n\n    if (this.oauthInstance) {\n      return this.oauthInstance;\n    }\n\n    const { env } = this.config;\n    this.oauthInstance = new CloudbaseOAuth({\n      clientId: env,\n      apiOrigin: getBaseEndPoint(),\n      _fromApp: this\n    });\n    return this.oauthInstance;\n  }\n}\n\ntry {\n  // 尝试自动注册至全局变量cloudbase\n  // 此行为只在浏览器环境下有效\n  cloudbase.registerComponent(component);\n} catch (e) { }"]}

dist/oauth2client/interface.d.ts

@@ -12,2 +12,5 @@ import { Credentials, AuthClientRequestOptions } from './models';
     setItem(key: string, value: string): Promise<void>;
+    getItemSync(key: string): string | null;
+    removeItemSync(key: string): void;
+    setItemSync(key: string, value: string): void;
 }

dist/oauth2client/interface.js

@@ -10,2 +10,2 @@ "use strict";
 exports.AuthClient = AuthClient;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW50ZXJmYWNlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL29hdXRoMmNsaWVudC9pbnRlcmZhY2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBS0E7SUFBQTtJQW9CQSxDQUFDO0lBQUQsaUJBQUM7QUFBRCxDQUFDLEFBcEJELElBb0JDO0FBcEJxQixnQ0FBVSIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7Q3JlZGVudGlhbHMsIEF1dGhDbGllbnRSZXF1ZXN0T3B0aW9uc30gZnJvbSAnLi9tb2RlbHMnO1xuXG4vKipcbiAqIHRoZSBpbnRlcmZhY2UgZm9yIHRoZSBPYXV0aDJDbGllbnRcbiAqL1xuZXhwb3J0IGFic3RyYWN0IGNsYXNzIEF1dGhDbGllbnQge1xuICAvKipcbiAgICogU2V0cyB0aGUgYXV0aCBjcmVkZW50aWFscy5cbiAgICovXG4gIGFic3RyYWN0IHNldENyZWRlbnRpYWxzKGNyZWRlbnRpYWxzPzogQ3JlZGVudGlhbHMpOiB2b2lkO1xuICAvKipcbiAgICogUHJvdmlkZXMgYW4gYWx0ZXJuYXRpdmUgZmV0Y2ggYXBpIHJlcXVlc3QgaW1wbGVtZW50YXRpb24gd2l0aCBhdXRoIGNyZWRlbnRpYWxzXG4gICAqIGlmIG9wdGlvbnMud2l0aENyZWRlbnRpYWxzOnRydWUsIHRoZSByZXF1ZXN0IHdpbGwgYXV0byBhZGQgQXV0aG9yaXphdGlvbjogQmVhcmVyIDxBY2Nlc3NUb2tlbj4gaW4gdGhlIHJlcXVlc3RcbiAgICogZXJyb3I6XG4gICAqICAgICAtIHVucmVhY2hhYmxlLCB0aGUgbmV0d29yayBlcnJvciBvciByZXNwb25zZSBpcyBub3QganNvblxuICAgKiAgICAgLSB1bmF1dGhlbnRpY2F0ZWQ6IGhhcyBubyB2YWxpZGF0ZSBhY2Nlc3MgdG9rZW5cbiAgICovXG4gIGFic3RyYWN0IHJlcXVlc3Q6IFJlcXVlc3RGdW5jdGlvbjtcblxuICAvKipcbiAgICogZ2V0IHRoZSBjdXJyZW50IGFjY2Vzc1Rva2VuIGZyb20gQXV0aENsaWVudCwgeW91IGNhbiB1c2UgdGhpcyB0byBkZXRlY3QgbG9naW4gc3RhdHVzXG4gICAqIGVycm9yOlxuICAgKiAgICAtICB1bmF1dGhlbnRpY2F0ZWQ6IGhhcyBubyB2YWxpZGF0ZSBhY2Nlc3MgdG9rZW5cbiAgICovXG4gIGFic3RyYWN0IGdldEFjY2Vzc1Rva2VuKCk6IFByb21pc2U8c3RyaW5nPjtcbn1cblxuZXhwb3J0IHR5cGUgUmVxdWVzdEZ1bmN0aW9uID0gPFQ+KHVybDogc3RyaW5nLG9wdGlvbnM/OiBBdXRoQ2xpZW50UmVxdWVzdE9wdGlvbnMpID0+IFByb21pc2U8VD47XG5cbi8qKiBBbiBpbnRlcmZhY2Ugb2YgdGhlIFNpbXBsZSAgV2ViIFN0b3JhZ2UgQVBJICAqL1xuZXhwb3J0IGludGVyZmFjZSBTaW1wbGVTdG9yYWdlIHtcbiAgLyoqXG4gICAqIHZhbHVlID0gc3RvcmFnZVtrZXldXG4gICAqL1xuICBnZXRJdGVtKGtleTogc3RyaW5nKTogUHJvbWlzZTxzdHJpbmcgfCBudWxsPjtcbiAgLyoqXG4gICAqIGRlbGV0ZSBzdG9yYWdlW2tleV1cbiAgICovXG4gIHJlbW92ZUl0ZW0oa2V5OiBzdHJpbmcpOiBQcm9taXNlPHZvaWQ+O1xuICAvKipcbiAgICogc3RvcmFnZVtrZXldID0gdmFsdWVcbiAgICovXG4gIHNldEl0ZW0oa2V5OiBzdHJpbmcsIHZhbHVlOiBzdHJpbmcpOiBQcm9taXNlPHZvaWQ+O1xufVxuIl19
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW50ZXJmYWNlLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL29hdXRoMmNsaWVudC9pbnRlcmZhY2UudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBS0E7SUFBQTtJQW9CQSxDQUFDO0lBQUQsaUJBQUM7QUFBRCxDQUFDLEFBcEJELElBb0JDO0FBcEJxQixnQ0FBVSIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCB7IENyZWRlbnRpYWxzLCBBdXRoQ2xpZW50UmVxdWVzdE9wdGlvbnMgfSBmcm9tICcuL21vZGVscyc7XG5cbi8qKlxuICogdGhlIGludGVyZmFjZSBmb3IgdGhlIE9hdXRoMkNsaWVudFxuICovXG5leHBvcnQgYWJzdHJhY3QgY2xhc3MgQXV0aENsaWVudCB7XG4gIC8qKlxuICAgKiBTZXRzIHRoZSBhdXRoIGNyZWRlbnRpYWxzLlxuICAgKi9cbiAgYWJzdHJhY3Qgc2V0Q3JlZGVudGlhbHMoY3JlZGVudGlhbHM/OiBDcmVkZW50aWFscyk6IHZvaWQ7XG4gIC8qKlxuICAgKiBQcm92aWRlcyBhbiBhbHRlcm5hdGl2ZSBmZXRjaCBhcGkgcmVxdWVzdCBpbXBsZW1lbnRhdGlvbiB3aXRoIGF1dGggY3JlZGVudGlhbHNcbiAgICogaWYgb3B0aW9ucy53aXRoQ3JlZGVudGlhbHM6dHJ1ZSwgdGhlIHJlcXVlc3Qgd2lsbCBhdXRvIGFkZCBBdXRob3JpemF0aW9uOiBCZWFyZXIgPEFjY2Vzc1Rva2VuPiBpbiB0aGUgcmVxdWVzdFxuICAgKiBlcnJvcjpcbiAgICogICAgIC0gdW5yZWFjaGFibGUsIHRoZSBuZXR3b3JrIGVycm9yIG9yIHJlc3BvbnNlIGlzIG5vdCBqc29uXG4gICAqICAgICAtIHVuYXV0aGVudGljYXRlZDogaGFzIG5vIHZhbGlkYXRlIGFjY2VzcyB0b2tlblxuICAgKi9cbiAgYWJzdHJhY3QgcmVxdWVzdDogUmVxdWVzdEZ1bmN0aW9uO1xuXG4gIC8qKlxuICAgKiBnZXQgdGhlIGN1cnJlbnQgYWNjZXNzVG9rZW4gZnJvbSBBdXRoQ2xpZW50LCB5b3UgY2FuIHVzZSB0aGlzIHRvIGRldGVjdCBsb2dpbiBzdGF0dXNcbiAgICogZXJyb3I6XG4gICAqICAgIC0gIHVuYXV0aGVudGljYXRlZDogaGFzIG5vIHZhbGlkYXRlIGFjY2VzcyB0b2tlblxuICAgKi9cbiAgYWJzdHJhY3QgZ2V0QWNjZXNzVG9rZW4oKTogUHJvbWlzZTxzdHJpbmc+O1xufVxuXG5leHBvcnQgdHlwZSBSZXF1ZXN0RnVuY3Rpb24gPSA8VD4odXJsOiBzdHJpbmcsIG9wdGlvbnM/OiBBdXRoQ2xpZW50UmVxdWVzdE9wdGlvbnMpID0+IFByb21pc2U8VD47XG5cbi8qKiBBbiBpbnRlcmZhY2Ugb2YgdGhlIFNpbXBsZSAgV2ViIFN0b3JhZ2UgQVBJICAqL1xuZXhwb3J0IGludGVyZmFjZSBTaW1wbGVTdG9yYWdlIHtcbiAgLyoqXG4gICAqIHZhbHVlID0gc3RvcmFnZVtrZXldXG4gICAqL1xuICBnZXRJdGVtKGtleTogc3RyaW5nKTogUHJvbWlzZTxzdHJpbmcgfCBudWxsPjtcbiAgLyoqXG4gICAqIGRlbGV0ZSBzdG9yYWdlW2tleV1cbiAgICovXG4gIHJlbW92ZUl0ZW0oa2V5OiBzdHJpbmcpOiBQcm9taXNlPHZvaWQ+O1xuICAvKipcbiAgICogc3RvcmFnZVtrZXldID0gdmFsdWVcbiAgICovXG4gIHNldEl0ZW0oa2V5OiBzdHJpbmcsIHZhbHVlOiBzdHJpbmcpOiBQcm9taXNlPHZvaWQ+O1xuXG4gIC8qKlxuICAgKiB2YWx1ZSA9IHN0b3JhZ2Vba2V5XVxuICAgKi9cbiAgZ2V0SXRlbVN5bmMoa2V5OiBzdHJpbmcpOiBzdHJpbmcgfCBudWxsO1xuICAvKipcbiAgICogZGVsZXRlIHN0b3JhZ2Vba2V5XVxuICAgKi9cbiAgcmVtb3ZlSXRlbVN5bmMoa2V5OiBzdHJpbmcpOiB2b2lkO1xuICAvKipcbiAgICogc3RvcmFnZVtrZXldID0gdmFsdWVcbiAgICovXG4gIHNldEl0ZW1TeW5jKGtleTogc3RyaW5nLCB2YWx1ZTogc3RyaW5nKTogdm9pZDtcbn1cbiJdfQ==

dist/oauth2client/oauth2client.d.ts

@@ -17,2 +17,5 @@ import { ErrorType } from './consts';
     setItem(key: string, value: string): Promise<void>;
+    getItemSync(key: string): string | null;
+    removeItemSync(key: string): void;
+    setItemSync(key: string, value: string): void;
 }
@@ -33,2 +36,3 @@ export declare const defaultStorage: DefaultStorage;
     private _getStorageCredentials;
+    _getStorageCredentialsSync(): Credentials | null;
 }
@@ -62,3 +66,5 @@ export declare class OAuth2Client implements AuthClient {
     private _defaultRefreshTokenFunc;
-    private _getCredentials;
+    _getCredentials(): Promise<Credentials | null>;
+    getCredentialsSync(): Credentials | null;
+    getCredentialsAsync(): Promise<Credentials | null>;
     private _getDeviceId;
@@ -65,0 +71,0 @@ private _unAuthenticatedError;

package.json

 {
   "name": "@cloudbase/oauth",
-  "version": "0.0.3-alpha.0",
+  "version": "0.0.4-alpha.0",
   "description": "cloudbase javascript sdk auth componets",
@@ -29,3 +29,3 @@ "main": "./dist/index.js",
   },
-  "gitHead": "d158e30a395d8fcd6b7c7e78a66006b194a3eddb"
+  "gitHead": "eb161dd3c79b90a95a877984bf7c07cdb4563077"
 }

src/auth/apis.ts

 'use strict';
 
-import {ApiUrls} from './consts';
+import { ApiUrls } from './consts';
 import {
-    GetVerificationRequest,
-    GetVerificationResponse,
-    UserProfile,
-    UserInfo,
-    SignInRequest,
-    SignUpRequest,
-    VerifyRequest,
-    VerifyResponse,
-    GenProviderRedirectUriRequest,
-    GenProviderRedirectUriResponse,
-    GrantProviderTokenRequest,
-    GrantProviderTokenResponse,
-    PatchProviderTokenRequest,
-    PatchProviderTokenResponse,
-    SignInWithProviderRequest,
-    BindWithProviderRequest,
-    TransByProviderRequest,
-    GrantTokenRequest,
-    UserProfileProvider,
-    UnbindProviderRequest,
-    CheckPasswordrRequest,
-    BindPhoneRequest,
-    SetPasswordRequest,
-    ChangeBindedProviderRequest,
-    ChangeBindedProviderResponse,
-    QueryUserProfileReq,
+  GetVerificationRequest,
+  GetVerificationResponse,
+  UserProfile,
+  UserInfo,
+  SignInRequest,
+  SignUpRequest,
+  VerifyRequest,
+  VerifyResponse,
+  GenProviderRedirectUriRequest,
+  GenProviderRedirectUriResponse,
+  GrantProviderTokenRequest,
+  GrantProviderTokenResponse,
+  PatchProviderTokenRequest,
+  PatchProviderTokenResponse,
+  SignInWithProviderRequest,
+  BindWithProviderRequest,
+  TransByProviderRequest,
+  GrantTokenRequest,
+  UserProfileProvider,
+  UnbindProviderRequest,
+  CheckPasswordrRequest,
+  BindPhoneRequest,
+  SetPasswordRequest,
+  ChangeBindedProviderRequest,
+  ChangeBindedProviderResponse,
+  QueryUserProfileReq,
 } from './models';
-import {SimpleStorage, RequestFunction} from '../oauth2client/interface';
-import {OAuth2Client, defaultStorage} from '../oauth2client/oauth2client';
-import {Credentials} from '../oauth2client/models';
-import {Captcha} from '../captcha/captcha';
+import { SimpleStorage, RequestFunction } from '../oauth2client/interface';
+import { OAuth2Client, defaultStorage } from '../oauth2client/oauth2client';
+import { Credentials } from '../oauth2client/models';
+import { Captcha } from '../captcha/captcha';
+import { ICloudbase } from '@cloudbase/types';
 
+
 export interface AuthOptions {
-    apiOrigin: string;
-    clientId: string;
-    credentialsClient?: OAuth2Client;
-    request?: RequestFunction;
-    storage?: SimpleStorage;
+  apiOrigin: string;
+  clientId: string;
+  credentialsClient?: OAuth2Client;
+  request?: RequestFunction;
+  storage?: SimpleStorage;
+  _fromApp?: ICloudbase // 所属cloudbase app对象
 }
@@ -49,437 +52,457 @@
 export class Auth {
-    private _config: AuthOptions;
+  private _config: AuthOptions;
 
-    /**
-     * constructor
-     * @param {AuthOptions} opts
-     */
-    constructor(opts: AuthOptions) {
-        let request = opts.request;
-        let oAuth2Client = opts.credentialsClient;
-        if (!oAuth2Client) {
-            const initOptions = {
-                apiOrigin: opts.apiOrigin,
-                clientId: opts.clientId,
-                storage: opts.storage,
-            };
-            oAuth2Client = new OAuth2Client(initOptions);
-        }
-        if (!request) {
-            const baseRequest = oAuth2Client.request.bind(oAuth2Client);
-            const captcha = new Captcha({
-                clientId: opts.clientId,
-                request: baseRequest,
-                storage: opts.storage,
-            })
-            request = captcha.request.bind(captcha)
-        }
-        this._config = {
-            apiOrigin: opts.apiOrigin,
-            clientId: opts.clientId,
-            request: request,
-            credentialsClient: oAuth2Client,
-            storage: opts.storage || defaultStorage,
-        };
+  /**
+   * constructor
+   * @param {AuthOptions} opts
+   */
+  constructor(opts: AuthOptions) {
+    let request = opts.request;
+    let oAuth2Client = opts.credentialsClient;
+    if (!oAuth2Client) {
+      const initOptions = {
+        apiOrigin: opts.apiOrigin,
+        clientId: opts.clientId,
+        storage: opts.storage,
+      };
+      oAuth2Client = new OAuth2Client(initOptions);
     }
-
-    /**
-     * Sign in.
-     * @param {SignInRequest} params A SignInRequest Object.
-     * @return {Promise<Credentials>} A Promise<Credentials> object.
-     */
-    public async signIn(params: SignInRequest): Promise<Credentials> {
-        params.client_id = this._config.clientId;
-        const credentials: Credentials = await this._config.request<Credentials>(
-            ApiUrls.AUTH_SIGN_IN_URL,
-            {
-                method: 'POST',
-                body: params
-            },
-        );
-        await this._config.credentialsClient.setCredentials(credentials);
-        return Promise.resolve(credentials);
+    if (!request) {
+      const baseRequest = oAuth2Client.request.bind(oAuth2Client);
+      const captcha = new Captcha({
+        clientId: opts.clientId,
+        request: baseRequest,
+        storage: opts.storage,
+      })
+      request = captcha.request.bind(captcha)
     }
+    this._config = {
+      apiOrigin: opts.apiOrigin,
+      clientId: opts.clientId,
+      request: request,
+      credentialsClient: oAuth2Client,
+      storage: opts.storage || defaultStorage,
+    };
+  }
 
-    /**
-     * Sign in Anonymously
-     * @return {Promise<Credentials>} A Promise<Credentials> object.
-     */
-    public async signInAnonymously(): Promise<Credentials> {
-        const credentials: Credentials = await this._config.request<Credentials>(
-            ApiUrls.AUTH_SIGN_IN_ANONYMOUSLY_URL,
-            {
-                method: 'POST',
-                body: {
-                    client_id: this._config.clientId
-                }
-            },
-        );
-        await this._config.credentialsClient.setCredentials(credentials);
-        return Promise.resolve(credentials);
-    }
+  /**
+   * Sign in.
+   * @param {SignInRequest} params A SignInRequest Object.
+   * @return {Promise<Credentials>} A Promise<Credentials> object.
+   */
+  public async signIn(params: SignInRequest): Promise<Credentials> {
+    params.client_id = this._config.clientId;
+    const credentials: Credentials = await this._config.request<Credentials>(
+      ApiUrls.AUTH_SIGN_IN_URL,
+      {
+        method: 'POST',
+        body: params
+      },
+    );
+    await this._config.credentialsClient.setCredentials(credentials);
+    return Promise.resolve(credentials);
+  }
 
-    /**
-     * Sign up.
-     * @param {SignUpRequest} params A SignUpRequest Object.
-     * @return {Promise<Credentials>} A Promise<Credentials> object.
-     */
-    protected async signUp(params: SignUpRequest): Promise<Credentials> {
-        params.client_id = this._config.clientId;
-        const data: Credentials = await this._config.request<Credentials>(
-            ApiUrls.AUTH_SIGN_UP_URL,
-            {
-                method: 'POST',
-                body: params,
-            },
-        );
-        await this._config.credentialsClient.setCredentials(data);
-        return Promise.resolve(data);
-    }
+  /**
+   * Sign in Anonymously
+   * @return {Promise<Credentials>} A Promise<Credentials> object.
+   */
+  public async signInAnonymously(): Promise<Credentials> {
+    const credentials: Credentials = await this._config.request<Credentials>(
+      ApiUrls.AUTH_SIGN_IN_ANONYMOUSLY_URL,
+      {
+        method: 'POST',
+        body: {
+          client_id: this._config.clientId
+        }
+      },
+    );
+    await this._config.credentialsClient.setCredentials(credentials);
+    return Promise.resolve(credentials);
+  }
 
-    /**
-     * Sign out.
-     * @return {Object} A Promise<void> object.
-     */
-    public async signOut(): Promise<void> {
-        const accessToken: string = await this._config.credentialsClient.getAccessToken();
-        const data = await this._config.request<void>(ApiUrls.AUTH_REVOKE_URL, {
-            method: 'POST',
-            body: {
-                client_id: this._config.clientId,
-                token: accessToken,
-            },
-        });
-        await this._config.credentialsClient.setCredentials();
-        return Promise.resolve(data);
-    }
+  /**
+   * Sign up.
+   * @param {SignUpRequest} params A SignUpRequest Object.
+   * @return {Promise<Credentials>} A Promise<Credentials> object.
+   */
+  protected async signUp(params: SignUpRequest): Promise<Credentials> {
+    params.client_id = this._config.clientId;
+    const data: Credentials = await this._config.request<Credentials>(
+      ApiUrls.AUTH_SIGN_UP_URL,
+      {
+        method: 'POST',
+        body: params,
+      },
+    );
+    await this._config.credentialsClient.setCredentials(data);
+    return Promise.resolve(data);
+  }
 
-    /**
-     * Get the verification.
-     * @param {GetVerificationRequest} params A GetVerificationRequest Object.
-     * @return {Promise<GetVerificationResponse>} A Promise<GetVerificationResponse> object.
-     */
-    public async getVerification(
-        params: GetVerificationRequest,
-    ): Promise<GetVerificationResponse> {
-        params.client_id = this._config.clientId;
-        return this._config.request<GetVerificationResponse>(
-            ApiUrls.VERIFICATION_URL,
-            {
-                method: 'POST',
-                body: params,
-                withCaptcha: true
-            },
-        );
-    }
+  /**
+   * Sign out.
+   * @return {Object} A Promise<void> object.
+   */
+  public async signOut(): Promise<any> {
+    const accessToken: string = await this._config.credentialsClient.getAccessToken();
+    const data = await this._config.request(ApiUrls.AUTH_REVOKE_URL, {
+      method: 'POST',
+      body: {
+        client_id: this._config.clientId,
+        token: accessToken,
+      },
+    });
+    await this._config.credentialsClient.setCredentials();
+    return Promise.resolve(data);
+  }
 
-    /**
-     *  Verify the code
-     * @param {VerifyRequest} params A VerifyRequest Object.
-     * @return {Promise<VerifyResponse>} A Promise<VerifyResponse> object.
-     */
-    public async verify(params: VerifyRequest): Promise<VerifyResponse> {
-        params.client_id = this._config.clientId;
-        return this._config.request<VerifyResponse>(ApiUrls.VERIFY_URL, {
-            method: 'POST',
-            body: params,
-        });
-    }
+  /**
+   * Get the verification.
+   * @param {GetVerificationRequest} params A GetVerificationRequest Object.
+   * @return {Promise<GetVerificationResponse>} A Promise<GetVerificationResponse> object.
+   */
+  public async getVerification(
+    params: GetVerificationRequest,
+  ): Promise<GetVerificationResponse> {
+    params.client_id = this._config.clientId;
+    return this._config.request<GetVerificationResponse>(
+      ApiUrls.VERIFICATION_URL,
+      {
+        method: 'POST',
+        body: params,
+        withCaptcha: true
+      },
+    );
+  }
 
-    /**
-     * Gen provider redirect uri.
-     * @param {GenProviderRedirectUriRequest} params A GenProviderRedirectUriRequest object.
-     * @return {Promise<GenProviderRedirectUriResponse>} A Promise<GenProviderRedirectUriResponse> object.
-     */
-    public async genProviderRedirectUri(
-        params: GenProviderRedirectUriRequest,
-    ): Promise<GenProviderRedirectUriResponse> {
-        let url = `${ApiUrls.PROVIDER_URI_URL}?client_id=${
-            this._config.clientId
-        }&provider_id=${params.provider_id}&redirect_uri=${encodeURIComponent(
-            params.provider_redirect_uri,
-        )}&state=${params.state}`;
-        const other_params = params.other_params;
-        if (other_params) {
-            if (
-                typeof other_params.sign_out_uri === 'string' &&
-                other_params.sign_out_uri.length > 0
-            ) {
-                url += `&other_params[sign_out_uri]=${other_params.sign_out_uri}`;
-            }
-        }
-        return this._config.request<GenProviderRedirectUriResponse>(url, {
-            method: 'GET',
-        });
-    }
+  /**
+   *  Verify the code
+   * @param {VerifyRequest} params A VerifyRequest Object.
+   * @return {Promise<VerifyResponse>} A Promise<VerifyResponse> object.
+   */
+  public async verify(params: VerifyRequest): Promise<VerifyResponse> {
+    params.client_id = this._config.clientId;
+    return this._config.request<VerifyResponse>(ApiUrls.VERIFY_URL, {
+      method: 'POST',
+      body: params,
+    });
+  }
 
-    /**
-     * Grant provider token.
-     * @param {GrantProviderTokenRequest} params A GrantProviderTokenRequest object.
-     * @return {Promise<GrantProviderTokenResponse>} A Promise<GrantProviderTokenResponse> object.
-     */
-    public async grantProviderToken(
-        params: GrantProviderTokenRequest,
-    ): Promise<GrantProviderTokenResponse> {
-        params.client_id = this._config.clientId;
-        return this._config.request<GrantProviderTokenResponse>(
-            ApiUrls.PROVIDER_TOKEN_URL,
-            {
-                method: 'POST',
-                body: params,
-            },
-        );
+  /**
+   * Gen provider redirect uri.
+   * @param {GenProviderRedirectUriRequest} params A GenProviderRedirectUriRequest object.
+   * @return {Promise<GenProviderRedirectUriResponse>} A Promise<GenProviderRedirectUriResponse> object.
+   */
+  public async genProviderRedirectUri(
+    params: GenProviderRedirectUriRequest,
+  ): Promise<GenProviderRedirectUriResponse> {
+    let url = `${ApiUrls.PROVIDER_URI_URL}?client_id=${this._config.clientId
+      }&provider_id=${params.provider_id}&redirect_uri=${encodeURIComponent(
+        params.provider_redirect_uri,
+      )}&state=${params.state}`;
+    const other_params = params.other_params;
+    if (other_params) {
+      if (
+        typeof other_params.sign_out_uri === 'string' &&
+        other_params.sign_out_uri.length > 0
+      ) {
+        url += `&other_params[sign_out_uri]=${other_params.sign_out_uri}`;
+      }
     }
+    return this._config.request<GenProviderRedirectUriResponse>(url, {
+      method: 'GET',
+    });
+  }
 
-    /**
-     * Grant provider token.
-     * @param {PatchProviderTokenRequest} params A PatchProviderTokenRequest object.
-     * @return {Promise<PatchProviderTokenResponse>} A Promise<PatchProviderTokenResponse> object.
-     */
-    public async patchProviderToken(
-        params: PatchProviderTokenRequest,
-    ): Promise<PatchProviderTokenResponse> {
-        params.client_id = this._config.clientId;
-        return this._config.request<PatchProviderTokenResponse>(
-            ApiUrls.PROVIDER_TOKEN_URL,
-            {
-                method: 'PATCH',
-                body: params,
-            },
-        );
-    }
+  /**
+   * Grant provider token.
+   * @param {GrantProviderTokenRequest} params A GrantProviderTokenRequest object.
+   * @return {Promise<GrantProviderTokenResponse>} A Promise<GrantProviderTokenResponse> object.
+   */
+  public async grantProviderToken(
+    params: GrantProviderTokenRequest,
+  ): Promise<GrantProviderTokenResponse> {
+    params.client_id = this._config.clientId;
+    return this._config.request<GrantProviderTokenResponse>(
+      ApiUrls.PROVIDER_TOKEN_URL,
+      {
+        method: 'POST',
+        body: params,
+      },
+    );
+  }
 
-    /**
-     * Signin with provider request.
-     * @param {SignInWithProviderRequest} params A SignInWithProviderRequest object.
-     * @return {Promise<Credentials>} A Promise<Credentials> object.
-     */
-    public async signInWithProvider(
-        params: SignInWithProviderRequest,
-    ): Promise<Credentials> {
-        params.client_id = this._config.clientId;
-        const credentials: Credentials = await this._config.request<Credentials>(
-            ApiUrls.AUTH_SIGN_IN_WITH_PROVIDER_URL,
-            {
-                method: 'POST',
-                body: params,
-            },
-        );
-        await this._config.credentialsClient.setCredentials(credentials);
-        return Promise.resolve(credentials);
-    }
+  /**
+   * Grant provider token.
+   * @param {PatchProviderTokenRequest} params A PatchProviderTokenRequest object.
+   * @return {Promise<PatchProviderTokenResponse>} A Promise<PatchProviderTokenResponse> object.
+   */
+  public async patchProviderToken(
+    params: PatchProviderTokenRequest,
+  ): Promise<PatchProviderTokenResponse> {
+    params.client_id = this._config.clientId;
+    return this._config.request<PatchProviderTokenResponse>(
+      ApiUrls.PROVIDER_TOKEN_URL,
+      {
+        method: 'PATCH',
+        body: params,
+      },
+    );
+  }
 
-    /**
-     * Bind with provider
-     * @param {BindWithProviderRequest} params A BindWithProviderRequest object.
-     * @return {Promise<void>} A Promise<any> object.
-     */
-    public async bindWithProvider(
-        params: BindWithProviderRequest,
-    ): Promise<void> {
-        params.client_id = this._config.clientId;
-        return this._config.request<any>(ApiUrls.PROVIDER_BIND_URL, {
-            method: 'POST',
-            body: params,
-            withCredentials: true,
-        });
-    }
+  /**
+   * Signin with provider request.
+   * @param {SignInWithProviderRequest} params A SignInWithProviderRequest object.
+   * @return {Promise<Credentials>} A Promise<Credentials> object.
+   */
+  public async signInWithProvider(
+    params: SignInWithProviderRequest,
+  ): Promise<Credentials> {
+    params.client_id = this._config.clientId;
+    const credentials: Credentials = await this._config.request<Credentials>(
+      ApiUrls.AUTH_SIGN_IN_WITH_PROVIDER_URL,
+      {
+        method: 'POST',
+        body: params,
+      },
+    );
+    await this._config.credentialsClient.setCredentials(credentials);
+    return Promise.resolve(credentials);
+  }
 
-    /**
-     * Get the user profile.
-     * @return {Promise<UserProfile>} A Promise<UserProfile> object.
-     */
-    public async getUserProfile(): Promise<UserProfile> {
-        return this.getUserInfo();
-    }
+  /**
+   * Bind with provider
+   * @param {BindWithProviderRequest} params A BindWithProviderRequest object.
+   * @return {Promise<void>} A Promise<any> object.
+   */
+  public async bindWithProvider(
+    params: BindWithProviderRequest,
+  ): Promise<void> {
+    params.client_id = this._config.clientId;
+    return this._config.request<any>(ApiUrls.PROVIDER_BIND_URL, {
+      method: 'POST',
+      body: params,
+      withCredentials: true,
+    });
+  }
 
-    /**
-     * Get the user info.
-     * @return {Promise<UserInfo>} A Promise<UserProfile> object.
-     */
-    public async getUserInfo(): Promise<UserInfo> {
-        return this._config.request<UserInfo>(ApiUrls.USER_ME_URL, {
-            method: 'GET',
-            withCredentials: true,
-        });
-    }
+  /**
+   * Get the user profile.
+   * @return {Promise<UserProfile>} A Promise<UserProfile> object.
+   */
+  public async getUserProfile(): Promise<UserProfile> {
+    return this.getUserInfo();
+  }
 
-    /**
-     * hasLoginState check if has login state
-     * @return {Promise<boolean>} A Promise<boolean> object.
-     */
-    public async hasLoginState(): Promise<boolean> {
-        try {
-            await this._config.credentialsClient.getAccessToken()
-            return true
-        } catch (error) {
-            return false
-        }
+  /**
+   * Get the user info.
+   * @return {Promise<UserInfo>} A Promise<UserProfile> object.
+   */
+  public async getUserInfo(): Promise<UserInfo> {
+    const userInfo = await this._config.request<UserInfo>(ApiUrls.USER_ME_URL, {
+      method: 'GET',
+      withCredentials: true,
+    });
+    if (userInfo.picture) {
+      userInfo.avatarUrl = userInfo.picture;
     }
 
-    /**
-     * Trans by provider.
-     * @param {TransByProviderRequest} params A TransByProviderRequest object.
-     * @return {Promise<Credentials>} A Promise<Credentials> object.
-     */
-    public async transByProvider(
-        params: TransByProviderRequest,
-    ): Promise<Credentials> {
-        return this._config.request<Credentials>(
-            ApiUrls.USER_TRANS_BY_PROVIDER_URL,
-            {
-                method: 'PATCH',
-                body: params,
-                withCredentials: true,
-            },
-        );
+    if (userInfo.sub) {
+      userInfo.uid = userInfo.sub
     }
 
-    /**
-     * Grant token.
-     * @param {GrantTokenRequest} params A GrantTokenRequest object.
-     * @return {Promise<Credentials>} A Promise<Credentials> object.
-     */
-    public async grantToken(params: GrantTokenRequest): Promise<Credentials> {
-        params.client_id = this._config.clientId;
-        return this._config.request<Credentials>(ApiUrls.AUTH_TOKEN_URL, {
-            method: 'POST',
-            body: params,
-        });
+    if (userInfo.name) {
+      userInfo.username = userInfo.name
     }
+    return userInfo;
+  }
 
-    /**
-     * Get the provide list.
-     * @return {Promise<UserProfileProvider>} A Promise<UserProfileProvider> object.
-     */
-    public async getProviders(): Promise<UserProfileProvider> {
-        return this._config.request<UserProfileProvider>(ApiUrls.PROVIDER_LIST, {
-            method: 'GET',
-            withCredentials: true,
-        });
+  /**
+   * hasLoginState check if has login state
+   * @return {Promise<boolean>} A Promise<boolean> object.
+   */
+  public async hasLoginState(): Promise<boolean> {
+    try {
+      await this._config.credentialsClient.getAccessToken()
+      return true
+    } catch (error) {
+      return false
     }
+  }
 
-    /**
-     * unbind provider.
-     * @param {UnbindProviderRequest} params
-     * @return {Promise<any>}
-     */
-    public async unbindProvider(params: UnbindProviderRequest): Promise<void> {
-        params.client_id = this._config.clientId;
-        return this._config.request<any>(
-            `${ApiUrls.PROVIDER_UNBIND_URL}/${params.provider_id}`,
-            {
-                method: 'DELETE',
-                withCredentials: true,
-            },
-        );
-    }
+  public hasLoginStateSync(): Credentials | null {
+    const credentials = this._config.credentialsClient.getCredentialsSync()
+    return credentials
+  }
 
-    /**
-     * check Password.
-     * @param {CheckPasswordrRequest} params
-     * @return {Promise<any>}
-     */
-    public async checkPassword(params: CheckPasswordrRequest): Promise<void> {
-        return this._config.request<any>(`${ApiUrls.CHECK_PWD_URL}`, {
-            method: 'POST',
-            withCredentials: true,
-            body: params,
-        });
-    }
+  public async getLoginState(): Promise<Credentials | null> {
+    return this._config.credentialsClient.getCredentialsAsync()
+  }
 
-    /**
-     * check Password.
-     * @param {CheckPasswordrRequest} params
-     * @return {Promise<any>}
-     */
-    public async bindPhone(params: BindPhoneRequest): Promise<void> {
-        return this._config.request<any>(`${ApiUrls.BIND_PHONE_URL}`, {
-            method: 'PATCH',
-            withCredentials: true,
-            body: params,
-        });
-    }
+  /**
+   * Trans by provider.
+   * @param {TransByProviderRequest} params A TransByProviderRequest object.
+   * @return {Promise<Credentials>} A Promise<Credentials> object.
+   */
+  public async transByProvider(
+    params: TransByProviderRequest,
+  ): Promise<Credentials> {
+    return this._config.request<Credentials>(
+      ApiUrls.USER_TRANS_BY_PROVIDER_URL,
+      {
+        method: 'PATCH',
+        body: params,
+        withCredentials: true,
+      },
+    );
+  }
 
-    /**
-     * Set Password.
-     * @param {SetPasswordrRequest} params
-     * @return {Promise<any>}
-     */
-    public async setPassword(params: SetPasswordRequest): Promise<void> {
-        return this._config.request<any>(`${ApiUrls.AUTH_SET_PASSWORD}`, {
-            method: 'PATCH',
-            withCredentials: true,
-            body: params,
-        });
-    }
+  /**
+   * Grant token.
+   * @param {GrantTokenRequest} params A GrantTokenRequest object.
+   * @return {Promise<Credentials>} A Promise<Credentials> object.
+   */
+  public async grantToken(params: GrantTokenRequest): Promise<Credentials> {
+    params.client_id = this._config.clientId;
+    return this._config.request<Credentials>(ApiUrls.AUTH_TOKEN_URL, {
+      method: 'POST',
+      body: params,
+    });
+  }
 
-    /**
-     * Get the current user verification.
-     * @param {GetVerificationRequest} params A GetVerificationRequest Object.
-     * @return {Promise<GetVerificationResponse>} A Promise<GetVerificationResponse> object.
-     */
-    public async getCurUserVerification(
-        params: GetVerificationRequest,
-    ): Promise<GetVerificationResponse> {
-        params.client_id = this._config.clientId;
-        params.target = 'CUR_USER';
-        return this._config.request<GetVerificationResponse>(
-            ApiUrls.VERIFICATION_URL,
-            {
-                method: 'POST',
-                body: params,
-                withCredentials: true,
-                withCaptcha: true
-            },
-        );
-    }
+  /**
+   * Get the provide list.
+   * @return {Promise<UserProfileProvider>} A Promise<UserProfileProvider> object.
+   */
+  public async getProviders(): Promise<UserProfileProvider> {
+    return this._config.request<UserProfileProvider>(ApiUrls.PROVIDER_LIST, {
+      method: 'GET',
+      withCredentials: true,
+    });
+  }
 
-    /**
-     * change binded provider.
-     * @param {GetVerificationRequest} params A GetVerificationRequest Object.
-     * @return {Promise<GetVerificationResponse>} A Promise<GetVerificationResponse> object.
-     */
-    public async changeBindedProvider(
-        params: ChangeBindedProviderRequest,
-    ): Promise<ChangeBindedProviderResponse> {
-        params.client_id = this._config.clientId;
-        return this._config.request<ChangeBindedProviderResponse>(
-            `${ApiUrls.PROVIDER_LIST}/${params.provider_id}/trans`,
-            {
-                method: 'POST',
-                body: {
-                    provider_trans_token: params.trans_token,
-                },
-                withCredentials: true,
-            },
-        );
-    }
+  /**
+   * unbind provider.
+   * @param {UnbindProviderRequest} params
+   * @return {Promise<any>}
+   */
+  public async unbindProvider(params: UnbindProviderRequest): Promise<void> {
+    params.client_id = this._config.clientId;
+    return this._config.request<any>(
+      `${ApiUrls.PROVIDER_UNBIND_URL}/${params.provider_id}`,
+      {
+        method: 'DELETE',
+        withCredentials: true,
+      },
+    );
+  }
 
-    /**
-     * Patch the user profile.
-     * @param {UserProfile} params A UserProfile Object.
-     * @return {Promise<UserProfile>} A Promise<UserProfile> object.
-     */
-    public async setUserProfile(params: UserProfile): Promise<UserProfile> {
-        return this._config.request<UserProfile>(ApiUrls.USER_PRIFILE_URL, {
-            method: 'PATCH',
-            body: params,
-            withCredentials: true,
-        });
-    }
+  /**
+   * check Password.
+   * @param {CheckPasswordrRequest} params
+   * @return {Promise<any>}
+   */
+  public async checkPassword(params: CheckPasswordrRequest): Promise<void> {
+    return this._config.request<any>(`${ApiUrls.CHECK_PWD_URL}`, {
+      method: 'POST',
+      withCredentials: true,
+      body: params,
+    });
+  }
 
-    /**
-     * Patch the user profile.
-     * @param {QueryUserProfileReq} appended_params A QueryUserProfileReq Object.
-     * @return {Promise<UserProfile>} A Promise<UserProfile> object.
-     */
-    public async queryUserProfile(
-        appended_params: QueryUserProfileReq,
-    ): Promise<UserProfile> {
-        const url = `${ApiUrls.USER_QUERY_URL}${appended_params}`;
-        return this._config.request<UserProfile>(url, {
-            method: 'GET',
-            withCredentials: true,
-        });
-    }
+  /**
+   * check Password.
+   * @param {CheckPasswordrRequest} params
+   * @return {Promise<any>}
+   */
+  public async bindPhone(params: BindPhoneRequest): Promise<void> {
+    return this._config.request<any>(`${ApiUrls.BIND_PHONE_URL}`, {
+      method: 'PATCH',
+      withCredentials: true,
+      body: params,
+    });
+  }
+
+  /**
+   * Set Password.
+   * @param {SetPasswordrRequest} params
+   * @return {Promise<any>}
+   */
+  public async setPassword(params: SetPasswordRequest): Promise<void> {
+    return this._config.request<any>(`${ApiUrls.AUTH_SET_PASSWORD}`, {
+      method: 'PATCH',
+      withCredentials: true,
+      body: params,
+    });
+  }
+
+  /**
+   * Get the current user verification.
+   * @param {GetVerificationRequest} params A GetVerificationRequest Object.
+   * @return {Promise<GetVerificationResponse>} A Promise<GetVerificationResponse> object.
+   */
+  public async getCurUserVerification(
+    params: GetVerificationRequest,
+  ): Promise<GetVerificationResponse> {
+    params.client_id = this._config.clientId;
+    params.target = 'CUR_USER';
+    return this._config.request<GetVerificationResponse>(
+      ApiUrls.VERIFICATION_URL,
+      {
+        method: 'POST',
+        body: params,
+        withCredentials: true,
+        withCaptcha: true
+      },
+    );
+  }
+
+  /**
+   * change binded provider.
+   * @param {GetVerificationRequest} params A GetVerificationRequest Object.
+   * @return {Promise<GetVerificationResponse>} A Promise<GetVerificationResponse> object.
+   */
+  public async changeBindedProvider(
+    params: ChangeBindedProviderRequest,
+  ): Promise<ChangeBindedProviderResponse> {
+    params.client_id = this._config.clientId;
+    return this._config.request<ChangeBindedProviderResponse>(
+      `${ApiUrls.PROVIDER_LIST}/${params.provider_id}/trans`,
+      {
+        method: 'POST',
+        body: {
+          provider_trans_token: params.trans_token,
+        },
+        withCredentials: true,
+      },
+    );
+  }
+
+  /**
+   * Patch the user profile.
+   * @param {UserProfile} params A UserProfile Object.
+   * @return {Promise<UserProfile>} A Promise<UserProfile> object.
+   */
+  public async setUserProfile(params: UserProfile): Promise<UserProfile> {
+    return this._config.request<UserProfile>(ApiUrls.USER_PRIFILE_URL, {
+      method: 'PATCH',
+      body: params,
+      withCredentials: true,
+    });
+  }
+
+  /**
+   * Patch the user profile.
+   * @param {QueryUserProfileReq} appended_params A QueryUserProfileReq Object.
+   * @return {Promise<UserProfile>} A Promise<UserProfile> object.
+   */
+  public async queryUserProfile(
+    appended_params: QueryUserProfileReq,
+  ): Promise<UserProfile> {
+    const url = `${ApiUrls.USER_QUERY_URL}${appended_params}`;
+    return this._config.request<UserProfile>(url, {
+      method: 'GET',
+      withCredentials: true,
+    });
+  }
 }

src/auth/models.ts

@@ -114,2 +114,3 @@ interface BaseRequest {
   picture?: string;
+  avatarUrl?: string;
   username?: string;
@@ -125,2 +126,4 @@ email?: string;
   created_from?: string;
+  sub?: string
+  uid?: string
 }
@@ -127,0 +130,0 @@

src/index.ts

@@ -1,3 +0,11 @@
-export {Syntax, ErrorType} from './oauth2client/consts';
+import { ICloudbaseComponent } from '@cloudbase/types/component';
+import { ICloudbase } from '@cloudbase/types';
+import { getBaseEndPoint } from '@cloudbase/app'
+import { helpers } from '@cloudbase/utilities'
+const { stopOAuthLoginWithAuth } = helpers
 
+export { Syntax, ErrorType } from './oauth2client/consts';
+
+import { OAuth2Client } from './oauth2client/oauth2client'
+
 export {
@@ -12,4 +20,5 @@ defaultStorage,
 
-export {AuthClient, SimpleStorage} from './oauth2client/interface';
+export { AuthClient, SimpleStorage } from './oauth2client/interface';
 
+import { Credentials } from './oauth2client/models'
 export {
@@ -22,5 +31,123 @@ Credentials,
 
-export {AuthOptions, Auth} from './auth/apis';
+import { AuthOptions, Auth } from './auth/apis'
 
+export { AuthOptions, Auth } from './auth/apis';
+
 import * as authModels from './auth/models';
-export {authModels};
+export { authModels };
+
+declare const cloudbase: ICloudbase;
+
+const COMPONENT_NAME = 'oauth';
+
+class CloudbaseOAuth {
+  public oauth2client: OAuth2Client
+  public authApi: Auth
+  private _fromApp: ICloudbase
+
+  constructor(authOptions: AuthOptions) {
+    const { apiOrigin, clientId, _fromApp } = authOptions
+    this._fromApp = _fromApp
+    this.oauth2client = new OAuth2Client({
+      apiOrigin,
+      clientId
+    })
+
+    this.authApi = new Auth({
+      credentialsClient: this.oauth2client,
+      ...authOptions
+    })
+  }
+
+  public async checkFromAuthV1OrV2() {
+    const { _fromApp } = this
+    const authInstance = _fromApp.authInstance
+    const oauthInstance = _fromApp.oauthInstance || (_fromApp as any).oauth()
+    const authLogin = authInstance && await authInstance.getLoginState()
+    if (authLogin) {
+      return 'auth'
+    }
+    const oauthLogin = oauthInstance && await oauthInstance.hasLoginState()
+    if (oauthLogin) {
+      return 'oauth'
+    }
+    return ''
+  }
+
+
+  /**
+   * 登录
+   * @param {authModels.SignInRequest} params
+   * @returns {Promise<Credentials>}
+   * @memberof CloudbaseOAuth
+   */
+  @stopOAuthLoginWithAuth()
+  public async signIn(params: authModels.SignInRequest): Promise<Credentials> {
+    return this.authApi.signIn(params)
+  }
+
+  public async signOut(): Promise<any> {
+    return this.authApi.signOut()
+  }
+
+  /**
+   * check 当前是否已 oauth 登录
+   * @returns {Promise<boolean>}
+   * @memberof CloudbaseOAuth
+   */
+  public async hasLoginState(): Promise<boolean> {
+    return this.authApi.hasLoginState()
+  }
+
+  public async getUserInfo(): Promise<authModels.UserProfile> {
+    return this.authApi.getUserInfo()
+  }
+
+  /**
+   * 获取 oauth 登录态
+   * @returns {Promise<boolean>}
+   * @memberof CloudbaseOAuth
+   */
+  public async getLoginState(): Promise<Credentials> {
+    return this.authApi.getLoginState()
+  }
+
+  public hasLoginStateSync(): Credentials {
+    return this.authApi.hasLoginStateSync()
+  }
+
+  /**
+   * 匿名登录
+   * @returns {Promise<Credentials>}
+   * @memberof CloudbaseOAuth
+   */
+  @stopOAuthLoginWithAuth()
+  public async signInAnonymously(): Promise<Credentials> {
+    return this.authApi.signInAnonymously()
+  }
+}
+
+const component: ICloudbaseComponent = {
+  name: COMPONENT_NAME,
+  namespace: 'oauth',
+  entity: function () {
+
+    if (this.oauthInstance) {
+      return this.oauthInstance;
+    }
+
+    const { env } = this.config;
+    this.oauthInstance = new CloudbaseOAuth({
+      clientId: env,
+      apiOrigin: getBaseEndPoint(),
+      _fromApp: this
+    });
+    return this.oauthInstance;
+  }
+}
+
+try {
+  // 尝试自动注册至全局变量cloudbase
+  // 此行为只在浏览器环境下有效
+  cloudbase.registerComponent(component);
+} catch (e) { }

src/oauth2client/interface.ts

@@ -1,2 +0,2 @@
-import {Credentials, AuthClientRequestOptions} from './models';
+import { Credentials, AuthClientRequestOptions } from './models';
 
@@ -28,3 +28,3 @@ /**
 
-export type RequestFunction = <T>(url: string,options?: AuthClientRequestOptions) => Promise<T>;
+export type RequestFunction = <T>(url: string, options?: AuthClientRequestOptions) => Promise<T>;
 
@@ -45,2 +45,15 @@ /** An interface of the Simple  Web Storage API  */
   setItem(key: string, value: string): Promise<void>;
+
+  /**
+   * value = storage[key]
+   */
+  getItemSync(key: string): string | null;
+  /**
+   * delete storage[key]
+   */
+  removeItemSync(key: string): void;
+  /**
+   * storage[key] = value
+   */
+  setItemSync(key: string, value: string): void;
 }

src/oauth2client/oauth2client.ts

@@ -1,17 +0,17 @@
-import {ErrorType} from './consts';
+import { ErrorType } from './consts';
 
-import {AuthClient, SimpleStorage} from './interface';
+import { AuthClient, SimpleStorage } from './interface';
 
 import {
-    Credentials,
-    ResponseError,
-    RequestOptions,
-    RequestFunction,
-    OAuth2ClientOptions,
-    AuthClientRequestOptions,
+  Credentials,
+  ResponseError,
+  RequestOptions,
+  RequestFunction,
+  OAuth2ClientOptions,
+  AuthClientRequestOptions,
 } from './models';
 
-import {uuidv4} from '../utils/uuid';
+import { uuidv4 } from '../utils/uuid';
 
-import {SinglePromise} from '../utils/function/single-promise';
+import { SinglePromise } from '../utils/function/single-promise';
 
@@ -23,69 +23,69 @@ const RequestIdHeaderName = 'x-request-id';
 export interface ToResponseErrorOptions {
-    error?: ErrorType;
-    error_description?: string | null;
-    error_uri?: string | null;
-    details?: any | null;
+  error?: ErrorType;
+  error_description?: string | null;
+  error_uri?: string | null;
+  details?: any | null;
 }
 
 export const defaultRequest: RequestFunction = async <T>(
-    url: string,
-    options?: RequestOptions,
+  url: string,
+  options?: RequestOptions,
 ): Promise<T> => {
-    let result: T | null = null;
-    let responseError: ResponseError | null = null;
-    try {
-        // Objects must be copied to prevent modification of data such as body.
-        const copyOptions = Object.assign({}, options);
-        if (!copyOptions.method) {
-            copyOptions.method = 'GET';
-        }
-        if (copyOptions.body && typeof copyOptions.body !== 'string') {
-            copyOptions.body = JSON.stringify(copyOptions.body);
-        }
-        const responseResult: Response = await fetch(url, copyOptions);
-        const jsonResponse = await responseResult.json();
-        if (jsonResponse && jsonResponse.error) {
-            responseError = jsonResponse as ResponseError;
-            responseError.error_uri = new URL(url).pathname;
-        } else {
-            result = jsonResponse as T;
-        }
-    } catch (error) {
-        responseError = {
-            error: ErrorType.UNREACHABLE,
-            error_description: error.message,
-            error_uri: new URL(url).pathname,
-        };
+  let result: T | null = null;
+  let responseError: ResponseError | null = null;
+  try {
+    // Objects must be copied to prevent modification of data such as body.
+    const copyOptions = Object.assign({}, options);
+    if (!copyOptions.method) {
+      copyOptions.method = 'GET';
     }
-    if (responseError) {
-        throw responseError;
+    if (copyOptions.body && typeof copyOptions.body !== 'string') {
+      copyOptions.body = JSON.stringify(copyOptions.body);
+    }
+    const responseResult: Response = await fetch(url, copyOptions);
+    const jsonResponse = await responseResult.json();
+    if (jsonResponse?.error) {
+      responseError = jsonResponse as ResponseError;
+      responseError.error_uri = new URL(url).pathname;
     } else {
-        return result;
+      result = jsonResponse as T;
     }
+  } catch (error) {
+    responseError = {
+      error: ErrorType.UNREACHABLE,
+      error_description: error.message,
+      error_uri: new URL(url).pathname,
+    };
+  }
+  if (responseError) {
+    throw responseError;
+  } else {
+    return result;
+  }
 };
 
 export const toResponseError = (
-    error: ResponseError | Error,
-    options?: ToResponseErrorOptions,
+  error: ResponseError | Error,
+  options?: ToResponseErrorOptions,
 ): ResponseError => {
-    let responseError: ResponseError;
-    const formatOptions: ToResponseErrorOptions = options || {};
-    if (error instanceof Error) {
-        responseError = {
-            error: formatOptions.error || ErrorType.LOCAL,
-            error_description: formatOptions.error_description || error.message,
-            error_uri: formatOptions.error_uri,
-            details: formatOptions.details || error.stack,
-        };
-    } else {
-        const formatError: ToResponseErrorOptions = error || {};
-        responseError = {
-            error: formatOptions.error || formatError.error || 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;
+  let responseError: ResponseError;
+  const formatOptions: ToResponseErrorOptions = options || {};
+  if (error instanceof Error) {
+    responseError = {
+      error: formatOptions.error || ErrorType.LOCAL,
+      error_description: formatOptions.error_description || error.message,
+      error_uri: formatOptions.error_uri,
+      details: formatOptions.details || error.stack,
+    };
+  } else {
+    const formatError: ToResponseErrorOptions = error || {};
+    responseError = {
+      error: formatOptions.error || formatError.error || 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;
 };
@@ -98,3 +98,3 @@
 export function generateRequestId(): string {
-    return uuidv4();
+  return uuidv4();
 }
@@ -107,19 +107,19 @@
 class DefaultStorage implements SimpleStorage {
-    /**
+  /**
      * Get item.
      * @param {string} key
      */
-    async getItem(key: string): Promise<string | null> {
-        return window.localStorage.getItem(key);
-    }
+  async getItem(key: string): Promise<string | null> {
+    return window.localStorage.getItem(key);
+  }
 
-    /**
+  /**
      * Remove item.
      * @param {string} key
      */
-    async removeItem(key: string): Promise<void> {
-        window.localStorage.removeItem(key);
-    }
+  async removeItem(key: string): Promise<void> {
+    window.localStorage.removeItem(key);
+  }
 
-    /**
+  /**
      * Set item.
@@ -129,5 +129,30 @@ * @param {string} key
      */
-    async setItem(key: string, value: string): Promise<void> {
-        window.localStorage.setItem(key, value);
-    }
+  async setItem(key: string, value: string): Promise<void> {
+    window.localStorage.setItem(key, value);
+  }
+
+  /**
+     * Get item sync.
+     * @param {string} key
+     */
+  getItemSync(key: string): string | null {
+    return window.localStorage.getItem(key);
+  }
+
+  /**
+     * Remove item sync.
+     * @param {string} key
+     */
+  removeItemSync(key: string): void {
+    window.localStorage.removeItem(key);
+  }
+
+  /**
+     * Set item sync.
+     * @param {string} key
+     * @param {string} value
+     */
+  setItemSync(key: string, value: string): void {
+    window.localStorage.setItem(key, value);
+  }
 }
@@ -138,4 +163,4 @@
 interface LocalCredentialsOptions {
-    tokenSectionName: string;
-    storage: SimpleStorage;
+  tokenSectionName: string;
+  storage: SimpleStorage;
 }
@@ -149,7 +174,7 @@
 function isCredentialsExpired(credentials: Credentials): boolean {
-    let isExpired = true;
-    if (credentials && credentials.expires_at && credentials.access_token) {
-        isExpired = credentials.expires_at < new Date();
-    }
-    return isExpired;
+  let isExpired = true;
+  if (credentials?.expires_at && credentials?.access_token) {
+    isExpired = credentials.expires_at < new Date();
+  }
+  return isExpired;
 }
@@ -163,77 +188,97 @@
 export class LocalCredentials {
-    private _tokenSectionName: string;
+  private _tokenSectionName: string;
 
-    private _storage: SimpleStorage;
+  private _storage: SimpleStorage;
 
-    private _credentials: Credentials | null = null;
+  private _credentials: Credentials | null = null;
 
-    private _singlePromise: SinglePromise = new SinglePromise();
+  private _singlePromise: SinglePromise = new SinglePromise();
 
-    /**
-     * constructor
-     * @param {LocalCredentialsOptions} options
-     */
-    constructor(options: LocalCredentialsOptions) {
-        this._tokenSectionName = options.tokenSectionName;
-        this._storage = options.storage;
+  /**
+   * constructor
+   * @param {LocalCredentialsOptions} options
+   */
+  constructor(options: LocalCredentialsOptions) {
+    this._tokenSectionName = options.tokenSectionName;
+    this._storage = options.storage;
+  }
+
+  /**
+   * setCredentials Provides an alternative fetch api request implementation with auth credentials
+   * @param {Credentials} credentials
+   */
+  public async setCredentials(credentials?: Credentials): Promise<void> {
+    if (credentials?.expires_in) {
+      credentials.expires_at = new Date(
+        Date.now() + (credentials.expires_in - 30) * 1000,
+      );
+      if (this._storage) {
+        const tokenStr: string = 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;
     }
+  }
 
-    /**
-     * setCredentials Provides an alternative fetch api request implementation with auth credentials
-     * @param {Credentials} credentials
-     */
-    public async setCredentials(credentials?: Credentials): Promise<void> {
-        if (credentials && credentials.expires_in) {
-            credentials.expires_at = new Date(
-                Date.now() + (credentials.expires_in - 30) * 1000,
-            );
-            if (this._storage) {
-                const tokenStr: string = 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 | null>}
+   */
+  public async getCredentials(): Promise<Credentials | null> {
+    return this._singlePromise.run('getCredentials', async () => {
+      if (isCredentialsExpired(this._credentials)) {
+        this._credentials = await this._getStorageCredentials();
+      }
+      return this._credentials;
+    });
+  }
+
+  /**
+   * Get storage credentials.
+   */
+  private async _getStorageCredentials(): Promise<Credentials | null> {
+    return this._singlePromise.run('_getStorageCredentials', async () => {
+      let credentials: Credentials = null;
+      const tokenStr: string = await this._storage.getItem(
+        this._tokenSectionName,
+      );
+      if (tokenStr !== undefined && tokenStr !== null) {
+        try {
+          credentials = JSON.parse(tokenStr);
+          if (credentials?.expires_at) {
+            credentials.expires_at = new Date(credentials.expires_at);
+          }
+        } catch (error) {
+          await this._storage.removeItem(this._tokenSectionName);
+          credentials = null;
         }
-    }
+      }
+      return credentials;
+    });
+  }
 
-    /**
-     * Get credentials.
-     * @return {Promise<Credentials | null>}
-     */
-    public async getCredentials(): Promise<Credentials | null> {
-        return this._singlePromise.run('getCredentials', async () => {
-            if (isCredentialsExpired(this._credentials)) {
-                this._credentials = await this._getStorageCredentials();
-            }
-            return this._credentials;
-        });
+  public _getStorageCredentialsSync(): Credentials | null {
+    let credentials: Credentials = null;
+    const tokenStr: string = this._storage.getItemSync(
+      this._tokenSectionName,
+    );
+    if (tokenStr !== undefined && tokenStr !== null) {
+      try {
+        credentials = JSON.parse(tokenStr);
+        if (credentials?.expires_at) {
+          credentials.expires_at = new Date(credentials.expires_at);
+        }
+      } catch (error) {
+        this._storage.removeItem(this._tokenSectionName);
+        credentials = null;
+      }
     }
+    return credentials
+  }
 
-    /**
-     * Get storage credentials.
-     */
-    private async _getStorageCredentials(): Promise<Credentials | null> {
-        return this._singlePromise.run('_getStorageCredentials', async () => {
-            let credentials: Credentials = null;
-            const tokenStr: string = 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;
-        });
-    }
 }
@@ -245,315 +290,325 @@
 export class OAuth2Client implements AuthClient {
-    private static _defaultRetry = 2;
-    private static _minRetry = 0;
-    private static _maxRetry = 5;
-    private static _retryInterval = 1000;
+  private static _defaultRetry = 2;
+  private static _minRetry = 0;
+  private static _maxRetry = 5;
+  private static _retryInterval = 1000;
 
-    private _apiOrigin: string;
-    private _clientId: string;
-    private _retry: number;
-    private _clientSecret?: string;
-    private _baseRequest: <T>(
-        url: string,
-        options?: RequestOptions,
-    ) => Promise<T>;
-    private _localCredentials: LocalCredentials;
-    private _storage: SimpleStorage;
-    private _deviceID?: string;
-    private _tokenInURL?: boolean;
-    private _refreshTokenFunc: (refreshToken?: string) => Promise<Credentials>;
-    private _headers?: { [key: string]: string };
-    private _singlePromise: SinglePromise = new SinglePromise();
+  private _apiOrigin: string;
+  private _clientId: string;
+  private _retry: number;
+  private _clientSecret?: string;
+  private _baseRequest: <T>(
+    url: string,
+    options?: RequestOptions,
+  ) => Promise<T>;
+  private _localCredentials: LocalCredentials;
+  private _storage: SimpleStorage;
+  private _deviceID?: string;
+  private _tokenInURL?: boolean;
+  private _refreshTokenFunc: (refreshToken?: string) => Promise<Credentials>;
+  private _headers?: { [key: string]: string };
+  private _singlePromise: SinglePromise = new SinglePromise();
 
-    /**
-     * constructor
-     * @param {OAuth2ClientOptions} options
-     */
-    constructor(options: OAuth2ClientOptions) {
-        this._apiOrigin = options.apiOrigin;
-        this._clientId = options.clientId;
-        this._retry = this._formatRetry(options.retry, OAuth2Client._defaultRetry);
-        if (options.baseRequest != undefined) {
-            this._baseRequest = options.baseRequest;
-        } else {
-            this._baseRequest = defaultRequest;
-        }
-        this._tokenInURL = options.tokenInURL;
-        this._headers = options.headers;
-        // @ts-ignore
-        this._storage = options.storage || defaultStorage;
-        this._localCredentials = new LocalCredentials({
-            tokenSectionName: 'credentials_' + options.clientId,
-            storage: this._storage,
-        });
-        this._clientSecret = options.clientSecret;
-        this._refreshTokenFunc =
-            options.refreshTokenFunc || this._defaultRefreshTokenFunc;
+  /**
+   * constructor
+   * @param {OAuth2ClientOptions} options
+   */
+  constructor(options: OAuth2ClientOptions) {
+    this._apiOrigin = options.apiOrigin;
+    this._clientId = options.clientId;
+    this._retry = this._formatRetry(options.retry, OAuth2Client._defaultRetry);
+    if (options.baseRequest != undefined) {
+      this._baseRequest = options.baseRequest;
+    } else {
+      this._baseRequest = defaultRequest;
     }
+    this._tokenInURL = options.tokenInURL;
+    this._headers = options.headers;
+    // @ts-ignore
+    this._storage = options.storage || defaultStorage;
+    this._localCredentials = new LocalCredentials({
+      tokenSectionName: 'credentials_' + options.clientId,
+      storage: this._storage,
+    });
+    this._clientSecret = options.clientSecret;
+    this._refreshTokenFunc =
+      options.refreshTokenFunc || this._defaultRefreshTokenFunc;
+  }
 
-    /**
-     * setCredentials Provides an alternative fetch api request implementation with auth credentials
-     * @param {Credentials} credentials
-     * @return {Promise<void>}
-     */
-    public setCredentials(credentials?: Credentials): Promise<void> {
-        return this._localCredentials.setCredentials(credentials);
+  /**
+   * setCredentials Provides an alternative fetch api request implementation with auth credentials
+   * @param {Credentials} credentials
+   * @return {Promise<void>}
+   */
+  public setCredentials(credentials?: Credentials): Promise<void> {
+    return this._localCredentials.setCredentials(credentials);
+  }
+
+  /**
+   * getAccessToken return a validate access token
+   */
+  public async getAccessToken(): Promise<string> {
+    const credentials: Credentials = await this._getCredentials();
+    if (credentials?.access_token) {
+      return Promise.resolve(credentials.access_token);
     }
+    return Promise.reject({ error: ErrorType.UNAUTHENTICATED } as ResponseError);
+  }
 
-    /**
-     * getAccessToken return a validate access token
-     */
-    public async getAccessToken(): Promise<string> {
-        const credentials: Credentials = await this._getCredentials();
-        if (credentials && credentials.access_token) {
-            return Promise.resolve(credentials.access_token);
-        }
-        return Promise.reject({error: ErrorType.UNAUTHENTICATED} as ResponseError);
+  /**
+   * request http like simple fetch api, exp:request('/v1/user/me', {withCredentials:true})
+   * @param {string} url
+   * @param {AuthClientRequestOptions} options
+   */
+  public async request<T>(
+    url: string,
+    options?: AuthClientRequestOptions,
+  ): Promise<T> {
+    if (!options) {
+      options = {};
     }
-
-    /**
-     * request http like simple fetch api, exp:request('/v1/user/me', {withCredentials:true})
-     * @param {string} url
-     * @param {AuthClientRequestOptions} options
-     */
-    public async request<T>(
-        url: string,
-        options?: AuthClientRequestOptions,
-    ): Promise<T> {
-        if (!options) {
-            options = {};
-        }
-        const retry: number = 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.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;
-                }
-            }
+    const retry: number = 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?.withCredentials) {
+      const credentials = await this._getCredentials();
+      if (credentials) {
+        if (this._tokenInURL) {
+          if (url.indexOf('?') < 0) {
+            url += '?';
+          }
+          url += 'access_token=' + credentials.access_token;
         } else {
-            if (this._clientId && url.indexOf('client_id') < 0) {
-                url += url.indexOf('?') < 0 ? '?' : '&';
-                url += 'client_id=' + this._clientId;
-            }
+          options.headers['Authorization'] =
+            credentials.token_type + ' ' + credentials.access_token;
         }
-        if (url.startsWith('/')) {
-            url = this._apiOrigin + url;
-        }
-        let response: T | null = null;
-        const maxRequestTimes: number = retry + 1;
-        for (
-            let requestTime = 0;
-            requestTime < maxRequestTimes;
-            requestTime++
-        ) {
-            try {
-                response = await this._baseRequest<T>(url, options);
-                break;
-            } catch (responseError) {
-                if (
-                    requestTime === retry ||
-                    !responseError ||
-                    responseError.error !== 'unreachable'
-                ) {
-                    return Promise.reject(responseError);
-                }
-            }
-            await this._sleep(OAuth2Client._retryInterval);
-        }
-        return response;
+      }
+    } else {
+      if (this._clientId && url.indexOf('client_id') < 0) {
+        url += url.indexOf('?') < 0 ? '?' : '&';
+        url += 'client_id=' + this._clientId;
+      }
     }
-
-    /**
-     * Check retry value.
-     * @param {number} retry
-     * @return {number}
-     */
-    private _checkRetry(retry: number): number {
-        let responseError: ResponseError | null = null;
+    if (url.startsWith('/')) {
+      url = this._apiOrigin + url;
+    }
+    let response: T | null = null;
+    const maxRequestTimes: number = retry + 1;
+    for (
+      let requestTime = 0;
+      requestTime < maxRequestTimes;
+      requestTime++
+    ) {
+      try {
+        response = await this._baseRequest<T>(url, options);
+        break;
+      } catch (responseError) {
         if (
-            typeof retry !== 'number' ||
-            retry < OAuth2Client._minRetry ||
-            retry > OAuth2Client._maxRetry
+          requestTime === retry ||
+          !responseError ||
+          responseError.error !== 'unreachable'
         ) {
-            responseError = {
-                error: ErrorType.UNREACHABLE,
-                error_description: 'wrong options param: retry',
-            };
+          return Promise.reject(responseError);
         }
-        if (responseError) {
-            throw responseError;
-        }
-        return retry;
+      }
+      await this._sleep(OAuth2Client._retryInterval);
     }
+    return response;
+  }
 
-    /**
-     * Format retry value.
-     * @param {number} retry
-     * @param {number} defaultVale
-     * @return {number}
-     */
-    private _formatRetry(retry: number, defaultVale: number): number {
-        if (typeof retry === 'undefined') {
-            return defaultVale;
-        } else {
-            return this._checkRetry(retry);
-        }
+  /**
+   * Check retry value.
+   * @param {number} retry
+   * @return {number}
+   */
+  private _checkRetry(retry: number): number {
+    let responseError: ResponseError | null = null;
+    if (
+      typeof retry !== 'number' ||
+      retry < OAuth2Client._minRetry ||
+      retry > OAuth2Client._maxRetry
+    ) {
+      responseError = {
+        error: ErrorType.UNREACHABLE,
+        error_description: 'wrong options param: retry',
+      };
     }
-
-    /**
-     * Sleep.
-     * @param {number} ms
-     * @return {Promise<void>}
-     */
-    private async _sleep(ms: number): Promise<void> {
-        return new Promise<void>((resolve) => {
-            setTimeout(() => {
-                resolve();
-            }, ms);
-        });
+    if (responseError) {
+      throw responseError;
     }
+    return retry;
+  }
 
-    /**
-     * Refresh expired token.
-     * @param {Credentials} credentials
-     * @return {Promise<Credentials>}
-     */
-    private async _refreshToken(credentials: Credentials): Promise<Credentials> {
-        return this._singlePromise.run('_refreshToken', async () => {
-            if (!credentials || !credentials.refresh_token) {
-                return this._unAuthenticatedError('no refresh token found in credentials');
-            }
-            try {
-                const newCredentials: Credentials = await this._refreshTokenFunc(
-                    credentials.refresh_token,
-                );
-                await this._localCredentials.setCredentials(newCredentials);
-                return newCredentials
-            } catch (error) {
-                if (error.error === ErrorType.INVALID_GRANT) {
-                    await this._localCredentials.setCredentials(null);
-                    return this._unAuthenticatedError(error.error_description);
-                }
-                return Promise.reject(error);
-            }
-        });
+  /**
+   * Format retry value.
+   * @param {number} retry
+   * @param {number} defaultVale
+   * @return {number}
+   */
+  private _formatRetry(retry: number, defaultVale: number): number {
+    if (typeof retry === 'undefined') {
+      return defaultVale;
+    } else {
+      return this._checkRetry(retry);
     }
+  }
 
-    /**
-     * anonymous signIn
-     * @param {Credentials} credentials
-     * @return {Promise<Credentials>}
-     */
-    private async _anonymousSignIn(credentials: Credentials): Promise<Credentials> {
-        return this._singlePromise.run('_anonymous', async () => {
-            if (!credentials || credentials.scope !== 'anonymous') {
-                return this._unAuthenticatedError('no anonymous in credentials');
-            }
-            try {
-                const newCredentials: Credentials = await this.request('/auth/v1/signin/anonymously', {
-                    method: 'POST',
-                    body: {
-                        client_id: this._clientId,
-                        client_secret: this._clientSecret,
-                    },
-                });
-                await this._localCredentials.setCredentials(newCredentials);
-                return newCredentials
-            } catch (error) {
-                if (error.error === ErrorType.INVALID_GRANT) {
-                    await this._localCredentials.setCredentials(null);
-                    return this._unAuthenticatedError(error.error_description);
-                }
-                return Promise.reject(error);
-            }
-        });
-    }
+  /**
+   * Sleep.
+   * @param {number} ms
+   * @return {Promise<void>}
+   */
+  private async _sleep(ms: number): Promise<void> {
+    return new Promise<void>((resolve) => {
+      setTimeout(() => {
+        resolve();
+      }, ms);
+    });
+  }
 
-    /**
-     * Default refresh token function.
-     * @param {string} refreshToken
-     * @return {Promise<Credentials>}
-     */
-    private _defaultRefreshTokenFunc(
-        refreshToken?: string,
-    ): Promise<Credentials> {
-        if (refreshToken === undefined || refreshToken === '') {
-            return this._unAuthenticatedError('refresh token not found');
+  /**
+   * Refresh expired token.
+   * @param {Credentials} credentials
+   * @return {Promise<Credentials>}
+   */
+  private async _refreshToken(credentials: Credentials): Promise<Credentials> {
+    return this._singlePromise.run('_refreshToken', async () => {
+      if (!credentials || !credentials.refresh_token) {
+        return this._unAuthenticatedError('no refresh token found in credentials');
+      }
+      try {
+        const newCredentials: Credentials = await this._refreshTokenFunc(
+          credentials.refresh_token,
+        );
+        await this._localCredentials.setCredentials(newCredentials);
+        return newCredentials
+      } catch (error) {
+        if (error.error === ErrorType.INVALID_GRANT) {
+          await this._localCredentials.setCredentials(null);
+          return this._unAuthenticatedError(error.error_description);
         }
-        return this.request('/auth/v1/token', {
-            method: 'POST',
-            body: {
-                client_id: this._clientId,
-                client_secret: this._clientSecret,
-                grant_type: 'refresh_token',
-                refresh_token: refreshToken,
-            },
+        return Promise.reject(error);
+      }
+    });
+  }
+
+  /**
+   * anonymous signIn
+   * @param {Credentials} credentials
+   * @return {Promise<Credentials>}
+   */
+  private async _anonymousSignIn(credentials: Credentials): Promise<Credentials> {
+    return this._singlePromise.run('_anonymous', async () => {
+      if (!credentials || credentials.scope !== 'anonymous') {
+        return this._unAuthenticatedError('no anonymous in credentials');
+      }
+      try {
+        const newCredentials: Credentials = await this.request('/auth/v1/signin/anonymously', {
+          method: 'POST',
+          body: {
+            client_id: this._clientId,
+            client_secret: this._clientSecret,
+          },
         });
+        await this._localCredentials.setCredentials(newCredentials);
+        return newCredentials
+      } catch (error) {
+        if (error.error === 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>}
+   */
+  private _defaultRefreshTokenFunc(
+    refreshToken?: string,
+  ): Promise<Credentials> {
+    if (refreshToken === undefined || refreshToken === '') {
+      return this._unAuthenticatedError('refresh token not found');
     }
+    return this.request('/auth/v1/token', {
+      method: 'POST',
+      body: {
+        client_id: this._clientId,
+        client_secret: this._clientSecret,
+        grant_type: 'refresh_token',
+        refresh_token: refreshToken,
+      },
+    });
+  }
 
-    /**
-     * Get credentials.
-     */
-    private async _getCredentials(): Promise<Credentials | null> {
-        let credentials: Credentials = await this._localCredentials.getCredentials();
-        if (isCredentialsExpired(credentials)) {
-            if (credentials && credentials.scope === 'anonymous') {
-                credentials = await this. _anonymousSignIn(credentials)
-            } else {
-                credentials = await this._refreshToken(credentials);
-            }
-        }
-        return credentials;
+  /**
+   * Get credentials.
+   */
+  public async _getCredentials(): Promise<Credentials | null> {
+    let credentials: Credentials = await this._localCredentials.getCredentials();
+    if (isCredentialsExpired(credentials)) {
+      if (credentials && credentials.scope === 'anonymous') {
+        credentials = await this._anonymousSignIn(credentials)
+      } else {
+        credentials = await this._refreshToken(credentials);
+      }
     }
+    return credentials;
+  }
 
-    /**
-     * Get deviceId
-     */
-    private async _getDeviceId(): Promise<string> {
-        if (this._deviceID) {
-            return this._deviceID;
-        }
-        let deviceId: string = await this._storage.getItem(
-            DeviceIdSectionName,
-        );
-        if (!(typeof deviceId === 'string' &&
-            deviceId.length >= 16 &&
-            deviceId.length <= 48)) {
-            deviceId = uuidv4();
-            await this._storage.setItem(DeviceIdSectionName, deviceId);
-        }
-        this._deviceID = deviceId;
-        return deviceId;
+  public getCredentialsSync(): Credentials | null {
+    const credentials: Credentials = this._localCredentials._getStorageCredentialsSync();
+    return credentials
+  }
+
+  public getCredentialsAsync(): Promise<Credentials | null> {
+    return this._localCredentials.getCredentials()
+  }
+
+
+  /**
+   * Get deviceId
+   */
+  private async _getDeviceId(): Promise<string> {
+    if (this._deviceID) {
+      return this._deviceID;
     }
-    /**
-     * Generate unAuthenticated error.
-     * @param {string} err
-     * @return {Promise<T>}
-     */
-    private _unAuthenticatedError<T>(err?: string): Promise<T> {
-        return Promise.reject({
-            error: ErrorType.UNAUTHENTICATED,
-            error_description: err,
-        } as ResponseError);
+    let deviceId: string = await this._storage.getItem(
+      DeviceIdSectionName,
+    );
+    if (!(typeof deviceId === 'string' &&
+      deviceId.length >= 16 &&
+      deviceId.length <= 48)) {
+      deviceId = uuidv4();
+      await this._storage.setItem(DeviceIdSectionName, deviceId);
     }
+    this._deviceID = deviceId;
+    return deviceId;
+  }
+  /**
+   * Generate unAuthenticated error.
+   * @param {string} err
+   * @return {Promise<T>}
+   */
+  private _unAuthenticatedError<T>(err?: string): Promise<T> {
+    return Promise.reject({
+      error: ErrorType.UNAUTHENTICATED,
+      error_description: err,
+    } as ResponseError);
+  }
 }

No alert changes

Improved metrics

Total package byte prevSize

277953

increased by8.26%

Lines of code

4038

increased by12.45%

No dependency changes