Renovate: Update all non-major dependencies

.woodpecker.yaml

@@ -1,5 +1,5 @@
 variables:
-  - &node_image 'node:20.8.1-alpine'
+  - &node_image 'node:20.9.0-alpine'
   - &create_synapse_access_token >-
     echo '{"user_id":"ci-dummy","access_token":"ci-dummy","home_server":"ci-dummy","device_id":"ci-dummy"}' > src/config/synapse_access_token.json
 

docker-compose.yaml

@@ -3,7 +3,7 @@ version: '3'
 services:
 
   synapse:
-    image: docker.io/matrixdotorg/synapse:v1.94.0
+    image: docker.io/matrixdotorg/synapse:v1.95.0
     # Since synapse does not retry to connect to the database, restart upon
     # failure
     restart: "no"

src/handlers/messages.ts

@@ -144,20 +144,7 @@ export async function handle(rcMessage: RcMessage): Promise<void> {
           )
           return
         }
-        const roomCreatorId = (
+
-          await axios.get(`/_synapse/admin/v1/rooms/${room_id}`)
-        ).data.creator
-        if (!roomCreatorId) {
-          log.warn(
-            `Could not determine room creator for room ${room_id}, using admin credentials.`
-          )
-        }
-        if (roomCreatorId == matrixUser) {
-          log.warn(
-            `Room creator ${roomCreatorId} left rocketchat room ${room_id}, skipping to prevent being unable to rejoin.`
-          )
-          return
-        }
         log.http(`User ${matrixUser} leaves room ${room_id}`)
         await axios.post(
           `/_matrix/client/v3/rooms/${room_id}/leave`,

src/handlers/users.ts

@@ -4,7 +4,7 @@ import adminAccessToken from '../config/synapse_access_token.json'
 import { IdMapping } from '../entity/IdMapping'
 import log from '../helpers/logger'
 import { createMembership, getUserId, save } from '../helpers/storage'
-import { axios, getUserDomain } from '../helpers/synapse'
+import { axios } from '../helpers/synapse'
 
 export type RcUser = {
   _id: string
@@ -32,12 +32,6 @@ export type AccessToken = {
   user_id: string
 }
 
-export type UserInfo = {
-  admin: boolean
-  displayname: string
-  name: string
-}
-
 export function mapUser(rcUser: RcUser): MatrixUser {
   return {
     user_id: '',
@@ -81,13 +75,6 @@ async function registerUser(user: MatrixUser): Promise<AccessToken> {
   return (await axios.post('/_synapse/admin/v1/register', user)).data
 }
 
-async function getUserData(user: MatrixUser): Promise<UserInfo> {
-  return (await axios.get('/_synapse/admin/v2/users/@' + user.username + ":" + getUserDomain())).data
-}
-async function loginUser(user: MatrixUser): Promise<AccessToken> {
-  return (await axios.post('/_synapse/admin/v1/users/@' + user.username + ":" + getUserDomain() + "/login")).data
-}
-
 async function parseUserMemberships(rcUser: RcUser): Promise<void> {
   await Promise.all(
     rcUser.__rooms.map(async (rcRoomId: string) => {
@@ -130,30 +117,12 @@ export async function createMapping(
 
 export async function createUser(rcUser: RcUser): Promise<MatrixUser> {
   const user = mapUser(rcUser)
-  var user_exists = false;
+  const nonce = await getUserRegistrationNonce()
-  try {
+  const mac = generateHmac({ ...user, nonce })
-    await getUserData(user)
+  const accessToken = await registerUser({ ...user, nonce, mac })
-    user_exists = true
+  user.user_id = accessToken.user_id
-  } catch (error) {
+  user.access_token = accessToken.access_token
-    user_exists = false
+  log.info(`User ${rcUser.username} created:`, user)
-  }
-
-  if (user_exists) {
-    const userData = await getUserData(user)
-    user.user_id = userData.name
-    user.displayname = userData.displayname
-    user.admin = user.admin || userData.admin
-    const accessToken = await loginUser(user)
-    user.access_token = accessToken.access_token
-    log.info(`User ${rcUser.username} exists:`, user)
-  } else {
-    const nonce = await getUserRegistrationNonce()
-    const mac = generateHmac({ ...user, nonce })
-    const accessToken = await registerUser({ ...user, nonce, mac })
-    user.user_id = accessToken.user_id
-    user.access_token = accessToken.access_token
-    log.info(`User ${rcUser.username} created:`, user)
-  }
 
   await parseUserMemberships(rcUser)
 

src/helpers/synapse.ts

@@ -3,7 +3,7 @@ import { access_token } from '../config/synapse_access_token.json'
 import log from './logger'
 import { getAccessToken } from './storage'
 
-axios.defaults.baseURL = 'https://m-rc.jennett-wheeler.co.uk'
+axios.defaults.baseURL = 'http://localhost:8008'
 axios.defaults.headers.common['Authorization'] = `Bearer ${access_token}`
 axios.defaults.headers.post['Content-Type'] = 'application/json'
 
@@ -14,10 +14,6 @@ export interface SessionOptions {
   [others: string]: unknown
 }
 
-export function getUserDomain(): string {
-  return "m-rc.jennett-wheeler.co.uk"
-}
-
 export { default as axios } from 'axios'
 export const whoami = () =>
   new Promise<void>((resolve, reject) => {