Page MenuHomePhabricator
Differential D4289

[services][identity] subroutine for generating token and writing it to db
ClosedPublic
Actions

Authored by varun on Jun 17 2022, 1:52 PM.
Tags
None
Referenced Files
Unknown Object (File)
Thu, Mar 13, 2:18 PM
Unknown Object (File)
Thu, Mar 13, 1:07 PM
Unknown Object (File)
Thu, Mar 13, 12:40 AM
Unknown Object (File)
Sat, Mar 8, 6:13 PM
Unknown Object (File)
Thu, Mar 6, 6:28 AM
Unknown Object (File)
Wed, Mar 5, 2:04 PM
Unknown Object (File)
Tue, Mar 4, 4:33 PM
Unknown Object (File)
Sat, Mar 1, 5:01 AM
View All Files
Subscribers
• abosh
• adrian
ashoat
atul

Details

Reviewers
• jim
• karol
tomek
Commits
rCOMM0ea4b3f1f831: [services][identity] subroutine for generating token and writing it to db
rCOMM3c3b3dac217f: [services][identity] subroutine for generating token and writing it to db
Summary

we have to do this for both wallet and pake login, so moving it to a helper fn to avoid duplicating code

Depends on D4286

Test Plan

cargo build, further testing done in functions that leverage this helper

Diff Detail

Repository
rCOMM Comm
Branch
arcpatch-D4289
Lint
No Lint Coverage
Unit
No Test Coverage

Event Timeline

varun created this revision.Jun 17 2022, 1:52 PM
Herald added subscribers: • abosh, atul, • adrian, ashoat. · View Herald TranscriptJun 17 2022, 1:52 PM
varun updated this revision to Diff 13556.Jun 17 2022, 1:53 PM

update diff stack

