@ts-core/oauth 3.1.5 → 3.1.7

package/cjs/go/GoUser.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GoUser = void 0;
 const OAuthUser_1 = require("../OAuthUser");
+const _ = require("lodash");
 class GoUser extends OAuthUser_1.OAuthUser {
     parse(item) {
         this.id = item.sub;
@@ -13,6 +14,17 @@ class GoUser extends OAuthUser_1.OAuthUser {
         this.familyName = item.family_name;
     }
     parsePerson(item) {
+        if (!_.isEmpty(item.genders)) {
+            this.isMale = _.first(item.genders).value === 'male';
+        }
+        if (!_.isEmpty(item.birthdays)) {
+            for (let value of item.birthdays) {
+                if (!_.isNil(value.date) && !_.isNil(value.date.year) && !_.isNil(value.date.month) && !_.isNil(value.date.day)) {
+                    this.birthday = new Date(value.date.year, value.date.month - 1, value.date.day);
+                    break;
+                }
+            }
+        }
     }
 }
 exports.GoUser = GoUser;

package/cjs/public-api.d.ts

@@ -10,6 +10,9 @@ export * from './ya/YaUser';
 export * from './ya/YaAuth';
 export * from './ma/MaAuth';
 export * from './ma/MaUser';
+export * from './tg/TgUser';
+export * from './tg/TgAuth';
+export * from './tg/TgApiLoader';
 export * from './keycloak/KeycloakAuth';
 export * from './keycloak/KeycloakUser';
 export * from './external/browser';

package/cjs/public-api.js

@@ -26,6 +26,9 @@ __exportStar(require("./ya/YaUser"), exports);
 __exportStar(require("./ya/YaAuth"), exports);
 __exportStar(require("./ma/MaAuth"), exports);
 __exportStar(require("./ma/MaUser"), exports);
+__exportStar(require("./tg/TgUser"), exports);
+__exportStar(require("./tg/TgAuth"), exports);
+__exportStar(require("./tg/TgApiLoader"), exports);
 __exportStar(require("./keycloak/KeycloakAuth"), exports);
 __exportStar(require("./keycloak/KeycloakUser"), exports);
 __exportStar(require("./external/browser"), exports);

package/cjs/tg/TgApiLoader.d.ts

@@ -0,0 +1,16 @@
+import { Destroyable } from "@ts-core/common";
+export declare class TgApiLoader extends Destroyable implements ITgApiLoader {
+    protected settings: ITgApiLoaderSettings;
+    constructor(settings: ITgApiLoaderSettings);
+    getApi(): Promise<any>;
+}
+export interface ITgApiLoaderSettings {
+    script: IScriptLoader;
+    window?: Window;
+}
+export interface ITgApiLoader {
+    getApi(): Promise<any>;
+}
+export interface IScriptLoader {
+    load(): Promise<void>;
+}

package/cjs/tg/TgApiLoader.js

@@ -0,0 +1,28 @@
+"use strict";
+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());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TgApiLoader = void 0;
+const common_1 = require("@ts-core/common");
+const _ = require("lodash");
+class TgApiLoader extends common_1.Destroyable {
+    constructor(settings) {
+        super();
+        this.settings = settings;
+    }
+    getApi() {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield this.settings.script.load();
+            let item = !_.isNil(this.settings.window) ? this.settings.window : window;
+            return item['Telegram'];
+        });
+    }
+}
+exports.TgApiLoader = TgApiLoader;

package/cjs/tg/TgAuth.d.ts

@@ -0,0 +1,14 @@
+import { ExtendedError, ILogger, LoggerWrapper, PromiseHandler } from "@ts-core/common";
+import { TgUser } from "./TgUser";
+import { ITgApiLoader } from "./TgApiLoader";
+export declare class TgAuth extends LoggerWrapper {
+    protected promise: PromiseHandler<TgUser, ExtendedError>;
+    protected settings: ITgAuthSettings;
+    constructor(logger: ILogger, settings: ITgAuthSettings);
+    getUser(): Promise<TgUser>;
+    destroy(): void;
+}
+export interface ITgAuthSettings {
+    api: ITgApiLoader;
+    botId: number;
+}

package/cjs/tg/TgAuth.js

