@apigames/sdk-core 22.1.1 → 22.1.4

package/README.md

@@ -1,8 +1,8 @@
 # API Games SDK Core Package
 
 ![](https://img.shields.io/badge/build-passing-brightgreen)
-[![Codacy Badge](https://app.codacy.com/project/badge/Grade/c5081d4fa5a84849b05e1a9b54d2b93f)](https://www.codacy.com/gh/apigames-public/sdk-core/dashboard?utm_source=github.com&utm_medium=referral&utm_content=apigames-public/sdk-core&utm_campaign=Badge_Grade)
-[![Codacy Badge](https://app.codacy.com/project/badge/Coverage/c5081d4fa5a84849b05e1a9b54d2b93f)](https://www.codacy.com/gh/apigames-public/sdk-core/dashboard?utm_source=github.com&utm_medium=referral&utm_content=apigames-public/sdk-core&utm_campaign=Badge_Coverage)
+[![Codacy Badge](https://app.codacy.com/project/badge/Grade/8c3c5f94c0ac457ab23170cd9fca50f9)](https://www.codacy.com/gh/apigames-core/sdk-core/dashboard?utm_source=github.com&utm_medium=referral&utm_content=apigames-core/sdk-core&utm_campaign=Badge_Grade)
+[![Codacy Badge](https://app.codacy.com/project/badge/Coverage/8c3c5f94c0ac457ab23170cd9fca50f9)](https://www.codacy.com/gh/apigames-core/sdk-core/dashboard?utm_source=github.com&utm_medium=referral&utm_content=apigames-core/sdk-core&utm_campaign=Badge_Coverage)
 ![](https://img.shields.io/npm/v/@apigames/sdk-core)
 ![](https://img.shields.io/badge/license-MIT-blue)
 

package/lib/classes/resource.container.d.ts

@@ -23,6 +23,7 @@ export default class ResourceContainer implements IResourceContainer {
     get uri(): string;
     isResourceObject(value: any): value is IResourceObject;
     isResourceList(value: any): value is IResourceObject[];
+    protected EndpointContentType(): string;
     protected EndpointPath(): string;
     protected ClearData(): void;
     protected AddResourceToMemoryStructure(obj: IResourceObject): void;
@@ -35,6 +36,7 @@ export default class ResourceContainer implements IResourceContainer {
     Find(): Promise<void>;
     Get(id: string): Promise<void>;
     private InitParams;
+    private GetHeaders;
     private GetQueryParams;
     IncludedObject(type: string, id: string): IResourceObject;
     Filter(filter: ResourceFilterName, selector: ResourceFilterType, value: ResourceFilterValue): IResourceContainer;

package/lib/classes/resource.container.js

@@ -12,7 +12,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ResourceFilterType = void 0;
 const json_1 = require("@apigames/json");
 const rest_client_1 = require("@apigames/rest-client");
-const utils_1 = require("@apigames/json/lib/utils");
 const __1 = require("..");
 const hash = require('object-hash');
 var ResourceFilterType;
@@ -59,6 +58,9 @@ class ResourceContainer {
     isResourceList(value) {
         return (0, json_1.isArray)(value);
     }
+    EndpointContentType() {
+        throw new Error('Method or Property not implemented.');
+    }
     EndpointPath() {
         throw new Error('Method or Property not implemented.');
     }
@@ -121,15 +123,12 @@ class ResourceContainer {
         return __awaiter(this, void 0, void 0, function* () {
             if ((0, json_1.isDefined)(resource.id)) {
                 const queryUri = `${this.uri}/${resource.id}`;
-                const queryHeaders = {
-                    Accept: 'application/vnd.api+json',
-                    'Content-Type': 'application/vnd.api+json',
-                };
+                const queryHeaders = this.GetHeaders('DELETE');
                 const queryOptions = {
                     queryParams: this.GetQueryParams(),
                 };
                 this.InitParams();
-                (0, utils_1.redactUndefinedValues)(queryOptions);
+                (0, json_1.redactUndefinedValues)(queryOptions);
                 yield this._restClient.Delete(queryUri, queryHeaders, queryOptions);
                 this.RemoveResourceFromMemoryStructure(resource);
             }
@@ -141,10 +140,7 @@ class ResourceContainer {
     Count() {
         return __awaiter(this, void 0, void 0, function* () {
             const queryUri = `${this.uri}`;
-            const queryHeaders = {
-                Accept: 'application/vnd.api+json',
-                'Content-Type': 'application/vnd.api+json',
-            };
+            const queryHeaders = this.GetHeaders('COUNT');
             const queryOptions = {
                 queryParams: this.GetQueryParams(),
             };
@@ -155,7 +151,7 @@ class ResourceContainer {
                 (0, json_1.extractAndRedact)(queryOptions.queryParams, 'page[size]');
                 (0, json_1.extractAndRedact)(queryOptions.queryParams, 'sort');
             }
-            (0, utils_1.redactUndefinedValues)(queryOptions);
+            (0, json_1.redactUndefinedValues)(queryOptions);
             const queryParams = {
                 uri: queryUri,
                 headers: queryHeaders,
@@ -183,15 +179,12 @@ class ResourceContainer {
         return __awaiter(this, void 0, void 0, function* () {
             this.ClearData();
             const queryUri = `${this.uri}`;
-            const queryHeaders = {
-                Accept: 'application/vnd.api+json',
-                'Content-Type': 'application/vnd.api+json',
-            };
+            const queryHeaders = this.GetHeaders('FIND');
             const queryOptions = {
                 queryParams: this.GetQueryParams(),
             };
             this.InitParams();
-            (0, utils_1.redactUndefinedValues)(queryOptions);
+            (0, json_1.redactUndefinedValues)(queryOptions);
             this.LoadResponse(yield this._restClient.Get(queryUri, queryHeaders, queryOptions));
         });
     }
@@ -199,15 +192,12 @@ class ResourceContainer {
         return __awaiter(this, void 0, void 0, function* () {
             this.ClearData();
             const queryUri = `${this.uri}/${id}`;
-            const queryHeaders = {
-                Accept: 'application/vnd.api+json',
-                'Content-Type': 'application/vnd.api+json',
-            };
+            const queryHeaders = this.GetHeaders('GET');
             const queryOptions = {
                 queryParams: this.GetQueryParams(),
             };
             this.InitParams();
-            (0, utils_1.redactUndefinedValues)(queryOptions);
+            (0, json_1.redactUndefinedValues)(queryOptions);
             this.LoadResponse(yield this._restClient.Get(queryUri, queryHeaders, queryOptions));
         });
     }
@@ -219,6 +209,27 @@ class ResourceContainer {
             pagination: {},
         };
     }
+    GetHeaders(action) {
+        const headers = {};
+        switch (action) {
+            case 'GET':
+            case 'COUNT':
+            case 'FIND':
+                headers.Accept = this.EndpointContentType();
+                break;
+            default:
+                headers.Accept = this.EndpointContentType();
+                headers['Content-Type'] = this.EndpointContentType();
+                break;
+        }
+        if ((0, json_1.isDefined)((0, __1.SDKConfig)().apiKey)) {
+            headers['x-api-key'] = (0, __1.SDKConfig)().apiKey;
+        }
+        if ((0, json_1.isDefined)((0, __1.SDKConfig)().accessToken)) {
+            headers.Authorization = `Bearer ${(0, __1.SDKConfig)().accessToken}`;
+        }
+        return headers;
+    }
     GetQueryParams() {
         const queryParams = {};
         for (const filterName in this._queryParams.filters) {

package/lib/classes/resource.object.d.ts

@@ -9,6 +9,7 @@ export default class ResourceObject implements IResourceObject {
     private _mode;
     private _uri;
     constructor(container: IResourceContainer);
+    protected EndpointContentType(): string;
     protected LoadAttributes(value: any): void;
     protected LoadRelationships(value: any): void;
     protected UpdateAttributes(value: any): void;
@@ -18,6 +19,7 @@ export default class ResourceObject implements IResourceObject {
     protected GetUpdatePayload(): any;
     Delete(): Promise<void>;
     private GetHeaderValue;
+    private GetHeaders;
     private HasHeader;
     private InsertResource;
     private UpdateResource;

package/lib/classes/resource.object.js

@@ -22,6 +22,9 @@ class ResourceObject {
         this._mode = ResourceObjectMode.NewDocument;
         this._container = container;
     }
+    EndpointContentType() {
+        throw new Error('Method or Property not implemented.');
+    }
     LoadAttributes(value) {
         throw new Error('Method or Property not implemented.');
     }
@@ -93,6 +96,19 @@ class ResourceObject {
         }
         return value;
     }
+    GetHeaders() {
+        const headers = {
+            Accept: this.EndpointContentType(),
+            'Content-Type': this.EndpointContentType(),
+        };
+        if ((0, json_1.isDefined)((0, __1.SDKConfig)().apiKey)) {
+            headers['x-api-key'] = (0, __1.SDKConfig)().apiKey;
+        }
+        if ((0, json_1.isDefined)((0, __1.SDKConfig)().accessToken)) {
+            headers.Authorization = `Bearer ${(0, __1.SDKConfig)().accessToken}`;
+        }
+        return headers;
+    }
     HasHeader(headers, targetHeader) {
         let hasHeader = false;
         for (const headerName in headers) {
@@ -105,10 +121,7 @@ class ResourceObject {
     InsertResource() {
         return __awaiter(this, void 0, void 0, function* () {
             const queryUri = this._container.uri;
-            const queryHeaders = {
-                Accept: 'application/vnd.api+json',
-                'Content-Type': 'application/vnd.api+json',
-            };
+            const queryHeaders = this.GetHeaders();
             const queryOptions = {};
             const payload = this.GetInsertPayload();
             const response = yield this._container.restClient.Post(queryUri, payload, queryHeaders, queryOptions);
@@ -128,10 +141,7 @@ class ResourceObject {
     UpdateResource() {
         return __awaiter(this, void 0, void 0, function* () {
             const queryUri = this.uri;
-            const queryHeaders = {
-                Accept: 'application/vnd.api+json',
-                'Content-Type': 'application/vnd.api+json',
-            };
+            const queryHeaders = this.GetHeaders();
             const queryOptions = {};
             const payload = this.GetUpdatePayload();
             yield this._container.restClient.Patch(queryUri, payload, queryHeaders, queryOptions);

package/lib/classes/sdk.config.d.ts

@@ -3,12 +3,18 @@ export declare type SDKResourceMap = {
     [index: string]: ResourceObjectClass;
 };
 export declare class SDKConfiguration {
+    private _accessToken;
+    private _apiKey;
     private _hostName;
     private _resourceMap;
     constructor();
     RegisterResourceClass(type: string, resourceClass: ResourceObjectClass): void;
     ResourceClass(type: string): ResourceObjectClass;
     FormatURL(path: string): string;
+    get accessToken(): string;
+    set accessToken(value: string);
+    get apiKey(): string;
+    set apiKey(value: string);
     get hostName(): string;
     set hostName(value: string);
 }

package/lib/classes/sdk.config.js

@@ -17,6 +17,18 @@ class SDKConfiguration {
         url = url.endsWith('/') ? url.slice(0, -1) : url;
         return path.startsWith('/') ? `${url}${path}` : `${url}/${path}`;
     }
+    get accessToken() {
+        return this._accessToken;
+    }
+    set accessToken(value) {
+        this._accessToken = value;
+    }
+    get apiKey() {
+        return this._apiKey;
+    }
+    set apiKey(value) {
+        this._apiKey = value;
+    }
     get hostName() {
         return this._hostName;
     }

package/lib/helpers/index.d.ts

@@ -0,0 +1,3 @@
+import { GeospatialPoint } from '../interfaces';
+export declare function LoadDateTime(value: string): Date;
+export declare function LoadGeospatialPoint(value: any): GeospatialPoint;

package/lib/helpers/index.js

@@ -0,0 +1,21 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.LoadGeospatialPoint = exports.LoadDateTime = void 0;
+const json_1 = require("@apigames/json");
+const interfaces_1 = require("../interfaces");
+function LoadDateTime(value) {
+    if ((0, json_1.isDefined)(value))
+        return new Date(value);
+    return undefined;
+}
+exports.LoadDateTime = LoadDateTime;
+function LoadGeospatialPoint(value) {
+    if ((0, json_1.isDefined)(value) && (0, json_1.hasProperty)(value, 'longitude') && (0, json_1.isNumber)(value.longitude)
+        && (0, json_1.hasProperty)(value, 'latitude') && (0, json_1.isNumber)(value.latitude)) {
+        const geospatialPoint = new interfaces_1.GeospatialPoint();
+        geospatialPoint.LoadData(value);
+        return geospatialPoint;
+    }
+    return undefined;
+}
+exports.LoadGeospatialPoint = LoadGeospatialPoint;

package/lib/index.d.ts

@@ -1,3 +1,4 @@
 export * from './interfaces';
 export * from './exceptions';
 export * from './classes';
+export * from './helpers';

package/lib/index.js

@@ -17,3 +17,4 @@ Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./interfaces"), exports);
 __exportStar(require("./exceptions"), exports);
 __exportStar(require("./classes"), exports);
+__exportStar(require("./helpers"), exports);

package/lib/interfaces/resource.object.js

@@ -2,13 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ResourceObjectRelationshipBase = exports.GeospatialPoint = exports.ResourceObjectAttributeBase = void 0;
 const json_1 = require("@apigames/json");
+const helpers_1 = require("../helpers");
 class ResourceObjectAttributeBase {
     static LoadDateTime(value) {
-        if ((0, json_1.isDefined)(value))
-            return new Date(value);
-        return undefined;
+        return (0, helpers_1.LoadDateTime)(value);
     }
     static LoadGeospatialPoint(value) {
+        return (0, helpers_1.LoadGeospatialPoint)(value);
         if ((0, json_1.isDefined)(value) && (0, json_1.hasProperty)(value, 'longitude') && (0, json_1.isNumber)(value.longitude)
             && (0, json_1.hasProperty)(value, 'latitude') && (0, json_1.isNumber)(value.latitude)) {
             const geospatialPoint = new GeospatialPoint();

package/package.json

@@ -13,7 +13,7 @@
   ],
   "description": "API Games SDK Core",
   "license": "MIT",
-  "version": "22.1.1",
+  "version": "22.1.4",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
   "scripts": {
@@ -33,8 +33,8 @@
     "test:watch": "jest --watch"
   },
   "dependencies": {
-    "@apigames/json": "22.1.1",
-    "@apigames/rest-client": "22.1.1",
+    "@apigames/json": "22.1.2",
+    "@apigames/rest-client": "22.1.3",
     "object-hash": "2.2.0"
   },
   "devDependencies": {
@@ -42,25 +42,25 @@
     "@types/date-and-time": "^0.13.0",
     "@types/jest": "27.4.1",
     "@types/node": "14.18.12",
-    "@typescript-eslint/eslint-plugin": "5.15.0",
-    "@typescript-eslint/parser": "5.15.0",
-    "eslint": "8.11.0",
+    "@typescript-eslint/eslint-plugin": "5.16.0",
+    "@typescript-eslint/parser": "5.16.0",
+    "eslint": "8.12.0",
     "eslint-config-airbnb": "19.0.4",
     "eslint-plugin-import": "2.25.4",
     "eslint-plugin-jsx-a11y": "6.5.1",
     "eslint-plugin-react": "7.29.4",
     "eslint-plugin-react-hooks": "4.3.0",
     "jest": "27.5.1",
-    "ts-jest": "27.1.3",
-    "typescript": "4.6.2"
+    "ts-jest": "27.1.4",
+    "typescript": "4.6.3"
   },
   "eslintConfig": {},
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/apigames-public/sdk-core.git"
+    "url": "git+https://github.com/apigames-core/sdk-core.git"
   },
   "bugs": {
-    "url": "https://github.com/apigames-public/sdk-core/issues"
+    "url": "https://github.com/apigames-core/sdk-core/issues"
   },
-  "homepage": "https://github.com/apigames-public/sdk-core#readme"
+  "homepage": "https://github.com/apigames-core/sdk-core#readme"
 }

package/publishCodeCoverage.sh

@@ -1,7 +0,0 @@
-export CODACY_API_TOKEN=zLmkgxu0V5R3qEbGrbbm
-export CODACY_ORGANIZATION_PROVIDER=gh
-export CODACY_USERNAME=apigames-public
-export CODACY_PROJECT_NAME=sdk-core
-
-bash <(curl -Ls https://coverage.codacy.com/get.sh) report -r coverage/clover.xml
-