avvir 3.9.0 → 4.1.0

package/source/models/domain/user.ts

@@ -1,46 +1,54 @@
-import {BASIC, FIREBASE, GATEWAY_JWT} from "../enums/user_auth_type";
+import { BASIC, FIREBASE, GATEWAY_JWT, HXAUTH_ACCESS_TOKEN } from "../enums/user_auth_type";
 import { UserRole } from "../enums";
 
 export class GatewayUser {
-    authType: typeof GATEWAY_JWT
-    gatewayUser?: {
-        idToken?: string,
-        role?: UserRole,
-        redirectUrl?: string,
-        storageToken?: string
-    }
-
-    constructor(authType, idToken, role, storageToken?, redirectUrl?) {
-        this.authType = authType;
-        this.gatewayUser = {
-            idToken,
-            role,
-            storageToken,
-            redirectUrl
-        }
-    }
+  authType: typeof GATEWAY_JWT;
+  gatewayUser?: {
+    idToken?: string,
+    role?: UserRole,
+    redirectUrl?: string,
+    storageToken?: string
+  };
+
+  constructor(authType, idToken, role, storageToken?, redirectUrl?) {
+    this.authType = authType;
+    this.gatewayUser = {
+      idToken,
+      role,
+      storageToken,
+      redirectUrl
+    };
+  }
 }
 
 export type FirebaseUser = {
-    firebaseUser: {
-        uid?: string
-        role?: UserRole
-        displayName?: string
-        idToken?: string
-        email?: string
-    }
-    authType: typeof FIREBASE
+  firebaseUser: {
+    uid?: string
+    role?: UserRole
+    displayName?: string
+    idToken?: string
+    email?: string
+  }
+  authType: typeof FIREBASE
 }
 
 export type BasicUser = {
-    authType: typeof BASIC,
-    username: string,
-    password: string
+  authType: typeof BASIC,
+  username: string,
+  password: string
+}
+
+export type HxAuthUser = {
+  authType: typeof HXAUTH_ACCESS_TOKEN,
+  hxAuthUser: {
+    accessToken: string,
+  }
 }
 
-export type User = BasicUser | GatewayUser | FirebaseUser | null
+export type User = BasicUser | GatewayUser | FirebaseUser | HxAuthUser | null;
 
 export const isFirebaseUser = (user: User): user is FirebaseUser => !!(user as FirebaseUser)?.firebaseUser;
 export const isGatewayUser = (user: User): user is GatewayUser => !!(user as GatewayUser)?.gatewayUser;
+export const isHxAuthUser = (user: User): user is HxAuthUser => user?.authType == HXAUTH_ACCESS_TOKEN;
 
 export default User;

package/source/models/enums/index.ts

