oro-sdk 2.13.0 → 2.15.1-dev1

package/dist/services/external/clinia.d.ts

@@ -1,63 +1,4 @@
-export declare type FacetFilter = 'type:PHARMACY' | 'type:CLINIC' | 'type:PHARMACY_VIRTUAL';
-export interface CliniaResponse<T> {
-    facets: any;
-    meta: {
-        query: string;
-        page: number;
-        numPages: number;
-        perPage: number;
-        total: number;
-    };
-    records: T[];
-}
-export interface PlaceData {
-    id: string;
-    documentType: string;
-    type: string;
-    name: string;
-    address: AddressData;
-    geoPoint: GeoPointData;
-    distance: number;
-    onlineBookingUrl: string;
-    openingHours: Map<string, Array<IntervalData>>;
-    phones: Array<PhoneData>;
-    socials: Array<SocialData>;
-    note: string;
-    services: Array<string>;
-    owner: string;
-}
-export interface AddressData {
-    streetAddress: string;
-    suiteNumber: string;
-    postalCode: string;
-    neighborhood: string;
-    locality: string;
-    place: string;
-    region: string;
-    regionCode: string;
-    country: string;
-    countryCode: string;
-}
-export interface PhoneData {
-    number: string;
-    extension: string;
-    countryCode: string;
-    type: 'MAIN' | 'ALTERNATE' | 'RECEPTION' | 'FAX' | 'TEXT_TELEPHONE_TTY' | 'INFO' | 'OTHER';
-    isTollFree: boolean;
-    province?: string;
-}
-export interface IntervalData {
-    start: string;
-    end: string;
-}
-export interface GeoPointData {
-    lat: number;
-    lng: number;
-}
-export interface SocialData {
-    url: string;
-    type: string;
-}
+import { CliniaResponse, FacetFilter, PlaceData } from "oro-sdk-apis";
 export declare class CliniaService {
     private url;
     private locale?;

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "2.13.0",
+  "version": "2.15.1-dev1",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
   "files": [
@@ -20,12 +20,8 @@
     "prepare": "tsdx build",
     "size": "size-limit",
     "analyze": "size-limit --why",
-    "package": "tsdx build && npm publish"
-  },
-  "husky": {
-    "hooks": {
-      "pre-commit": "tsdx lint"
-    }
+    "package": "tsdx build && npm publish",
+    "pretty": "prettier --config ../../.prettierrc.yaml --write './src/**/*.{ts,js,json,md}' && prettier --write './*.md'"
   },
   "name": "oro-sdk",
   "author": "Antoine Jaouën <antoine@orohealth.me>",
@@ -45,7 +41,6 @@
     "@size-limit/preset-small-lib": "^4.10.2",
     "@types/jest": "^27.4.1",
     "@types/uuid": "^8.3.0",
-    "husky": "^6.0.0",
     "prettier": "^2.5.1",
     "prettier-plugin-svelte": "^2.3.0",
     "size-limit": "^4.10.2",
@@ -59,7 +54,7 @@
     "form-data": "^4.0.0",
     "formdata-node": "^4.3.1",
     "idb-keyval": "^5.0.6",
-    "oro-sdk-apis": "1.9.0",
+    "oro-sdk-apis": "1.11.1-dev1",
     "oro-toolbox": "0.0.6",
     "uuid": "^8.3.2"
   }

package/src/client.ts

