@ts-core/oauth 3.1.17 → 3.1.18

package/cjs/external/cordovaInAppBrowserTgPlugin.d.ts

@@ -0,0 +1,8 @@
+import type { TgAuth } from '../tg/TgAuth';
+export declare const TgAuthCordovaInAppBrowserPluginPropertiesSet: (item: TgAuth, options: ITgAuthCordovaInAppBrowserOptions) => void;
+export interface ITgAuthCordovaInAppBrowserOptions {
+    origin: string;
+    returnUrl: string;
+    requestAccess?: 'write';
+    inAppBrowserOptions?: string;
+}

package/cjs/external/cordovaInAppBrowserTgPlugin.js

@@ -0,0 +1,106 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TgAuthCordovaInAppBrowserPluginPropertiesSet = void 0;
+const common_1 = require("@ts-core/common");
+const PopUpBase_1 = require("../PopUpBase");
+const TgUser_1 = require("../tg/TgUser");
+const _ = require("lodash");
+const TgAuthCordovaInAppBrowserPluginPropertiesSet = (item, options) => {
+    let returnUrl = options.returnUrl;
+    let origin = options.origin;
+    let requestAccess = options.requestAccess;
+    let inAppBrowserOptions = !_.isNil(options.inAppBrowserOptions) ? options.inAppBrowserOptions : 'location=no,clearcache=yes,clearsessioncache=yes';
+    item.userProvider = (botId) => new Promise((resolve, reject) => {
+        let cordova = window['cordova'];
+        if (_.isNil(cordova) || _.isNil(cordova.InAppBrowser)) {
+            reject(new common_1.ExtendedError(`Cordova InAppBrowser undefined, please check installed plugins`));
+            return;
+        }
+        let url = `https://oauth.telegram.org/auth?bot_id=${botId}`
+            + `&origin=${encodeURIComponent(origin)}`
+            + `&return_to=${encodeURIComponent(returnUrl)}`;
+        if (!_.isNil(requestAccess)) {
+            url += `&request_access=${requestAccess}`;
+        }
+        let popUp = cordova.InAppBrowser.open(url, '_blank', inAppBrowserOptions);
+        let isSettled = false;
+        let cleanup = () => {
+            popUp.removeEventListener('loadstart', onLoad);
+            popUp.removeEventListener('loadstop', onLoad);
+            popUp.removeEventListener('exit', onExit);
+        };
+        let onLoad = (event) => {
+            if (isSettled || _.isNil(event) || _.isNil(event.url) || event.url.indexOf(returnUrl) !== 0) {
+                return;
+            }
+            let user = parseTgAuthResult(event.url);
+            if (_.isNil(user)) {
+                return;
+            }
+            isSettled = true;
+            cleanup();
+            popUp.close();
+            resolve(user);
+        };
+        let onExit = () => {
+            cleanup();
+            if (!isSettled) {
+                reject(new common_1.ExtendedError(PopUpBase_1.PopUpBase.ERROR_WINDOW_CLOSED, PopUpBase_1.PopUpBase.ERROR_WINDOW_CLOSED));
+            }
+        };
+        popUp.addEventListener('loadstart', onLoad, false);
+        popUp.addEventListener('loadstop', onLoad, false);
+        popUp.addEventListener('exit', onExit, false);
+    });
+};
+exports.TgAuthCordovaInAppBrowserPluginPropertiesSet = TgAuthCordovaInAppBrowserPluginPropertiesSet;
+function parseTgAuthResult(url) {
+    let raw = null;
+    let hashIndex = url.indexOf('#');
+    if (hashIndex >= 0) {
+        let value = new URLSearchParams(url.substring(hashIndex + 1)).get('tgAuthResult');
+        if (!_.isEmpty(value)) {
+            try {
+                raw = base64UrlDecode(value);
+            }
+            catch (error) { }
+        }
+    }
+    let data = null;
+    if (!_.isNil(raw)) {
+        try {
+            data = JSON.parse(raw);
+        }
+        catch (error) {
+            return null;
+        }
+    }
+    else {
+        let qIndex = url.indexOf('?');
+        if (qIndex < 0) {
+            return null;
+        }
+        let query = new URLSearchParams(url.substring(qIndex + 1, hashIndex >= 0 ? hashIndex : undefined));
+        if (_.isEmpty(query.get('hash'))) {
+            return null;
+        }
+        data = {};
+        query.forEach((v, k) => data[k] = v);
+    }
+    if (_.isNil(data) || _.isNil(data.hash)) {
+        return null;
+    }
+    let user = new TgUser_1.TgUser();
+    user.parse(data);
+    return user;
+}
+function base64UrlDecode(value) {
+    let normalized = value.replace(/-/g, '+').replace(/_/g, '/');
+    let pad = normalized.length % 4;
+    if (pad !== 0) {
+        normalized += '='.repeat(4 - pad);
+    }
+    let binary = atob(normalized);
+    let bytes = Uint8Array.from(binary, c => c.charCodeAt(0));
+    return new TextDecoder().decode(bytes);
+}

package/cjs/external/index.d.ts