@@ -1,24 +1,24 @@
-export {DeviationStatus} from "./deviation_status"
-export {ApiInspectionMode, ApiInspectionModes} from "./inspection_modes";
-export {EventType} from "./event_type";
-export {NotificationLevel} from "./notification_level";
-export {PhotoProjectionType} from "./photo_projection_type";
-export {PhotoRotationType} from "./photo_rotation_type";
-export {PipelineName, Pipelines} from "./pipeline_types";
-export {ProcessStatus} from "./process_status";
-export {RunningProcessStatus} from "./running_process_status";
-export {ApiBuiltStatus} from "./api_built_status";
-export {SystemOfMeasurement} from "./system_of_measurement";
-export {UploaderStatus} from "./uploader_status";
-export {UserAuthType} from "./user_auth_type";
-export {UserRole} from "./user_role";
-export {UserActionType} from "./user_action_type";
-export {ApiIntegrationCredentialsType} from "./api_integration_credentials_type";
-export {UserPermissionAction} from "./user_permission_action";
-export {UserPermissionType} from "./user_permission_type";
-export {AssociationType} from "./association_type";
-export {ProjectWorkPackageType} from "./project_work_package_type";
-export {ProgressType} from "./progress_type";
+export * from "./deviation_status";
+export * from "./inspection_modes";
+export * from "./event_type";
+export * from "./notification_level";
+export * from "./photo_projection_type";
+export * from "./photo_rotation_type";
+export * from "./pipeline_types";
+export * from "./process_status";
+export * from "./running_process_status";
+export * from "./api_built_status";
+export * from "./system_of_measurement";
+export * from "./uploader_status";
+export * from "./user_auth_type";
+export * from "./user_role";
+export * from "./user_action_type";
+export * from "./api_integration_credentials_type";
+export * from "./user_permission_action";
+export * from "./user_permission_type";
+export * from "./association_type";
+export * from "./project_work_package_type";
+export * from "./progress_type";
 
 export {
   ProjectPurposeType,

package/source/models/enums/user_auth_type.ts

@@ -1,11 +1,13 @@
 export enum UserAuthType {
   GATEWAY_JWT = "GATEWAY_JWT",
   BASIC = "BASIC",
-  FIREBASE = "FIREBASE"
+  FIREBASE = "FIREBASE",
+  HXAUTH_ACCESS_TOKEN = "HXAUTH_ACCESS_TOKEN"
 }
 
 export const GATEWAY_JWT = UserAuthType.GATEWAY_JWT;
 export const BASIC = UserAuthType.BASIC;
 export const FIREBASE = UserAuthType.FIREBASE;
+export const HXAUTH_ACCESS_TOKEN = UserAuthType.HXAUTH_ACCESS_TOKEN;
 
 export default UserAuthType;

package/source/models/index.ts

@@ -1,5 +1,5 @@
 export * from "./api";
 export * from "./domain";
 export * from "./enums";
-export {ResponseError} from "./response_error";
-export {CustomError} from "./custom_error"
+export * from "./response_error";
+export * from "./custom_error";

package/source/utilities/get_authorization_headers.ts

@@ -1,4 +1,4 @@
-import {BASIC, FIREBASE, GATEWAY_JWT} from "../models/enums/user_auth_type";
+import { BASIC, FIREBASE, GATEWAY_JWT, HXAUTH_ACCESS_TOKEN } from "../models/enums/user_auth_type";
 import User from "../models/domain/user";
 
 export {User,BasicUser,FirebaseUser,GatewayUser} from "../models/domain/user";
@@ -23,6 +23,11 @@ const getAuthorizationHeaders = (user: User) => {
         firebaseIdToken: user.firebaseUser.idToken
       };
     }
+    case HXAUTH_ACCESS_TOKEN: {
+      return {
+        hxAuthAccessToken: user.hxAuthUser.accessToken
+      }
+    }
     default: {
       console.warn("no authentication");
       return null;

package/source/utilities/http.ts

@@ -1,6 +1,6 @@
 import getAuthorizationHeaders, { User } from "./get_authorization_headers";
 import {httpGetHeaders, httpPostHeaders} from "./request_headers";
-import {isFirebaseUser, isGatewayUser} from "../models";
+import {isFirebaseUser, isGatewayUser, isHxAuthUser} from "../models";
 import Config from "../config";
 
 export default class Http {
@@ -69,7 +69,9 @@ export default class Http {
 
   static addAuthToDownloadUrl(baseUrl: string, user: User): string {
     if (user) {
-      if (isGatewayUser(user)) {
+      if (isHxAuthUser(user)) {
+        return `${baseUrl}?auth=${user.hxAuthUser.accessToken}`;
+      } else if (isGatewayUser(user)) {
         return `${baseUrl}?auth=${user.gatewayUser.idToken}`;
       } else if (isFirebaseUser(user)) {
         return `${baseUrl}?firebaseAuth=${user.firebaseUser.idToken}`;

package/dist/esm/models/domain/masterformat_filter.js

@@ -1 +0,0 @@
-//# sourceMappingURL=masterformat_filter.js.map

package/dist/esm/models/domain/masterformat_filter.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"masterformat_filter.js","sourceRoot":"","sources":["../../../../source/models/domain/masterformat_filter.ts"],"names":[],"mappings":""}