diff --git a/vidaia/android/app/build.gradle b/vidaia/android/app/build.gradle index 2bba797..4b7b705 100644 --- a/vidaia/android/app/build.gradle +++ b/vidaia/android/app/build.gradle @@ -48,7 +48,11 @@ android { targetSdkVersion flutter.targetSdkVersion versionCode flutterVersionCode.toInteger() versionName flutterVersionName - manifestPlaceHolders = ['appAuthRedirectScheme': 'ch.saynode.vidaia'] + multiDexEnabled true + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + manifestPlaceholders = [ + 'appAuthRedirectScheme': 'ch.saynode.vidaia' + ] } buildTypes { diff --git a/vidaia/lib/pages/settings_page.dart b/vidaia/lib/pages/settings_page.dart index 7d75657..23f8aa5 100644 --- a/vidaia/lib/pages/settings_page.dart +++ b/vidaia/lib/pages/settings_page.dart @@ -27,7 +27,6 @@ class _SettingsPageState extends State { Text( 'changeLanguage'.tr(), style: Theme.of(context).textTheme.headline5, - ), DropdownButton( hint: Text( diff --git a/vidaia/lib/services/auth_service.dart b/vidaia/lib/services/auth_service.dart index 54b9502..20dbd63 100644 --- a/vidaia/lib/services/auth_service.dart +++ b/vidaia/lib/services/auth_service.dart @@ -1,5 +1,4 @@ import 'dart:convert'; -import 'dart:html'; import 'dart:math'; import 'package:flutter/foundation.dart'; import 'package:http/http.dart' as http; @@ -13,7 +12,8 @@ import 'package:vidaia/models/auth0_user.dart'; import 'package:pkce/pkce.dart'; class AuthService { - Auth0User profile = Auth0User(nickname: '', name: '', email: '', picture: '', updatedAt: '', sub: ''); + Auth0User profile = Auth0User( + nickname: '', name: '', email: '', picture: '', updatedAt: '', sub: ''); Auth0IdToken? idToken; String? auth0AccessToken; bool isLoggedIn = false; @@ -72,7 +72,8 @@ class AuthService { headers: {'Authorization': 'Bearer $auth0AccessToken'}, ); - debugPrint('logout: ${response.request} ${response.statusCode} ${response.body}'); + debugPrint( + 'logout: ${response.request} ${response.statusCode} ${response.body}'); return 'logout: ${response.request} ${response.statusCode} ${response.body}'; } @@ -83,13 +84,21 @@ class AuthService { AUTH0_CLIENT_ID, AUTH0_REDIRECT_URI, issuer: AUTH0_ISSUER, - scopes: ['openid', 'profile', 'email', 'offline_access', 'update:current_user_metadata', 'create:current_user_metadata'], + scopes: [ + 'openid', + 'profile', + 'email', + 'offline_access', + 'update:current_user_metadata', + 'create:current_user_metadata' + ], promptValues: ['login'], /// possible values login, none, consent, select_account ); - final AuthorizationTokenResponse? result = await appAuth.authorizeAndExchangeCode( + final AuthorizationTokenResponse? result = + await appAuth.authorizeAndExchangeCode( authorizationTokenRequest, ); @@ -145,7 +154,8 @@ class AuthService { } Future _setLocalVariables(result) async { - final bool isValidResult = result != null && result.accessToken != null && result.idToken != null; + final bool isValidResult = + result != null && result.accessToken != null && result.idToken != null; if (isValidResult) { auth0AccessToken = result.accessToken; @@ -156,8 +166,10 @@ class AuthService { key: REFRESH_TOKEN_KEY, value: result.refreshToken, ); - String? refreshTokenKeyFromStorage = await secureStorage.read(key: REFRESH_TOKEN_KEY); - debugPrint('auth_service | REFRESH_TOKEN_KEY in storage is ' + refreshTokenKeyFromStorage!); + String? refreshTokenKeyFromStorage = + await secureStorage.read(key: REFRESH_TOKEN_KEY); + debugPrint('auth_service | REFRESH_TOKEN_KEY in storage is ' + + refreshTokenKeyFromStorage!); } isLoggedIn = true; return 'Success'; @@ -171,7 +183,8 @@ class AuthService { final pkcePair = PkcePair.generate(length: 32); final code_challenge = pkcePair.codeChallenge; final code_verifier = pkcePair.codeVerifier; - final managementApiTokenUrl = '$AUTH0_DOMAIN/authorize?response_type=code&code_challenge=$code_challenge&code_challenge_method=S256&client_id=$AUTH0_CLIENT_ID&redirect_uri=$AUTH0_REDIRECT_URI&audience=dev-jp7b9rk6.us.auth0.com'; + final managementApiTokenUrl = + '$AUTH0_DOMAIN/authorize?response_type=code&code_challenge=$code_challenge&code_challenge_method=S256&client_id=$AUTH0_CLIENT_ID&redirect_uri=$AUTH0_REDIRECT_URI&audience=dev-jp7b9rk6.us.auth0.com'; /// @@ -196,7 +209,8 @@ class AuthService { debugPrint('update wallet response 200'); return true; } else { - debugPrint('update wallet response ' + responseAuth0UserInfo.statusCode.toString()); + debugPrint('update wallet response ' + + responseAuth0UserInfo.statusCode.toString()); debugPrint('update wallet response body' + responseAuth0UserInfo.body); return false; }