Skip to content

Support add login id setting actions #72

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

Merged
louischan-oursky merged 4 commits into from
Feb 4, 2025
Merged

Support add login id setting actions #72

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
33b7007
Add settings action addEmail
tung2744 Jan 24, 2025
8bb1d29
Add settings action addPhone
tung2744 Jan 24, 2025
d6fa77d
Add settings action addUsername
tung2744 Jan 24, 2025
991a054
Remove wechatRedirectURI from settings action
tung2744 Jan 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
86 changes: 84 additions & 2 deletions example/lib/main.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -593,6 +593,36 @@ class _MyAppState extends State<MyApp> {
_onPressChangePassword(context);
},
),
SessionStateButton(
sessionState: _authgear.sessionState,
targetState: SessionState.authenticated,
label: "Add Email",
onPressed: _unconfigured || _loading
? null
: () {
_onPressAddEmail(context);
},
),
SessionStateButton(
sessionState: _authgear.sessionState,
targetState: SessionState.authenticated,
label: "Add Phone",
onPressed: _unconfigured || _loading
? null
: () {
_onPressAddPhone(context);
},
),
SessionStateButton(
sessionState: _authgear.sessionState,
targetState: SessionState.authenticated,
label: "Add Username",
onPressed: _unconfigured || _loading
? null
: () {
_onPressAddUsername(context);
},
),
SessionStateButton(
sessionState: _authgear.sessionState,
targetState: SessionState.authenticated,
Expand Down Expand Up @@ -907,7 +937,6 @@ class _MyAppState extends State<MyApp> {
await _authgear.changePassword(
redirectURI: redirectURI,
colorScheme: _getColorScheme(context),
wechatRedirectURI: wechatRedirectURI,
);
} catch (e) {
onError(context, e);
Expand All @@ -926,7 +955,60 @@ class _MyAppState extends State<MyApp> {
await _authgear.deleteAccount(
redirectURI: redirectURI,
colorScheme: _getColorScheme(context),
wechatRedirectURI: wechatRedirectURI,
);
} catch (e) {
onError(context, e);
} finally {
setState(() {
_loading = false;
});
}
}

Future<void> _onPressAddEmail(BuildContext context) async {
try {
setState(() {
_loading = true;
});
await _authgear.addEmail(
redirectURI: redirectURI,
colorScheme: _getColorScheme(context),
);
} catch (e) {
onError(context, e);
} finally {
setState(() {
_loading = false;
});
}
}

Future<void> _onPressAddPhone(BuildContext context) async {
try {
setState(() {
_loading = true;
});
await _authgear.addPhone(
redirectURI: redirectURI,
colorScheme: _getColorScheme(context),
);
} catch (e) {
onError(context, e);
} finally {
setState(() {
_loading = false;
});
}
}

Future<void> _onPressAddUsername(BuildContext context) async {
try {
setState(() {
_loading = true;
});
await _authgear.addUsername(
redirectURI: redirectURI,
colorScheme: _getColorScheme(context),
);
} catch (e) {
onError(context, e);
Expand Down
55 changes: 38 additions & 17 deletions lib/src/container.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,14 +166,12 @@ class SettingsActionOptions {
final String redirectURI;
final List<String>? uiLocales;
final ColorScheme? colorScheme;
final String? wechatRedirectURI;

SettingsActionOptions({
required this.settingAction,
required this.redirectURI,
this.uiLocales,
this.colorScheme,
this.wechatRedirectURI,
});

OIDCAuthenticationRequest toRequest(String clientID, String idTokenHint,
Expand All @@ -196,7 +194,6 @@ class SettingsActionOptions {
colorScheme: colorScheme,
idTokenHint: idTokenHint,
loginHint: loginHint,
wechatRedirectURI: wechatRedirectURI,
settingsAction: settingAction,
);
}
Expand Down Expand Up @@ -562,7 +559,6 @@ class Authgear implements AuthgearHttpClientDelegate {
required String redirectURI,
List<String>? uiLocales,
ColorScheme? colorScheme,
String? wechatRedirectURI,
}) async {
final idTokenHint = this.idTokenHint;
final refreshToken = _refreshToken;
Expand All @@ -582,18 +578,11 @@ class Authgear implements AuthgearHttpClientDelegate {
redirectURI: redirectURI,
uiLocales: uiLocales,
colorScheme: colorScheme,
wechatRedirectURI: wechatRedirectURI,
);

final request = await internalCreateSettingsActionRequest(
clientID, idTokenHint, loginHint, options);

if (wechatRedirectURI != null) {
await native.registerWechatRedirectURI(
onWechatRedirectURI: _onWechatRedirectURI,
wechatRedirectURI: wechatRedirectURI);
}

final resultURL = await _uiImplementation.openAuthorizationURL(
url: request.url.toString(),
redirectURI: redirectURI,
Expand All @@ -608,32 +597,64 @@ class Authgear implements AuthgearHttpClientDelegate {
Future<void> changePassword(
{required String redirectURI,
List<String>? uiLocales,
ColorScheme? colorScheme,
String? wechatRedirectURI}) {
ColorScheme? colorScheme}) {
return _openSettingsAction(
action: SettingsAction.changePassword,
redirectURI: redirectURI,
uiLocales: uiLocales,
colorScheme: colorScheme,
wechatRedirectURI: wechatRedirectURI,
);
}

Future<void> deleteAccount(
{required String redirectURI,
List<String>? uiLocales,
ColorScheme? colorScheme,
String? wechatRedirectURI}) async {
ColorScheme? colorScheme}) async {
await _openSettingsAction(
action: SettingsAction.deleteAccount,
redirectURI: redirectURI,
uiLocales: uiLocales,
colorScheme: colorScheme,
wechatRedirectURI: wechatRedirectURI,
);
await _clearSession(SessionStateChangeReason.invalid);
}

Future<void> addEmail(
{required String redirectURI,
List<String>? uiLocales,
ColorScheme? colorScheme}) async {
await _openSettingsAction(
action: SettingsAction.addEmail,
redirectURI: redirectURI,
uiLocales: uiLocales,
colorScheme: colorScheme,
);
}

Future<void> addPhone(
{required String redirectURI,
List<String>? uiLocales,
ColorScheme? colorScheme}) async {
await _openSettingsAction(
action: SettingsAction.addPhone,
redirectURI: redirectURI,
uiLocales: uiLocales,
colorScheme: colorScheme,
);
}

Future<void> addUsername(
{required String redirectURI,
List<String>? uiLocales,
ColorScheme? colorScheme}) async {
await _openSettingsAction(
action: SettingsAction.addUsername,
redirectURI: redirectURI,
uiLocales: uiLocales,
colorScheme: colorScheme,
);
}

Future<void> refreshIDToken() async {
if (shouldRefreshAccessToken) {
await refreshAccessToken();
Expand Down
14 changes: 13 additions & 1 deletion lib/src/type.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,13 @@ extension ActorTokenTypeExtension on ActorTokenType {
}
}

enum SettingsAction { changePassword, deleteAccount }
enum SettingsAction {
changePassword,
deleteAccount,
addEmail,
addPhone,
addUsername,
}

extension SettingsActionExtension on SettingsAction {
String get value {
Expand All @@ -167,6 +173,12 @@ extension SettingsActionExtension on SettingsAction {
return "change_password";
case SettingsAction.deleteAccount:
return "delete_account";
case SettingsAction.addEmail:
return "add_email";
case SettingsAction.addPhone:
return "add_phone";
case SettingsAction.addUsername:
return "add_username";
}
}
}
Expand Down