fix: remove uws completely

Author: stanley2058

.env.docker.template

@@ -8,8 +8,8 @@ S3_SSL=false
 S3_ACCESS_KEY=minioadmin
 S3_SECRET_KEY=minioadmin
 
-AUTH_PERM_CALLBACK=http://demo:5173/auth/perm
-YDOC_UPDATE_CALLBACK=http://demo:5173/ydoc
+NO_AUTH=true
+# YDOC_UPDATE_CALLBACK=http://demo:5173/ydoc
 
 # log everything
 LOG=*

.env.template

@@ -1,6 +1,3 @@
-### Server mode 'ws' (default) | 'socketio'
-# SERVER_MODE=socketio
-
 ### Redis endpoint
 REDIS=redis://localhost:6379
 # REDIS_PREFIX=y # by default "y:" is prepended to all used redis keys
@@ -24,7 +21,6 @@ S3_SECRET_KEY=minioadmin
 # POSTGRES_TESTDB=yredis_tests ## use a different database for testing
 
 ### Skip authentication
-## Only works in SocketIO mode
 # NO_AUTH=true
 
 ### Auth signature
@@ -35,16 +31,10 @@ S3_SECRET_KEY=minioadmin
 AUTH_PUBLIC_KEY=..
 AUTH_PRIVATE_KEY=..
 
-### Auth backend
-## This REST endpoint is called to check whether a user has access to a document. It
-## is provided by you. However, there are multiple sample implementations in this
-## repository.
-AUTH_PERM_CALLBACK=http://localhost:5173/auth/perm
-
 ### Optional change callback
 ## This REST endpoint is called in regular intervals when a ydoc is changed.
 ## Remove this if you don't need it.
-YDOC_UPDATE_CALLBACK=http://localhost:5173/ydoc
+# YDOC_UPDATE_CALLBACK=http://localhost:5173/ydoc
 
 ### Logging
 ## Configure what you want to log. LOG is a regular expression that is applied

.env.test.template

@@ -20,6 +20,9 @@ S3_SECRET_KEY=minioadmin
 POSTGRES=postgres://yredis:yredis@localhost:35432/yredis
 POSTGRES_TESTDB=yredis_tests ## use a different database for testing
 
+### Skip authentication
+# NO_AUTH=true
+
 ### Auth signature
 ## The auth server authenticates web clients using json-web-tokens (jwt). 
 ## They are generated and validated using the following json-web-keys (jwk).
@@ -28,16 +31,10 @@ POSTGRES_TESTDB=yredis_tests ## use a different database for testing
 AUTH_PUBLIC_KEY=..
 AUTH_PRIVATE_KEY=..
 
-### Auth backend
-## This REST endpoint is called to check whether a user has access to a document. It
-## is provided by you. However, there are multiple sample implementations in this
-## repository.
-AUTH_PERM_CALLBACK=http://localhost:5173/auth/perm
-
 ### Optional change callback
 ## This REST endpoint is called in regular intervals when a ydoc is changed.
 ## Remove this if you don't need it.
-YDOC_UPDATE_CALLBACK=http://localhost:5173/ydoc
+# YDOC_UPDATE_CALLBACK=http://localhost:5173/ydoc
 
 ### Logging
 ## Configure what you want to log. LOG is a regular expression that is applied

bin/auth-server-example.js

@@ -8,8 +8,6 @@ const port = number.parseInt(env.getConf('port') || '3002')
 const redisPrefix = env.getConf('redis-prefix') || 'y'
 const postgresUrl = env.getConf('postgres')
 const s3Endpoint = env.getConf('s3-endpoint')
-const serverMode = env.getConf('server-mode')
-const checkPermCallbackUrl = env.ensureConf('AUTH_PERM_CALLBACK')
 
 let store
 if (s3Endpoint) {
@@ -31,8 +29,4 @@ if (s3Endpoint) {
   store = createMemoryStorage()
 }
 
-if (serverMode === 'socketio') {
-  server.createYSocketIOServer({ port, store, redisPrefix })
-} else {
-  server.createYWebsocketServer({ port, store, checkPermCallbackUrl, redisPrefix })
-}
+server.createYSocketIOServer({ port, store, redisPrefix })