@@ -1,3 +1,4 @@
 export * from './browser';
 export * from './cordovaOAuthPlugin';
 export * from './cordovaInAppBrowserPlugin';
+export * from './cordovaInAppBrowserTgPlugin';

package/cjs/external/index.js

@@ -17,3 +17,4 @@ Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./browser"), exports);
 __exportStar(require("./cordovaOAuthPlugin"), exports);
 __exportStar(require("./cordovaInAppBrowserPlugin"), exports);
+__exportStar(require("./cordovaInAppBrowserTgPlugin"), exports);

package/cjs/public-api.d.ts

@@ -18,3 +18,4 @@ export * from './keycloak/KeycloakUser';
 export * from './external/browser';
 export * from './external/cordovaOAuthPlugin';
 export * from './external/cordovaInAppBrowserPlugin';
+export * from './external/cordovaInAppBrowserTgPlugin';

package/cjs/public-api.js

@@ -34,3 +34,4 @@ __exportStar(require("./keycloak/KeycloakUser"), exports);
 __exportStar(require("./external/browser"), exports);
 __exportStar(require("./external/cordovaOAuthPlugin"), exports);
 __exportStar(require("./external/cordovaInAppBrowserPlugin"), exports);
+__exportStar(require("./external/cordovaInAppBrowserTgPlugin"), exports);

package/cjs/tg/TgAuth.d.ts