@@ -109,7 +109,8 @@ export class OroClient {
         practice: Practice,
         tosAndCpAcceptance: TosAndCpAcceptanceRequest,
         tokenData?: TokenData,
-        subscription?: boolean
+        subscription?: boolean,
+        skipEmailValidation?: boolean
     ): Promise<IdentityResponse> {
         this.rsa = new CryptoRSA()
         const privateKey = this.rsa.private()
@@ -119,9 +120,12 @@ export class OroClient {
 
         const hashedPassword = this.toolbox.hashStringToBase64(this.toolbox.hashStringToBase64(password))
 
+        const emailConfirmed = !!skipEmailValidation
+
         const signupRequest: IdentityCreateRequest = {
             practiceUuid: practice.uuid,
             email: email.toLowerCase(),
+            emailConfirmed,
             password: hashedPassword,
             publicKey: this.toolbox.encodeToBase64(this.rsa.public()),
             recoveryPassword,
@@ -1415,7 +1419,7 @@ export class OroClient {
         recoverySecurityAnswers: string[],
         threshold: number
     ) {
-        let shards: SecretShard[] = (await this.guardClient.identityGet(id)).recoverySecurityQuestions
+        let shards: SecretShard[] = (await this.guardClient.identityGet(id)).recoverySecurityQuestions!
         let answeredShards = shards
             .filter((shard: any) => {
                 // filters all answered security questions
@@ -1470,7 +1474,7 @@ export class OroClient {
      * @param masterKey
      */
     public async recoverPrivateKeyFromMasterKey(id: Uuid, masterKey: string) {
-        let recoveryPayload = (await this.guardClient.identityGet(id)).recoveryMasterKey
+        let recoveryPayload = (await this.guardClient.identityGet(id)).recoveryMasterKey!
         let symmetricDecryptor = this.toolbox.CryptoChaCha.fromPassphrase(masterKey)
         let privateKey = symmetricDecryptor.base64PayloadDecryptToBytes(recoveryPayload)
         this.rsa = this.toolbox.CryptoRSA.fromKey(privateKey)

package/src/helpers/workflow.ts

@@ -14,7 +14,7 @@ import {
 
 export async function filterTriggeredAnsweredWithKind(
     workflowData: WorkflowData,
-    kind: 'text' | 'date' | 'number' | 'images' | 'images-alias' | 'body-parts' | 'pharmacy-picker'
+    kind: 'text' | 'textArea' | 'hybrid' | 'date' | 'number' | 'images' | 'images-alias' | 'body-parts' | 'pharmacy-picker'
 ): Promise<SelectedAnswerData[]> {
     if (!workflowData.selectedAnswers) throw WorkflowAnswersMissingError
 
@@ -120,6 +120,15 @@ async function populateWorkflowField(
     let displayedAnswer: string | string[] | undefined = undefined
 
     switch (question.kind) {
+        case 'hybrid':
+            if (question.answers) {
+                const displayedAnswer1 = question.answers[answerValue as string].text.split(" ")[0]
+                const displayedAnswer2 = question.answers[answerValue as string].text.split(" ")[1]
+                displayedAnswer = `${displayedAnswer1} ${displayedAnswer2}`
+            }
+
+            answer = answerValue
+            break
         case 'radio':
         case 'radio-card':
         case 'select':

package/src/models/client.ts

@@ -1,5 +1,4 @@
-import { PlaceData } from '../services/external/clinia'
-import { Uuid } from 'oro-sdk-apis'
+import { PlaceData, Uuid } from 'oro-sdk-apis'
 
 export interface PersonalInformations {
     birthday?: string

package/src/services/external/clinia.ts

@@ -1,79 +1,4 @@
-import { AxiosService } from "oro-sdk-apis"
-
-export type FacetFilter = 'type:PHARMACY' | 'type:CLINIC' | 'type:PHARMACY_VIRTUAL'
-
-export interface CliniaResponse<T> {
-    facets: any
-    meta: {
-        query: string
-        page: number
-        numPages: number
-        perPage: number
-        total: number
-    }
-    records: T[]
-}
-
-export interface PlaceData {
-    id: string // The Clinia Id of the resource.
-    documentType: string // Type of document. This will always be set to health_facility.
-    type: string // The type of the resource. Possible Place types are detailed here.
-    name: string // The name of the resource.
-    address: AddressData // The address of the resource.
-    geoPoint: GeoPointData // The coordinates of the resource. Useful to locate resource on a map.
-    distance: number // The distance (in meters) the is from the location used to filter the query.
-    onlineBookingUrl: string // The url for the online booking system of the resource.
-    openingHours: Map<string, Array<IntervalData>> // The opening hours of the resource. This object has integers from 1 to 7 as keys, representing days of the week from Monday to Sunday as per ISO 8601.
-    phones: Array<PhoneData> // Phones associated with this resource.
-    socials: Array<SocialData> // The social links of the resource. Can be a website or a social media link.
-    note: string // Special notes on the resource.
-    services: Array<string> // The services offered by the resource.
-    owner: string // The owner of the resource in the Clinia ecosystem.
-}
-
-export interface AddressData {
-    streetAddress: string //	Street number plus route name.
-    suiteNumber: string //	Suite, door, appartment number.
-    postalCode: string //	Postal code.
-    neighborhood: string //	Neighborhood.
-    locality: string //	Locality.
-    place: string //	City.
-    region: string //	Name of the region.
-    regionCode: string //	ISO 3166-2 region code.
-    country: string //	Name of the country.
-    countryCode: string //	ISO 3166 country code
-}
-
-export interface PhoneData {
-    number: string //The phone number.
-    extension: string //The extension of the phone number.
-    countryCode: string //The country code associated with this phone number.
-    type:
-        | 'MAIN'
-        | 'ALTERNATE'
-        | 'RECEPTION'
-        | 'FAX'
-        | 'TEXT_TELEPHONE_TTY'
-        | 'INFO'
-        | 'OTHER' //The type of phone.
-    isTollFree: boolean //If the number is toll free or not.
-    province?: string //If the number is specific to a province
-}
-
-export interface IntervalData {
-    start: string //	Start time of the time interval. Format is HH:mm.
-    end: string //	End time of the time interval. Format is HH:mm.
-}
-
-export interface GeoPointData {
-    lat: number //	Latitude
-    lng: number //	Longitude
-}
-
-export interface SocialData {
-    url: string //	Url representing the link.
-    type: string // Type of link.
-}
+import { AxiosService, CliniaResponse, FacetFilter, PlaceData } from "oro-sdk-apis"
 
 export class CliniaService {
     private api: AxiosService

package/LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2021 ORO Health Inc.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.