@@ -0,0 +1,58 @@
+"use strict";
+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());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TgAuth = void 0;
+const common_1 = require("@ts-core/common");
+const TgUser_1 = require("./TgUser");
+const PopUpBase_1 = require("../PopUpBase");
+const _ = require("lodash");
+class TgAuth extends common_1.LoggerWrapper {
+    constructor(logger, settings) {
+        super(logger);
+        this.settings = settings;
+    }
+    getUser() {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!_.isNil(this.promise)) {
+                return this.promise.promise;
+            }
+            this.promise = common_1.PromiseHandler.create();
+            this.settings.api.getApi()
+                .then(item => {
+                item.Login.auth({ bot_id: this.settings.botId }, item => {
+                    if (item === false) {
+                        this.promise.reject(new common_1.ExtendedError(PopUpBase_1.PopUpBase.ERROR_WINDOW_CLOSED, PopUpBase_1.PopUpBase.ERROR_WINDOW_CLOSED));
+                        this.promise = null;
+                    }
+                    let user = new TgUser_1.TgUser();
+                    user.parse(item);
+                    this.promise.resolve(user);
+                });
+            })
+                .catch(error => {
+                this.promise.reject(new common_1.ExtendedError(error.message));
+                this.promise = null;
+            });
+            return this.promise.promise;
+        });
+    }
+    destroy() {
+        if (this.isDestroyed) {
+            return;
+        }
+        super.destroy();
+        if (!_.isNil(this.promise)) {
+            this.promise.reject(new common_1.ExtendedError(PopUpBase_1.PopUpBase.ERROR_WINDOW_CLOSED, PopUpBase_1.PopUpBase.ERROR_WINDOW_CLOSED));
+            this.promise = null;
+        }
+    }
+}
+exports.TgAuth = TgAuth;

package/cjs/tg/TgUser.d.ts

@@ -0,0 +1,9 @@
+import { OAuthUser } from '../OAuthUser';
+export declare class TgUser extends OAuthUser {
+    raw: any;
+    date: Date;
+    hash: string;
+    username: string;
+    parse(item: any): void;
+    toCheckString(): string;
+}

package/cjs/tg/TgUser.js

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TgUser = void 0;
+const common_1 = require("@ts-core/common");
+const OAuthUser_1 = require("../OAuthUser");
+class TgUser extends OAuthUser_1.OAuthUser {
+    parse(item) {
+        this.id = item.id;
+        this.hash = item.hash;
+        this.name = `${item.first_name} ${item.last_name}`;
+        this.date = common_1.DateUtil.getDate(item.auth_date * common_1.DateUtil.MILLISECONDS_SECOND);
+        this.picture = item.photo_url;
+        this.username = item.username;
+        this.telegram = `https://t.me/${item.username}`;
+        this.raw = item;
+    }
+    toCheckString() {
+        return Object.keys(this.raw).sort().filter((k) => this.raw[k]).filter((k) => !['hash'].includes(k)).map(k => (`${k}=${this.raw[k]}`)).join('\n');
+    }
+}
+exports.TgUser = TgUser;

package/cjs/vk/VkAuth.js

@@ -11,9 +11,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.VkAuth = void 0;
 const common_1 = require("@ts-core/common");
-const _ = require("lodash");
 const OAuthBase_1 = require("../OAuthBase");
 const VkUser_1 = require("./VkUser");
+const _ = require("lodash");
 class VkAuth extends OAuthBase_1.OAuthBase {
     constructor(logger, applicationId, window) {
         super(logger, applicationId, window);

package/esm/go/GoUser.js

@@ -1,4 +1,5 @@
 import { OAuthUser } from "../OAuthUser";
+import * as _ from 'lodash';
 export class GoUser extends OAuthUser {
     parse(item) {
         this.id = item.sub;
@@ -10,5 +11,16 @@ export class GoUser extends OAuthUser {
         this.familyName = item.family_name;
     }
     parsePerson(item) {
+        if (!_.isEmpty(item.genders)) {
+            this.isMale = _.first(item.genders).value === 'male';
+        }
+        if (!_.isEmpty(item.birthdays)) {
+            for (let value of item.birthdays) {
+                if (!_.isNil(value.date) && !_.isNil(value.date.year) && !_.isNil(value.date.month) && !_.isNil(value.date.day)) {
+                    this.birthday = new Date(value.date.year, value.date.month - 1, value.date.day);
+                    break;
+                }
+            }
+        }
     }
 }

package/esm/public-api.d.ts

@@ -10,6 +10,9 @@ export * from './ya/YaUser';
 export * from './ya/YaAuth';
 export * from './ma/MaAuth';
 export * from './ma/MaUser';
+export * from './tg/TgUser';
+export * from './tg/TgAuth';
+export * from './tg/TgApiLoader';
 export * from './keycloak/KeycloakAuth';
 export * from './keycloak/KeycloakUser';
 export * from './external/browser';

package/esm/public-api.js

@@ -10,6 +10,9 @@ export * from './ya/YaUser';
 export * from './ya/YaAuth';
 export * from './ma/MaAuth';
 export * from './ma/MaUser';
+export * from './tg/TgUser';
+export * from './tg/TgAuth';
+export * from './tg/TgApiLoader';
 export * from './keycloak/KeycloakAuth';
 export * from './keycloak/KeycloakUser';
 export * from './external/browser';

package/esm/tg/TgApiLoader.d.ts

@@ -0,0 +1,16 @@
+import { Destroyable } from "@ts-core/common";
+export declare class TgApiLoader extends Destroyable implements ITgApiLoader {
+    protected settings: ITgApiLoaderSettings;
+    constructor(settings: ITgApiLoaderSettings);
+    getApi(): Promise<any>;
+}
+export interface ITgApiLoaderSettings {
+    script: IScriptLoader;
+    window?: Window;
+}
+export interface ITgApiLoader {
+    getApi(): Promise<any>;
+}
+export interface IScriptLoader {
+    load(): Promise<void>;
+}

package/esm/tg/TgApiLoader.js

@@ -0,0 +1,24 @@
+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());
+    });
+};
+import { Destroyable } from "@ts-core/common";
+import * as _ from 'lodash';
+export class TgApiLoader extends Destroyable {
+    constructor(settings) {
+        super();
+        this.settings = settings;
+    }
+    getApi() {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield this.settings.script.load();
+            let item = !_.isNil(this.settings.window) ? this.settings.window : window;
+            return item['Telegram'];
+        });
+    }
+}

