build 1.1.5

Author: SSOfy

CHANGELOG.md

@@ -1,5 +1,10 @@
 # CHANGELOG
 
+## 1.1.5 - 2023-02-28
+
+* Compliance with Draft 1.30 signature style
+* Entity models directory restructure and fixes
+
 ## 1.1.4 - 2023-02-11
 
 * Added UserEntity missing properties

build/Client.js

@@ -78,7 +78,7 @@ var Client = /** @class */ (function () {
         else {
             this.cache = config.cacheStore;
         }
-        this.signatureGenerator = new SignatureGenerator_1.SignatureGenerator(config);
+        this.signatureGenerator = new SignatureGenerator_1.SignatureGenerator();
     }
     Client.prototype.verifyAuthentication = function (token) {
         return __awaiter(this, void 0, void 0, function () {
@@ -247,7 +247,7 @@ var Client = /** @class */ (function () {
                         salt = Math.random().toString(36).substring(2, saltLength + 2);
                         _b = (_a = Buffer).from;
                         _d = (_c = JSON).stringify;
-                        return [4 /*yield*/, this.signatureGenerator.generate(url.href, fields, salt)];
+                        return [4 /*yield*/, this.signatureGenerator.generate(url.href, fields, this.config.secret, salt)];
                     case 1:
                         signature = _b.apply(_a, [_d.apply(_c, [_e.sent()]),
                             'utf8']).toString('base64');

build/Models/APIResponse.d.ts

@@ -1,5 +1,5 @@
 import { Token } from "./Token";
-import { UserEntity } from "./UserEntity";
+import { UserEntity } from "./Entities/UserEntity";
 export interface APIResponse {
     token?: Token;
     user?: UserEntity;

build/Models/Entities/AuthResponseEntity.d.ts

@@ -0,0 +1,5 @@
+import { TokenEntity } from "./TokenEntity";
+export interface AuthResponseEntity {
+    user: string;
+    token?: TokenEntity;
+}

build/Models/ClientEntity.js build/Models/Entities/AuthResponseEntity.js

@@ -0,0 +1,4 @@
+export interface TokenEntity {
+    token: string;
+    ttl: number;
+}

build/Models/ClientEntity.d.ts build/Models/Entities/ClientEntity.d.ts

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

build/Models/OTPOptionEntity.js build/Models/Entities/ClientEntity.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

build/Models/OTPOptionEntity.d.ts build/Models/Entities/OTPOptionEntity.d.ts

@@ -1,10 +1,6 @@
 import { Signature } from "./Models/Signature";
-import { ClientConfig } from "./ClientConfig";
 export declare class SignatureGenerator {
-    private readonly key;
-    private readonly secret;
-    constructor(config: ClientConfig);
-    generate(url: string, params: any, salt?: string): Promise<Signature>;
+    generate(url: string, params: any, secret: string, salt?: string): Promise<Signature>;
     private getValues;
-    private sha256;
+    private hmac;
 }

build/Models/ScopeEntity.js build/Models/Entities/OTPOptionEntity.js

@@ -62,30 +62,23 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.SignatureGenerator = void 0;
 var crypto = __importStar(require("crypto"));
 var SignatureGenerator = /** @class */ (function () {
-    function SignatureGenerator(config) {
-        this.key = config.key;
-        this.secret = config.secret;
+    function SignatureGenerator() {
     }
-    SignatureGenerator.prototype.generate = function (url, params, salt) {
+    SignatureGenerator.prototype.generate = function (url, params, secret, salt) {
         return __awaiter(this, void 0, void 0, function () {
-            var path, toSign, hash, e_1;
+            var path, toSign, hash;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        _a.trys.push([0, 2, , 3]);
                         path = (new URL(url)).pathname;
-                        toSign = path + this.getValues(params).join('') + this.key + this.secret + (salt || '');
-                        return [4 /*yield*/, this.sha256(toSign)];
+                        toSign = path + this.getValues(params).join('') + (salt || '');
+                        return [4 /*yield*/, this.hmac(toSign, secret)];
                     case 1:
                         hash = _a.sent();
                         return [2 /*return*/, {
                                 hash: hash,
                                 salt: salt
                             }];
-                    case 2:
-                        e_1 = _a.sent();
-                        return [2 /*return*/, {}];
-                    case 3: return [2 /*return*/];
                 }
             });
         });
@@ -108,17 +101,17 @@ var SignatureGenerator = /** @class */ (function () {
         }
         return values;
     };
-    SignatureGenerator.prototype.sha256 = function (message) {
+    SignatureGenerator.prototype.hmac = function (message, secret) {
         return __awaiter(this, void 0, void 0, function () {
-            var msgBuffer, hashBuffer, hashArray;
+            var msgBuffer, hmacBuffer, hashArray;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         msgBuffer = new TextEncoder().encode(message);
-                        return [4 /*yield*/, crypto.subtle.digest('SHA-256', msgBuffer)];
+                        return [4 /*yield*/, crypto.subtle.importKey('raw', new TextEncoder().encode(secret), { name: 'HMAC', hash: { name: 'SHA-256' } }, false, ['sign']).then(function (key) { return crypto.subtle.sign('HMAC', key, msgBuffer); })];
                     case 1:
-                        hashBuffer = _a.sent();
-                        hashArray = Array.from(new Uint8Array(hashBuffer));
+                        hmacBuffer = _a.sent();
+                        hashArray = Array.from(new Uint8Array(hmacBuffer));
                         return [2 /*return*/, hashArray.map(function (b) { return b.toString(16).padStart(2, '0'); }).join('')];
                 }
             });

build/Models/ScopeEntity.d.ts build/Models/Entities/ScopeEntity.d.ts

@@ -1,5 +1,6 @@
 import { ClientConfig } from ".";
 export declare class SignatureValidator {
+    private config;
     private signatureGenerator;
     constructor(config: ClientConfig);
     verifyBase64Signature(url: string, params: any, signature: string): Promise<boolean>;

build/Models/UserEntity.js build/Models/Entities/ScopeEntity.js

@@ -40,7 +40,8 @@ exports.SignatureValidator = void 0;
 var _1 = require(".");
 var SignatureValidator = /** @class */ (function () {
     function SignatureValidator(config) {
-        this.signatureGenerator = new _1.SignatureGenerator(config);
+        this.config = config;
+        this.signatureGenerator = new _1.SignatureGenerator();
     }
     SignatureValidator.prototype.verifyBase64Signature = function (url, params, signature) {
         return __awaiter(this, void 0, void 0, function () {
@@ -50,7 +51,7 @@ var SignatureValidator = /** @class */ (function () {
                     case 0:
                         _a.trys.push([0, 2, , 3]);
                         decodedSignature = (JSON.parse(Buffer.from(signature, 'base64').toString('utf8')));
-                        return [4 /*yield*/, this.signatureGenerator.generate(url, params, decodedSignature.salt)];
+                        return [4 /*yield*/, this.signatureGenerator.generate(url, params, this.config.secret, decodedSignature.salt)];
                     case 1:
                         generatedSignature = _a.sent();
                         return [2 /*return*/, generatedSignature.hash === decodedSignature.hash];

build/Models/Entities/TokenEntity.d.ts

@@ -8,6 +8,9 @@ export { NullStorage } from "./Storage/NullStorage";
 export { APIResponse } from "./Models/APIResponse";
 export { Signature } from "./Models/Signature";
 export { Token } from "./Models/Token";
-export { ClientEntity } from "./Models/ClientEntity";
-export { ScopeEntity } from "./Models/ScopeEntity";
-export { UserEntity } from "./Models/UserEntity";
+export { AuthResponseEntity } from "./Models/Entities/AuthResponseEntity";
+export { TokenEntity } from "./Models/Entities/TokenEntity";
+export { ClientEntity } from "./Models/Entities/ClientEntity";
+export { OTPOptionEntity } from "./Models/Entities/OTPOptionEntity";
+export { ScopeEntity } from "./Models/Entities/ScopeEntity";
+export { UserEntity } from "./Models/Entities/UserEntity";

build/Models/Entities/TokenEntity.js

@@ -1,6 +1,6 @@
 {
   "name": "@ssofy/node-sdk",
-  "version": "1.1.4",
+  "version": "1.1.5",
   "description": "Official SSOfy Node.js SDK for instant and efficient API access.",
   "keywords": [
     "ssofy",