@snugdesk/whatsapp-widget 0.2.1 → 0.2.3

package/README.md

@@ -180,6 +180,18 @@ The widget can run in two modes without any extra setup from third parties:
 - The widget honors the host AppSync auth mode when it reuses the host config (for example, `API_KEY` vs `AWS_LAMBDA`).
 - Otherwise, the widget will **configure Amplify itself** using its default configuration (`AWS_LAMBDA`).
 
+You can also pass your host Amplify config directly to the widget:
+
+```ts
+import { provideAmplifyConfig } from '@snugdesk/whatsapp-widget';
+import { AmplifyConfig } from './app/app-config.model';
+
+@NgModule({
+  providers: [provideAmplifyConfig(AmplifyConfig)]
+})
+export class AppModule {}
+```
+
 ---
 
 ## 🎨 Assets & Styling

package/fesm2022/snugdesk-whatsapp-widget.mjs

@@ -22,12 +22,12 @@ import * as i6$1 from '@angular/material/select';
 import { MatSelectModule } from '@angular/material/select';
 import * as i1 from '@snugdesk/core';
 import { CustomValidators, CleanDeep, SnugdeskCoreModule, CustomPipesModule } from '@snugdesk/core';
-import { API, Amplify } from 'aws-amplify';
-import { GRAPHQL_AUTH_MODE } from '@aws-amplify/api-graphql';
 import moment from 'moment-timezone';
 import { lastValueFrom, BehaviorSubject } from 'rxjs';
 import * as i1$1 from '@angular/common/http';
 import { HttpHeaders } from '@angular/common/http';
+import { API, Amplify } from 'aws-amplify';
+import { GRAPHQL_AUTH_MODE } from '@aws-amplify/api-graphql';
 import * as i3 from '@angular/material/snack-bar';
 import { parsePhoneNumberFromString } from 'libphonenumber-js';
 import * as i6$2 from 'ngx-avatars';
@@ -44,15 +44,36 @@ import { sort } from 'sort-nested-json';
 import * as i16 from '@ctrl/ngx-emoji-mart';
 import { PickerModule } from '@ctrl/ngx-emoji-mart';
 