package/esm/tg/TgAuth.d.ts

@@ -0,0 +1,14 @@
+import { ExtendedError, ILogger, LoggerWrapper, PromiseHandler } from "@ts-core/common";
+import { TgUser } from "./TgUser";
+import { ITgApiLoader } from "./TgApiLoader";
+export declare class TgAuth extends LoggerWrapper {
+    protected promise: PromiseHandler<TgUser, ExtendedError>;
+    protected settings: ITgAuthSettings;
+    constructor(logger: ILogger, settings: ITgAuthSettings);
+    getUser(): Promise<TgUser>;
+    destroy(): void;
+}
+export interface ITgAuthSettings {
+    api: ITgApiLoader;
+    botId: number;
+}

package/esm/tg/TgAuth.js

@@ -0,0 +1,54 @@
+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());
+    });
+};
+import { ExtendedError, LoggerWrapper, PromiseHandler } from "@ts-core/common";
+import { TgUser } from "./TgUser";
+import { PopUpBase } from "../PopUpBase";
+import * as _ from 'lodash';
+export class TgAuth extends LoggerWrapper {
+    constructor(logger, settings) {
+        super(logger);
+        this.settings = settings;
+    }
+    getUser() {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!_.isNil(this.promise)) {
+                return this.promise.promise;
+            }
+            this.promise = PromiseHandler.create();
+            this.settings.api.getApi()
+                .then(item => {
+                item.Login.auth({ bot_id: this.settings.botId }, item => {
+                    if (item === false) {
+                        this.promise.reject(new ExtendedError(PopUpBase.ERROR_WINDOW_CLOSED, PopUpBase.ERROR_WINDOW_CLOSED));
+                        this.promise = null;
+                    }
+                    let user = new TgUser();
+                    user.parse(item);
+                    this.promise.resolve(user);
+                });
+            })
+                .catch(error => {
+                this.promise.reject(new ExtendedError(error.message));
+                this.promise = null;
+            });
+            return this.promise.promise;
+        });
+    }
+    destroy() {
+        if (this.isDestroyed) {
+            return;
+        }
+        super.destroy();
+        if (!_.isNil(this.promise)) {
+            this.promise.reject(new ExtendedError(PopUpBase.ERROR_WINDOW_CLOSED, PopUpBase.ERROR_WINDOW_CLOSED));
+            this.promise = null;
+        }
+    }
+}

package/esm/tg/TgUser.d.ts

@@ -0,0 +1,9 @@
+import { OAuthUser } from '../OAuthUser';
+export declare class TgUser extends OAuthUser {
+    raw: any;
+    date: Date;
+    hash: string;
+    username: string;
+    parse(item: any): void;
+    toCheckString(): string;
+}

package/esm/tg/TgUser.js

@@ -0,0 +1,17 @@
+import { DateUtil } from '@ts-core/common';
+import { OAuthUser } from '../OAuthUser';
+export class TgUser extends OAuthUser {
+    parse(item) {
+        this.id = item.id;
+        this.hash = item.hash;
+        this.name = `${item.first_name} ${item.last_name}`;
+        this.date = DateUtil.getDate(item.auth_date * DateUtil.MILLISECONDS_SECOND);
+        this.picture = item.photo_url;
+        this.username = item.username;
+        this.telegram = `https://t.me/${item.username}`;
+        this.raw = item;
+    }
+    toCheckString() {
+        return Object.keys(this.raw).sort().filter((k) => this.raw[k]).filter((k) => !['hash'].includes(k)).map(k => (`${k}=${this.raw[k]}`)).join('\n');
+    }
+}

package/esm/vk/VkAuth.js

@@ -8,9 +8,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 import { ExtendedError } from '@ts-core/common';
-import * as _ from 'lodash';
 import { OAuthBase } from "../OAuthBase";
 import { VkUser } from "./VkUser";
+import * as _ from 'lodash';
 export class VkAuth extends OAuthBase {
     constructor(logger, applicationId, window) {
         super(logger, applicationId, window);

package/package.json

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