@product7/product7-js 0.3.5 → 0.3.7

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@product7/product7-js",
-	"version": "0.3.5",
+	"version": "0.3.7",
 	"description": "JavaScript SDK for integrating Product7 feedback widgets into any website",
 	"main": "dist/product7-js.js",
 	"module": "src/index.js",

package/src/api/services/FeedbackService.js

@@ -21,12 +21,19 @@ export class FeedbackService {
 			};
 		}
 
+		const contact = this.api.getContactIdentity();
+
 		const payload = {
 			board:
 				feedbackData.board_id || feedbackData.board || feedbackData.boardName,
 			title: feedbackData.title,
 			content: feedbackData.content,
 			attachments: feedbackData.attachments || [],
+			...(contact?.contactId && {
+				contact_id:    contact.contactId,
+				contact_email: contact.contactEmail,
+				contact_name:  contact.contactName,
+			}),
 		};
 
 		return this.api._handleAuthRetry(async () => {

package/src/api/services/MessengerService.js

@@ -37,6 +37,10 @@ export class MessengerService {
 					agents_online: true,
 					online_count: 2,
 					response_time: 'Usually replies within a few minutes',
+					available_agents: [
+						{ full_name: 'Sarah', picture: '' },
+						{ full_name: 'Tom', picture: '' },
+					],
 				},
 			};
 		}
@@ -224,10 +228,48 @@ export class MessengerService {
 		});
 	}
 
+	async uploadFile(base64Data, filename) {
+		await this.api._ensureSession();
+
+		if (this.api.mock) {
+			await delay(300);
+			return { status: true, url: `https://mock-cdn.example.com/${filename}` };
+		}
+
+		return this.api._makeRequest('/widget/messenger/upload', {
+			method: 'POST',
+			headers: {
+				'Content-Type': 'application/json',
+				Authorization: `Bearer ${this.api.sessionToken}`,
+			},
+			body: JSON.stringify({ file: base64Data, filename }),
+		});
+	}
+
 	async identifyContact(data) {
 		return this.api.identify(data);
 	}
 
