ReiMerc/skantravels
2
0
Fork 1
Code Issues Pull Requests 1 Packages Projects 1 Releases Wiki Activity

Fix formatting, remove logs

Browse Source
This commit is contained in:
Reimar 2024-08-22 09:12:50 +02:00
parent 6a0696b9c1
commit 5f1773f614
Signed by: Reimar
GPG Key ID: 93549FA07F0AE268
2 changed files with 15 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Mobile/lib/api.dart
View File

@ -2,16 +2,13 @@ import 'package:flutter/material.dart';
import 'package:shared_preferences/shared_preferences.dart';
import 'package:http/http.dart' as http;
import 'dart:convert';
import 'dart:developer';
enum ApiService {
auth,
app,
}
Future<String?> request(BuildContext context, ApiService service, String method,
String path, Object? body) async {
log('hello');
Future<String?> request(BuildContext context, ApiService service, String method, String path, Object? body) async {
final messenger = ScaffoldMessenger.of(context);
final host = switch (service) {
@ -19,9 +16,6 @@ Future<String?> request(BuildContext context, ApiService service, String method,
ApiService.app => const String.fromEnvironment('APP_SERVICE_HOST'),
};
log('hello');
log(const String.fromEnvironment('AUTH_SERVICE_HOST'));
final http.Response response;
try {
@ -42,8 +36,7 @@ Future<String?> request(BuildContext context, ApiService service, String method,
);
}
} catch (_) {
messenger.showSnackBar(
const SnackBar(content: Text('Unable to connect to server')));
messenger.showSnackBar(const SnackBar(content: Text('Unable to connect to server')));
return null;
}
@ -52,8 +45,7 @@ Future<String?> request(BuildContext context, ApiService service, String method,
final json = jsonDecode(response.body);
messenger.showSnackBar(SnackBar(content: Text(json['message'])));
} catch (_) {
messenger.showSnackBar(SnackBar(
content: Text('Something went wrong (HTTP ${response.statusCode})')));
messenger.showSnackBar(SnackBar(content: Text('Something went wrong (HTTP ${response.statusCode})')));
}
return null;
}
@ -75,14 +67,12 @@ Future<bool> isLoggedIn(BuildContext context) async {
final payload = jsonDecode(String.fromCharCodes(base64Decode(base64)));
if (payload['exp'] < DateTime.now().millisecondsSinceEpoch / 1000) {
messenger.showSnackBar(
const SnackBar(content: Text('Token expired, please sign in again')));
messenger.showSnackBar(const SnackBar(content: Text('Token expired, please sign in again')));
prefs.remove('token');
return false;
}
} catch (e) {
messenger.showSnackBar(
const SnackBar(content: Text('Invalid token, please sign in again')));
messenger.showSnackBar(const SnackBar(content: Text('Invalid token, please sign in again')));
prefs.remove('token');
return false;
}

13
Mobile/lib/login.dart
View File

@ -15,8 +15,7 @@ class _LoginPageState extends State<LoginPage> {
final passwordInput = TextEditingController();
Future<void> _login() async {
final token = await api
.request(context, api.ApiService.auth, 'POST', '/api/Users/login', {
final token = await api.request(context, api.ApiService.auth, 'POST', '/api/Users/login', {
'email': emailInput.text,
'password': passwordInput.text,
});
@ -27,8 +26,7 @@ class _LoginPageState extends State<LoginPage> {
prefs.setString('token', token);
if (mounted) {
ScaffoldMessenger.of(context).showSnackBar(
const SnackBar(content: Text('Successfully logged in')));
ScaffoldMessenger.of(context).showSnackBar(const SnackBar(content: Text('Successfully logged in')));
Navigator.pushReplacementNamed(context, '/home');
}
}
@ -50,14 +48,15 @@ class _LoginPageState extends State<LoginPage> {
controller: passwordInput,
obscureText: true,
enableSuggestions: false,
autocorrect: false),
autocorrect: false,
),
const SizedBox(height: 30),
ElevatedButton(onPressed: _login, child: const Text('Login')),
const SizedBox(height: 10),
TextButton(
child: const Text('Register account'),
onPressed: () =>
Navigator.pushReplacementNamed(context, '/register')),
onPressed: () => Navigator.pushReplacementNamed(context, '/register')
),
]),
),
),