+ {t`Error`}: {error} +
+ ))} ++ {t`Type the characters from the following image:`} + + + ({t`Tip: Not case-sensitive; I and l are the same`}) + +
++
+ 
{ setImgLoaded(true); }}
+ onError={() => setErrors([t`Could not load captcha`])}
+ />
+
+
+ {t`Can't read? Reload:`}
+ {
+ setImgLoaded(false);
+ setCaptchaUrl(getUrl());
+ }}
+ >
+
+
+
+
+
+ )}
+ 
{
- window.pixel = null;
- window.hcaptcha.execute();
- }}
- style={{
- width: '5%',
- height: '5%',
- paddingTop: 20,
- cursor: 'pointer',
- }}
- />
- )}
);
}
@@ -212,11 +193,13 @@ function mapStateToProps(state: State) {
const {
name,
mailreg,
+ } = state.user;
+ const {
totalPixels,
dailyTotalPixels,
ranking,
dailyRanking,
- } = state.user;
+ } = state.ranks;
const stats = {
totalPixels,
dailyTotalPixels,
diff --git a/src/components/UserMessages.jsx b/src/components/UserMessages.jsx
index 0025edf..27441ec 100644
--- a/src/components/UserMessages.jsx
+++ b/src/components/UserMessages.jsx
@@ -6,8 +6,8 @@ import React from 'react';
import { connect } from 'react-redux';
import { t } from 'ttag';
-import { parseAPIresponse } from '../utils/validation';
import { setMinecraftName, remFromMessages } from '../actions';
+import { requestResendVerify, requestMcLink } from '../actions/fetch';
class UserMessages extends React.Component {
@@ -31,11 +31,8 @@ class UserMessages extends React.Component {
resentVerify: true,
});
- const response = await fetch('./api/auth/resend_verify', {
- credentials: 'include',
- });
+ const { errors } = await requestResendVerify();
- const { errors } = await parseAPIresponse(response);
const verifyAnswer = (errors)
? errors[0]
: t`A new verification mail is getting sent to you.`;
@@ -50,15 +47,9 @@ class UserMessages extends React.Component {
this.setState({
sentLink: true,
});
- const body = JSON.stringify({ accepted });
- const rep = await fetch('./api/auth/mclink', {
- method: 'POST',
- headers: { 'Content-Type': 'application/json' },
- body,
- credentials: 'include',
- });
- const { errors } = parseAPIresponse(rep);
+ const { errors } = await requestMcLink(accepted);
+
if (errors) {
this.setState({
linkAnswer: errors[0],
diff --git a/src/core/config.js b/src/core/config.js
index fb6eb6c..d512cfa 100644
--- a/src/core/config.js
+++ b/src/core/config.js
@@ -10,6 +10,7 @@ if (process.env.BROWSER) {
}
export const PORT = process.env.PORT || 80;
+export const HOST = process.env.HOST || 'localhost';
export const GMAIL_USER = process.env.GMAIL_USER || null;
export const GMAIL_PW = process.env.GMAIL_PW || null;
@@ -19,6 +20,8 @@ export const TILE_FOLDER = path.join(__dirname, `./${TILE_FOLDER_REL}`);
export const ASSET_SERVER = process.env.ASSET_SERVER || '.';
+export const CAPTCHA_URL = process.env.CAPTCHA_URL || '';
+
export const USE_XREALIP = process.env.USE_XREALIP || false;
export const BACKUP_URL = process.env.BACKUP_URL || null;
@@ -35,8 +38,6 @@ export const MYSQL_USER = process.env.MYSQL_USER || 'pixelplanet';
export const MYSQL_PW = process.env.MYSQL_PW || 'password';
// Social
-export const DISCORD_INVITE = process.env.DISCORD_INVITE
- || 'https://discordapp.com/';
export const GUILDED_INVITE = process.env.GUILDED_INVITE
|| 'https://www.guilded.gg/';
@@ -87,13 +88,9 @@ export const auth = {
},
};
-// o: none
-// 1: reCaptcha
-// 2: hCaptcha
-export const CAPTCHA_METHOD = Number(process.env.CAPTCHA_METHOD || 0);
-export const CAPTCHA_SECRET = process.env.CAPTCHA_SECRET || false;
-export const CAPTCHA_SITEKEY = process.env.CAPTCHA_SITEKEY || false;
// time on which to display captcha in minutes
export const CAPTCHA_TIME = parseInt(process.env.CAPTCHA_TIME, 10) || 30;
+// time during which the user can solve a captcha in seconds
+export const CAPTCHA_TIMEOUT = parseInt(process.env.CAPTCHA_TIMEOUT, 10) || 120;
export const SESSION_SECRET = process.env.SESSION_SECRET || 'dummy';
diff --git a/src/reducers/alert.js b/src/reducers/alert.js
new file mode 100644
index 0000000..30e7eda
--- /dev/null
+++ b/src/reducers/alert.js
@@ -0,0 +1,51 @@
+/* @flow */
+
+import type { Action } from '../actions/types';
+
+export type AlertState = {
+ alertOpen: boolean,
+ alertType: ?string,
+ alertTitle: ?string,
+ alertMessage: ?string,
+ alertBtn: ?string,
+};
+
+const initialState: AlertState = {
+ alertOpen: false,
+ alertType: null,
+ alertTitle: null,
+ alertMessage: null,
+ alertBtn: null,
+};
+
+export default function alert(
+ state: AlertState = initialState,
+ action: Action,
+): AlertState {
+ switch (action.type) {
+ case 'ALERT': {
+ const {
+ title, text, icon, confirmButtonText,
+ } = action;
+
+ return {
+ ...state,
+ alertOpen: true,
+ alertTitle: title,
+ alertMessage: text,
+ alertType: icon,
+ alertBtn: confirmButtonText,
+ };
+ }
+
+ case 'CLOSE_ALERT': {
+ return {
+ ...state,
+ alertOpen: false,
+ };
+ }
+
+ default:
+ return state;
+ }
+}
diff --git a/src/reducers/index.js b/src/reducers/index.js
index 28fc39e..c62e651 100644
--- a/src/reducers/index.js
+++ b/src/reducers/index.js
@@ -7,6 +7,8 @@ import canvas from './canvas';
import gui from './gui';
import modal from './modal';
import user from './user';
+import ranks from './ranks';
+import alert from './alert';
import chat from './chat';
import contextMenu from './contextMenu';
import chatRead from './chatRead';
@@ -17,6 +19,8 @@ import type { CanvasState } from './canvas';
import type { GUIState } from './gui';
import type { ModalState } from './modal';
import type { UserState } from './user';
+import type { RanksState } from './ranks';
+import type { AlertState } from './alert';
import type { ChatState } from './chat';
import type { ContextMenuState } from './contextMenu';
import type { FetchingState } from './fetching';
@@ -27,6 +31,8 @@ export type State = {
gui: GUIState,
modal: ModalState,
user: UserState,
+ ranks: RanksState,
+ alert: AlertState,
chat: ChatState,
contextMenu: ContextMenuState,
chatRead: ChatReadState,
@@ -38,7 +44,9 @@ const config = {
storage: localForage,
blacklist: [
'user',
+ 'ranks',
'canvas',
+ 'alert',
'modal',
'chat',
'contextMenu',
@@ -52,6 +60,8 @@ export default persistCombineReducers(config, {
gui,
modal,
user,
+ ranks,
+ alert,
chat,
contextMenu,
chatRead,
diff --git a/src/reducers/ranks.js b/src/reducers/ranks.js
new file mode 100644
index 0000000..3c307d5
--- /dev/null
+++ b/src/reducers/ranks.js
@@ -0,0 +1,80 @@
+/* @flow */
+
+import type { Action } from '../actions/types';
+
+export type RanksState = {
+ totalPixels: number,
+ dailyTotalPixels: number,
+ ranking: number,
+ dailyRanking: number,
+ // global stats
+ online: ?number,
+ totalRanking: Object,
+ totalDailyRanking: Object,
+};
+
+const initialState: RanksState = {
+ totalPixels: 0,
+ dailyTotalPixels: 0,
+ ranking: 1488,
+ dailyRanking: 1488,
+ online: 1,
+ totalRanking: {},
+ totalDailyRanking: {},
+};
+
+export default function ranks(
+ state: RanksState = initialState,
+ action: Action,
+): RanksState {
+ switch (action.type) {
+ case 'PLACED_PIXELS': {
+ let { totalPixels, dailyTotalPixels } = state;
+ const { amount } = action;
+ totalPixels += amount;
+ dailyTotalPixels += amount;
+ return {
+ ...state,
+ totalPixels,
+ dailyTotalPixels,
+ };
+ }
+
+ case 'RECEIVE_ONLINE': {
+ const { online } = action;
+ return {
+ ...state,
+ online,
+ };
+ }
+
+ case 'RECEIVE_ME':
+ case 'LOGIN': {
+ const {
+ totalPixels,
+ dailyTotalPixels,
+ ranking,
+ dailyRanking,
+ } = action;
+ return {
+ ...state,
+ totalPixels,
+ dailyTotalPixels,
+ ranking,
+ dailyRanking,
+ };
+ }
+
+ case 'RECEIVE_STATS': {
+ const { totalRanking, totalDailyRanking } = action;
+ return {
+ ...state,
+ totalRanking,
+ totalDailyRanking,
+ };
+ }
+
+ default:
+ return state;
+ }
+}
diff --git a/src/reducers/user.js b/src/reducers/user.js
index 067261d..2739ab7 100644
--- a/src/reducers/user.js
+++ b/src/reducers/user.js
@@ -5,7 +5,6 @@ import type { Action } from '../actions/types';
import { createNameRegExp } from '../core/utils';
-
export type UserState = {
name: string,
center: Cell,
@@ -13,18 +12,9 @@ export type UserState = {
coolDown: ?number, // ms
lastCoolDownEnd: ?Date,
requestingPixel: boolean,
- online: ?number,
// messages are sent by api/me, like not_verified status
messages: Array,
mailreg: boolean,
- // stats
- totalPixels: number,
- dailyTotalPixels: number,
- ranking: number,
- dailyRanking: number,
- // global stats
- totalRanking: Object,
- totalDailyRanking: Object,
// minecraft
minecraftname: string,
// blocking all Dms
@@ -46,11 +36,8 @@ const initialState: UserState = {
coolDown: null,
lastCoolDownEnd: null,
requestingPixel: true,
- online: null,
messages: [],
mailreg: false,
- totalRanking: {},
- totalDailyRanking: {},
minecraftname: null,
blockDm: false,
isOnMobile: false,
@@ -81,7 +68,7 @@ export default function user(
};
}
- case 'SET_PLACE_ALLOWED': {
+ case 'SET_REQUESTING_PIXEL': {
const { requestingPixel } = action;
return {
...state,
@@ -120,35 +107,11 @@ export default function user(
};
}
- case 'PLACED_PIXELS': {
- let { totalPixels, dailyTotalPixels } = state;
- const { amount } = action;
- totalPixels += amount;
- dailyTotalPixels += amount;
- return {
- ...state,
- totalPixels,
- dailyTotalPixels,
- };
- }
-
- case 'RECEIVE_ONLINE': {
- const { online } = action;
- return {
- ...state,
- online,
- };
- }
-
case 'RECEIVE_ME':
case 'LOGIN': {
const {
name,
mailreg,
- totalPixels,
- dailyTotalPixels,
- ranking,
- dailyRanking,
minecraftname,
blockDm,
userlvl,
@@ -160,10 +123,6 @@ export default function user(
name,
messages,
mailreg,
- totalPixels,
- dailyTotalPixels,
- ranking,
- dailyRanking,
minecraftname,
blockDm,
userlvl,
@@ -184,15 +143,6 @@ export default function user(
};
}
- case 'RECEIVE_STATS': {
- const { totalRanking, totalDailyRanking } = action;
- return {
- ...state,
- totalRanking,
- totalDailyRanking,
- };
- }
-
case 'SET_NAME': {
const { name } = action;
const nameRegExp = createNameRegExp(name);
diff --git a/src/routes/api/captcha.js b/src/routes/api/captcha.js
index 45ab8b3..dfecc54 100644
--- a/src/routes/api/captcha.js
+++ b/src/routes/api/captcha.js
@@ -8,42 +8,51 @@
import type { Request, Response } from 'express';
import logger from '../../core/logger';
-import { verifyCaptcha } from '../../utils/captcha';
+import { checkCaptchaSolution } from '../../utils/captcha';
import { getIPFromRequest } from '../../utils/ip';
export default async (req: Request, res: Response) => {
const ip = getIPFromRequest(req);
+ const { t } = req.ttag;
try {
- const { token } = req.body;
- if (!token) {
+ const { text } = req.body;
+ if (!text) {
res.status(400)
- .json({ errors: [{ msg: 'No token given' }] });
+ .json({ errors: [t`No captcha text given`] });
return;
}
- if (!await verifyCaptcha(token, ip)) {
- logger.info(`CAPTCHA ${ip} failed his captcha`);
- res.status(422)
- .json({
- errors: [{
- msg:
- 'You failed your captcha',
- }],
- });
- return;
- }
+ const ret = await checkCaptchaSolution(text, ip);
- res.status(200)
- .json({ success: true });
+ switch (ret) {
+ case 0:
+ res.status(200)
+ .json({ success: true });
+ break;
+ case 1:
+ res.status(422)
+ .json({
+ errors: [t`You took too long, try again.`],
+ });
+ break;
+ case 2:
+ res.status(422)
+ .json({
+ errors: [t`You failed your captcha`],
+ });
+ break;
+ default:
+ res.status(422)
+ .json({
+ errors: [t`Unknown Captcha Error`],
+ });
+ }
} catch (error) {
- logger.error('checkHuman', error);
+ logger.error('CAPTCHA', error);
res.status(500)
.json({
- errors: [{
- msg:
- 'Server error occured',
- }],
+ errors: [t`Server error occured`],
});
}
};
diff --git a/src/routes/api/index.js b/src/routes/api/index.js
index a378bc0..fefaa8d 100644
--- a/src/routes/api/index.js
+++ b/src/routes/api/index.js
@@ -44,6 +44,11 @@ router.use((err, req, res, next) => {
}
});
+/*
+ * make localisations available
+ */
+router.use(expressTTag);
+
// captcah doesn't need a user
router.post('/captcha', captcha);
@@ -89,11 +94,6 @@ router.post('/block', block);
router.post('/blockdm', blockdm);
-/*
- * make localisations available
- */
-router.use(expressTTag);
-
router.get('/chathistory', chatHistory);
router.get('/me', me);
diff --git a/src/ssr-components/Html.jsx b/src/ssr-components/Html.jsx
index 8d7dbe2..4f7b142 100644
--- a/src/ssr-components/Html.jsx
+++ b/src/ssr-components/Html.jsx
@@ -11,7 +11,6 @@
/* eslint-disable max-len */
import React from 'react';
-import { CAPTCHA_METHOD, CAPTCHA_SITEKEY } from '../core/config';
const Html = ({
title,
@@ -25,8 +24,6 @@ const Html = ({
styles,
// code as string
code,
- // if recaptcha should get loaded
- useCaptcha,
}) => (
@@ -48,10 +45,6 @@ const Html = ({
dangerouslySetInnerHTML={{ __html: style.cssText }}
/>
))}
- {(CAPTCHA_METHOD === 1) && CAPTCHA_SITEKEY && useCaptcha
- && }
- {(CAPTCHA_METHOD === 2) && CAPTCHA_SITEKEY && useCaptcha
- && }
{code && (