mirror of
https://github.com/sct/overseerr.git
synced 2025-09-17 17:24:35 +02:00
build(deps): bump node to 14.17 and drop uuid in favor of native randomUUID (#1792)
This commit is contained in:
2
.github/workflows/ci.yml
vendored
2
.github/workflows/ci.yml
vendored
@@ -12,7 +12,7 @@ jobs:
|
|||||||
test:
|
test:
|
||||||
name: Lint & Test Build
|
name: Lint & Test Build
|
||||||
runs-on: ubuntu-20.04
|
runs-on: ubuntu-20.04
|
||||||
container: node:14.16-alpine
|
container: node:14.17-alpine
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout
|
- name: Checkout
|
||||||
uses: actions/checkout@v2.3.4
|
uses: actions/checkout@v2.3.4
|
||||||
|
2
.github/workflows/release.yml
vendored
2
.github/workflows/release.yml
vendored
@@ -9,7 +9,7 @@ jobs:
|
|||||||
test:
|
test:
|
||||||
name: Lint & Test Build
|
name: Lint & Test Build
|
||||||
runs-on: ubuntu-20.04
|
runs-on: ubuntu-20.04
|
||||||
container: node:14.16-alpine
|
container: node:14.17-alpine
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout
|
- name: Checkout
|
||||||
uses: actions/checkout@v2.3.4
|
uses: actions/checkout@v2.3.4
|
||||||
|
2
.github/workflows/snap.yaml
vendored
2
.github/workflows/snap.yaml
vendored
@@ -20,7 +20,7 @@ jobs:
|
|||||||
name: Lint & Test Build
|
name: Lint & Test Build
|
||||||
needs: jobs
|
needs: jobs
|
||||||
runs-on: ubuntu-20.04
|
runs-on: ubuntu-20.04
|
||||||
container: node:14.16-alpine
|
container: node:14.17-alpine
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout
|
- name: Checkout
|
||||||
uses: actions/checkout@v2.3.4
|
uses: actions/checkout@v2.3.4
|
||||||
|
@@ -1,4 +1,4 @@
|
|||||||
FROM node:14.16-alpine AS BUILD_IMAGE
|
FROM node:14.17-alpine AS BUILD_IMAGE
|
||||||
|
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
|
|
||||||
@@ -31,7 +31,7 @@ RUN touch config/DOCKER
|
|||||||
RUN echo "{\"commitTag\": \"${COMMIT_TAG}\"}" > committag.json
|
RUN echo "{\"commitTag\": \"${COMMIT_TAG}\"}" > committag.json
|
||||||
|
|
||||||
|
|
||||||
FROM node:14.16-alpine
|
FROM node:14.17-alpine
|
||||||
|
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
|
|
||||||
|
@@ -1,4 +1,4 @@
|
|||||||
FROM node:14.16-alpine
|
FROM node:14.17-alpine
|
||||||
|
|
||||||
COPY . /app
|
COPY . /app
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
|
@@ -66,7 +66,6 @@
|
|||||||
"swagger-ui-express": "^4.1.6",
|
"swagger-ui-express": "^4.1.6",
|
||||||
"swr": "^0.5.6",
|
"swr": "^0.5.6",
|
||||||
"typeorm": "0.2.32",
|
"typeorm": "0.2.32",
|
||||||
"uuid": "^8.3.2",
|
|
||||||
"web-push": "^3.4.4",
|
"web-push": "^3.4.4",
|
||||||
"winston": "^3.3.3",
|
"winston": "^3.3.3",
|
||||||
"winston-daily-rotate-file": "^4.5.5",
|
"winston-daily-rotate-file": "^4.5.5",
|
||||||
@@ -104,7 +103,6 @@
|
|||||||
"@types/react-transition-group": "^4.4.1",
|
"@types/react-transition-group": "^4.4.1",
|
||||||
"@types/secure-random-password": "^0.2.0",
|
"@types/secure-random-password": "^0.2.0",
|
||||||
"@types/swagger-ui-express": "^4.1.2",
|
"@types/swagger-ui-express": "^4.1.2",
|
||||||
"@types/uuid": "^8.3.0",
|
|
||||||
"@types/web-push": "^3.3.0",
|
"@types/web-push": "^3.3.0",
|
||||||
"@types/xml2js": "^0.4.8",
|
"@types/xml2js": "^0.4.8",
|
||||||
"@types/yamljs": "^0.2.31",
|
"@types/yamljs": "^0.2.31",
|
||||||
|
@@ -1,4 +1,5 @@
|
|||||||
import bcrypt from 'bcrypt';
|
import bcrypt from 'bcrypt';
|
||||||
|
import { randomUUID } from 'crypto';
|
||||||
import path from 'path';
|
import path from 'path';
|
||||||
import { default as generatePassword } from 'secure-random-password';
|
import { default as generatePassword } from 'secure-random-password';
|
||||||
import {
|
import {
|
||||||
@@ -15,7 +16,6 @@ import {
|
|||||||
RelationCount,
|
RelationCount,
|
||||||
UpdateDateColumn,
|
UpdateDateColumn,
|
||||||
} from 'typeorm';
|
} from 'typeorm';
|
||||||
import { v4 as uuid } from 'uuid';
|
|
||||||
import { MediaRequestStatus, MediaType } from '../constants/media';
|
import { MediaRequestStatus, MediaType } from '../constants/media';
|
||||||
import { UserType } from '../constants/user';
|
import { UserType } from '../constants/user';
|
||||||
import { QuotaResponse } from '../interfaces/api/userInterfaces';
|
import { QuotaResponse } from '../interfaces/api/userInterfaces';
|
||||||
@@ -189,7 +189,7 @@ export class User {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public async resetPassword(): Promise<void> {
|
public async resetPassword(): Promise<void> {
|
||||||
const guid = uuid();
|
const guid = randomUUID();
|
||||||
this.resetPasswordGuid = guid;
|
this.resetPasswordGuid = guid;
|
||||||
|
|
||||||
// 24 hours into the future
|
// 24 hours into the future
|
||||||
|
@@ -1,4 +1,4 @@
|
|||||||
import crypto from 'crypto';
|
import { randomBytes } from 'crypto';
|
||||||
import * as openpgp from 'openpgp';
|
import * as openpgp from 'openpgp';
|
||||||
import { Transform, TransformCallback } from 'stream';
|
import { Transform, TransformCallback } from 'stream';
|
||||||
|
|
||||||
@@ -107,7 +107,7 @@ class PGPEncryptor extends Transform {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Generate a new boundary for the email content
|
// Generate a new boundary for the email content
|
||||||
const boundary = 'nm_' + crypto.randomBytes(14).toString('hex');
|
const boundary = 'nm_' + randomBytes(14).toString('hex');
|
||||||
/**
|
/**
|
||||||
* Concatenate everything into single strings
|
* Concatenate everything into single strings
|
||||||
* and add pgp headers to the email headers
|
* and add pgp headers to the email headers
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
|
import { randomUUID } from 'crypto';
|
||||||
import { getRepository } from 'typeorm';
|
import { getRepository } from 'typeorm';
|
||||||
import { v4 as uuid } from 'uuid';
|
|
||||||
import TheMovieDb from '../../api/themoviedb';
|
import TheMovieDb from '../../api/themoviedb';
|
||||||
import { MediaStatus, MediaType } from '../../constants/media';
|
import { MediaStatus, MediaType } from '../../constants/media';
|
||||||
import Media from '../../entity/Media';
|
import Media from '../../entity/Media';
|
||||||
@@ -512,7 +512,7 @@ class BaseScanner<T> {
|
|||||||
*/
|
*/
|
||||||
protected startRun(): string {
|
protected startRun(): string {
|
||||||
const settings = getSettings();
|
const settings = getSettings();
|
||||||
const sessionId = uuid();
|
const sessionId = randomUUID();
|
||||||
this.sessionId = sessionId;
|
this.sessionId = sessionId;
|
||||||
|
|
||||||
this.log('Scan starting', 'info', { sessionId });
|
this.log('Scan starting', 'info', { sessionId });
|
||||||
|
@@ -1,7 +1,7 @@
|
|||||||
|
import { randomUUID } from 'crypto';
|
||||||
import fs from 'fs';
|
import fs from 'fs';
|
||||||
import { merge } from 'lodash';
|
import { merge } from 'lodash';
|
||||||
import path from 'path';
|
import path from 'path';
|
||||||
import { v4 as uuidv4 } from 'uuid';
|
|
||||||
import webpush from 'web-push';
|
import webpush from 'web-push';
|
||||||
import { Permission } from './permissions';
|
import { Permission } from './permissions';
|
||||||
|
|
||||||
@@ -234,7 +234,7 @@ class Settings {
|
|||||||
|
|
||||||
constructor(initialSettings?: AllSettings) {
|
constructor(initialSettings?: AllSettings) {
|
||||||
this.data = {
|
this.data = {
|
||||||
clientId: uuidv4(),
|
clientId: randomUUID(),
|
||||||
vapidPrivate: '',
|
vapidPrivate: '',
|
||||||
vapidPublic: '',
|
vapidPublic: '',
|
||||||
main: {
|
main: {
|
||||||
@@ -428,7 +428,7 @@ class Settings {
|
|||||||
|
|
||||||
get clientId(): string {
|
get clientId(): string {
|
||||||
if (!this.data.clientId) {
|
if (!this.data.clientId) {
|
||||||
this.data.clientId = uuidv4();
|
this.data.clientId = randomUUID();
|
||||||
this.save();
|
this.save();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -454,7 +454,7 @@ class Settings {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private generateApiKey(): string {
|
private generateApiKey(): string {
|
||||||
return Buffer.from(`${Date.now()}${uuidv4()})`).toString('base64');
|
return Buffer.from(`${Date.now()}${randomUUID()})`).toString('base64');
|
||||||
}
|
}
|
||||||
|
|
||||||
private generateVapidKeys(force = false): void {
|
private generateVapidKeys(force = false): void {
|
||||||
|
@@ -11,7 +11,7 @@ confinement: strict
|
|||||||
parts:
|
parts:
|
||||||
overseerr:
|
overseerr:
|
||||||
plugin: nodejs
|
plugin: nodejs
|
||||||
nodejs-version: '14.16.1'
|
nodejs-version: '14.17.0'
|
||||||
nodejs-package-manager: 'yarn'
|
nodejs-package-manager: 'yarn'
|
||||||
nodejs-yarn-version: v1.22.10
|
nodejs-yarn-version: v1.22.10
|
||||||
build-packages:
|
build-packages:
|
||||||
|
@@ -2556,11 +2556,6 @@
|
|||||||
resolved "https://registry.yarnpkg.com/@types/unist/-/unist-2.0.3.tgz#9c088679876f374eb5983f150d4787aa6fb32d7e"
|
resolved "https://registry.yarnpkg.com/@types/unist/-/unist-2.0.3.tgz#9c088679876f374eb5983f150d4787aa6fb32d7e"
|
||||||
integrity sha512-FvUupuM3rlRsRtCN+fDudtmytGO6iHJuuRKS1Ss0pG5z8oX0diNEw94UEL7hgDbpN94rgaK5R7sWm6RrSkZuAQ==
|
integrity sha512-FvUupuM3rlRsRtCN+fDudtmytGO6iHJuuRKS1Ss0pG5z8oX0diNEw94UEL7hgDbpN94rgaK5R7sWm6RrSkZuAQ==
|
||||||
|
|
||||||
"@types/uuid@^8.3.0":
|
|
||||||
version "8.3.0"
|
|
||||||
resolved "https://registry.yarnpkg.com/@types/uuid/-/uuid-8.3.0.tgz#215c231dff736d5ba92410e6d602050cce7e273f"
|
|
||||||
integrity sha512-eQ9qFW/fhfGJF8WKHGEHZEyVWfZxrT+6CLIJGBcZPfxUh/+BnEj+UCGYMlr9qZuX/2AltsvwrGqp0LhEW8D0zQ==
|
|
||||||
|
|
||||||
"@types/web-push@^3.3.0":
|
"@types/web-push@^3.3.0":
|
||||||
version "3.3.0"
|
version "3.3.0"
|
||||||
resolved "https://registry.yarnpkg.com/@types/web-push/-/web-push-3.3.0.tgz#459eb722c9585b84a149e7020606d4f65f64f0ca"
|
resolved "https://registry.yarnpkg.com/@types/web-push/-/web-push-3.3.0.tgz#459eb722c9585b84a149e7020606d4f65f64f0ca"
|
||||||
|
Reference in New Issue
Block a user