瀏覽代碼

Add another test for registration errors and fix bug

JC Brand 5 年之前
父節點
當前提交
efb486511c
共有 3 個文件被更改,包括 85 次插入2 次删除
  1. 1 1
      sass/_core.scss
  2. 83 0
      spec/register.js
  3. 1 1
      src/converse-register.js

+ 1 - 1
sass/_core.scss

@@ -503,7 +503,7 @@ body.converse-fullscreen {
     }
     }
 
 
     .error {
     .error {
-        color: var(--error-color);
+        color: var(--error-color) !important;
     }
     }
     .info {
     .info {
         color: var(--info-color);
         color: var(--info-color);

+ 83 - 0
spec/register.js

@@ -360,4 +360,87 @@ describe("The Registration Panel", function () {
         delete _converse.connection;
         delete _converse.connection;
         done();
         done();
     }));
     }));
+
+    it("renders errors",
+        mock.initConverse(
+            ['chatBoxesInitialized'],
+            { auto_login: false,
+              view_mode: 'fullscreen',
+              discover_connection_methods: false,
+              allow_registration: true },
+            async function (done, _converse) {
+
+        await u.waitUntil(() => _converse.chatboxviews.get('controlbox')?.registerpanel);
+        const toggle = document.querySelector(".toggle-controlbox");
+        if (!u.isVisible(document.querySelector("#controlbox"))) {
+            if (!u.isVisible(toggle)) {
+                u.removeClass('hidden', toggle);
+            }
+            toggle.click();
+        }
+        const cbview = _converse.chatboxviews.get('controlbox');
+        cbview.el.querySelector('.toggle-register-login').click();
+        const view = _converse.chatboxviews.get('controlbox').registerpanel;
+        view.delegateEvents();  // We need to rebind all events otherwise our spy won't be called
+
+        view.el.querySelector('input[name=domain]').value = 'conversejs.org';
+        view.el.querySelector('input[type=submit]').click();
+
+        let stanza = new Strophe.Builder("stream:features", {
+                    'xmlns:stream': "http://etherx.jabber.org/streams",
+                    'xmlns': "jabber:client"
+                })
+            .c('register',  {xmlns: "http://jabber.org/features/iq-register"}).up()
+            .c('mechanisms', {xmlns: "urn:ietf:params:xml:ns:xmpp-sasl"});
+        _converse.connection._connect_cb(mock.createRequest(stanza));
+
+        stanza = u.toStanza(`
+            <iq xmlns="jabber:client" type="result" from="conversejs.org" id="ad1e0d50-5adb-4397-a997-5feab56fe418:sendIQ" xml:lang="en">
+                <query xmlns="jabber:iq:register">
+                    <x xmlns="jabber:x:data" type="form">
+                        <instructions>Choose a username and password to register with this server</instructions>
+                        <field var="FORM_TYPE" type="hidden"><value>urn:xmpp:captcha</value></field>
+                        <field var="username" type="text-single" label="User"><required/></field>
+                        <field var="password" type="text-private" label="Password"><required/></field>
+                        <field var="from" type="hidden"><value>conversejs.org</value></field>
+                        <field var="challenge" type="hidden"><value>15376320046808160053</value></field>
+                        <field var="sid" type="hidden"><value>ad1e0d50-5adb-4397-a997-5feab56fe418:sendIQ</value></field>
+                        <field var="ocr" type="text-single" label="Enter the text you see">
+                            <media xmlns="urn:xmpp:media-element">
+                                <uri type="image/png">cid:sha1+2df8c1b366f1e90ce60354f97d1fe75237290b8a@bob.xmpp.org</uri>
+                            </media>
+                            <required/>
+                        </field>
+                    </x>
+                    <data xmlns="urn:xmpp:bob" cid="sha1+2df8c1b366f1e90ce60354f97d1fe75237290b8a@bob.xmpp.org"
+                          type="image/png"
+                          max-age="0">iVBORw0KGgoAAAANSUhEUgAAALQAAAA8BAMAAAA9AI20AAAAMFBMVEX///8AAADf39+fn59fX19/f3+/v78fHx8/Pz9PT08bGxsvLy9jY2NTU1MXFxcnJyc84bkWAAAACXBIWXMAAA7EAAAOxAGVKw4bAAAERUlEQVRYhe1WTXMaRxDdDxY4JWpYvDinpVyxdATLin0MiRLlCHEi+7hYUcVHTSI7urhK6yr5//gn5N/4Z7inX89+CQkTcFUO6gOwS8/r7tdvesbzvoT5ROR5JJ9bB97xAK22XWAY1WznlnUr7QaAzSOsWufXQ6wH/FmO60b4D936LJr8TWRwW4SNgOsodZr8m4vZUoRt2xZ3xHXgna1FCE5+f5aWwPU//bXgg8eHjyqPp4aXJeOlwLUIt0O39zOvPWW3WfHmCCkli816FxlK0rnFGKZ484dN+eIXsw1R+G+JfjwgOpMnm+r5SxA63gS2Q8MchO1RLN8jSn4W4F5OPed2evhTthKLG3bsfjLL874XGBpWHLrU0953i/ev7JsfViHbhsWSQTunJDOppeAe0hVGokJUHBOphmjrbBlgabviJKXbIP0B//gKSBHZh2rvJnQp3wsapMFz+VsTPNhPr0Hn9N57YOjywaxFSU6S79fUF39KBDgnt6yjZOeSffk+4IXDZovbQl9E96m34EzQKMepQcbzijAGiBmDsO+LaqzqG3m3kEf+DQ2mY+vdk5c2n2Iaj5QGi6n59FHDmcuP4t8MGlRaF39P6ENyIaB2EXdpjLnQq9IgdVxfax3ilBc10u4gowX9K6BaKiZNmCC7CF/WpkJvWxN00OjuoqGYLqAnpILLE68Ymrt9M0S9hcznUJ8RykdlLalUfFaDjvA8pT2kxmsl5fuMaM6mSWUpUhDoudSucdhiZFDwphEHwsMwhEpH0jsm+/UBK2wCzFIiitalN7YjWkyIBgTNPgpDXX4rjk4UH+yPPgfK4HNZQCP/KZ0fGnrnKl8+pXl3X7FwZuwNUdwDGO+BjPUn6XaKtbkm+MJ6vtaXSnIz6wBT/m+VvZNIhz7ayabQLSeRQDmYkjt0KlmHDa555v9DzFxx+CCvCG4K3dbx6mTYtfPs1Dgdh0i3W+cl4lnnhblMKKBBA23X1Ezc3E5ZoPS5KHjPiU1rKTviYe1fTsa6e3UwXGWI4ykB8uiGqkmA6Cbf3K4JTH3LOBlbX+yPWll57LKVeH8CTEvyVPV2TXL8kPnPqtA51CaFYxOH2rJoZunSnvsSj48WiaDccl6KEgiMSarITsa+rWWBnqFloYlT1qWW2GKw9nPSbEvoVHFst967XgNQjxdA66Q6VFEUh488xfaSo7cHB52XYzA4eRlVteeT8ostWfuPea0oF6MwzlwgZE9gQI+uUV0gzK+WlpUrNI8juhhX/OyNwZnRrsDfxOqS1aDR+gC6NUPvJpvQeVZ9eiNr9aDUuddY3bLnA4tH4r/49UboznH1ia8PV/uP3WUB3dxtzj1uxfDZgbEbZx17Itwrf0Jyc8N4en+5dhivtKeYjGJ8yXgUzKvSU/uWJZmsuAYtseDku+K3zMHi4lC1h0suPmtZaEp2tm3hEV2lXwb6zu7szv6f9glF5rPGT5xR7AAAAABJRU5ErkJggg==</data>
+                    <instructions>You need a client that supports x:data and CAPTCHA to register</instructions>
+                </query>
+            </iq>`);
+        _converse.connection._dataRecv(mock.createRequest(stanza));
+
+        spyOn(view, 'submitRegistrationForm').and.callThrough();
+        const username_input = view.el.querySelector('[name="username"]');
+        username_input.value = 'romeo';
+        const password_input = view.el.querySelector('[name="password"]');
+        password_input.value = 'secret';
+        const ocr_input = view.el.querySelector('[name="ocr"]');
+        ocr_input.value = '8m9D88';
+        view.el.querySelector('[type="submit"]').click();
+        expect(view.submitRegistrationForm).toHaveBeenCalled();
+
+        const response_IQ = u.toStanza(`
+            <iq xml:lang='en' from='conversejs.org' type='error' id='d9917b7a-588f-4ef6-8a56-0d6d3ad538ae:sendIQ'>
+                <query xmlns='jabber:iq:register'/>
+                <error code='500' type='wait'>
+                    <resource-constraint xmlns='urn:ietf:params:xml:ns:xmpp-stanzas'/>
+                    <text xml:lang='en' xmlns='urn:ietf:params:xml:ns:xmpp-stanzas'>Too many CAPTCHA requests</text>
+                </error>
+            </iq>`);
+        _converse.connection._dataRecv(mock.createRequest(response_IQ));
+        expect(view.el.querySelector('.error')?.textContent.trim()).toBe('Too many CAPTCHA requests');
+        delete _converse.connection;
+        done();
+    }));
 });
 });

+ 1 - 1
src/converse-register.js

@@ -630,7 +630,7 @@ converse.plugins.add('converse-register', {
                         _converse.connection._changeConnectStatus(Strophe.Status.REGIFAIL, "unknown");
                         _converse.connection._changeConnectStatus(Strophe.Status.REGIFAIL, "unknown");
                         return false;
                         return false;
                     }
                     }
-                    error = error[0].firstChild.tagName.toLowerCase();
+                    error = error[0].firstElementChild.tagName.toLowerCase();
                     if (error === 'conflict') {
                     if (error === 'conflict') {
                         _converse.connection._changeConnectStatus(Strophe.Status.CONFLICT, error);
                         _converse.connection._changeConnectStatus(Strophe.Status.CONFLICT, error);
                     } else if (error === 'not-acceptable') {
                     } else if (error === 'not-acceptable') {