mirror of
https://github.com/cake-tech/cake_wallet.git
synced 2024-12-23 03:59:23 +00:00
Use the latest version of the DFX Auth Api to minimize the number of API calls (#1410)
This commit is contained in:
parent
3732a4c646
commit
190c8e06b9
1 changed files with 21 additions and 55 deletions
|
@ -17,9 +17,8 @@ class DFXBuyProvider extends BuyProvider {
|
||||||
: super(wallet: wallet, isTestEnvironment: isTestEnvironment);
|
: super(wallet: wallet, isTestEnvironment: isTestEnvironment);
|
||||||
|
|
||||||
static const _baseUrl = 'api.dfx.swiss';
|
static const _baseUrl = 'api.dfx.swiss';
|
||||||
static const _authPath = '/v1/auth/signMessage';
|
// static const _signMessagePath = '/v1/auth/signMessage';
|
||||||
static const _signUpPath = '/v1/auth/signUp';
|
static const _authPath = '/v1/auth';
|
||||||
static const _signInPath = '/v1/auth/signIn';
|
|
||||||
static const walletName = 'CakeWallet';
|
static const walletName = 'CakeWallet';
|
||||||
|
|
||||||
@override
|
@override
|
||||||
|
@ -73,21 +72,25 @@ class DFXBuyProvider extends BuyProvider {
|
||||||
String get walletAddress =>
|
String get walletAddress =>
|
||||||
wallet.walletAddresses.primaryAddress ?? wallet.walletAddresses.address;
|
wallet.walletAddresses.primaryAddress ?? wallet.walletAddresses.address;
|
||||||
|
|
||||||
Future<String> getSignMessage() async {
|
Future<String> getSignMessage() async =>
|
||||||
final uri = Uri.https(_baseUrl, _authPath, {'address': walletAddress});
|
"By_signing_this_message,_you_confirm_that_you_are_the_sole_owner_of_the_provided_Blockchain_address._Your_ID:_$walletAddress";
|
||||||
|
|
||||||
var response = await http.get(uri, headers: {'accept': 'application/json'});
|
// // Lets keep this just in case, but we can avoid this API Call
|
||||||
|
// Future<String> getSignMessage() async {
|
||||||
|
// final uri = Uri.https(_baseUrl, _signMessagePath, {'address': walletAddress});
|
||||||
|
//
|
||||||
|
// final response = await http.get(uri, headers: {'accept': 'application/json'});
|
||||||
|
//
|
||||||
|
// if (response.statusCode == 200) {
|
||||||
|
// final responseBody = jsonDecode(response.body);
|
||||||
|
// return responseBody['message'] as String;
|
||||||
|
// } else {
|
||||||
|
// throw Exception(
|
||||||
|
// 'Failed to get sign message. Status: ${response.statusCode} ${response.body}');
|
||||||
|
// }
|
||||||
|
// }
|
||||||
|
|
||||||
if (response.statusCode == 200) {
|
Future<String> auth() async {
|
||||||
final responseBody = jsonDecode(response.body);
|
|
||||||
return responseBody['message'] as String;
|
|
||||||
} else {
|
|
||||||
throw Exception(
|
|
||||||
'Failed to get sign message. Status: ${response.statusCode} ${response.body}');
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
Future<String> signUp() async {
|
|
||||||
final signMessage = getSignature(await getSignMessage());
|
final signMessage = getSignature(await getSignMessage());
|
||||||
|
|
||||||
final requestBody = jsonEncode({
|
final requestBody = jsonEncode({
|
||||||
|
@ -96,7 +99,7 @@ class DFXBuyProvider extends BuyProvider {
|
||||||
'signature': signMessage,
|
'signature': signMessage,
|
||||||
});
|
});
|
||||||
|
|
||||||
final uri = Uri.https(_baseUrl, _signUpPath);
|
final uri = Uri.https(_baseUrl, _authPath);
|
||||||
var response = await http.post(
|
var response = await http.post(
|
||||||
uri,
|
uri,
|
||||||
headers: {'Content-Type': 'application/json'},
|
headers: {'Content-Type': 'application/json'},
|
||||||
|
@ -115,33 +118,6 @@ class DFXBuyProvider extends BuyProvider {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Future<String> signIn() async {
|
|
||||||
final signMessage = getSignature(await getSignMessage());
|
|
||||||
|
|
||||||
final requestBody = jsonEncode({
|
|
||||||
'address': walletAddress,
|
|
||||||
'signature': signMessage,
|
|
||||||
});
|
|
||||||
|
|
||||||
final uri = Uri.https(_baseUrl, _signInPath);
|
|
||||||
var response = await http.post(
|
|
||||||
uri,
|
|
||||||
headers: {'Content-Type': 'application/json'},
|
|
||||||
body: requestBody,
|
|
||||||
);
|
|
||||||
|
|
||||||
if (response.statusCode == 201) {
|
|
||||||
final responseBody = jsonDecode(response.body);
|
|
||||||
return responseBody['accessToken'] as String;
|
|
||||||
} else if (response.statusCode == 403) {
|
|
||||||
final responseBody = jsonDecode(response.body);
|
|
||||||
final message = responseBody['message'] ?? 'Service unavailable in your country';
|
|
||||||
throw Exception(message);
|
|
||||||
} else {
|
|
||||||
throw Exception('Failed to sign in. Status: ${response.statusCode} ${response.body}');
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
String getSignature(String message) {
|
String getSignature(String message) {
|
||||||
switch (wallet.type) {
|
switch (wallet.type) {
|
||||||
case WalletType.ethereum:
|
case WalletType.ethereum:
|
||||||
|
@ -164,17 +140,7 @@ class DFXBuyProvider extends BuyProvider {
|
||||||
final blockchain = this.blockchain;
|
final blockchain = this.blockchain;
|
||||||
final actionType = isBuyAction == true ? '/buy' : '/sell';
|
final actionType = isBuyAction == true ? '/buy' : '/sell';
|
||||||
|
|
||||||
String accessToken;
|
final accessToken = await auth();
|
||||||
|
|
||||||
try {
|
|
||||||
accessToken = await signUp();
|
|
||||||
} on Exception catch (e) {
|
|
||||||
if (e.toString().contains('409')) {
|
|
||||||
accessToken = await signIn();
|
|
||||||
} else {
|
|
||||||
rethrow;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
final uri = Uri.https('services.dfx.swiss', actionType, {
|
final uri = Uri.https('services.dfx.swiss', actionType, {
|
||||||
'session': accessToken,
|
'session': accessToken,
|
||||||
|
|
Loading…
Reference in a new issue