compiles on desktop again oops

lib/business_logic/websocket.dart

@@ -1,9 +1,6 @@
 import 'dart:async';
-
-import 'package:flutter/foundation.dart';
 import 'package:loris/business_logic/settings.dart';
-import 'package:web_socket_channel/io.dart';
-import 'package:web_socket_channel/html.dart';
+import 'package:web_socket_channel/web_socket_channel.dart';
 import '../global.dart' as global;
 
 bool connected = false;
@@ -58,9 +55,7 @@ StreamController getStreamController(AccountSettings id, StreamType type) {
   final uri =
       Uri(scheme: scheme, host: host, path: path, queryParameters: query);
   final controller = StreamController.broadcast();
-  final socket = kIsWeb
-      ? HtmlWebSocketChannel.connect(uri)
-      : IOWebSocketChannel.connect(uri);
+  final socket = WebSocketChannel.connect(uri);
   controller.addStream(socket.stream);
   return controller;
 }

lib/pages/login/weblogin.dart

@@ -1,3 +1,5 @@
+// oauth page for web only
+
 import 'dart:convert';
 
 import 'package:flutter/material.dart';
@@ -24,14 +26,18 @@ class _WebloginState extends State<Weblogin> {
     final app = oauth.App.fromJson(jsonDecode(appresponse.body));
 
     var popupWin = html.window.open(
-      oauth.getAuthUrl(widget.url, app).toString(),
+      "https://${oauth.getAuthUrl(widget.url, app).toString()}",
       "loris",
     );
 
     html.window.onMessage.listen((event) async {
       final uri = Uri.parse(event.data);
       if (uri.queryParameters.containsKey("code")) {
-        popupWin.close();
+        // this null check needs to be here!
+        // becuase this is null when compiling for
+        // anything but web
+        // this makes the compiler unhappy
+        popupWin?.close();
         final token = await oauth.getToken(
           uri.queryParameters["code"]!,
           app.clientId,