+	async submitRating(conversationId, data) {
+		await this.api._ensureSession();
+
+		if (this.api.mock) {
+			return { status: true, data: { rated: true } };
+		}
+
+		return this.api._makeRequest(
+			`/widget/messenger/conversations/${conversationId}/rating`,
+			{
+				method: 'POST',
+				headers: {
+					'Content-Type': 'application/json',
+					Authorization: `Bearer ${this.api.sessionToken}`,
+				},
+				body: JSON.stringify(data),
+			}
+		);
+	}
+
 	async sendTypingIndicator(conversationId, isTyping) {
 		await this.api._ensureSession();
 

package/src/api/services/SurveyService.js

@@ -78,6 +78,7 @@ export class SurveyService {
 		}
 
 		const respondent = this._getRespondentContext(responseData);
+		const contact = this.api.getContactIdentity?.() || null;
 
 		const payload = {
 			rating: responseData.rating,
@@ -87,6 +88,11 @@ export class SurveyService {
 				respondent_id: respondent.respondent_id,
 			}),
 			...(respondent.email && { email: respondent.email }),
+			...(contact?.contactId && {
+				contact_id:    contact.contactId,
+				contact_email: contact.contactEmail,
+				contact_name:  contact.contactName,
+			}),
 		};
 
 		return this.api._handleAuthRetry(async () => {

package/src/core/APIService.js

@@ -37,29 +37,7 @@ export class APIService extends BaseAPIService {
 	}
 
 	async checkAgentsOnline() {
-		if (!this.isSessionValid()) {
-			await this.init();
-		}
-
-		if (this.mock) {
-			return {
-				status: true,
-				data: {
-					agents_online: true,
-					online_count: 2,
-					response_time: 'Usually replies within a few minutes',
-					available_agents: [
-						{ full_name: 'Sarah', picture: '' },
-						{ full_name: 'Tom', picture: '' },
-					],
-				},
-			};
-		}
-
-		return this._makeRequest('/widget/messenger/agents/online', {
-			method: 'GET',
-			headers: { Authorization: `Bearer ${this.sessionToken}` },
-		});
+		return this.messenger.checkAgentsOnline();
 	}
 
 	async getConversations(options) {
@@ -75,137 +53,15 @@ export class APIService extends BaseAPIService {
 	}
 
 	async startConversation(data) {
-		if (!this.isSessionValid()) {
-			console.log(
-				'[APIService] startConversation: session invalid, calling init...'
-			);
-			try {
-				await this.init();
-				console.log(
-					'[APIService] startConversation: init result, token:',
-					this.sessionToken ? 'set' : 'null'
-				);
-			} catch (initError) {
-				console.error(
-					'[APIService] startConversation: init failed:',
-					initError.message
-				);
-				throw initError;
-			}
-		}
-
-		if (!this.sessionToken) {
-			console.error(
-				'[APIService] startConversation: no session token after init'
-			);
-			throw new APIError(401, 'No valid session token available');
-		}
-
-		console.log(
-			'[APIService] startConversation: sending to',
-			`${this.baseURL}/widget/messenger/conversations`,
-			'mock:',
-			this.mock
-		);
-
-		if (this.mock) {
-			await new Promise((resolve) => setTimeout(resolve, 300));
-			const newConv = {
-				id: 'conv_' + Date.now(),
-				subject: data.subject || 'New conversation',
-				status: 'open',
-				last_message_at: new Date().toISOString(),
-				created_at: new Date().toISOString(),
-				messages: [
-					{
-						id: 'msg_' + Date.now(),
-						content: data.message,
-						sender_type: 'customer',
-						created_at: new Date().toISOString(),
-					},
-				],
-			};
-			MOCK_CONVERSATIONS.unshift(newConv);
-			MOCK_MESSAGES[newConv.id] = newConv.messages;
-			return { status: true, data: newConv };
-		}
-
-		return this._makeRequest('/widget/messenger/conversations', {
-			method: 'POST',
-			headers: {
-				'Content-Type': 'application/json',
-				Authorization: `Bearer ${this.sessionToken}`,
-			},
-			body: JSON.stringify({
-				message: data.message,
-				subject: data.subject || '',
-			}),
-		});
+		return this.messenger.startConversation(data);
 	}
 
 	async sendMessage(conversationId, data) {
-		if (!this.isSessionValid()) {
-			await this.init();
-		}
-
-		if (this.mock) {
-			await new Promise((resolve) => setTimeout(resolve, 200));
-			const newMessage = {
-				id: 'msg_' + Date.now(),
-				content: data.content,
-				attachments: data.attachments || [],
-				sender_type: 'customer',
-				created_at: new Date().toISOString(),
-			};
-			if (!MOCK_MESSAGES[conversationId]) {
-				MOCK_MESSAGES[conversationId] = [];
-			}
-			MOCK_MESSAGES[conversationId].push(newMessage);
-			return { status: true, data: newMessage };
-		}
-
-		const payload = { content: data.content };
-		if (data.attachments && data.attachments.length > 0) {
-			payload.attachments = data.attachments;
-		}
-
-		return this._makeRequest(
-			`/widget/messenger/conversations/${conversationId}/messages`,
-			{
-				method: 'POST',
-				headers: {
-					'Content-Type': 'application/json',
-					Authorization: `Bearer ${this.sessionToken}`,
-				},
-				body: JSON.stringify(payload),
-			}
-		);
+		return this.messenger.sendMessage(conversationId, data);
 	}
 
-	/**
-	 * Upload a file to CDN via widget endpoint
-	 * @param {string} base64Data - Base64 encoded file data (with or without data URI prefix)
-	 * @param {string} filename - Original filename
-	 * @returns {Promise<Object>} Response with url
-	 */
 	async uploadFile(base64Data, filename) {
-		if (!this.isSessionValid()) {
-			await this.init();
-		}
-
-		if (this.mock) {
-			await new Promise((resolve) => setTimeout(resolve, 300));
-			return { status: true, url: `https://mock-cdn.example.com/${filename}` };
-		}
-
-		return this._makeRequest('/widget/messenger/upload', {
-			method: 'POST',
-			headers: {
-				'Content-Type': 'application/json',
-				Authorization: `Bearer ${this.sessionToken}`,
-			},
-			body: JSON.stringify({ file: base64Data, filename }),
-		});
+		return this.messenger.uploadFile(base64Data, filename);
 	}
 
 	async sendTypingIndicator(conversationId, isTyping) {
@@ -242,7 +98,7 @@ export class APIService extends BaseAPIService {
 			return mockResponse;
 		}
 
-		const response = await this._makeRequest('/widget/messenger/identify', {
+		const response = await this._makeRequest('/widget/identify', {
 			method: 'POST',
 			headers: {
 				'Content-Type': 'application/json',
@@ -325,65 +181,4 @@ export class APIService extends BaseAPIService {
 	async getChangelogs(options) {
 		return this.changelog.getChangelogs(options);
 	}
-
-	_loadStoredSession() {
-		if (typeof localStorage === 'undefined') return false;
-
-		try {
-			const stored = localStorage.getItem('product7_session');
-			if (!stored) return false;
-
-			const sessionData = JSON.parse(stored);
-
-			// Invalidate mock tokens when not in mock mode (and vice versa)
-			const isMockToken =
-				sessionData.token && sessionData.token.startsWith('mock_');
-			if (isMockToken !== this.mock) {
-				localStorage.removeItem('product7_session');
-				return false;
-			}
-
-			this.sessionToken = sessionData.token;
-			this.sessionExpiry = new Date(sessionData.expiry);
-
-			return this.isSessionValid();
-		} catch (error) {
-			return false;
-		}
-	}
-
-	async _makeRequest(endpoint, options = {}) {
-		const url = `${this.baseURL}${endpoint}`;
-
-		try {
-			const response = await fetch(url, options);
-
-			if (!response.ok) {
-				let errorMessage = `HTTP ${response.status}`;
-				let responseData = null;
-
-				try {
-					responseData = await response.json();
-					errorMessage =
-						responseData.message || responseData.error || errorMessage;
-				} catch (e) {
-					errorMessage = (await response.text()) || errorMessage;
-				}
-
-				throw new APIError(response.status, errorMessage, responseData);
-			}
-
-			const contentType = response.headers.get('content-type');
-			if (contentType && contentType.includes('application/json')) {
-				return await response.json();
-			}
-
-			return await response.text();
-		} catch (error) {
-			if (error instanceof APIError) {
-				throw error;
-			}
-			throw new APIError(0, error.message, null);
-		}
-	}
 }

package/src/core/BaseAPIService.js

@@ -275,6 +275,15 @@ export class BaseAPIService {
 			if (!stored) return false;
 
 			const sessionData = JSON.parse(stored);
+
+			// Invalidate mock tokens when not in mock mode (and vice versa)
+			const isMockToken =
+				sessionData.token && sessionData.token.startsWith('mock_');
+			if (isMockToken !== this.mock) {
+				localStorage.removeItem('product7_session');
+				return false;
+			}
+
 			if (
 				this.workspace &&
 				sessionData.workspace &&
@@ -283,6 +292,7 @@ export class BaseAPIService {
 				localStorage.removeItem('product7_session');
 				return false;
 			}
+
 			this.sessionToken = sessionData.token;
 			this.sessionExpiry = new Date(sessionData.expiry);