varun edited the summary of this revision. (Show Details)Jun 17 2022, 1:54 PM
varun added a parent revision: D4286: [services][identity] add un-signed SIWE message to WalletLoginRequest.
Harbormaster completed remote builds in B9792: Diff 13555.Jun 17 2022, 1:57 PM
Harbormaster completed remote builds in B9793: Diff 13556.Jun 17 2022, 2:02 PM
varun requested review of this revision.Jun 17 2022, 2:02 PM
• jim requested changes to this revision.Jun 17 2022, 2:13 PM
• jim added inline comments.
services/identity/src/service.rs
105 ↗(On Diff #13556)

Should this be auth_type instead of AuthType::Password?

This revision now requires changes to proceed.Jun 17 2022, 2:13 PM
varun updated this revision to Diff 13557.Jun 17 2022, 2:22 PM

fix bug

services/identity/src/service.rs
105 ↗(On Diff #13556)

yes, thank you for catching that

Harbormaster completed remote builds in B9794: Diff 13557.Jun 17 2022, 2:27 PM
tomek accepted this revision.Jun 20 2022, 6:16 AM
• jim accepted this revision.Jun 23 2022, 8:08 AM
This revision is now accepted and ready to land.Jun 23 2022, 8:08 AM
Closed by commit rCOMM3c3b3dac217f: [services][identity] subroutine for generating token and writing it to db (authored by varun). · Explain WhyJun 23 2022, 10:11 AM
This revision was automatically updated to reflect the committed changes.
varun added a commit: rCOMM3c3b3dac217f: [services][identity] subroutine for generating token and writing it to db.
atul added a comment.Jun 23 2022, 10:48 AM

Whatever was landed wasn't the latest revision of this diff + doesn't build. Going to revert commit on master, this diff will need to be re-opened

atul added a comment.Jun 23 2022, 10:48 AM
error[E0432]: unresolved import `crate::token::AccessToken`
  --> src/service.rs:11:20
   |
11 | use crate::token::{AccessToken, AuthType};
   |                    ^^^^^^^^^^^ no `AccessToken` in `token`
 
error[E0432]: unresolved import `proto::pake_login_response::Data::Token`
  --> src/service.rs:18:46
   |
18 |   login_response::Data::WalletLoginResponse, pake_login_response::Data::Token,
   |                                              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ no `Token` in `service::proto::pake_login_response::Data`
 
error[E0599]: no method named `put_token` found for struct `DatabaseClient` in the current scope
   --> src/service.rs:106:16
    |
106 |   match client.put_token(token.clone()).await {
    |                ^^^^^^^^^ method not found in `DatabaseClient`
    |
   ::: src/database.rs:16:1
    |
16  | pub struct DatabaseClient {
    | ------------------------- method `put_token` not found for this
 
error[E0560]: struct `WalletLoginResponse` has no field named `token`
   --> src/service.rs:110:11
    |
110 |           token: token.token,
    |           ^^^^^ `WalletLoginResponse` does not have this field
    |
    = note: available fields are: `access_token`
 
Some errors have detailed explanations: E0432, E0560, E0599.
For more information about an error, try `rustc --explain E0432`.
error: could not compile `identity` due to 4 previous errors
atul added a reverting change: rCOMM4ebce398490f: Revert "[services][identity] subroutine for generating token and writing it to….Jun 23 2022, 10:51 AM
atul reopened this revision.Jun 23 2022, 10:54 AM
This revision is now accepted and ready to land.Jun 23 2022, 10:54 AM
varun updated this revision to Diff 13727.Jun 23 2022, 11:08 AM

rebase

This revision was landed with ongoing or failed builds.Jun 23 2022, 11:09 AM
Closed by commit rCOMM0ea4b3f1f831: [services][identity] subroutine for generating token and writing it to db (authored by varun). · Explain Why
This revision was automatically updated to reflect the committed changes.
varun added a commit: rCOMM0ea4b3f1f831: [services][identity] subroutine for generating token and writing it to db.
Harbormaster completed remote builds in B9928: Diff 13727.Jun 23 2022, 11:14 AM

Revision Contents
Changeset List

PathSize
services/
identity/
src/
53 lines
2 lines

Diff 13727

View Options

services/identity/src/service.rs

// @flow // @flow
import * as React from 'react'; import * as React from 'react';
import { View, Text, TouchableOpacity, ScrollView } from 'react-native';
import {
configurableCommunityPermissions,
configurableCommunityPermissionsOptions,
type ConfigurableCommunityPermissionOption,
} from 'lib/types/thread-permission-types.js';
import type { ThreadInfo } from 'lib/types/thread-types.js'; import type { ThreadInfo } from 'lib/types/thread-types.js';
import { getKeysByValue } from 'lib/utils/objects.js';
import type { RolesNavigationProp } from './roles-navigator.react.js'; import type { RolesNavigationProp } from './roles-navigator.react.js';
import EnumSettingsOption from '../components/enum-settings-option.react.js';
import SWMansionIcon from '../components/swmansion-icon.react.js';
import TextInput from '../components/text-input.react.js';
import type { NavigationRoute } from '../navigation/route-names.js'; import type { NavigationRoute } from '../navigation/route-names.js';
import { useStyles } from '../themes/colors.js';
export type CreateRolesScreenParams = { export type CreateRolesScreenParams = {
+threadInfo: ThreadInfo, +threadInfo: ThreadInfo,
+action: 'create_role' | 'edit_role', +action: 'create_role' | 'edit_role',
}; };
type CreateRolesScreenProps = { type CreateRolesScreenProps = {
+navigation: RolesNavigationProp<'CreateRolesScreen'>, +navigation: RolesNavigationProp<'CreateRolesScreen'>,
+route: NavigationRoute<'CreateRolesScreen'>, +route: NavigationRoute<'CreateRolesScreen'>,
}; };
// eslint-disable-next-line no-unused-vars
function CreateRolesScreen(props: CreateRolesScreenProps): React.Node { function CreateRolesScreen(props: CreateRolesScreenProps): React.Node {
return <></>; // eslint-disable-next-line no-unused-vars
const { threadInfo, action } = props.route.params;
const [customRoleName, setCustomRoleName] =
React.useState<string>('New Role');
const [selectedPermissions, setSelectedPermissions] = React.useState([]);
const styles = useStyles(unboundStyles);
const onClearPermissions = React.useCallback(() => {
setSelectedPermissions([]);
}, []);
const isSelectedPermissionsEmpty = selectedPermissions.length === 0;
const clearPermissionsText = React.useMemo(() => {
if (isSelectedPermissionsEmpty) {
return (
<Text style={styles.clearPermissionsTextDisabled}>
Clear permissions
</Text>
);
}
return (
<TouchableOpacity onPress={onClearPermissions}>
ashoatUnsubmitted
Not Done
Inline Actions

Does TouchableOpacity have a disabled prop? It would probably be less expensive to use that, instead of unmounting / remounting TouchableOpacity when it becomes enabled / disabled

ashoat: Does `TouchableOpacity` have a `disabled` prop? It would probably be less expensive to use that…
rohanAuthorUnsubmitted
Done
Inline Actions

Looks like it does actually, I didn't know that

rohan: Looks like it does actually, I didn't know that
<Text style={styles.clearPermissionsText}>Clear permissions</Text>
</TouchableOpacity>
);
}, [
isSelectedPermissionsEmpty,
onClearPermissions,
styles.clearPermissionsText,
styles.clearPermissionsTextDisabled,
]);
const isUserFacingPermissionSelected = React.useCallback(
(option: ConfigurableCommunityPermissionOption) => {
const associatedPermissions = getKeysByValue(
configurableCommunityPermissions,
option,
);
return associatedPermissions.every(permission =>
selectedPermissions.includes(permission),
);
},
[selectedPermissions],
);
const onEnumValuePress = React.useCallback(
(option: ConfigurableCommunityPermissionOption) => {
// configurableCommunityPermissions is an object where one permission
// is associated with exactly one user-facing option. This means that
// permission propagation are classed as separate entries in the object.
// So, for example, 'edit_entries' and 'descendants_edit_entries' are
// separate entries in the object, but they are both associated with the
// same user-facing option, 'Edit entries'. So when a user-facing option
// is selected, we need to select all permissions associated with that.
const associatedPermissions = getKeysByValue(
configurableCommunityPermissions,
option,
);
// Toggle the inclusivity of the permissions associated with the
// user-facing option.
if (isUserFacingPermissionSelected(option)) {
setSelectedPermissions(currentPermissions =>
currentPermissions.filter(
permission => !associatedPermissions.includes(permission),
),
);
} else {
setSelectedPermissions(currentPermissions => [
...currentPermissions,
...associatedPermissions,
]);
}
},
[isUserFacingPermissionSelected],
);
const permissionsList = React.useMemo(
() =>
[...configurableCommunityPermissionsOptions].map(permission => (
rohanAuthorUnsubmitted
Done
Inline Actions

This is a Set so I used the ... operator to map over it

rohan: This is a Set so I used the `...` operator to [[ https://stackoverflow.
<EnumSettingsOption
key={permission.title}
name={permission.title}
description={permission.description}
enumValue={isUserFacingPermissionSelected(permission)}
onEnumValuePress={() => onEnumValuePress(permission)}
/>
)),
[isUserFacingPermissionSelected, onEnumValuePress],
);
const onChangeRoleNameInput = React.useCallback((roleName: string) => {
setCustomRoleName(roleName);
}, []);
return (
<View>
<View style={styles.roleNameContainer}>
<Text style={styles.roleNameText}>ROLE NAME</Text>
<View style={styles.roleInput}>
<TextInput
style={styles.roleInputComponent}
value={customRoleName}
onChangeText={onChangeRoleNameInput}
editable={true}
/>
<SWMansionIcon name="edit-1" size={20} style={styles.pencilIcon} />
</View>
</View>
<View style={styles.permissionsContainer}>
<View style={styles.permissionsHeader}>
<Text style={styles.permissionsText}>PERMISSIONS</Text>
{clearPermissionsText}
</View>
<ScrollView style={styles.permissionsListContainer}>
{permissionsList}
</ScrollView>
</View>
</View>
);
} }
const unboundStyles = {
roleNameContainer: {
marginTop: 30,
},
roleNameText: {
color: 'panelBackgroundLabel',
fontSize: 12,
marginBottom: 5,
marginLeft: 10,
},
roleInput: {
backgroundColor: 'panelForeground',
padding: 12,
flexDirection: 'row',
justifyContent: 'space-between',
},
roleInputComponent: {
color: 'whiteText',
fontSize: 16,
},
pencilIcon: {
color: 'panelInputSecondaryForeground',
},
permissionsContainer: {
marginTop: 20,
paddingBottom: 220,
},
permissionsHeader: {
flexDirection: 'row',
justifyContent: 'space-between',
},
permissionsText: {
color: 'panelBackgroundLabel',
fontSize: 12,
marginLeft: 10,
},
clearPermissionsText: {
color: 'purpleLink',
fontSize: 12,
marginRight: 15,
},
clearPermissionsTextDisabled: {
color: 'disabledButton',
fontSize: 12,
marginRight: 15,
},
permissionsListContainer: {
backgroundColor: 'panelForeground',
marginTop: 10,
},
};
export default CreateRolesScreen; export default CreateRolesScreen;
View Options

services/identity/src/token.rs

// @flow // @flow
import * as React from 'react'; import * as React from 'react';
import { View, Text, TouchableOpacity, ScrollView } from 'react-native';
import {
configurableCommunityPermissions,
configurableCommunityPermissionsOptions,
type ConfigurableCommunityPermissionOption,
} from 'lib/types/thread-permission-types.js';
import type { ThreadInfo } from 'lib/types/thread-types.js'; import type { ThreadInfo } from 'lib/types/thread-types.js';
import { getKeysByValue } from 'lib/utils/objects.js';
import type { RolesNavigationProp } from './roles-navigator.react.js'; import type { RolesNavigationProp } from './roles-navigator.react.js';
import EnumSettingsOption from '../components/enum-settings-option.react.js';
import SWMansionIcon from '../components/swmansion-icon.react.js';
import TextInput from '../components/text-input.react.js';
import type { NavigationRoute } from '../navigation/route-names.js'; import type { NavigationRoute } from '../navigation/route-names.js';
import { useStyles } from '../themes/colors.js';
export type CreateRolesScreenParams = { export type CreateRolesScreenParams = {
+threadInfo: ThreadInfo, +threadInfo: ThreadInfo,
+action: 'create_role' | 'edit_role', +action: 'create_role' | 'edit_role',
}; };
type CreateRolesScreenProps = { type CreateRolesScreenProps = {
+navigation: RolesNavigationProp<'CreateRolesScreen'>, +navigation: RolesNavigationProp<'CreateRolesScreen'>,
+route: NavigationRoute<'CreateRolesScreen'>, +route: NavigationRoute<'CreateRolesScreen'>,
}; };
// eslint-disable-next-line no-unused-vars
function CreateRolesScreen(props: CreateRolesScreenProps): React.Node { function CreateRolesScreen(props: CreateRolesScreenProps): React.Node {
return <></>; // eslint-disable-next-line no-unused-vars
const { threadInfo, action } = props.route.params;
const [customRoleName, setCustomRoleName] =
React.useState<string>('New Role');
const [selectedPermissions, setSelectedPermissions] = React.useState([]);
const styles = useStyles(unboundStyles);
const onClearPermissions = React.useCallback(() => {
setSelectedPermissions([]);
}, []);
const isSelectedPermissionsEmpty = selectedPermissions.length === 0;
const clearPermissionsText = React.useMemo(() => {
if (isSelectedPermissionsEmpty) {
return (
<Text style={styles.clearPermissionsTextDisabled}>
Clear permissions
</Text>
);
}
return (
<TouchableOpacity onPress={onClearPermissions}>
ashoatUnsubmitted
Not Done
Inline Actions

Does TouchableOpacity have a disabled prop? It would probably be less expensive to use that, instead of unmounting / remounting TouchableOpacity when it becomes enabled / disabled

ashoat: Does `TouchableOpacity` have a `disabled` prop? It would probably be less expensive to use that…
rohanAuthorUnsubmitted
Done
Inline Actions

Looks like it does actually, I didn't know that

rohan: Looks like it does actually, I didn't know that
<Text style={styles.clearPermissionsText}>Clear permissions</Text>
</TouchableOpacity>
);
}, [
isSelectedPermissionsEmpty,
onClearPermissions,
styles.clearPermissionsText,
styles.clearPermissionsTextDisabled,
]);
const isUserFacingPermissionSelected = React.useCallback(
(option: ConfigurableCommunityPermissionOption) => {
const associatedPermissions = getKeysByValue(
configurableCommunityPermissions,
option,
);
return associatedPermissions.every(permission =>
selectedPermissions.includes(permission),
);
},
[selectedPermissions],
);
const onEnumValuePress = React.useCallback(
(option: ConfigurableCommunityPermissionOption) => {
// configurableCommunityPermissions is an object where one permission
// is associated with exactly one user-facing option. This means that
// permission propagation are classed as separate entries in the object.
// So, for example, 'edit_entries' and 'descendants_edit_entries' are
// separate entries in the object, but they are both associated with the
// same user-facing option, 'Edit entries'. So when a user-facing option
// is selected, we need to select all permissions associated with that.
const associatedPermissions = getKeysByValue(
configurableCommunityPermissions,
option,
);
// Toggle the inclusivity of the permissions associated with the
// user-facing option.
if (isUserFacingPermissionSelected(option)) {
setSelectedPermissions(currentPermissions =>
currentPermissions.filter(
permission => !associatedPermissions.includes(permission),
),
);
} else {
setSelectedPermissions(currentPermissions => [
...currentPermissions,
...associatedPermissions,
]);
}
},
[isUserFacingPermissionSelected],
);
const permissionsList = React.useMemo(
() =>
[...configurableCommunityPermissionsOptions].map(permission => (
rohanAuthorUnsubmitted
Done
Inline Actions

This is a Set so I used the ... operator to map over it

rohan: This is a Set so I used the `...` operator to [[ https://stackoverflow.
<EnumSettingsOption
key={permission.title}
name={permission.title}
description={permission.description}
enumValue={isUserFacingPermissionSelected(permission)}
onEnumValuePress={() => onEnumValuePress(permission)}
/>
)),
[isUserFacingPermissionSelected, onEnumValuePress],
);
const onChangeRoleNameInput = React.useCallback((roleName: string) => {
setCustomRoleName(roleName);
}, []);
return (
<View>
<View style={styles.roleNameContainer}>
<Text style={styles.roleNameText}>ROLE NAME</Text>
<View style={styles.roleInput}>
<TextInput
style={styles.roleInputComponent}
value={customRoleName}
onChangeText={onChangeRoleNameInput}
editable={true}
/>
<SWMansionIcon name="edit-1" size={20} style={styles.pencilIcon} />
</View>
</View>
<View style={styles.permissionsContainer}>
<View style={styles.permissionsHeader}>
<Text style={styles.permissionsText}>PERMISSIONS</Text>
{clearPermissionsText}
</View>
<ScrollView style={styles.permissionsListContainer}>
{permissionsList}
</ScrollView>
</View>
</View>
);
} }
const unboundStyles = {
roleNameContainer: {
marginTop: 30,
},
roleNameText: {
color: 'panelBackgroundLabel',
fontSize: 12,
marginBottom: 5,
marginLeft: 10,
},
roleInput: {
backgroundColor: 'panelForeground',
padding: 12,
flexDirection: 'row',
justifyContent: 'space-between',
},
roleInputComponent: {
color: 'whiteText',
fontSize: 16,
},
pencilIcon: {
color: 'panelInputSecondaryForeground',
},
permissionsContainer: {
marginTop: 20,
paddingBottom: 220,
},
permissionsHeader: {
flexDirection: 'row',
justifyContent: 'space-between',
},
permissionsText: {
color: 'panelBackgroundLabel',
fontSize: 12,
marginLeft: 10,
},
clearPermissionsText: {
color: 'purpleLink',
fontSize: 12,
marginRight: 15,
},
clearPermissionsTextDisabled: {
color: 'disabledButton',
fontSize: 12,
marginRight: 15,
},
permissionsListContainer: {
backgroundColor: 'panelForeground',
marginTop: 10,
},
};
export default CreateRolesScreen; export default CreateRolesScreen;