Merge branch 'bug-fix-login-server-shutdown' into v3.5.0

ded637c2 · michael.minelli · 5cdaee22 · 0560f3d4 · ded637c2
Commit ded637c2 authored 1 year ago by michael.minelli
--- a/NodeApp/src/managers/SessionManager.ts
+++ b/NodeApp/src/managers/SessionManager.ts
@@ -38,11 +38,11 @@ class LoginServer {
            if ( req.url?.match(Config.login.server.route) ) {
                const urlParts = req.url.split('=');
                if ( urlParts.length > 0 ) {
-                    this.events.emit('code', urlParts[1]);
-
                    res.writeHead(HttpStatusCode.Ok, { 'Content-Type': 'text/html' });
                    res.write(`<html lang="en"><body><h1 style="color: green">DojoCLI login successful</h1><h3>You can close this window.</h3></body></html>`);
                    res.end();
+                    
+                    this.events.emit('code', urlParts[1]);
                    return;
                }

@@ -66,6 +66,7 @@ class LoginServer {
    stop() {
        try {
            this.server.close();
+            this.server.closeAllConnections();
            this.events.emit('stopped');
        } catch ( error ) {
            this.events.emit('error', error);