Compare commits

...

2 Commits

Author SHA1 Message Date
6fd8c365f6
Add authorization header 2024-08-22 09:17:36 +02:00
5f1773f614
Fix formatting, remove logs 2024-08-22 09:13:16 +02:00
2 changed files with 23 additions and 27 deletions

View File

@ -2,31 +2,30 @@ 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 prefs = await SharedPreferences.getInstance();
final host = switch (service) {
ApiService.auth => const String.fromEnvironment('AUTH_SERVICE_HOST'),
ApiService.app => const String.fromEnvironment('APP_SERVICE_HOST'),
};
log('hello');
log(const String.fromEnvironment('AUTH_SERVICE_HOST'));
final token = prefs.getString('token');
final Map<String, String> headers = {};
if (token != null) headers.addAll({'Authorization': 'Bearer $token'});
final http.Response response;
try {
if (method == 'GET') {
response = await http.get(Uri.parse(host + path));
response = await http.get(Uri.parse(host + path), headers: headers);
} else {
final function = switch (method) {
'POST' => http.post,
@ -35,15 +34,16 @@ Future<String?> request(BuildContext context, ApiService service, String method,
_ => throw const FormatException('Invalid method'),
};
headers.addAll({'Content-Type': 'application/json'});
response = await function(
Uri.parse(host + path),
headers: {'Content-Type': 'application/json'},
headers: headers,
body: body != null ? jsonEncode(body) : null,
);
}
} 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 +52,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 +74,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;
}

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')
),
]),
),
),