-const defaultAppSyncConfig = {
-    endpoint: 'https://sgbnsklbvrh67mcvh3wqkzgyou.appsync-api.ap-south-1.amazonaws.com/graphql',
-    region: 'ap-south-1',
+var ModelAttributeTypes;
+(function (ModelAttributeTypes) {
+    ModelAttributeTypes["binary"] = "binary";
+    ModelAttributeTypes["binarySet"] = "binarySet";
+    ModelAttributeTypes["bool"] = "bool";
+    ModelAttributeTypes["list"] = "list";
+    ModelAttributeTypes["map"] = "map";
+    ModelAttributeTypes["number"] = "number";
+    ModelAttributeTypes["numberSet"] = "numberSet";
+    ModelAttributeTypes["string"] = "string";
+    ModelAttributeTypes["stringSet"] = "stringSet";
+    ModelAttributeTypes["_null"] = "_null";
+})(ModelAttributeTypes || (ModelAttributeTypes = {}));
+var ModelSortDirection;
+(function (ModelSortDirection) {
+    ModelSortDirection["ASC"] = "ASC";
+    ModelSortDirection["DESC"] = "DESC";
+})(ModelSortDirection || (ModelSortDirection = {}));
+
+const defaultAmplifyConfig = {
+    aws_project_region: 'ap-south-1',
+    aws_appsync_graphqlEndpoint: 'https://sgbnsklbvrh67mcvh3wqkzgyou.appsync-api.ap-south-1.amazonaws.com/graphql',
+    aws_appsync_region: 'ap-south-1',
+    aws_appsync_authenticationType: 'AWS_LAMBDA',
 };
 
-const APPSYNC_GRAPHQL_CONFIG = new InjectionToken('APPSYNC_GRAPHQL_CONFIG');
-function provideAppSyncConfig(config) {
+const AMPLIFY_CONFIG = new InjectionToken('AMPLIFY_CONFIG');
+function provideAmplifyConfig(config) {
     return {
-        provide: APPSYNC_GRAPHQL_CONFIG,
+        provide: AMPLIFY_CONFIG,
         useValue: config,
     };
 }
@@ -60,10 +81,10 @@ class AppSyncGraphqlService {
     authenticationService;
     configured = false;
     authMode = GRAPHQL_AUTH_MODE.AWS_LAMBDA;
-    config;
-    constructor(config, authenticationService) {
+    amplifyConfig;
+    constructor(amplifyConfig, authenticationService) {
         this.authenticationService = authenticationService;
-        this.config = config ?? defaultAppSyncConfig;
+        this.amplifyConfig = amplifyConfig;
         // this.ensureConfigured();
     }
     async query(statement, variables) {
@@ -142,26 +163,26 @@ class AppSyncGraphqlService {
         if (this.configured) {
             return;
         }
+        if (this.amplifyConfig) {
+            Amplify.configure(this.amplifyConfig);
+            this.authMode = this.normalizeAuthMode(this.getAuthModeFromConfig(this.amplifyConfig));
+            this.configured = true;
+            return;
+        }
         const hostConfig = this.getHostConfig();
         if (hostConfig.useHost) {
-            this.authMode = this.normalizeAuthMode(hostConfig.authMode) ?? GRAPHQL_AUTH_MODE.API_KEY;
+            this.authMode = this.normalizeAuthMode(hostConfig.authMode);
             this.configured = true;
             return;
         }
-        if (!this.config?.endpoint || !this.config?.region) {
-            throw new Error('AppSync GraphQL configuration is missing.');
-        }
-        const { endpoint, region } = this.config;
         Amplify.configure({
-            aws_project_region: region,
-            aws_appsync_graphqlEndpoint: endpoint,
-            aws_appsync_region: region,
-            aws_appsync_authenticationType: GRAPHQL_AUTH_MODE.AWS_LAMBDA,
+            ...defaultAmplifyConfig,
+            aws_appsync_authenticationType: this.normalizeAuthMode(defaultAmplifyConfig.aws_appsync_authenticationType),
             API: {
                 GraphQL: {
-                    endpoint,
-                    region,
-                    defaultAuthMode: GRAPHQL_AUTH_MODE.AWS_LAMBDA,
+                    endpoint: defaultAmplifyConfig.aws_appsync_graphqlEndpoint,
+                    region: defaultAmplifyConfig.aws_appsync_region,
+                    defaultAuthMode: this.normalizeAuthMode(defaultAmplifyConfig.aws_appsync_authenticationType),
                     graphql_headers: async () => this.buildAuthHeaders(),
                     functionAuthProvider: async () => ({
                         token: this.getToken(),
@@ -169,21 +190,15 @@ class AppSyncGraphqlService {
                 },
             },
         });
-        this.authMode = GRAPHQL_AUTH_MODE.AWS_LAMBDA;
+        this.authMode = this.normalizeAuthMode(defaultAmplifyConfig.aws_appsync_authenticationType);
         this.configured = true;
     }
     getHostConfig() {
         const existing = Amplify.getConfig?.() ?? {};
         const existingEndpoint = existing?.API?.GraphQL?.endpoint ?? existing?.API?.GraphQL?.graphql_endpoint ?? existing?.aws_appsync_graphqlEndpoint;
         const existingAuthMode = existing?.API?.GraphQL?.defaultAuthMode ?? existing?.aws_appsync_authenticationType;
-        const useHost = existingEndpoint === defaultAppSyncConfig.endpoint;
-        console.debug('[WhatsAppWidget] Host Amplify config', {
-            existingEndpoint,
-            existingAuthMode,
-            useHost,
-        });
         return {
-            useHost,
+            useHost: existingEndpoint === defaultAmplifyConfig.aws_appsync_graphqlEndpoint,
             authMode: existingAuthMode,
         };
     }
@@ -206,6 +221,9 @@ class AppSyncGraphqlService {
                 return undefined;
         }
     }
+    getAuthModeFromConfig(config) {
+        return config?.API?.GraphQL?.defaultAuthMode ?? config?.aws_appsync_authenticationType;
+    }
     buildAuthHeaders() {
         const token = this.getToken();
         if (!token) {
@@ -222,7 +240,7 @@ class AppSyncGraphqlService {
         }
         return token;
     }
-    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.15", ngImport: i0, type: AppSyncGraphqlService, deps: [{ token: APPSYNC_GRAPHQL_CONFIG, optional: true }, { token: i1.SnugdeskAuthenticationService }], target: i0.ɵɵFactoryTarget.Injectable });
+    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "20.3.15", ngImport: i0, type: AppSyncGraphqlService, deps: [{ token: AMPLIFY_CONFIG, optional: true }, { token: i1.SnugdeskAuthenticationService }], target: i0.ɵɵFactoryTarget.Injectable });
     static ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "20.3.15", ngImport: i0, type: AppSyncGraphqlService, providedIn: 'root' });
 }
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.15", ngImport: i0, type: AppSyncGraphqlService, decorators: [{
@@ -234,28 +252,9 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.15", ngImpo
                     type: Optional
                 }, {
                     type: Inject,
-                    args: [APPSYNC_GRAPHQL_CONFIG]
+                    args: [AMPLIFY_CONFIG]
                 }] }, { type: i1.SnugdeskAuthenticationService }] });
 