@@ -8,6 +8,7 @@ export declare class TgAuth extends LoggerWrapper {
     private static urlParseHashParams;
     private static urlParseQueryString;
     private static urlSafeDecode;
+    userProvider: ITgUserProvider;
     protected promise: PromiseHandler<TgUser, ExtendedError>;
     protected settings: ITgAuthSettings;
     constructor(logger: ILogger, settings: ITgAuthSettings);
@@ -18,3 +19,4 @@ export interface ITgAuthSettings {
     api: ITgApiLoader;
     botId: number;
 }
+export type ITgUserProvider = (botId: number) => Promise<TgUser>;

package/cjs/tg/TgAuth.js

@@ -85,6 +85,18 @@ class TgAuth extends common_1.LoggerWrapper {
                 return this.promise.promise;
             }
             this.promise = common_1.PromiseHandler.create();
+            if (!_.isNil(this.userProvider)) {
+                this.userProvider(this.settings.botId)
+                    .then(user => {
+                    this.promise.resolve(user);
+                })
+                    .catch(error => {
+                    this.promise.reject(error instanceof common_1.ExtendedError ? error : new common_1.ExtendedError(error.message));
+                }).finally(() => {
+                    this.promise = null;
+                });
+                return this.promise.promise;
+            }
             this.settings.api.getApi()
                 .then(item => {
                 item.Login.auth({ bot_id: this.settings.botId }, item => {

package/esm/external/cordovaInAppBrowserTgPlugin.d.ts

@@ -0,0 +1,8 @@
+import type { TgAuth } from '../tg/TgAuth';
+export declare const TgAuthCordovaInAppBrowserPluginPropertiesSet: (item: TgAuth, options: ITgAuthCordovaInAppBrowserOptions) => void;
+export interface ITgAuthCordovaInAppBrowserOptions {
+    origin: string;
+    returnUrl: string;
+    requestAccess?: 'write';
+    inAppBrowserOptions?: string;
+}

package/esm/external/cordovaInAppBrowserTgPlugin.js

@@ -0,0 +1,102 @@
+import { ExtendedError } from '@ts-core/common';
+import { PopUpBase } from '../PopUpBase';
+import { TgUser } from '../tg/TgUser';
+import * as _ from 'lodash';
+export const TgAuthCordovaInAppBrowserPluginPropertiesSet = (item, options) => {
+    let returnUrl = options.returnUrl;
+    let origin = options.origin;
+    let requestAccess = options.requestAccess;
+    let inAppBrowserOptions = !_.isNil(options.inAppBrowserOptions) ? options.inAppBrowserOptions : 'location=no,clearcache=yes,clearsessioncache=yes';
+    item.userProvider = (botId) => new Promise((resolve, reject) => {
+        let cordova = window['cordova'];
+        if (_.isNil(cordova) || _.isNil(cordova.InAppBrowser)) {
+            reject(new ExtendedError(`Cordova InAppBrowser undefined, please check installed plugins`));
+            return;
+        }
+        let url = `https://oauth.telegram.org/auth?bot_id=${botId}`
+            + `&origin=${encodeURIComponent(origin)}`
+            + `&return_to=${encodeURIComponent(returnUrl)}`;
+        if (!_.isNil(requestAccess)) {
+            url += `&request_access=${requestAccess}`;
+        }
+        let popUp = cordova.InAppBrowser.open(url, '_blank', inAppBrowserOptions);
+        let isSettled = false;
+        let cleanup = () => {
+            popUp.removeEventListener('loadstart', onLoad);
+            popUp.removeEventListener('loadstop', onLoad);
+            popUp.removeEventListener('exit', onExit);
+        };
+        let onLoad = (event) => {
+            if (isSettled || _.isNil(event) || _.isNil(event.url) || event.url.indexOf(returnUrl) !== 0) {
+                return;
+            }
+            let user = parseTgAuthResult(event.url);
+            if (_.isNil(user)) {
+                return;
+            }
+            isSettled = true;
+            cleanup();
+            popUp.close();
+            resolve(user);
+        };
+        let onExit = () => {
+            cleanup();
+            if (!isSettled) {
+                reject(new ExtendedError(PopUpBase.ERROR_WINDOW_CLOSED, PopUpBase.ERROR_WINDOW_CLOSED));
+            }
+        };
+        popUp.addEventListener('loadstart', onLoad, false);
+        popUp.addEventListener('loadstop', onLoad, false);
+        popUp.addEventListener('exit', onExit, false);
+    });
+};
+function parseTgAuthResult(url) {
+    let raw = null;
+    let hashIndex = url.indexOf('#');
+    if (hashIndex >= 0) {
+        let value = new URLSearchParams(url.substring(hashIndex + 1)).get('tgAuthResult');
+        if (!_.isEmpty(value)) {
+            try {
+                raw = base64UrlDecode(value);
+            }
+            catch (error) { }
+        }
+    }
+    let data = null;
+    if (!_.isNil(raw)) {
+        try {
+            data = JSON.parse(raw);
+        }
+        catch (error) {
+            return null;
+        }
+    }
+    else {
+        let qIndex = url.indexOf('?');
+        if (qIndex < 0) {
+            return null;
+        }
+        let query = new URLSearchParams(url.substring(qIndex + 1, hashIndex >= 0 ? hashIndex : undefined));
+        if (_.isEmpty(query.get('hash'))) {
+            return null;
+        }
+        data = {};
+        query.forEach((v, k) => data[k] = v);
+    }
+    if (_.isNil(data) || _.isNil(data.hash)) {
+        return null;
+    }
+    let user = new TgUser();
+    user.parse(data);
+    return user;
+}
+function base64UrlDecode(value) {
+    let normalized = value.replace(/-/g, '+').replace(/_/g, '/');
+    let pad = normalized.length % 4;
+    if (pad !== 0) {
+        normalized += '='.repeat(4 - pad);
+    }
+    let binary = atob(normalized);
+    let bytes = Uint8Array.from(binary, c => c.charCodeAt(0));
+    return new TextDecoder().decode(bytes);
+}

package/esm/external/index.d.ts

@@ -1,3 +1,4 @@
 export * from './browser';
 export * from './cordovaOAuthPlugin';
 export * from './cordovaInAppBrowserPlugin';
+export * from './cordovaInAppBrowserTgPlugin';

package/esm/external/index.js

@@ -1,3 +1,4 @@
 export * from './browser';
 export * from './cordovaOAuthPlugin';
 export * from './cordovaInAppBrowserPlugin';
+export * from './cordovaInAppBrowserTgPlugin';

package/esm/public-api.d.ts

@@ -18,3 +18,4 @@ export * from './keycloak/KeycloakUser';
 export * from './external/browser';
 export * from './external/cordovaOAuthPlugin';
 export * from './external/cordovaInAppBrowserPlugin';
+export * from './external/cordovaInAppBrowserTgPlugin';

package/esm/public-api.js

@@ -18,3 +18,4 @@ export * from './keycloak/KeycloakUser';
 export * from './external/browser';
 export * from './external/cordovaOAuthPlugin';
 export * from './external/cordovaInAppBrowserPlugin';
+export * from './external/cordovaInAppBrowserTgPlugin';

package/esm/tg/TgAuth.d.ts

@@ -8,6 +8,7 @@ export declare class TgAuth extends LoggerWrapper {
     private static urlParseHashParams;
     private static urlParseQueryString;
     private static urlSafeDecode;
+    userProvider: ITgUserProvider;
     protected promise: PromiseHandler<TgUser, ExtendedError>;
     protected settings: ITgAuthSettings;
     constructor(logger: ILogger, settings: ITgAuthSettings);
@@ -18,3 +19,4 @@ export interface ITgAuthSettings {
     api: ITgApiLoader;
     botId: number;
 }
+export type ITgUserProvider = (botId: number) => Promise<TgUser>;

package/esm/tg/TgAuth.js

@@ -82,6 +82,18 @@ export class TgAuth extends LoggerWrapper {
                 return this.promise.promise;
             }
             this.promise = PromiseHandler.create();
+            if (!_.isNil(this.userProvider)) {
+                this.userProvider(this.settings.botId)
+                    .then(user => {
+                    this.promise.resolve(user);
+                })
+                    .catch(error => {
+                    this.promise.reject(error instanceof ExtendedError ? error : new ExtendedError(error.message));
+                }).finally(() => {
+                    this.promise = null;
+                });
+                return this.promise.promise;
+            }
             this.settings.api.getApi()
                 .then(item => {
                 item.Login.auth({ bot_id: this.settings.botId }, item => {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ts-core/oauth",
-    "version": "3.1.17",
+    "version": "3.1.18",
     "description": "Classes and utils for oauth",
     "main": "./cjs/public-api.js",
     "module": "./esm/public-api.js",