yuuza/outline
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: Add Portugese, Brazil to language options (#2164)

Browse Source 
* Add Portugese, Brazil to language options

* Upgrade date-fns package

Co-authored-by: Tom Moor <tom.moor@gmail.com>
This commit is contained in:
Saumya Pandey
2021-06-10 06:12:14 +05:30
committed by GitHub
parent a99f6bed42
commit a6d4d4ea36
27 changed files with 85 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/api/attachments.js
View File

@@ -1,5 +1,5 @@
// @flow
import format from "date-fns/format";
import { format } from "date-fns";
import Router from "koa-router";
import { v4 as uuidv4 } from "uuid";
import { NotFoundError } from "../errors";
@@ -39,7 +39,7 @@ router.post("attachments.create", auth(), async (ctx) => {
const bucket = acl === "public-read" ? "public" : "uploads";
const key = `${bucket}/${user.id}/${s3Key}/${name}`;
const credential = makeCredential();
const longDate = format(new Date(), "YYYYMMDDTHHmmss\\Z");
const longDate = format(new Date(), "yyyyMMdd'T'HHmmss'Z'");
const policy = makePolicy(credential, longDate, acl, contentType);
const endpoint = publicS3Endpoint();
const url = `${endpoint}/${key}`;

2
server/api/utils.js
View File

@@ -1,5 +1,5 @@
// @flow
import subDays from "date-fns/sub_days";
import { subDays } from "date-fns";
import debug from "debug";
import Router from "koa-router";
import { AuthenticationError } from "../errors";

2
server/api/utils.test.js
View File

@@ -1,5 +1,5 @@
/* eslint-disable flowtype/require-valid-file-annotation */
import subDays from "date-fns/sub_days";
import { subDays } from "date-fns";
import TestServer from "fetch-test-server";
import app from "../app";
import { Attachment, Document } from "../models";

2
server/auth/index.js
View File

@@ -1,6 +1,6 @@
// @flow
import passport from "@outlinewiki/koa-passport";
import addMonths from "date-fns/add_months";
import { addMonths } from "date-fns";
import debug from "debug";
import Koa from "koa";
import bodyParser from "koa-body";

2
server/auth/providers/email.js
View File

@@ -1,5 +1,5 @@
// @flow
import subMinutes from "date-fns/sub_minutes";
import { subMinutes } from "date-fns";
import Router from "koa-router";
import { find } from "lodash";
import { AuthorizationError } from "../../errors";

3
server/models/User.js
View File

@@ -1,7 +1,6 @@
// @flow
import crypto from "crypto";
import addMinutes from "date-fns/add_minutes";
import subMinutes from "date-fns/sub_minutes";
import { addMinutes, subMinutes } from "date-fns";
import JWT from "jsonwebtoken";
import { v4 as uuidv4 } from "uuid";
import { languages } from "../../shared/i18n";

2
server/models/View.js
View File

@@ -1,5 +1,5 @@
// @flow
import subMilliseconds from "date-fns/sub_milliseconds";
import { subMilliseconds } from "date-fns";
import { USER_PRESENCE_INTERVAL } from "../../shared/constants";
import { User } from "../models";
import { DataTypes, Op, sequelize } from "../sequelize";

2
server/services/websockets.js
View File

@@ -1,5 +1,5 @@
// @flow
import subHours from "date-fns/sub_hours";
import { subHours } from "date-fns";
import type { Event } from "../events";
import { socketio } from "../main";
import {

2
server/utils/authentication.js
View File

@@ -1,7 +1,7 @@
// @flow
import querystring from "querystring";
import * as Sentry from "@sentry/node";
import addMonths from "date-fns/add_months";
import { addMonths } from "date-fns";
import { type Context } from "koa";
import { pick } from "lodash";
import { User, Event, Team } from "../models";

2
server/utils/jwt.js
View File

@@ -1,5 +1,5 @@
// @flow
import subMinutes from "date-fns/sub_minutes";
import { subMinutes } from "date-fns";
import JWT from "jsonwebtoken";
import { AuthenticationError } from "../errors";
import { Team, User } from "../models";

3
server/utils/passport.js
View File

@@ -1,6 +1,5 @@
// @flow
import addMinutes from "date-fns/add_minutes";
import subMinutes from "date-fns/sub_minutes";
import { addMinutes, subMinutes } from "date-fns";
import { type Request } from "koa";
import { OAuthStateMismatchError } from "../errors";
import { getCookieDomain } from "./domains";

9
server/utils/s3.js
View File

@@ -2,8 +2,7 @@
import crypto from "crypto";
import * as Sentry from "@sentry/node";
import AWS from "aws-sdk";
import addHours from "date-fns/add_hours";
import format from "date-fns/format";
import { addHours, format } from "date-fns";
import fetch from "fetch-with-proxy";
const AWS_SECRET_ACCESS_KEY = process.env.AWS_SECRET_ACCESS_KEY;
@@ -36,7 +35,7 @@ export const makeCredential = () => {
const credential =
AWS_ACCESS_KEY_ID +
"/" +
format(new Date(), "YYYYMMDD") +
format(new Date(), "yyyyMMdd") +
"/" +
AWS_REGION +
"/s3/aws4_request";
@@ -62,7 +61,7 @@ export const makePolicy = (
{ "x-amz-credential": credential },
{ "x-amz-date": longDate },
],
expiration: format(tomorrow, "YYYY-MM-DDTHH:mm:ss\\Z"),
expiration: format(tomorrow, "yyyy-MM-dd'T'HH:mm:ss'Z'"),
};
return Buffer.from(JSON.stringify(policy)).toString("base64");
@@ -71,7 +70,7 @@ export const makePolicy = (
export const getSignature = (policy: any) => {
const kDate = hmac(
"AWS4" + AWS_SECRET_ACCESS_KEY,
format(new Date(), "YYYYMMDD")
format(new Date(), "yyyyMMdd")
);
const kRegion = hmac(kDate, AWS_REGION);
const kService = hmac(kRegion, "s3");