-var ModelAttributeTypes;
-(function (ModelAttributeTypes) {
-    ModelAttributeTypes["binary"] = "binary";
-    ModelAttributeTypes["binarySet"] = "binarySet";
-    ModelAttributeTypes["bool"] = "bool";
-    ModelAttributeTypes["list"] = "list";
-    ModelAttributeTypes["map"] = "map";
-    ModelAttributeTypes["number"] = "number";
-    ModelAttributeTypes["numberSet"] = "numberSet";
-    ModelAttributeTypes["string"] = "string";
-    ModelAttributeTypes["stringSet"] = "stringSet";
-    ModelAttributeTypes["_null"] = "_null";
-})(ModelAttributeTypes || (ModelAttributeTypes = {}));
-var ModelSortDirection;
-(function (ModelSortDirection) {
-    ModelSortDirection["ASC"] = "ASC";
-    ModelSortDirection["DESC"] = "DESC";
-})(ModelSortDirection || (ModelSortDirection = {}));
-
 const ENTITY_SELECTION = /* GraphQL */ `
     id
     externalId
@@ -6298,7 +6297,7 @@ class WhatsAppWidgetModule {
             InfiniteScrollDirective,
             NgxSkeletonLoaderModule,
             PickerModule], exports: [WhatsAppWidgetComponent, WhatsAppTextFormatterPipe] });
-    static ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "20.3.15", ngImport: i0, type: WhatsAppWidgetModule, providers: [provideAppSyncConfig(defaultAppSyncConfig)], imports: [CommonModule,
+    static ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "20.3.15", ngImport: i0, type: WhatsAppWidgetModule, imports: [CommonModule,
             FormsModule,
             ReactiveFormsModule,
             MatNativeDateModule,
@@ -6359,7 +6358,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.15", ngImpo
                         PickerModule,
                     ],
                     exports: [WhatsAppWidgetComponent, WhatsAppTextFormatterPipe],
-                    providers: [provideAppSyncConfig(defaultAppSyncConfig)],
+                    // providers: [provideAmplifyConfig(defaultAmplifyConfig)],
                 }]
         }] });
 
@@ -6371,5 +6370,5 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "20.3.15", ngImpo
  * Generated bundle index. Do not edit.
  */
 
-export { APPSYNC_GRAPHQL_CONFIG, AppSyncGraphqlService, CustomError, LocationInputComponent, PhoneInputComponent, WhatsAppContactCreateComponent, WhatsAppContactListComponent, WhatsAppConversationsComponent, WhatsAppMessageItemComponent, WhatsAppMessagesComponent, WhatsAppTemplatePreviewComponent, WhatsAppTemplatesComponent, WhatsAppTextFormatterPipe, WhatsAppWidgetComponent, WhatsAppWidgetModule, provideAppSyncConfig };
+export { AMPLIFY_CONFIG, AppSyncGraphqlService, CustomError, LocationInputComponent, PhoneInputComponent, WhatsAppContactCreateComponent, WhatsAppContactListComponent, WhatsAppConversationsComponent, WhatsAppMessageItemComponent, WhatsAppMessagesComponent, WhatsAppTemplatePreviewComponent, WhatsAppTemplatesComponent, WhatsAppTextFormatterPipe, WhatsAppWidgetComponent, WhatsAppWidgetModule, provideAmplifyConfig };
 //# sourceMappingURL=snugdesk-whatsapp-widget.mjs.map