Page MenuHomePhabricator
Files F2903878

D6077.id20271.diff
No OneTemporary
Actions

D6077.id20271.diff
View Options

diff --git a/keyserver/src/creators/account-creator.js b/keyserver/src/creators/account-creator.js
--- a/keyserver/src/creators/account-creator.js
+++ b/keyserver/src/creators/account-creator.js
@@ -16,6 +16,11 @@
RegisterResponse,
RegisterRequest,
} from 'lib/types/account-types';
+import type {
+ PlatformDetails,
+ DeviceTokenUpdateRequest,
+} from 'lib/types/device-types.js';
+import type { CalendarQuery } from 'lib/types/entry-types.js';
import { messageTypes } from 'lib/types/message-types';
import { threadTypes } from 'lib/types/thread-types';
import { ServerError } from 'lib/utils/errors';
@@ -193,52 +198,31 @@
};
}
+export type CreateSIWEAccountRequest = {
+ +address: string,
+ +calendarQuery?: ?CalendarQuery,
+ +deviceTokenUpdateRequest?: ?DeviceTokenUpdateRequest,
+ +platformDetails: PlatformDetails,
+};
async function createSIWEAccount(
viewer: Viewer,
- request: RegisterRequest,
-): Promise<RegisterResponse> {
- if (request.password.trim() === '') {
- throw new ServerError('empty_password');
- }
- const usernameRegex = hasMinCodeVersion(viewer.platformDetails, 69)
- ? validUsernameRegex
- : oldValidUsernameRegex;
- if (request.username.search(usernameRegex) === -1) {
- throw new ServerError('invalid_username');
- }
+ request: CreateSIWEAccountRequest,
+): Promise<string> {
+ const promises = [];
- const usernameQuery = SQL`
- SELECT COUNT(id) AS count
- FROM users
- WHERE LCASE(username) = LCASE(${request.username})
- `;
- const promises = [dbQuery(usernameQuery)];
const { calendarQuery } = request;
if (calendarQuery) {
promises.push(verifyCalendarQueryThreadIDs(calendarQuery));
}
- const [[usernameResult]] = await Promise.all(promises);
- if (reservedUsernamesSet.has(request.username.toLowerCase())) {
- if (hasMinCodeVersion(viewer.platformDetails, 120)) {
- throw new ServerError('username_reserved');
- } else {
- throw new ServerError('username_taken');
- }
- }
- if (usernameResult[0].count !== 0) {
- throw new ServerError('username_taken');
- }
-
- const hash = bcrypt.hashSync(request.password);
const time = Date.now();
const deviceToken = request.deviceTokenUpdateRequest
? request.deviceTokenUpdateRequest.deviceToken
: viewer.deviceToken;
const [id] = await createIDs('users', 1);
- const newUserRow = [id, request.username, hash, time];
+ const newUserRow = [id, request.address, request.address, time];
const newUserQuery = SQL`
- INSERT INTO users(id, username, hash, creation_time)
+ INSERT INTO users(id, username, ethereum_address, creation_time)
VALUES ${[newUserRow]}
`;
const [userViewerData] = await Promise.all([
@@ -268,7 +252,7 @@
]);
const [privateThreadResult, ashoatThreadResult] = await Promise.all([
- createPrivateThread(viewer, request.username),
+ createPrivateThread(viewer, request.address),
createThread(
viewer,
{
@@ -305,32 +289,8 @@
text: message,
}));
const messageDatas = [...ashoatMessageDatas, ...privateMessageDatas];
- const [
- messageInfos,
- threadsResult,
- userInfos,
- currentUserInfo,
- ] = await Promise.all([
- createMessages(viewer, messageDatas),
- fetchThreadInfos(viewer),
- fetchKnownUserInfos(viewer),
- fetchLoggedInUserInfo(viewer),
- ]);
- const rawMessageInfos = [
- ...ashoatThreadResult.newMessageInfos,
- ...privateThreadResult.newMessageInfos,
- ...messageInfos,
- ];
-
- return {
- id,
- rawMessageInfos,
- currentUserInfo,
- cookieChange: {
- threadInfos: threadsResult.threadInfos,
- userInfos: values(userInfos),
- },
- };
+ await Promise.all([createMessages(viewer, messageDatas)]);
+ return id;
}
export { createAccount, createSIWEAccount };
diff --git a/keyserver/src/responders/user-responders.js b/keyserver/src/responders/user-responders.js
--- a/keyserver/src/responders/user-responders.js
+++ b/keyserver/src/responders/user-responders.js
@@ -44,7 +44,7 @@
tOldValidUsername,
} from 'lib/utils/validation-utils';
-import { createAccount } from '../creators/account-creator';
+import { createAccount, createSIWEAccount } from '../creators/account-creator';
import { dbQuery, SQL } from '../database/database';
import { deleteAccount } from '../deleters/account-deleters';
import { deleteCookie } from '../deleters/cookie-deleters';
@@ -323,7 +323,12 @@
): Promise<LogInResponse> {
await validateInput(viewer, siweAuthRequestInputValidator, input);
const request: SIWEAuthRequest = input;
- const { message, signature } = request;
+ const {
+ message,
+ signature,
+ deviceTokenUpdateRequest,
+ platformDetails,
+ } = request;
// 1. Ensure that `message` is a well formed Comm SIWE Auth message.
const siweMessage: SIWEMessage = new SiweMessage(message);
@@ -359,12 +364,19 @@
}
}
- // 4. Complete login with call to `successfulLogInQueries(...)`
- // if `address` corresponds to an existing user.
- const userID = await fetchUserIDForEthereumAddress(siweMessage.address);
+ // 4. Create account with call to `createSIWEAccount(...)`
+ // if address does not correspond to an existing user.
+ let userID = await fetchUserIDForEthereumAddress(siweMessage.address);
if (!userID) {
- throw new ServerError('placeholder_error');
+ const createSIWEAccountRequest = {
+ address: siweMessage.address,
+ deviceTokenUpdateRequest: deviceTokenUpdateRequest,
+ platformDetails,
+ };
+ userID = await createSIWEAccount(viewer, createSIWEAccountRequest);
}
+
+ // 5. Complete login with call to `processSuccessfulLogin(...)`.
return await processSuccessfulLogin(viewer, input, userID);
}

File Metadata

Mime Type
text/plain
Expires
Mon, Oct 7, 12:00 AM (21 h, 45 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2251490
Default Alt Text
D6077.id20271.diff (5 KB)

Event Timeline