From 32f76b74a69ad4d60a014bf075c39517888436bc Mon Sep 17 00:00:00 2001 From: MCMXC <16797721+mcmxcdev@users.noreply.github.com> Date: Sat, 29 Jul 2023 21:12:16 -0600 Subject: refactor: various improvements (#1296) * refactor: various improvements - enable no-use-before-define eslint rule - shuffle code to conform to no-use-before-define eslint rule - remove btoa dependency which is deprecated and replace with Buffer.from(string).toString('base64') - convert some any types into useful ones - add type annotations where possible - remove unused @types/expect.js - install @types/semver and ts-node which were missing - repair and rewrite add-crowdin-contributors script - remove export keyword from variables which are never consumed in another file - remove unity indicator hack where linked issue was closed - remove module declaration for kebab-case which is unused - add missing state interface for certain components - remove default exports for files which already have a named export - export IRecipePreview so it can be used throughout codebase - remove unused removeCacheForCallWith method from CachedRequest.ts - cleanup unused colors and styles inside legacy theme * - improve ColorPickerInput - fix invalid DOM nesting with div inside p in EditSettingsForm - fix progressbarAccentColor color picker not updating input when using slider - install missing @types/react-color dependency --- src/internal-server/app/Controllers/Http/UserController.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/internal-server/app/Controllers/Http/UserController.js') diff --git a/src/internal-server/app/Controllers/Http/UserController.js b/src/internal-server/app/Controllers/Http/UserController.js index a9c67a1b2..43d925119 100644 --- a/src/internal-server/app/Controllers/Http/UserController.js +++ b/src/internal-server/app/Controllers/Http/UserController.js @@ -4,7 +4,6 @@ const Service = use('App/Models/Service'); const Workspace = use('App/Models/Workspace'); const { validateAll } = use('Validator'); -const btoa = require('btoa'); const fetch = require('node-fetch'); const { v4: uuid } = require('uuid'); const crypto = require('crypto'); @@ -152,7 +151,9 @@ class UserController { // Try to get an authentication token let token; try { - const basicToken = btoa(`${email}:${hashedPassword}`); + const basicToken = Buffer.from(`${email}:${hashedPassword}`).toString( + 'base64', + ); const rawResponse = await fetch(`${server}/${API_VERSION}/auth/login`, { method: 'POST', -- cgit v1.2.3-54-g00ecf