@ts-core/oauth 3.0.28 → 3.0.30

package/cjs/keycloak/{KeyCloakAuth.d.ts → KeycloakAuth.d.ts}

@@ -1,17 +1,17 @@
 import { ILogger } from "@ts-core/common";
 import { IOAuthDto, IOAuthToken, OAuthBase } from "../OAuthBase";
-import { KeyCloakUser } from "./KeyCloakUser";
-export declare class KeyCloakAuth<T extends KeyCloakUser = KeyCloakUser> extends OAuthBase<T> {
-    protected _settings: IKeyCloakAuthSettings;
-    constructor(logger: ILogger, settings: IKeyCloakAuthSettings, window?: Window);
+import { KeycloakUser } from "./KeycloakUser";
+export declare class KeycloakAuth<T extends KeycloakUser = KeycloakUser> extends OAuthBase<T> {
+    protected _settings: IKeycloakAuthSettings;
+    constructor(logger: ILogger, settings: IKeycloakAuthSettings, window?: Window);
     protected getBaseUrl(): string;
     getPopUpUrl(): string;
     getProfile(token: string): Promise<T>;
     getTokenByCode(dto: IOAuthDto, secret: string): Promise<IOAuthToken>;
     destroy(): void;
-    get settings(): IKeyCloakAuthSettings;
+    get settings(): IKeycloakAuthSettings;
 }
-export interface IKeyCloakAuthSettings {
+export interface IKeycloakAuthSettings {
     url: string;
     realm: string;
     applicationId: string;

package/cjs/keycloak/{KeyCloakAuth.js → KeycloakAuth.js}

@@ -9,17 +9,19 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.KeyCloakAuth = void 0;
+exports.KeycloakAuth = void 0;
 const common_1 = require("@ts-core/common");
-const _ = require("lodash");
 const OAuthBase_1 = require("../OAuthBase");
-const KeyCloakUser_1 = require("./KeyCloakUser");
-class KeyCloakAuth extends OAuthBase_1.OAuthBase {
+const KeycloakUser_1 = require("./KeycloakUser");
+const url_1 = require("url");
+const _ = require("lodash");
+class KeycloakAuth extends OAuthBase_1.OAuthBase {
     constructor(logger, settings, window) {
         super(logger, settings.applicationId, window);
         this._settings = settings;
+        this.urlParams.set('scope', 'openid');
+        this.urlParams.set('state', common_1.RandomUtil.randomString(10));
         this.urlParams.set('response_mode', 'query');
-        this.urlParams.set('state', common_1.RandomUtil.randomString(43));
     }
     getBaseUrl() {
         return `${this.settings.url}/realms/${this.settings.realm}/protocol/openid-connect`;
@@ -29,7 +31,7 @@ class KeyCloakAuth extends OAuthBase_1.OAuthBase {
     }
     getProfile(token) {
         return __awaiter(this, void 0, void 0, function* () {
-            let item = new KeyCloakUser_1.KeyCloakUser();
+            let item = new KeycloakUser_1.KeycloakUser();
             item.parse(yield this.http.call(`${this.getBaseUrl()}/userinfo`, { headers: { Authorization: `Bearer ${token}` } }));
             return item;
         });
@@ -37,13 +39,13 @@ class KeyCloakAuth extends OAuthBase_1.OAuthBase {
     getTokenByCode(dto, secret) {
         return __awaiter(this, void 0, void 0, function* () {
             let item = yield this.http.call(`${this.getBaseUrl()}/token`, {
-                data: {
+                data: new url_1.URLSearchParams({
                     code: dto.codeOrToken,
                     client_id: this.applicationId,
                     client_secret: secret,
                     redirect_uri: dto.redirectUri,
                     grant_type: 'authorization_code'
-                },
+                }),
                 method: 'post',
                 headers: { 'Content-Type': 'application/x-www-form-urlencoded' }
             });
@@ -51,6 +53,8 @@ class KeyCloakAuth extends OAuthBase_1.OAuthBase {
                 throw new common_1.ExtendedError(item.error_description);
             }
             return {
+                scope: item.scope,
+                state: item.session_state,
                 tokenType: item.token_type,
                 expiresIn: item.expires_in,
                 accessToken: item.access_token,
@@ -70,4 +74,4 @@ class KeyCloakAuth extends OAuthBase_1.OAuthBase {
         return this._settings;
     }
 }
-exports.KeyCloakAuth = KeyCloakAuth;
+exports.KeycloakAuth = KeycloakAuth;

package/cjs/keycloak/KeycloakUser.d.ts

@@ -0,0 +1,8 @@
+import { OAuthUser } from "../OAuthUser";
+export declare class KeycloakUser extends OAuthUser {
+    givenName: string;
+    familyName: string;
+    isEmailVerified: boolean;
+    preferredUsername: string;
+    parse(item: any): void;
+}

package/cjs/keycloak/KeycloakUser.js

@@ -0,0 +1,16 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.KeycloakUser = void 0;
+const OAuthUser_1 = require("../OAuthUser");
+class KeycloakUser extends OAuthUser_1.OAuthUser {
+    parse(item) {
+        this.id = item.sub;
+        this.name = item.name;
+        this.email = item.email;
+        this.isEmailVerified = item.email_verified;
+        this.preferredUsername = item.preferred_username;
+        this.givenName = item.given_name;
+        this.familyName = item.family_name;
+    }
+}
+exports.KeycloakUser = KeycloakUser;

package/cjs/public-api.d.ts

@@ -9,8 +9,8 @@ export * from './ya/YaUser';
 export * from './ya/YaAuth';
 export * from './ma/MaAuth';
 export * from './ma/MaUser';
-export * from './keycloak/KeyCloakAuth';
-export * from './keycloak/KeyCloakUser';
+export * from './keycloak/KeycloakAuth';
+export * from './keycloak/KeycloakUser';
 export * from './external/browser';
 export * from './external/cordovaOAuthPlugin';
 export * from './external/cordovaInAppBrowserPlugin';

package/cjs/public-api.js

@@ -25,8 +25,8 @@ __exportStar(require("./ya/YaUser"), exports);
 __exportStar(require("./ya/YaAuth"), exports);
 __exportStar(require("./ma/MaAuth"), exports);
 __exportStar(require("./ma/MaUser"), exports);
-__exportStar(require("./keycloak/KeyCloakAuth"), exports);
-__exportStar(require("./keycloak/KeyCloakUser"), exports);
+__exportStar(require("./keycloak/KeycloakAuth"), exports);
+__exportStar(require("./keycloak/KeycloakUser"), exports);
 __exportStar(require("./external/browser"), exports);
 __exportStar(require("./external/cordovaOAuthPlugin"), exports);
 __exportStar(require("./external/cordovaInAppBrowserPlugin"), exports);

package/esm/keycloak/{KeyCloakAuth.d.ts → KeycloakAuth.d.ts}

@@ -1,17 +1,17 @@
 import { ILogger } from "@ts-core/common";
 import { IOAuthDto, IOAuthToken, OAuthBase } from "../OAuthBase";
-import { KeyCloakUser } from "./KeyCloakUser";
-export declare class KeyCloakAuth<T extends KeyCloakUser = KeyCloakUser> extends OAuthBase<T> {
-    protected _settings: IKeyCloakAuthSettings;
-    constructor(logger: ILogger, settings: IKeyCloakAuthSettings, window?: Window);
+import { KeycloakUser } from "./KeycloakUser";
+export declare class KeycloakAuth<T extends KeycloakUser = KeycloakUser> extends OAuthBase<T> {
+    protected _settings: IKeycloakAuthSettings;
+    constructor(logger: ILogger, settings: IKeycloakAuthSettings, window?: Window);
     protected getBaseUrl(): string;
     getPopUpUrl(): string;
     getProfile(token: string): Promise<T>;
     getTokenByCode(dto: IOAuthDto, secret: string): Promise<IOAuthToken>;
     destroy(): void;
-    get settings(): IKeyCloakAuthSettings;
+    get settings(): IKeycloakAuthSettings;
 }
-export interface IKeyCloakAuthSettings {
+export interface IKeycloakAuthSettings {
     url: string;
     realm: string;
     applicationId: string;

package/esm/keycloak/{KeyCloakAuth.js → KeycloakAuth.js}

@@ -8,15 +8,17 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 import { ExtendedError, RandomUtil } from "@ts-core/common";
-import * as _ from 'lodash';
 import { OAuthBase } from "../OAuthBase";
-import { KeyCloakUser } from "./KeyCloakUser";
-export class KeyCloakAuth extends OAuthBase {
+import { KeycloakUser } from "./KeycloakUser";
+import { URLSearchParams } from "url";
+import * as _ from 'lodash';
+export class KeycloakAuth extends OAuthBase {
     constructor(logger, settings, window) {
         super(logger, settings.applicationId, window);
         this._settings = settings;
+        this.urlParams.set('scope', 'openid');
+        this.urlParams.set('state', RandomUtil.randomString(10));
         this.urlParams.set('response_mode', 'query');
-        this.urlParams.set('state', RandomUtil.randomString(43));
     }
     getBaseUrl() {
         return `${this.settings.url}/realms/${this.settings.realm}/protocol/openid-connect`;
@@ -26,7 +28,7 @@ export class KeyCloakAuth extends OAuthBase {
     }
     getProfile(token) {
         return __awaiter(this, void 0, void 0, function* () {
-            let item = new KeyCloakUser();
+            let item = new KeycloakUser();
             item.parse(yield this.http.call(`${this.getBaseUrl()}/userinfo`, { headers: { Authorization: `Bearer ${token}` } }));
             return item;
         });
@@ -34,13 +36,13 @@ export class KeyCloakAuth extends OAuthBase {
     getTokenByCode(dto, secret) {
         return __awaiter(this, void 0, void 0, function* () {
             let item = yield this.http.call(`${this.getBaseUrl()}/token`, {
-                data: {
+                data: new URLSearchParams({
                     code: dto.codeOrToken,
                     client_id: this.applicationId,
                     client_secret: secret,
                     redirect_uri: dto.redirectUri,
                     grant_type: 'authorization_code'
-                },
+                }),
                 method: 'post',
                 headers: { 'Content-Type': 'application/x-www-form-urlencoded' }
             });
@@ -48,6 +50,8 @@ export class KeyCloakAuth extends OAuthBase {
                 throw new ExtendedError(item.error_description);
             }
             return {
+                scope: item.scope,
+                state: item.session_state,
                 tokenType: item.token_type,
                 expiresIn: item.expires_in,
                 accessToken: item.access_token,

package/esm/keycloak/KeycloakUser.d.ts

@@ -0,0 +1,8 @@
+import { OAuthUser } from "../OAuthUser";
+export declare class KeycloakUser extends OAuthUser {
+    givenName: string;
+    familyName: string;
+    isEmailVerified: boolean;
+    preferredUsername: string;
+    parse(item: any): void;
+}

package/esm/keycloak/KeycloakUser.js

@@ -0,0 +1,12 @@
+import { OAuthUser } from "../OAuthUser";
+export class KeycloakUser extends OAuthUser {
+    parse(item) {
+        this.id = item.sub;
+        this.name = item.name;
+        this.email = item.email;
+        this.isEmailVerified = item.email_verified;
+        this.preferredUsername = item.preferred_username;
+        this.givenName = item.given_name;
+        this.familyName = item.family_name;
+    }
+}

package/esm/public-api.d.ts

@@ -9,8 +9,8 @@ export * from './ya/YaUser';
 export * from './ya/YaAuth';
 export * from './ma/MaAuth';
 export * from './ma/MaUser';
-export * from './keycloak/KeyCloakAuth';
-export * from './keycloak/KeyCloakUser';
+export * from './keycloak/KeycloakAuth';
+export * from './keycloak/KeycloakUser';
 export * from './external/browser';
 export * from './external/cordovaOAuthPlugin';
 export * from './external/cordovaInAppBrowserPlugin';

package/esm/public-api.js

@@ -9,8 +9,8 @@ export * from './ya/YaUser';
 export * from './ya/YaAuth';
 export * from './ma/MaAuth';
 export * from './ma/MaUser';
-export * from './keycloak/KeyCloakAuth';
-export * from './keycloak/KeyCloakUser';
+export * from './keycloak/KeycloakAuth';
+export * from './keycloak/KeycloakUser';
 export * from './external/browser';
 export * from './external/cordovaOAuthPlugin';
 export * from './external/cordovaInAppBrowserPlugin';

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@ts-core/oauth",
-    "version": "3.0.28",
+    "version": "3.0.30",
     "description": "Classes and utils for oauth",
     "main": "./cjs/public-api.js",
     "module": "./esm/public-api.js",
@@ -19,6 +19,9 @@
     "dependencies": {
         "@ts-core/common": "~3.0.14"
     },
+    "peerDependencies": {
+        "url": "^0.11.0"
+    },
     "devDependencies": {
         "@types/node": "^14.14.31",
         "gulp-npm-module-publisher": "^3.0.0"

package/cjs/keycloak/KeyCloakUser.d.ts

@@ -1,8 +0,0 @@
-import { OAuthUser } from "../OAuthUser";
-export declare class KeyCloakUser extends OAuthUser {
-    clientId: string;
-    lastName: string;
-    nickname: string;
-    firstName: string;
-    parse(item: any): void;
-}

package/cjs/keycloak/KeyCloakUser.js

@@ -1,18 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.KeyCloakUser = void 0;
-const OAuthUser_1 = require("../OAuthUser");
-class KeyCloakUser extends OAuthUser_1.OAuthUser {
-    parse(item) {
-        this.id = item.id;
-        this.name = item.name;
-        this.email = item.email;
-        this.locale = item.locale;
-        this.picture = item.image;
-        this.clientId = item.clientId;
-        this.nickname = item.nickname;
-        this.lastName = item.last_name;
-        this.firstName = item.first_name;
-    }
-}
-exports.KeyCloakUser = KeyCloakUser;

package/esm/keycloak/KeyCloakUser.d.ts

@@ -1,8 +0,0 @@
-import { OAuthUser } from "../OAuthUser";
-export declare class KeyCloakUser extends OAuthUser {
-    clientId: string;
-    lastName: string;
-    nickname: string;
-    firstName: string;
-    parse(item: any): void;
-}

package/esm/keycloak/KeyCloakUser.js

@@ -1,14 +0,0 @@
-import { OAuthUser } from "../OAuthUser";
-export class KeyCloakUser extends OAuthUser {
-    parse(item) {
-        this.id = item.id;
-        this.name = item.name;
-        this.email = item.email;
-        this.locale = item.locale;
-        this.picture = item.image;
-        this.clientId = item.clientId;
-        this.nickname = item.nickname;
-        this.lastName = item.last_name;
-        this.firstName = item.first_name;
-    }
-}