Extend support command to dump log #446

aatp/peerbook_webrtc/admin.spec.ts

@@ -238,7 +238,7 @@ test.describe('peerbook administration', ()  => {
         const fromPeerbook = await page.$$('.from-peerbook')
         expect(fromPeerbook.length).toBe(0)
     })
-    test('try login with an invalid email', async ({ browser }) => {
+    test('try subscribe with an invalid email', async ({ browser }) => {
         // TODO: rename to context2
         context = await browser.newContext()
         page = await context.newPage()
@@ -261,7 +261,7 @@ test.describe('peerbook administration', ()  => {
         await sleep(100)
         if (await page.locator('[data-test="twr-minimized"]').isVisible())
             await page.click('[data-test="twr-minimized"]')
-        await page.keyboard.type('login')
+        await page.keyboard.type('subscribe')
         await page.keyboard.press("Enter")
         await sleep(100)
         let twr = await getTWRBuffer(page)
@@ -279,9 +279,9 @@ test.describe('peerbook administration', ()  => {
         twr = await getTWRBuffer(page)
         expect(twr).toMatch(/Invalid credentials/)
     })
-    test('try login with an invalid OTP', async () => {
+    test('try subscribe with an invalid OTP', async () => {
         await sleep(100)
-        await page.keyboard.type('login')
+        await page.keyboard.type('subscribe')
         await page.keyboard.press("Enter")
         await sleep(100)
         let twr = await getTWRBuffer(page)
@@ -299,9 +299,9 @@ test.describe('peerbook administration', ()  => {
         twr = await getTWRBuffer(page)
         expect(twr).toMatch(/Invalid credentials/)
     })
-    test('login with a valid email & OTP', async () => {
+    test('subscribe with a valid email & OTP', async () => {
         await sleep(100)
-        await page.keyboard.type('login')
+        await page.keyboard.type('subscribe')
         await page.keyboard.press("Enter")
         await sleep(100)
         let twr = await getTWRBuffer(page)

src/commands.ts

@@ -712,7 +712,7 @@ async function subscribeCMD(shell: Shell) {
     }
     if (!terminal7.pb.isOpen()) {
         if (!Capacitor.isNativePlatform()) {
-            loginCMD(shell);
+            await loginCMD(shell);
             return
         }
         terminal7.pb.startSpinner()
@@ -981,9 +981,37 @@ async function configCMD(shell: Shell) {
     await shell.openConfig()
 }
 async function supportCMD(shell: Shell) {
-    shell.t.write("Sorry things are not working well. Please ")
-    shell.t.writeln("\x1B]8;;https://github.com/tuzig/terminal7/issues/new?template=bug_report.md\x07report a bug\x1B]8;;\x07")
-    shell.t.writeln("or talk to us on our \x1B]8;;https://discord.gg/Puu2afdUtr\x07discord server\x1B]8;;\x07")
+    shell.t.write("Apologies. Have you tried resetting the App?\n")
+    shell.t.writeln("If that doesn't work, please send us a log of the error.")
+    const insecure = terminal7.conf.peerbook.insecure,
+    schema = insecure?"http":"https"
+
+    // ask for email address + check validity
+    const email = terminal7.conf.peerbook.email ? terminal7.conf.peerbook.email : (await shell.askValue("Enter your email address:"))
+    if (!email.includes("@")) {
+        shell.t.writeln("Invalid email address")
+        return
+    }
+
+    // Saving the log to the clipboard
+    terminal7.dumpLog()
+
+    // send the log to the server
+    const res = await fetch(`${schema}://${terminal7.conf.net.peerbook}/support`, {
+        method: "POST",
+        body: JSON.stringify({
+            email,
+            log: (await Clipboard.read()).value,
+        }),        
+    })
+
+    // check the response
+    if (res.ok) {
+        shell.t.writeln("Thank you for your feedback")
+    }
+    else {
+        shell.t.writeln("Error sending feedback")
+    }
 }
 async function loginCMD(shell: Shell) {
     if (terminal7.pb.isOpen()) {