@onesignal/node-onesignal 1.0.0-beta4 → 1.0.0-beta6

package/apis/baseapi.ts

@@ -13,7 +13,7 @@ export const COLLECTION_FORMATS = {
 
 
 /**
- * 
+ *
  * @export
  * @class BaseAPI
  */
@@ -24,14 +24,14 @@ export class BaseAPIRequestFactory {
 };
 
 /**
- * 
+ *
  * @export
  * @class RequiredError
  * @extends {Error}
  */
 export class RequiredError extends Error {
     name: "RequiredError" = "RequiredError";
-    constructor(public field: string, msg?: string) {
-        super(msg);
+    constructor(public api: string, public method: string, public field: string) {
+        super("Required parameter " + field + " was null or undefined when calling " + api + "." + method + ".");
     }
 }

package/apis/exception.ts

@@ -1,5 +1,5 @@
 /**
- * Represents an error caused by an api call i.e. it has attributes for a HTTP status code 
+ * Represents an error caused by an api call i.e. it has attributes for a HTTP status code
  * and the returned body object.
  *
  * Example
@@ -8,7 +8,8 @@
  *
  */
 export class ApiException<T> extends Error {
-    public constructor(public code: number, public body: T) {
-        super("HTTP-Code: " + code + "\nMessage: " + JSON.stringify(body))  
+    public constructor(public code: number, message: string, public body: T, public headers: { [key: string]: string; }) {
+        super("HTTP-Code: " + code + "\nMessage: " + message + "\nBody: " + JSON.stringify(body) + "\nHeaders: " +
+        JSON.stringify(headers))
     }
 }

package/auth/auth.ts

@@ -66,6 +66,7 @@ export class UserKeyAuthentication implements SecurityAuthentication {
 
 
 export type AuthMethods = {
+    "default"?: SecurityAuthentication,
     "app_key"?: SecurityAuthentication,
     "user_key"?: SecurityAuthentication
 }
@@ -76,6 +77,7 @@ export type HttpBearerConfiguration = { tokenProvider: TokenProvider };
 export type OAuth2Configuration = { accessToken: string };
 
 export type AuthMethodsConfiguration = {
+    "default"?: SecurityAuthentication,
     "app_key"?: HttpBearerConfiguration,
     "user_key"?: HttpBearerConfiguration
 }
@@ -90,6 +92,7 @@ export function configureAuthMethods(config: AuthMethodsConfiguration | undefine
     if (!config) {
         return authMethods;
     }
+    authMethods["default"] = config["default"]
 
     if (config["app_key"]) {
         authMethods["app_key"] = new AppKeyAuthentication(
@@ -104,4 +107,4 @@ export function configureAuthMethods(config: AuthMethodsConfiguration | undefine
     }
 
     return authMethods;
-}
+}

package/configuration.ts

@@ -35,7 +35,12 @@ export interface ConfigurationParameters {
     /**
      * Configuration for the available authentication methods
      */
-    authMethods: AuthMethodsConfiguration
+    authMethods?: AuthMethodsConfiguration;
+    /**
+     * Faster way to configure authentication methods
+     */
+    appKey?: string;
+    userKey?: string;
 }
 
 /**
@@ -51,11 +56,25 @@ export interface ConfigurationParameters {
  * @param conf partial configuration
  */
 export function createConfiguration(conf: ConfigurationParameters): Configuration {
+
+    const authMethods: AuthMethodsConfiguration = {
+        'app_key': {
+            tokenProvider: {
+                getToken: () => conf.appKey || ''
+            }
+        },
+        'user_key': {
+            tokenProvider: {
+                getToken: () => conf.userKey || ''
+            }
+        },
+    }
+
     const configuration: Configuration = {
         baseServer: conf.baseServer !== undefined ? conf.baseServer : server1,
         httpApi: conf.httpApi || new DefaultHttpLibrary(),
         middleware: conf.middleware || [],
-        authMethods: configureAuthMethods(conf.authMethods)
+        authMethods: configureAuthMethods(Object.assign(authMethods, conf.authMethods || {}))
     };
     if (conf.promiseMiddleware) {
         conf.promiseMiddleware.forEach(

package/http/http.ts

@@ -1,8 +1,5 @@
 // TODO: evaluate if we can easily get rid of this library
 import * as FormData from "form-data";
-// typings of url-parse are incorrect...
-// @ts-ignore 
-import * as URLParse from "url-parse";
 import { Observable, from } from '../rxjsStub';
 
 export * from './isomorphic-fetch';
@@ -48,16 +45,16 @@ export type RequestBody = undefined | string | FormData;
 export class RequestContext {
     private headers: { [key: string]: string } = {};
     private body: RequestBody = undefined;
-    private url: URLParse;
-
-    /**
-     * Creates the request context using a http method and request resource url
-     *
-     * @param url url of the requested resource
-     * @param httpMethod http method
-     */
+    private url: URL;
+
+	/**
+	 * Creates the request context using a http method and request resource url
+	 *
+	 * @param url url of the requested resource
+	 * @param httpMethod http method
+	 */
     public constructor(url: string, private httpMethod: HttpMethod) {
-        this.url = new URLParse(url, true);
+        this.url = new URL(url);
     }
 
     /*
@@ -65,7 +62,7 @@ export class RequestContext {
      *
      */
     public getUrl(): string {
-        return this.url.toString();
+    	return this.url.toString();
     }
 
     /**
@@ -73,7 +70,7 @@ export class RequestContext {
      *
      */
     public setUrl(url: string) {
-        this.url = new URLParse(url, true);
+        this.url = new URL(url);
     }
 
     /**
@@ -90,27 +87,25 @@ export class RequestContext {
     }
 
     public getHttpMethod(): HttpMethod {
-        return this.httpMethod;
+    	return this.httpMethod;
     }
 
     public getHeaders(): { [key: string]: string } {
-        return this.headers;
+    	return this.headers;
     }
 
     public getBody(): RequestBody {
         return this.body;
     }
 
-    public setQueryParam(name: string, value: string) {
-        let queryObj = this.url.query;
-        queryObj[name] = value;
-        this.url.set("query", queryObj);
+	public setQueryParam(name: string, value: string) {
+        this.url.searchParams.set(name, value);
     }
 
-    /**
-     * Sets a cookie with the name and value. NO check  for duplicate cookies is performed
-     *
-     */
+	/**
+	 *	Sets a cookie with the name and value. NO check  for duplicate cookies is performed
+	 *
+	 */
     public addCookie(name: string, value: string): void {
         if (!this.headers["Cookie"]) {
             this.headers["Cookie"] = "";
@@ -118,7 +113,7 @@ export class RequestContext {
         this.headers["Cookie"] += name + "=" + value + "; ";
     }
 
-    public setHeaderParam(key: string, value: string): void  { 
+    public setHeaderParam(key: string, value: string): void  {
         this.headers[key] = value;
     }
 }
@@ -128,6 +123,7 @@ export interface ResponseBody {
     binary(): Promise<Buffer>;
 }
 
+
 /**
  * Helper class to generate a `ResponseBody` from binary data
  */
@@ -186,6 +182,10 @@ export class ResponseContext {
         const fileName = this.getParsedHeader("content-disposition")["filename"] || "";
         return { data, name: fileName };
     }
+
+    public async getBodyAsAny(): Promise<any> {
+        return this.body as any;
+    }
 }
 
 export interface HttpLibrary {
@@ -202,4 +202,4 @@ export function wrapHttpLibrary(promiseHttpLibrary: PromiseHttpLibrary): HttpLib
       return from(promiseHttpLibrary.send(request));
     }
   }
-}
+}

package/index.ts

@@ -5,6 +5,7 @@ export { createConfiguration } from "./configuration"
 export { Configuration } from "./configuration"
 export * from "./apis/exception";
 export * from "./servers";
+export { RequiredError } from "./apis/baseapi";
 
 export { PromiseMiddleware as Middleware } from './middleware';
 export { PromiseDefaultApi as DefaultApi } from './types/PromiseAPI';

package/middleware.ts

@@ -34,7 +34,7 @@ export class PromiseMiddlewareWrapper implements Middleware {
     pre(context: RequestContext): Observable<RequestContext> {
         return from(this.middleware.pre(context));
     }
-    
+
     post(context: ResponseContext): Observable<ResponseContext> {
         return from(this.middleware.post(context));
     }

package/models/App.ts

@@ -2,22 +2,22 @@
  * OneSignal
  * A powerful way to send personalized messages at scale and build effective customer engagement strategies. Learn more at onesignal.com
  *
- * API Version: 1.0.0
+ * API Version: 1.0.1
  * Contact: devrel@onesignal.com
  */
 
 import { HttpFile } from '../http/http';
 
 export class App {
-    'id': string;
+    'id'?: string;
     /**
     * The name of your app, as displayed on your apps list on the dashboard.  This can be renamed.
     */
     'name'?: string;
     'players'?: number;
     'messageable_players'?: number;
-    'updated_at'?: Date;
-    'created_at'?: Date;
+    'updated_at'?: string;
+    'created_at'?: string;
     /**
     * Android: Your Google Project number.  Also known as Sender ID.
     */
@@ -87,7 +87,7 @@ export class App {
     */
     'organization_id'?: string;
     /**
-    * iOS: Notification data (additional data) values will be added to the root of the apns payload when sent to the device.  Ignore if you're not using any other plugins, or not using OneSignal SDK methods to read the payload.
+    * iOS: Notification data (additional data) values will be added to the root of the apns payload when sent to the device.  Ignore if you\'re not using any other plugins, or not using OneSignal SDK methods to read the payload.
     */
     'additional_data_is_root_payload'?: boolean;
 
@@ -121,13 +121,13 @@ export class App {
         {
             "name": "updated_at",
             "baseName": "updated_at",
-            "type": "Date",
+            "type": "string",
             "format": "date-time"
         },
         {
             "name": "created_at",
             "baseName": "created_at",
-            "type": "Date",
+            "type": "string",
             "format": "date-time"
         },
         {
@@ -278,7 +278,7 @@ export class App {
     static getAttributeTypeMap() {
         return App.attributeTypeMap;
     }
-    
+
     public constructor() {
     }
 }