Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(github): allow multiple accounts #188

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

fix(github): allow multiple accounts #188

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b8f59c4
fix(github): allow multiple accounts
shreyas1599 Feb 3, 2021
79791c5
fix: remove email, use any()
shreyas1599 Feb 14, 2021
df8b043
Merge branch 'main' into duplicate-account-screen
shreyas1599 Jun 20, 2021
bc3dc48
fix: any() null check error
shreyas1599 Jun 20, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions lib/models/auth.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -728,13 +728,13 @@ class AuthModel with ChangeNotifier {
}

String _oauthState;
void redirectToGithubOauth([publicOnly = false]) {
void redirectToGithubOauth(String login, [publicOnly = false]) {
_oauthState = nanoid();
final repoScope = publicOnly ? 'public_repo' : 'repo';
final scope = Uri.encodeComponent(
['user', repoScope, 'read:org', 'notifications'].join(','));
launchUrl(
'https://github.com/login/oauth/authorize?client_id=$clientId&redirect_uri=gittouch://login&scope=$scope&state=$_oauthState',
'https://github.com/login/oauth/authorize?client_id=$clientId&redirect_uri=gittouch://login&scope=$scope&state=$_oauthState&login=$login',
);
}

Expand Down
63 changes: 53 additions & 10 deletions lib/screens/login.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,17 +111,16 @@ class _LoginScreenState extends State<LoginScreen> {
);
}

Widget _buildPopup(
BuildContext context, {
List<Widget> notes,
bool showDomain = false,
}) {
Widget _buildPopup(BuildContext context,
{List<Widget> notes,
bool showDomain = false,
String placeholder = 'Access token'}) {
return Column(
children: <Widget>[
if (showDomain)
MyTextField(controller: _domainController, placeholder: 'Domain'),
SizedBox(height: 8),
MyTextField(placeholder: 'Access token', controller: _tokenController),
MyTextField(placeholder: placeholder, controller: _tokenController),
SizedBox(height: 8),
if (notes != null) ...notes,
],
Expand All @@ -133,6 +132,14 @@ class _LoginScreenState extends State<LoginScreen> {
Text(AppLocalizations.of(context).somethingBadHappens + '$err'));
}

// TODO: handle email
bool _checkAccountExists(BuildContext context, String domain, String login) {
final auth = context.read<AuthModel>();
final accountExists = auth.accounts
.where((account) => account.domain == domain && account.login == login);
return accountExists.isNotEmpty;
shreyas1599 marked this conversation as resolved.
Show resolved Hide resolved
}

@override
Widget build(BuildContext context) {
final auth = Provider.of<AuthModel>(context);
Expand All @@ -152,14 +159,50 @@ class _LoginScreenState extends State<LoginScreen> {
theme.showActions(context, [
ActionItem(
text: 'via OAuth',
onTap: (_) {
auth.redirectToGithubOauth();
onTap: (_) async {
await theme.showConfirm(
context,
_buildPopup(
context,
placeholder: 'Username or email',
shreyas1599 marked this conversation as resolved.
Show resolved Hide resolved
),
);

bool accountExists = _checkAccountExists(context,
'https://github.com', _tokenController.text);

if (accountExists) {
await theme.showWarning(
context, "Account already exists");
} else {
auth.redirectToGithubOauth(_tokenController.text);
}

_tokenController.clear();
},
),
ActionItem(
text: 'via OAuth (Public repos only)',
onTap: (_) {
auth.redirectToGithubOauth(true);
onTap: (_) async {
await theme.showConfirm(
context,
_buildPopup(
context,
placeholder: 'Username or email',
));

bool accountExists = _checkAccountExists(context,
'https://github.com', _tokenController.text);

if (accountExists) {
await theme.showWarning(
context, "Account already exists");
} else {
auth.redirectToGithubOauth(
_tokenController.text, true);
}

_tokenController.clear();
},
),
ActionItem(
Expand Down