From 8229d69fa0ddfdeed794b78b519291d9c9fd0bb0 Mon Sep 17 00:00:00 2001
From: carlobortolan <carlobortolan@gmail.com>
Date: Fri, 17 Nov 2023 16:36:08 +0100
Subject: [PATCH 1/9] Update README.md and dependencies

---
 README.md                                |  36 ++++++
 android/app/src/main/AndroidManifest.xml |   2 +
 ios/Runner/Info.plist                    |  10 ++
 pubspec.lock                             | 144 +++++++++++++++++++++--
 pubspec.yaml                             |  10 ++
 5 files changed, 189 insertions(+), 13 deletions(-)

diff --git a/README.md b/README.md
index 3d5ffcc0..ae26a1c6 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,39 @@
+![xcodebuild](https://github.com/TUM-Dev/Campus-Flutter/actions/workflows/deploy_beta.yml/badge.svg?branch=development)
+![xcodebuild](https://github.com/TUM-Dev/Campus-Flutter/actions/workflows/deploy_web.yml/badge.svg?branch=development)
+[![Discord Channel](https://img.shields.io/badge/Chat-on%20Discord-brightgreen)](https://discord.gg/k558T6ktuh)
+<a href="https://testflight.apple.com/join/LnxaIfKi">
+<img src="https://developer.apple.com/assets/elements/icons/testflight/testflight-64x64_2x.png" height="42" align="right">
+</a>
+
+
 # The mobile client for [gocast](https://github.com/TUM-Dev/gocast)
 
 This mobile client for [gocast](https://github.com/TUM-Dev/gocast) is currently under development by the [iPraktikum Winter 23/24](https://ase.cit.tum.de/teaching/23w/ipraktikum/) on behalf of the TUM Developers. In order not to influence the grading of the students, we would ask you to refrain from code contributions until **March 2023**. Until then, we look forward to your contributions in our other repositories. Thank you for your understanding! 
+
+
+## Features
+
+- [x] Authentication using internal account
+- [ ] Authentication using TUM SSO
+- [ ] Overview of own and publicly available Lectures
+- [ ] Ability to watch lectures (single, multi - view and split - view)
+- [ ] Bookmark lectures
+- [ ] Automatic notifications if lecture starts
+- [ ] Ability to search for lectures
+- [ ] Ability to download lectures in a data privacy conform manner (non - exportable and remotely deletable)
+- [ ] Ability to answer quizzes and feedback requests
+
+## Config
+
+1. Make sure to have a local [`gocast`](https://github.com/tum-dev/gocast) instance listening on port `8081`. 
+
+2. Run `$ flutter run` to start the app. 
+
+3. Run `dart fix --apply && dart format ./lib` before commiting new changes.
+
+## Development
+
+| Dependency                               | Usage                                    | where to download it                         |
+|------------------------------------------|------------------------------------------|----------------------------------------------|
+| `Flutter` (includes the `Dart` compiler) | SDK to develop this app                  | https://docs.flutter.dev/get-started/install |
+| A local instance of [`gocast`](https://github.com/tum-dev/gocast) | API to fetch user data & streams                  | https://github.com/TUM-Dev/gocast#readme |
\ No newline at end of file
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
index 0e44b06d..75afe80e 100644
--- a/android/app/src/main/AndroidManifest.xml
+++ b/android/app/src/main/AndroidManifest.xml
@@ -22,6 +22,8 @@
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.LAUNCHER"/>
+                <category android:name="android.intent.category.BROWSABLE" />
+                <data android:scheme="de.tum.gocast_mobile" /> 
             </intent-filter>
         </activity>
         <!-- Don't delete the meta-data below.
diff --git a/ios/Runner/Info.plist b/ios/Runner/Info.plist
index 68f7e9fb..0be50881 100644
--- a/ios/Runner/Info.plist
+++ b/ios/Runner/Info.plist
@@ -45,5 +45,15 @@
 		<string>UIInterfaceOrientationLandscapeLeft</string>
 		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
+	<key>CFBundleURLTypes</key>
+	<array>
+		<dict>
+			<key>CFBundleURLSchemes</key>
+			<array>
+				<string>gocast</string>
+			</array>
+   	 </dict>
+	</array>
+
 </dict>
 </plist>
diff --git a/pubspec.lock b/pubspec.lock
index 5420a200..f7cdf3e2 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -9,6 +9,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "2.11.0"
+  bloc:
+    dependency: "direct main"
+    description:
+      name: bloc
+      sha256: "3820f15f502372d979121de1f6b97bfcf1630ebff8fe1d52fb2b0bfa49be5b49"
+      url: "https://pub.dev"
+    source: hosted
+    version: "8.1.2"
   boolean_selector:
     dependency: transitive
     description:
@@ -37,10 +45,34 @@ packages:
     dependency: transitive
     description:
       name: collection
-      sha256: f092b211a4319e98e5ff58223576de6c2803db36221657b46c82574721240687
+      sha256: ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.18.0"
+  cookie_jar:
+    dependency: "direct main"
+    description:
+      name: cookie_jar
+      sha256: a6ac027d3ed6ed756bfce8f3ff60cb479e266f3b0fdabd6242b804b6765e52de
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.0.8"
+  dio:
+    dependency: transitive
+    description:
+      name: dio
+      sha256: "417e2a6f9d83ab396ec38ff4ea5da6c254da71e4db765ad737a42af6930140b7"
+      url: "https://pub.dev"
+    source: hosted
+    version: "5.3.3"
+  dio_cookie_manager:
+    dependency: "direct main"
+    description:
+      name: dio_cookie_manager
+      sha256: e79498b0f632897ff0c28d6e8178b4bc6e9087412401f618c31fa0904ace050d
       url: "https://pub.dev"
     source: hosted
-    version: "1.17.2"
+    version: "3.1.1"
   fake_async:
     dependency: transitive
     description:
@@ -54,6 +86,14 @@ packages:
     description: flutter
     source: sdk
     version: "0.0.0"
+  flutter_inappwebview:
+    dependency: "direct main"
+    description:
+      name: flutter_inappwebview
+      sha256: d198297060d116b94048301ee6749cd2e7d03c1f2689783f52d210a6b7aba350
+      url: "https://pub.dev"
+    source: hosted
+    version: "5.8.0"
   flutter_lints:
     dependency: "direct dev"
     description:
@@ -67,6 +107,19 @@ packages:
     description: flutter
     source: sdk
     version: "0.0.0"
+  flutter_web_plugins:
+    dependency: transitive
+    description: flutter
+    source: sdk
+    version: "0.0.0"
+  http_parser:
+    dependency: transitive
+    description:
+      name: http_parser
+      sha256: "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b"
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.0.2"
   lints:
     dependency: transitive
     description:
@@ -95,10 +148,18 @@ packages:
     dependency: transitive
     description:
       name: meta
-      sha256: "3c74dbf8763d36539f114c799d8a2d87343b5067e9d796ca22b5eb8437090ee3"
+      sha256: a6e590c838b18133bb482a2745ad77c5bb7715fb0451209e1a7567d416678b8e
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.10.0"
+  nested:
+    dependency: transitive
+    description:
+      name: nested
+      sha256: "03bac4c528c64c95c722ec99280375a6f2fc708eec17c7b3f07253b626cd2a20"
       url: "https://pub.dev"
     source: hosted
-    version: "1.9.1"
+    version: "1.0.0"
   path:
     dependency: transitive
     description:
@@ -107,6 +168,22 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.8.3"
+  plugin_platform_interface:
+    dependency: transitive
+    description:
+      name: plugin_platform_interface
+      sha256: da3fdfeccc4d4ff2da8f8c556704c08f912542c5fb3cf2233ed75372384a034d
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.1.6"
+  provider:
+    dependency: "direct main"
+    description:
+      name: provider
+      sha256: "9a96a0a19b594dbc5bf0f1f27d2bc67d5f95957359b461cd9feb44ed6ae75096"
+      url: "https://pub.dev"
+    source: hosted
+    version: "6.1.1"
   sky_engine:
     dependency: transitive
     description: flutter
@@ -124,18 +201,18 @@ packages:
     dependency: transitive
     description:
       name: stack_trace
-      sha256: c3c7d8edb15bee7f0f74debd4b9c5f3c2ea86766fe4178eb2a18eb30a0bdaed5
+      sha256: "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b"
       url: "https://pub.dev"
     source: hosted
-    version: "1.11.0"
+    version: "1.11.1"
   stream_channel:
     dependency: transitive
     description:
       name: stream_channel
-      sha256: "83615bee9045c1d322bbbd1ba209b7a749c2cbcdcb3fdd1df8eb488b3279c1c8"
+      sha256: ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7
       url: "https://pub.dev"
     source: hosted
-    version: "2.1.1"
+    version: "2.1.2"
   string_scanner:
     dependency: transitive
     description:
@@ -156,10 +233,50 @@ packages:
     dependency: transitive
     description:
       name: test_api
-      sha256: "75760ffd7786fffdfb9597c35c5b27eaeec82be8edfb6d71d32651128ed7aab8"
+      sha256: "5c2f730018264d276c20e4f1503fd1308dfbbae39ec8ee63c5236311ac06954b"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.6.1"
+  typed_data:
+    dependency: transitive
+    description:
+      name: typed_data
+      sha256: facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.3.2"
+  uni_links:
+    dependency: "direct main"
+    description:
+      name: uni_links
+      sha256: "051098acfc9e26a9fde03b487bef5d3d228ca8f67693480c6f33fd4fbb8e2b6e"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.5.1"
+  uni_links_platform_interface:
+    dependency: transitive
+    description:
+      name: uni_links_platform_interface
+      sha256: "929cf1a71b59e3b7c2d8a2605a9cf7e0b125b13bc858e55083d88c62722d4507"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.0"
+  uni_links_web:
+    dependency: transitive
+    description:
+      name: uni_links_web
+      sha256: "7539db908e25f67de2438e33cc1020b30ab94e66720b5677ba6763b25f6394df"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.1.0"
+  universal_io:
+    dependency: transitive
+    description:
+      name: universal_io
+      sha256: "1722b2dcc462b4b2f3ee7d188dad008b6eb4c40bbd03a3de451d82c78bba9aad"
       url: "https://pub.dev"
     source: hosted
-    version: "0.6.0"
+    version: "2.2.2"
   vector_math:
     dependency: transitive
     description:
@@ -172,9 +289,10 @@ packages:
     dependency: transitive
     description:
       name: web
-      sha256: dc8ccd225a2005c1be616fe02951e2e342092edf968cf0844220383757ef8f10
+      sha256: afe077240a270dcfd2aafe77602b4113645af95d0ad31128cc02bce5ac5d5152
       url: "https://pub.dev"
     source: hosted
-    version: "0.1.4-beta"
+    version: "0.3.0"
 sdks:
-  dart: ">=3.1.5 <4.0.0"
+  dart: ">=3.2.0-194.0.dev <4.0.0"
+  flutter: ">=3.0.0"
diff --git a/pubspec.yaml b/pubspec.yaml
index ecf53180..0497decd 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -7,8 +7,14 @@ environment:
   sdk: '>=3.1.5 <4.0.0'
 
 dependencies:
+  bloc: ^8.1.2
+  cookie_jar: ^4.0.8
+  dio_cookie_manager: ^3.1.1
   flutter:
     sdk: flutter
+  flutter_inappwebview: ^5.8.0
+  provider: ^6.1.1
+  uni_links: ^0.5.1
 
 dev_dependencies:
   flutter_test:
@@ -17,3 +23,7 @@ dev_dependencies:
 
 flutter:
   uses-material-design: true
+  generate: true
+  assets:
+    - assets/
+    - assets/images/logos/tum-logo-blue.png
\ No newline at end of file

From 6a0e201c9712e72136c1831cf1d2782e6fe018a0 Mon Sep 17 00:00:00 2001
From: carlobortolan <carlobortolan@gmail.com>
Date: Fri, 17 Nov 2023 16:36:51 +0100
Subject: [PATCH 2/9] Add basic app structure and assets

---
 assets/images/logos/tum-logo-blue.png | Bin 0 -> 494 bytes
 lib/bootstrap.dart                    |  33 +++++++
 lib/main.dart                         |  59 ++++++++++--
 lib/views/home_view.dart              |  29 ++++++
 lib/views/login_view.dart             | 129 ++++++++++++++++++++++++++
 lib/views/welcome_view.dart           |  23 +++++
 6 files changed, 266 insertions(+), 7 deletions(-)
 create mode 100644 assets/images/logos/tum-logo-blue.png
 create mode 100644 lib/bootstrap.dart
 create mode 100644 lib/views/home_view.dart
 create mode 100644 lib/views/login_view.dart
 create mode 100644 lib/views/welcome_view.dart

diff --git a/assets/images/logos/tum-logo-blue.png b/assets/images/logos/tum-logo-blue.png
new file mode 100644
index 0000000000000000000000000000000000000000..cc2bd6de16fc991ba920a3a28a4da48904098f50
GIT binary patch
literal 494
zcmeAS@N?(olHy`uVBq!ia0vp^4}iFggAGVt6q>&uNO2Z;L>4nJ=qZCRW5rVYGN7Pj
ziEBhjaDG}zd16s2gJVj5QmTSyZen_BP-<dIW#P$G8wLi(YEKu(kcwMxt{>z)WFXS;
zFwAIzGRNGd<>nUz_k4e()LPcu_kbgBfn`V6a~tQ=-yPRI6#U$N%k1xu42}F3w=Vqs
zn-^{Hb`IkeWd{KT4go^=$HY%oBKL~9W_+G;U8sa@`krs=m`a&scI|x8_gBL3c~H%{
z^Lxs#KY05qDsb7<bF$w&)XV$yw{K|Idsq1H_?^W5E&m$=CNelSC^$F}i3JoCfG#5j
z6Lvk!cPtzn0x)c*W7(wex1xxHW5c}7$_Lan5XQiiV56@+);z!<epWt5%j<{~Fs>Lp
MUHx3vIVCg!0J=wwWB>pF

literal 0
HcmV?d00001

diff --git a/lib/bootstrap.dart b/lib/bootstrap.dart
new file mode 100644
index 00000000..558f7314
--- /dev/null
+++ b/lib/bootstrap.dart
@@ -0,0 +1,33 @@
+import 'dart:async';
+import 'dart:developer';
+
+import 'package:bloc/bloc.dart';
+import 'package:flutter/widgets.dart';
+
+class AppBlocObserver extends BlocObserver {
+  const AppBlocObserver();
+
+  @override
+  void onChange(BlocBase<dynamic> bloc, Change<dynamic> change) {
+    super.onChange(bloc, change);
+    log('onChange(${bloc.runtimeType}, $change)');
+  }
+
+  @override
+  void onError(BlocBase<dynamic> bloc, Object error, StackTrace stackTrace) {
+    log('onError(${bloc.runtimeType}, $error, $stackTrace)');
+    super.onError(bloc, error, stackTrace);
+  }
+}
+
+Future<void> bootstrap(FutureOr<Widget> Function() builder) async {
+  FlutterError.onError = (details) {
+    log(details.exceptionAsString(), stackTrace: details.stack);
+  };
+
+  Bloc.observer = const AppBlocObserver();
+
+  // Add cross-flavor configuration here
+
+  runApp(await builder());
+}
diff --git a/lib/main.dart b/lib/main.dart
index cc5d71dd..ea961cf2 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -1,26 +1,71 @@
 import 'package:flutter/material.dart';
+import 'package:gocast_mobile/model/user_model.dart';
+import 'package:gocast_mobile/viewModels/user_viewmodel.dart';
+import 'package:gocast_mobile/views/home_view.dart';
+import 'package:gocast_mobile/views/login_view.dart';
+import 'package:gocast_mobile/views/welcome_view.dart';
+import 'package:provider/provider.dart';
+import 'package:gocast_mobile/bootstrap.dart';
 
 void main() {
-  runApp(const MyApp());
+  bootstrap(() {
+    return ChangeNotifierProvider(
+      create: (context) =>
+          UserState(isLoading: false, user: null, errorMessage: ''),
+      child: const App(),
+    );
+  });
+
+//  runApp(const MyApp());
 }
 
-class MyApp extends StatelessWidget {
-  const MyApp({super.key});
+class App extends StatelessWidget {
+  const App({super.key});
 
   @override
   Widget build(BuildContext context) {
+    final current = Provider.of<UserState>(context);
+    final userViewModel = UserViewModel(current);
+
     return MaterialApp(
       title: 'gocast',
       debugShowCheckedModeBanner: false,
       theme: ThemeData(
         colorScheme: ColorScheme.fromSeed(seedColor: const Color(0xff0065bd)),
         useMaterial3: true,
-      ),
-      home: const Scaffold(
-        body: Center(
-          child: Text("Hello, iPraktikum! 👋"),
+        appBarTheme: AppBarTheme(
+          backgroundColor: Theme.of(context).colorScheme.inversePrimary,
         ),
       ),
+      home: current.user == null
+          ? LoginView(
+              key: const Key('loginView'),
+              userViewModel: userViewModel,
+            )
+          : HomeView(
+              key: const Key('homeView'),
+              userViewModel: userViewModel,
+            ),
+      routes: {
+        '/welcome': (context) => current.user == null
+            ? LoginView(
+                key: const Key('loginView'),
+                userViewModel: UserViewModel(Provider.of<UserState>(context)),
+              )
+            : WelcomeView(
+                key: const Key('welcomeView'),
+                userViewModel: UserViewModel(Provider.of<UserState>(context)),
+              ),
+        '/home': (context) => current.user == null
+            ? LoginView(
+                key: const Key('loginView'),
+                userViewModel: UserViewModel(Provider.of<UserState>(context)),
+              )
+            : HomeView(
+                key: const Key('homeView'),
+                userViewModel: UserViewModel(Provider.of<UserState>(context)),
+              ),
+      },
     );
   }
 }
diff --git a/lib/views/home_view.dart b/lib/views/home_view.dart
new file mode 100644
index 00000000..ee07b43b
--- /dev/null
+++ b/lib/views/home_view.dart
@@ -0,0 +1,29 @@
+import 'package:flutter/material.dart';
+import 'package:gocast_mobile/viewModels/user_viewmodel.dart';
+
+class HomeView extends StatelessWidget {
+  const HomeView({required this.userViewModel, super.key});
+
+  final UserViewModel userViewModel;
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: AppBar(
+        title: const Text('Home'),
+        actions: [
+          IconButton(
+            icon: const Icon(Icons.logout),
+            onPressed: userViewModel.logout,
+          ),
+        ],
+      ),
+      body: const Center(
+        child: Text(
+          'TODO: Implement main views',
+          style: TextStyle(fontSize: 24),
+        ),
+      ),
+    );
+  }
+}
diff --git a/lib/views/login_view.dart b/lib/views/login_view.dart
new file mode 100644
index 00000000..3676470d
--- /dev/null
+++ b/lib/views/login_view.dart
@@ -0,0 +1,129 @@
+import 'package:flutter/material.dart';
+import 'package:gocast_mobile/viewModels/user_viewmodel.dart';
+
+class LoginView extends StatelessWidget {
+  LoginView({required this.userViewModel, super.key});
+
+  final UserViewModel userViewModel;
+
+  final TextEditingController usernameController = TextEditingController();
+  final TextEditingController passwordController = TextEditingController();
+
+  Future<void> _handleSSOLogin(BuildContext context) async {
+    // Call the SSO authentication function from /base/api/auth
+    await userViewModel.ssoAuth(context);
+    // Navigate to the home screen after successful authentication
+    if (userViewModel.current.user != null) {
+      // ignore: use_build_context_synchronously
+      await Navigator.pushNamed(context, '/welcome');
+    }
+  }
+
+  Future<void> _handleBasicLogin(BuildContext context) async {
+    // Call the basic authentication function from /base/api/auth
+    await userViewModel
+        .basicAuth(usernameController.text, passwordController.text)
+        .then(
+          (value) => {
+            if (userViewModel.current.user != null)
+              {Navigator.pushNamed(context, '/welcome')},
+          },
+        );
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      backgroundColor: Colors.white,
+      body: SafeArea(
+        child: userViewModel.current.isLoading
+            ? const Center(child: CircularProgressIndicator())
+            : SingleChildScrollView(
+                child: Padding(
+                  padding: const EdgeInsets.symmetric(horizontal: 16),
+                  child: Column(
+                    crossAxisAlignment: CrossAxisAlignment.stretch,
+                    children: [
+                      const SizedBox(height: 32),
+                      Image.asset(
+                        'assets/images/logos/tum-logo-blue.png',
+                        fit: BoxFit.contain,
+                        height: 64,
+                      ),
+                      const SizedBox(height: 32),
+                      ElevatedButton(
+                        onPressed: () => _handleSSOLogin(context),
+                        style: ElevatedButton.styleFrom(
+                          backgroundColor: Colors.blue,
+                          shape: RoundedRectangleBorder(
+                            borderRadius: BorderRadius.circular(8),
+                          ),
+                          padding: const EdgeInsets.symmetric(vertical: 16),
+                        ),
+                        child: const Text(
+                          'Sign in using TUM SSO',
+                          style: TextStyle(color: Colors.white),
+                        ),
+                      ),
+                      const SizedBox(height: 32),
+                      const Divider(
+                        thickness: 2,
+                      ),
+                      const SizedBox(height: 32),
+                      TextField(
+                        controller: usernameController,
+                        decoration: InputDecoration(
+                          labelText: 'User',
+                          labelStyle: const TextStyle(color: Colors.blue),
+                          enabledBorder: OutlineInputBorder(
+                            borderSide: const BorderSide(color: Colors.blue),
+                            borderRadius: BorderRadius.circular(8),
+                          ),
+                          focusedBorder: OutlineInputBorder(
+                            borderSide: const BorderSide(color: Colors.blue),
+                            borderRadius: BorderRadius.circular(8),
+                          ),
+                        ),
+                        style: const TextStyle(color: Colors.blue),
+                      ),
+                      const SizedBox(height: 16),
+                      TextField(
+                        controller: passwordController,
+                        obscureText: true,
+                        decoration: InputDecoration(
+                          labelText: 'Password',
+                          labelStyle: const TextStyle(color: Colors.blue),
+                          enabledBorder: OutlineInputBorder(
+                            borderSide: const BorderSide(color: Colors.blue),
+                            borderRadius: BorderRadius.circular(8),
+                          ),
+                          focusedBorder: OutlineInputBorder(
+                            borderSide: const BorderSide(color: Colors.blue),
+                            borderRadius: BorderRadius.circular(8),
+                          ),
+                        ),
+                        style: const TextStyle(color: Colors.blue),
+                      ),
+                      const SizedBox(height: 32),
+                      ElevatedButton(
+                        onPressed: () => _handleBasicLogin(context),
+                        style: ElevatedButton.styleFrom(
+                          backgroundColor: Colors.blue,
+                          shape: RoundedRectangleBorder(
+                            borderRadius: BorderRadius.circular(8),
+                          ),
+                          padding: const EdgeInsets.symmetric(vertical: 16),
+                        ),
+                        child: const Text(
+                          'Login',
+                          style: TextStyle(color: Colors.white),
+                        ),
+                      ),
+                    ],
+                  ),
+                ),
+              ),
+      ),
+    );
+  }
+}
diff --git a/lib/views/welcome_view.dart b/lib/views/welcome_view.dart
new file mode 100644
index 00000000..f21c1282
--- /dev/null
+++ b/lib/views/welcome_view.dart
@@ -0,0 +1,23 @@
+import 'package:flutter/material.dart';
+import 'package:gocast_mobile/viewModels/user_viewmodel.dart';
+
+class WelcomeView extends StatelessWidget {
+  const WelcomeView({required this.userViewModel, super.key});
+
+  final UserViewModel userViewModel;
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: AppBar(
+        title: const Text('Welcome to GoCast'),
+      ),
+      body: Center(
+        child: Text(
+          'Servus, ${userViewModel.current.user?.name ?? 'Guest'}!',
+          style: const TextStyle(fontSize: 24),
+        ),
+      ),
+    );
+  }
+}

From 7621fb7beece67d6e1b74d0caefd9633b951f50f Mon Sep 17 00:00:00 2001
From: carlobortolan <carlobortolan@gmail.com>
Date: Fri, 17 Nov 2023 16:37:34 +0100
Subject: [PATCH 3/9] Implement first models, viewmodels and api calls needed
 for user auth

---
 lib/base/helpers/model_generator.dart      |  62 ++++++++++
 lib/base/networking/apis/auth_handler.dart | 130 +++++++++++++++++++++
 lib/model/user_model.dart                  | 105 +++++++++++++++++
 lib/routes.dart                            |  33 ++++++
 lib/viewModels/user_viewmodel.dart         |  26 +++++
 5 files changed, 356 insertions(+)
 create mode 100644 lib/base/helpers/model_generator.dart
 create mode 100644 lib/base/networking/apis/auth_handler.dart
 create mode 100644 lib/model/user_model.dart
 create mode 100644 lib/routes.dart
 create mode 100644 lib/viewModels/user_viewmodel.dart

diff --git a/lib/base/helpers/model_generator.dart b/lib/base/helpers/model_generator.dart
new file mode 100644
index 00000000..0cc9ebb2
--- /dev/null
+++ b/lib/base/helpers/model_generator.dart
@@ -0,0 +1,62 @@
+import 'dart:math';
+import 'package:gocast_mobile/model/user_model.dart';
+
+class ModelGenerator {
+  static User generateRandomUser() {
+    final random = Random();
+    final id = random.nextInt(1000);
+    final name = 'User$id';
+    final lastName = 'Last$id';
+    final email = '$name.$lastName@example.com';
+    final matriculationNumber = 'M$id';
+    final lrzId = 'L$id';
+    final role = random.nextInt(3) + 1;
+    final password = 'password$id';
+    final courses = List.generate(
+      random.nextInt(5) + 1,
+      (index) => Course(id: index, name: 'Course$index'),
+    );
+    final administeredCourses = List.generate(
+      random.nextInt(3) + 1,
+      (index) => Course(id: index, name: 'Administered Course$index'),
+    );
+    final pinnedCourses = List.generate(
+      random.nextInt(3) + 1,
+      (index) => Course(id: index, name: 'Pinned Course$index'),
+    );
+    final settings = List.generate(
+      random.nextInt(3) + 1,
+      (index) => UserSetting(
+        id: index,
+        userId: id,
+        type: UserSettingType.values[random.nextInt(3)],
+        value: 'Value$index',
+      ),
+    );
+    final bookmarks = List.generate(
+      random.nextInt(3) + 1,
+      (index) => Bookmark(
+        id: index,
+        userId: id,
+        title: 'Bookmark$index',
+        url: 'https://example.com/bookmark$index',
+      ),
+    );
+
+    return User(
+      id: id,
+      name: name,
+      lastName: lastName,
+      email: email,
+      matriculationNumber: matriculationNumber,
+      lrzId: lrzId,
+      role: role,
+      password: password,
+      courses: courses,
+      administeredCourses: administeredCourses,
+      pinnedCourses: pinnedCourses,
+      settings: settings,
+      bookmarks: bookmarks,
+    );
+  }
+}
diff --git a/lib/base/networking/apis/auth_handler.dart b/lib/base/networking/apis/auth_handler.dart
new file mode 100644
index 00000000..b77168f8
--- /dev/null
+++ b/lib/base/networking/apis/auth_handler.dart
@@ -0,0 +1,130 @@
+import 'package:cookie_jar/cookie_jar.dart';
+import 'package:dio/dio.dart';
+import 'package:dio_cookie_manager/dio_cookie_manager.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_inappwebview/flutter_inappwebview.dart' as webview;
+import 'package:gocast_mobile/base/helpers/model_generator.dart';
+import 'package:gocast_mobile/model/user_model.dart';
+import 'package:gocast_mobile/routes.dart';
+
+class AuthHandler {
+  static Future<void> basicAuth(
+    String username,
+    String password,
+  ) async {
+    const url = Routes.basicLogin;
+    final cookieJar = CookieJar();
+    final dio = Dio(
+      BaseOptions(
+        followRedirects: false,
+        validateStatus: (status) {
+          return status! < 500;
+        },
+      ),
+    );
+    dio.interceptors.add(CookieManager(cookieJar));
+
+    final formData = FormData.fromMap({
+      'username': username,
+      'password': password,
+    });
+
+    await dio.post(
+      url,
+      data: formData,
+    );
+
+    // For debug purposes only:
+    List<Cookie> cookies = await cookieJar.loadForRequest(Uri.parse(url));
+    print(
+      'UserCookie: ${cookies.isNotEmpty ? cookies[0].value : 'No cookie set'}',
+    );
+  }
+
+  // TODO@carlobortolan: Finish implementing TUM SSO
+  static Future<void> ssoAuth(BuildContext context) async {
+    print('ssoAuth started');
+    // Step 1: Redirect the user to the Shibboleth login page
+    const loginUrl = 'https://live.rbg.tum.de/saml/out';
+    print('Login URL: $loginUrl');
+
+    // Step 2: Open the login page in a web view
+    await Navigator.push(
+      context,
+      MaterialPageRoute(
+        builder: (context) => webview.InAppWebView(
+          initialUrlRequest: webview.URLRequest(url: Uri.parse(loginUrl)),
+          onWebViewCreated: (webview.InAppWebViewController controller) {
+            print('Web view created');
+          },
+          onLoadStart: (webview.InAppWebViewController controller, Uri? url) {
+            print('Page load started: $url');
+          },
+          onLoadStop:
+              (webview.InAppWebViewController controller, Uri? url) async {
+            print('Page load stopped: $url');
+            // Step 3: Redirect back to app and save cookie
+            if (url != null &&
+                url.toString().startsWith(
+                      'https://live.rbg.tum.de',
+                    )) {
+              print('Redirect URL detected: $url');
+
+              // Extract the SAMLResponse parameter from the URL
+              final queryParams = Uri.splitQueryString(url.query);
+              final samlRequest = queryParams['SAMLRequest'];
+              final relayState = queryParams['RelayState'];
+              print('SAMLRequest: $samlRequest');
+              print('RelayState: $relayState');
+
+              // Send the SAMLResponse to the server to validate it and create a session
+              const ssoCallbackUrl = 'https://live.rbg.tum.de/shib';
+              final cookieJar = CookieJar();
+              final dio = Dio(
+                BaseOptions(
+                  followRedirects: false,
+                  validateStatus: (status) {
+                    return status! < 500;
+                  },
+                ),
+              );
+              dio.interceptors.add(CookieManager(cookieJar));
+
+              final formData = FormData.fromMap({
+                'SAMLResponse': samlRequest,
+              });
+
+              print('Sending SAMLResponse to server');
+              await dio.post(
+                ssoCallbackUrl,
+                data: formData,
+              );
+              print('SAMLResponse sent to server');
+
+              // Close the web view and go back to the app
+              print('Closing web view and returning to app');
+              Navigator.pop(context);
+            }
+          },
+        ),
+      ),
+    );
+    print('ssoAuth finished');
+  }
+
+// Just for testing
+  static Future<User> fetchUser() async {
+    /*
+    TODO: Add GET:/user endpoint in gocast API to fetch current user information 
+    const url = 'http://localhost:8081/api/user';
+    final response = await http.get(
+      Uri.parse(url),
+      headers: {
+        'Cookie':
+            'jwt=eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE3MDA0MTc0ODksIlVzZXJJRCI6NCwiU2FtbFN1YmplY3RJRCI6bnVsbH0.gNkwmP2QDieyFb-oAq4zuimlIGozsD5eqlD3ZBs9lLxKE3UpQDVB-ufUmbY_hZq5WE2BVlZ3jLLdQKJKMsvJZNkKRMov_W7ADAxHgVa5IE7WWry9YGLNigVEM_ruagKrp8RyV2MOyA7xQKVudLwfF3RNhcJImVFSkpMTFH6IPr7PvIvilktgNmJDTq4hdieKmzAOQMuNsFxsAIAHXZvAOt9JP0XuIrQMJk6J9Ye201D_V6iObSyMa2AFE7nnTgvOMJeRiuhRrFy9u61XnWc7GfiE9b057aNhTKrTU389Z0vJaHJeIk9c-4x9jLuspMFpX_8g_J-EWfbCWXFHxPRqCQ',
+      },
+    );
+  */
+    return ModelGenerator.generateRandomUser();
+  }
+}
diff --git a/lib/model/user_model.dart b/lib/model/user_model.dart
new file mode 100644
index 00000000..20955e06
--- /dev/null
+++ b/lib/model/user_model.dart
@@ -0,0 +1,105 @@
+import 'package:flutter/foundation.dart';
+
+// ignore_for_file: always_put_required_named_parameters_first
+class UserState with ChangeNotifier {
+  UserState({
+    required this.isLoading,
+    required this.user,
+    required this.errorMessage,
+  });
+
+  bool isLoading;
+  User? user;
+  String errorMessage;
+
+  void setUser(User? newUser) {
+    user = newUser;
+    notifyListeners();
+  }
+
+  void removeUser() {
+    user = null;
+    notifyListeners();
+  }
+
+  void setIsLoading(bool isLoading) {
+    this.isLoading = isLoading;
+    notifyListeners();
+  }
+}
+
+class User {
+  User({
+    required this.id,
+    required this.name,
+    required this.lastName,
+    this.email = '',
+    this.matriculationNumber = '',
+    this.lrzId = '',
+    this.role = 3,
+    this.password = '',
+    required this.courses,
+    required this.administeredCourses,
+    required this.pinnedCourses,
+    required this.settings,
+    required this.bookmarks,
+  });
+
+  int id;
+  String name;
+  String lastName;
+  String email;
+  String matriculationNumber;
+  String lrzId;
+  int role;
+  String password;
+  List<Course> courses;
+  List<Course> administeredCourses;
+  List<Course> pinnedCourses;
+  List<UserSetting> settings;
+  List<Bookmark> bookmarks;
+}
+
+class Course {
+  Course({
+    required this.id,
+    required this.name,
+  });
+
+  int id;
+  String name;
+}
+
+class UserSetting {
+  UserSetting({
+    required this.id,
+    required this.userId,
+    required this.type,
+    required this.value,
+  });
+
+  int id;
+  int userId;
+  UserSettingType type;
+  String value;
+}
+
+enum UserSettingType {
+  preferredName,
+  greeting,
+  customPlaybackSpeeds,
+}
+
+class Bookmark {
+  Bookmark({
+    required this.id,
+    required this.userId,
+    required this.title,
+    required this.url,
+  });
+
+  int id;
+  int userId;
+  String title;
+  String url;
+}
diff --git a/lib/routes.dart b/lib/routes.dart
new file mode 100644
index 00000000..96e6068f
--- /dev/null
+++ b/lib/routes.dart
@@ -0,0 +1,33 @@
+// ignore_for_file: constant_identifier_names
+
+// API ROOT URL
+const _ROOT_URL = 'http://10.0.2.2:8081/api';
+
+// AUTHENTICATION
+const _BASIC_AUTH_URL = 'http://10.0.2.2:8081/login';
+
+// COURSES
+const _COURSES_PATH = '/courses';
+const _COURSES_LIVE_PATH = '/courses/live';
+const _COURSES_USER_PATH = '/courses/user';
+const _COURSES_USER_PINNED_PATH = '/courses/user/pinned';
+const _COURSES_PUBLIC_PATH = '/courses/public';
+
+// SEMESTERS
+const _SEMESTERS_PATH = '/semesters';
+
+// USER AND SERVER NOTIFICATIONS
+const _NOTIFICATIONS_USER_PATH = '/notifications';
+const _NOTIFICATIONS_SERVER_PATH = '/notifications/server';
+
+class Routes {
+  static const basicLogin = _BASIC_AUTH_URL;
+  static const courses = _ROOT_URL + _COURSES_PATH;
+  static const coursesLive = _ROOT_URL + _COURSES_LIVE_PATH;
+  static const coursesUser = _ROOT_URL + _COURSES_USER_PATH;
+  static const coursesUserPinned = _ROOT_URL + _COURSES_USER_PINNED_PATH;
+  static const coursesPublic = _ROOT_URL + _COURSES_PUBLIC_PATH;
+  static const semesters = _ROOT_URL + _SEMESTERS_PATH;
+  static const notificationsUser = _ROOT_URL + _NOTIFICATIONS_USER_PATH;
+  static const notificationsServer = _ROOT_URL + _NOTIFICATIONS_SERVER_PATH;
+}
diff --git a/lib/viewModels/user_viewmodel.dart b/lib/viewModels/user_viewmodel.dart
new file mode 100644
index 00000000..5ac76b04
--- /dev/null
+++ b/lib/viewModels/user_viewmodel.dart
@@ -0,0 +1,26 @@
+import 'package:flutter/material.dart';
+import 'package:gocast_mobile/base/networking/apis/auth_handler.dart';
+import 'package:gocast_mobile/model/user_model.dart';
+
+class UserViewModel with ChangeNotifier {
+  UserViewModel(this.current);
+  final UserState current;
+
+  // Sign in user and store cookie
+  Future<void> basicAuth(String email, String password) async {
+    await AuthHandler.basicAuth(email, password)
+        .then((value) => AuthHandler.fetchUser().then(current.setUser));
+    notifyListeners();
+  }
+
+  Future<void> ssoAuth(BuildContext context) async {
+    await AuthHandler.ssoAuth(context)
+        .then((value) => AuthHandler.fetchUser().then(current.setUser));
+    notifyListeners();
+  }
+
+  void logout() {
+    current.removeUser();
+    notifyListeners();
+  }
+}

From f856791e03c75c7c074016735414afa7cd634102 Mon Sep 17 00:00:00 2001
From: carlobortolan <carlobortolan@gmail.com>
Date: Sat, 18 Nov 2023 01:16:50 +0100
Subject: [PATCH 4/9] Implement TUM-SSO authentication and update README.md and

---
 README.md                                  |  12 +-
 lib/base/networking/apis/auth_handler.dart |  76 ++++++-------
 lib/viewModels/user_viewmodel.dart         |   6 +-
 pubspec.lock                               | 122 ++++++++++++++++++++-
 pubspec.yaml                               |   1 +
 5 files changed, 162 insertions(+), 55 deletions(-)

diff --git a/README.md b/README.md
index ae26a1c6..37c4b227 100644
--- a/README.md
+++ b/README.md
@@ -1,11 +1,3 @@
-![xcodebuild](https://github.com/TUM-Dev/Campus-Flutter/actions/workflows/deploy_beta.yml/badge.svg?branch=development)
-![xcodebuild](https://github.com/TUM-Dev/Campus-Flutter/actions/workflows/deploy_web.yml/badge.svg?branch=development)
-[![Discord Channel](https://img.shields.io/badge/Chat-on%20Discord-brightgreen)](https://discord.gg/k558T6ktuh)
-<a href="https://testflight.apple.com/join/LnxaIfKi">
-<img src="https://developer.apple.com/assets/elements/icons/testflight/testflight-64x64_2x.png" height="42" align="right">
-</a>
-
-
 # The mobile client for [gocast](https://github.com/TUM-Dev/gocast)
 
 This mobile client for [gocast](https://github.com/TUM-Dev/gocast) is currently under development by the [iPraktikum Winter 23/24](https://ase.cit.tum.de/teaching/23w/ipraktikum/) on behalf of the TUM Developers. In order not to influence the grading of the students, we would ask you to refrain from code contributions until **March 2023**. Until then, we look forward to your contributions in our other repositories. Thank you for your understanding! 
@@ -14,7 +6,7 @@ This mobile client for [gocast](https://github.com/TUM-Dev/gocast) is currently
 ## Features
 
 - [x] Authentication using internal account
-- [ ] Authentication using TUM SSO
+- [x] Authentication using TUM SSO
 - [ ] Overview of own and publicly available Lectures
 - [ ] Ability to watch lectures (single, multi - view and split - view)
 - [ ] Bookmark lectures
@@ -33,7 +25,7 @@ This mobile client for [gocast](https://github.com/TUM-Dev/gocast) is currently
 
 ## Development
 
-| Dependency                               | Usage                                    | where to download it                         |
+| Dependency                               | Usage                                    | Where to download it                         |
 |------------------------------------------|------------------------------------------|----------------------------------------------|
 | `Flutter` (includes the `Dart` compiler) | SDK to develop this app                  | https://docs.flutter.dev/get-started/install |
 | A local instance of [`gocast`](https://github.com/tum-dev/gocast) | API to fetch user data & streams                  | https://github.com/TUM-Dev/gocast#readme |
\ No newline at end of file
diff --git a/lib/base/networking/apis/auth_handler.dart b/lib/base/networking/apis/auth_handler.dart
index b77168f8..ec4762f5 100644
--- a/lib/base/networking/apis/auth_handler.dart
+++ b/lib/base/networking/apis/auth_handler.dart
@@ -6,6 +6,7 @@ import 'package:flutter_inappwebview/flutter_inappwebview.dart' as webview;
 import 'package:gocast_mobile/base/helpers/model_generator.dart';
 import 'package:gocast_mobile/model/user_model.dart';
 import 'package:gocast_mobile/routes.dart';
+import 'package:shared_preferences/shared_preferences.dart';
 
 class AuthHandler {
   static Future<void> basicAuth(
@@ -34,21 +35,28 @@ class AuthHandler {
       data: formData,
     );
 
-    // For debug purposes only:
+    // Save jwt token
     List<Cookie> cookies = await cookieJar.loadForRequest(Uri.parse(url));
-    print(
-      'UserCookie: ${cookies.isNotEmpty ? cookies[0].value : 'No cookie set'}',
-    );
+
+    if (cookies.isNotEmpty) {
+      SharedPreferences prefs = await SharedPreferences.getInstance();
+      await prefs.setString('jwt', cookies[0].value);
+
+      // DEBUG: Check cookie - TODO: Remove before merge
+      String? jwt = prefs.getString('jwt');
+      print('Current jwt: $jwt\nbasicAuth finished.');
+    } else {
+      // TODO: Handle error
+    }
   }
 
-  // TODO@carlobortolan: Finish implementing TUM SSO
   static Future<void> ssoAuth(BuildContext context) async {
     print('ssoAuth started');
-    // Step 1: Redirect the user to the Shibboleth login page
+    // Redirect the user to the Shibboleth login page
     const loginUrl = 'https://live.rbg.tum.de/saml/out';
-    print('Login URL: $loginUrl');
+    print('Login URL: $Routes.basicLogin');
 
-    // Step 2: Open the login page in a web view
+    // Open the login page in a web view
     await Navigator.push(
       context,
       MaterialPageRoute(
@@ -63,43 +71,21 @@ class AuthHandler {
           onLoadStop:
               (webview.InAppWebViewController controller, Uri? url) async {
             print('Page load stopped: $url');
-            // Step 3: Redirect back to app and save cookie
-            if (url != null &&
-                url.toString().startsWith(
-                      'https://live.rbg.tum.de',
-                    )) {
-              print('Redirect URL detected: $url');
 
-              // Extract the SAMLResponse parameter from the URL
-              final queryParams = Uri.splitQueryString(url.query);
-              final samlRequest = queryParams['SAMLRequest'];
-              final relayState = queryParams['RelayState'];
-              print('SAMLRequest: $samlRequest');
-              print('RelayState: $relayState');
+            // DEBUG: Get the cookies - TODO: Remove before merge
+            final cookieManager = webview.CookieManager.instance();
+            List<webview.Cookie> cookies =
+                await cookieManager.getCookies(url: url!);
 
-              // Send the SAMLResponse to the server to validate it and create a session
-              const ssoCallbackUrl = 'https://live.rbg.tum.de/shib';
-              final cookieJar = CookieJar();
-              final dio = Dio(
-                BaseOptions(
-                  followRedirects: false,
-                  validateStatus: (status) {
-                    return status! < 500;
-                  },
-                ),
-              );
-              dio.interceptors.add(CookieManager(cookieJar));
-
-              final formData = FormData.fromMap({
-                'SAMLResponse': samlRequest,
-              });
+            // Save cookie
+            if (cookies.isNotEmpty) {
+              SharedPreferences prefs = await SharedPreferences.getInstance();
+              await prefs.setString('jwt', cookies[0].value);
+            }
 
-              print('Sending SAMLResponse to server');
-              await dio.post(
-                ssoCallbackUrl,
-                data: formData,
-              );
-              print('SAMLResponse sent to server');
+            // Redirect back to app
+            if (url.toString().startsWith('https://live.rbg.tum.de')) {
+              print('Redirect URL detected: $url');
 
               // Close the web view and go back to the app
               print('Closing web view and returning to app');
@@ -109,7 +95,11 @@ class AuthHandler {
         ),
       ),
     );
-    print('ssoAuth finished');
+
+    // DEBUG: Check cookie - TODO: Remove before merge
+    SharedPreferences prefs = await SharedPreferences.getInstance();
+    String? jwt = prefs.getString('jwt');
+    print('Current jwt: $jwt\nssoAuth finished.');
   }
 
 // Just for testing
diff --git a/lib/viewModels/user_viewmodel.dart b/lib/viewModels/user_viewmodel.dart
index 5ac76b04..9093a98a 100644
--- a/lib/viewModels/user_viewmodel.dart
+++ b/lib/viewModels/user_viewmodel.dart
@@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:gocast_mobile/base/networking/apis/auth_handler.dart';
 import 'package:gocast_mobile/model/user_model.dart';
+import 'package:shared_preferences/shared_preferences.dart';
 
 class UserViewModel with ChangeNotifier {
   UserViewModel(this.current);
@@ -19,8 +20,11 @@ class UserViewModel with ChangeNotifier {
     notifyListeners();
   }
 
-  void logout() {
+  Future<void> logout() async {
     current.removeUser();
     notifyListeners();
+    SharedPreferences prefs = await SharedPreferences.getInstance();
+    prefs.remove('jwt');
+    print('Logged out user and cleared tokens.');
   }
 }
diff --git a/pubspec.lock b/pubspec.lock
index f7cdf3e2..33f4ed4c 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -81,6 +81,22 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.3.1"
+  ffi:
+    dependency: transitive
+    description:
+      name: ffi
+      sha256: "7bf0adc28a23d395f19f3f1eb21dd7cfd1dd9f8e1c50051c069122e6853bc878"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.1.0"
+  file:
+    dependency: transitive
+    description:
+      name: file
+      sha256: "5fc22d7c25582e38ad9a8515372cd9a93834027aacf1801cf01164dac0ffa08c"
+      url: "https://pub.dev"
+    source: hosted
+    version: "7.0.0"
   flutter:
     dependency: "direct main"
     description: flutter
@@ -168,6 +184,38 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.8.3"
+  path_provider_linux:
+    dependency: transitive
+    description:
+      name: path_provider_linux
+      sha256: f7a1fe3a634fe7734c8d3f2766ad746ae2a2884abe22e241a8b301bf5cac3279
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.2.1"
+  path_provider_platform_interface:
+    dependency: transitive
+    description:
+      name: path_provider_platform_interface
+      sha256: "94b1e0dd80970c1ce43d5d4e050a9918fce4f4a775e6142424c30a29a363265c"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.1.1"
+  path_provider_windows:
+    dependency: transitive
+    description:
+      name: path_provider_windows
+      sha256: "8bc9f22eee8690981c22aa7fc602f5c85b497a6fb2ceb35ee5a5e5ed85ad8170"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.2.1"
+  platform:
+    dependency: transitive
+    description:
+      name: platform
+      sha256: "0a279f0707af40c890e80b1e9df8bb761694c074ba7e1d4ab1bc4b728e200b59"
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.1.3"
   plugin_platform_interface:
     dependency: transitive
     description:
@@ -184,6 +232,62 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "6.1.1"
+  shared_preferences:
+    dependency: "direct main"
+    description:
+      name: shared_preferences
+      sha256: "81429e4481e1ccfb51ede496e916348668fd0921627779233bd24cc3ff6abd02"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.2.2"
+  shared_preferences_android:
+    dependency: transitive
+    description:
+      name: shared_preferences_android
+      sha256: "8568a389334b6e83415b6aae55378e158fbc2314e074983362d20c562780fb06"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.2.1"
+  shared_preferences_foundation:
+    dependency: transitive
+    description:
+      name: shared_preferences_foundation
+      sha256: "7bf53a9f2d007329ee6f3df7268fd498f8373602f943c975598bbb34649b62a7"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.3.4"
+  shared_preferences_linux:
+    dependency: transitive
+    description:
+      name: shared_preferences_linux
+      sha256: "9f2cbcf46d4270ea8be39fa156d86379077c8a5228d9dfdb1164ae0bb93f1faa"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.3.2"
+  shared_preferences_platform_interface:
+    dependency: transitive
+    description:
+      name: shared_preferences_platform_interface
+      sha256: d4ec5fc9ebb2f2e056c617112aa75dcf92fc2e4faaf2ae999caa297473f75d8a
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.3.1"
+  shared_preferences_web:
+    dependency: transitive
+    description:
+      name: shared_preferences_web
+      sha256: d762709c2bbe80626ecc819143013cc820fa49ca5e363620ee20a8b15a3e3daf
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.2.1"
+  shared_preferences_windows:
+    dependency: transitive
+    description:
+      name: shared_preferences_windows
+      sha256: "841ad54f3c8381c480d0c9b508b89a34036f512482c407e6df7a9c4aa2ef8f59"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.3.2"
   sky_engine:
     dependency: transitive
     description: flutter
@@ -293,6 +397,22 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.3.0"
+  win32:
+    dependency: transitive
+    description:
+      name: win32
+      sha256: "7c99c0e1e2fa190b48d25c81ca5e42036d5cac81430ef249027d97b0935c553f"
+      url: "https://pub.dev"
+    source: hosted
+    version: "5.1.0"
+  xdg_directories:
+    dependency: transitive
+    description:
+      name: xdg_directories
+      sha256: "589ada45ba9e39405c198fe34eb0f607cddb2108527e658136120892beac46d2"
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.3"
 sdks:
   dart: ">=3.2.0-194.0.dev <4.0.0"
-  flutter: ">=3.0.0"
+  flutter: ">=3.7.0"
diff --git a/pubspec.yaml b/pubspec.yaml
index 0497decd..4508386f 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -14,6 +14,7 @@ dependencies:
     sdk: flutter
   flutter_inappwebview: ^5.8.0
   provider: ^6.1.1
+  shared_preferences: ^2.2.2
   uni_links: ^0.5.1
 
 dev_dependencies:

From c6b36d2a1075703fa4d80311e7317d4e757f0d37 Mon Sep 17 00:00:00 2001
From: carlobortolan <carlobortolan@gmail.com>
Date: Sat, 18 Nov 2023 03:05:39 +0100
Subject: [PATCH 5/9] Clean up auth_handler.dart and update routes

---
 lib/base/networking/apis/auth_handler.dart | 81 +++++++++++-----------
 lib/routes.dart                            |  4 ++
 2 files changed, 43 insertions(+), 42 deletions(-)

diff --git a/lib/base/networking/apis/auth_handler.dart b/lib/base/networking/apis/auth_handler.dart
index ec4762f5..411ab90f 100644
--- a/lib/base/networking/apis/auth_handler.dart
+++ b/lib/base/networking/apis/auth_handler.dart
@@ -9,6 +9,23 @@ import 'package:gocast_mobile/routes.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 
 class AuthHandler {
+  static Future<void> saveToken(List<Cookie> cookies) async {
+    for (var cookie in cookies) {
+      if (cookie.name == 'jwt') {
+        SharedPreferences prefs = await SharedPreferences.getInstance();
+        await prefs.setString('jwt', cookie.value);
+
+        // DEBUG: Check cookie
+        String? jwt = prefs.getString('jwt');
+        print('Current jwt: $jwt');
+        return;
+      }
+    }
+
+    // TODO: Handle error when no jwt cookie is found
+    print('No JWT cookie found');
+  }
+
   static Future<void> basicAuth(
     String username,
     String password,
@@ -30,38 +47,35 @@ class AuthHandler {
       'password': password,
     });
 
-    await dio.post(
-      url,
-      data: formData,
-    );
+    try {
+      await dio.post(
+        url,
+        data: formData,
+      );
+    } catch (e) {
+      // TODO: Handle network errors
+      print('Request error: $e');
+      return;
+    }
 
-    // Save jwt token
     List<Cookie> cookies = await cookieJar.loadForRequest(Uri.parse(url));
 
-    if (cookies.isNotEmpty) {
-      SharedPreferences prefs = await SharedPreferences.getInstance();
-      await prefs.setString('jwt', cookies[0].value);
-
-      // DEBUG: Check cookie - TODO: Remove before merge
-      String? jwt = prefs.getString('jwt');
-      print('Current jwt: $jwt\nbasicAuth finished.');
-    } else {
-      // TODO: Handle error
-    }
+    // Save jwt token
+    await saveToken(cookies);
   }
 
   static Future<void> ssoAuth(BuildContext context) async {
     print('ssoAuth started');
     // Redirect the user to the Shibboleth login page
-    const loginUrl = 'https://live.rbg.tum.de/saml/out';
-    print('Login URL: $Routes.basicLogin');
+    print('Login URL: $Routes.ssoLogin');
 
     // Open the login page in a web view
     await Navigator.push(
       context,
       MaterialPageRoute(
         builder: (context) => webview.InAppWebView(
-          initialUrlRequest: webview.URLRequest(url: Uri.parse(loginUrl)),
+          initialUrlRequest:
+              webview.URLRequest(url: Uri.parse(Routes.ssoLogin)),
           onWebViewCreated: (webview.InAppWebViewController controller) {
             print('Web view created');
           },
@@ -72,19 +86,17 @@ class AuthHandler {
               (webview.InAppWebViewController controller, Uri? url) async {
             print('Page load stopped: $url');
 
-            // DEBUG: Get the cookies - TODO: Remove before merge
             final cookieManager = webview.CookieManager.instance();
             List<webview.Cookie> cookies =
                 await cookieManager.getCookies(url: url!);
 
-            // Save cookie
-            if (cookies.isNotEmpty) {
-              SharedPreferences prefs = await SharedPreferences.getInstance();
-              await prefs.setString('jwt', cookies[0].value);
-            }
+            // Save jwt token
+            await saveToken(
+              cookies.map((c) => Cookie(c.name, c.value)).toList(),
+            );
 
             // Redirect back to app
-            if (url.toString().startsWith('https://live.rbg.tum.de')) {
+            if (url.toString().startsWith(Routes.ssoRedirect)) {
               print('Redirect URL detected: $url');
 
               // Close the web view and go back to the app
@@ -95,26 +107,11 @@ class AuthHandler {
         ),
       ),
     );
-
-    // DEBUG: Check cookie - TODO: Remove before merge
-    SharedPreferences prefs = await SharedPreferences.getInstance();
-    String? jwt = prefs.getString('jwt');
-    print('Current jwt: $jwt\nssoAuth finished.');
   }
 
-// Just for testing
+  // Generate user mock for testing the views until API/v2 is implemented
   static Future<User> fetchUser() async {
-    /*
-    TODO: Add GET:/user endpoint in gocast API to fetch current user information 
-    const url = 'http://localhost:8081/api/user';
-    final response = await http.get(
-      Uri.parse(url),
-      headers: {
-        'Cookie':
-            'jwt=eyJhbGciOiJSUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE3MDA0MTc0ODksIlVzZXJJRCI6NCwiU2FtbFN1YmplY3RJRCI6bnVsbH0.gNkwmP2QDieyFb-oAq4zuimlIGozsD5eqlD3ZBs9lLxKE3UpQDVB-ufUmbY_hZq5WE2BVlZ3jLLdQKJKMsvJZNkKRMov_W7ADAxHgVa5IE7WWry9YGLNigVEM_ruagKrp8RyV2MOyA7xQKVudLwfF3RNhcJImVFSkpMTFH6IPr7PvIvilktgNmJDTq4hdieKmzAOQMuNsFxsAIAHXZvAOt9JP0XuIrQMJk6J9Ye201D_V6iObSyMa2AFE7nnTgvOMJeRiuhRrFy9u61XnWc7GfiE9b057aNhTKrTU389Z0vJaHJeIk9c-4x9jLuspMFpX_8g_J-EWfbCWXFHxPRqCQ',
-      },
-    );
-  */
+    // TODO: Add GET:/user endpoint in gocast API to fetch current user information
     return ModelGenerator.generateRandomUser();
   }
 }
diff --git a/lib/routes.dart b/lib/routes.dart
index 96e6068f..62dc0382 100644
--- a/lib/routes.dart
+++ b/lib/routes.dart
@@ -5,6 +5,8 @@ const _ROOT_URL = 'http://10.0.2.2:8081/api';
 
 // AUTHENTICATION
 const _BASIC_AUTH_URL = 'http://10.0.2.2:8081/login';
+const _SSO_AUTH_URL = 'https://live.rbg.tum.de/saml/out';
+const _SSO_REDIRECT_URL = 'https://live.rbg.tum.de';
 
 // COURSES
 const _COURSES_PATH = '/courses';
@@ -22,6 +24,8 @@ const _NOTIFICATIONS_SERVER_PATH = '/notifications/server';
 
 class Routes {
   static const basicLogin = _BASIC_AUTH_URL;
+  static const ssoLogin = _SSO_AUTH_URL;
+  static const ssoRedirect = _SSO_REDIRECT_URL;
   static const courses = _ROOT_URL + _COURSES_PATH;
   static const coursesLive = _ROOT_URL + _COURSES_LIVE_PATH;
   static const coursesUser = _ROOT_URL + _COURSES_USER_PATH;

From 32cb061ff88baa1974ea38ad35f6afe2cd7bb114 Mon Sep 17 00:00:00 2001
From: carlobortolan <carlobortolan@gmail.com>
Date: Sat, 18 Nov 2023 18:50:35 +0100
Subject: [PATCH 6/9] Update userState and userViewModel to use riverpod and
 rxdart

---
 lib/main.dart                      | 66 +++++++++++-------------------
 lib/model/user_model.dart          | 23 +++++++----
 lib/viewModels/user_viewmodel.dart | 30 +++++++++-----
 lib/views/home_view.dart           | 14 +++----
 lib/views/login_view.dart          | 62 ++++++++++++++--------------
 lib/views/welcome_view.dart        | 33 ++++++++-------
 pubspec.lock                       | 32 +++++++++++++++
 pubspec.yaml                       |  4 +-
 8 files changed, 150 insertions(+), 114 deletions(-)

diff --git a/lib/main.dart b/lib/main.dart
index ea961cf2..9a6331fd 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -1,31 +1,31 @@
 import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:gocast_mobile/model/user_model.dart';
 import 'package:gocast_mobile/viewModels/user_viewmodel.dart';
 import 'package:gocast_mobile/views/home_view.dart';
 import 'package:gocast_mobile/views/login_view.dart';
 import 'package:gocast_mobile/views/welcome_view.dart';
-import 'package:provider/provider.dart';
-import 'package:gocast_mobile/bootstrap.dart';
 
-void main() {
-  bootstrap(() {
-    return ChangeNotifierProvider(
-      create: (context) =>
-          UserState(isLoading: false, user: null, errorMessage: ''),
-      child: const App(),
-    );
-  });
+final userViewModel = Provider((ref) => UserViewModel());
 
-//  runApp(const MyApp());
+final userStateProvider = StreamProvider<UserState>((ref) {
+  return ref.watch(userViewModel).current.stream;
+});
+
+void main() {
+  runApp(
+    const ProviderScope(
+      child: App(),
+    ),
+  );
 }
 
-class App extends StatelessWidget {
+class App extends ConsumerWidget {
   const App({super.key});
 
   @override
-  Widget build(BuildContext context) {
-    final current = Provider.of<UserState>(context);
-    final userViewModel = UserViewModel(current);
+  Widget build(BuildContext context, WidgetRef ref) {
+    final userState = ref.watch(userStateProvider);
 
     return MaterialApp(
       title: 'gocast',
@@ -37,34 +37,16 @@ class App extends StatelessWidget {
           backgroundColor: Theme.of(context).colorScheme.inversePrimary,
         ),
       ),
-      home: current.user == null
-          ? LoginView(
-              key: const Key('loginView'),
-              userViewModel: userViewModel,
-            )
-          : HomeView(
-              key: const Key('homeView'),
-              userViewModel: userViewModel,
-            ),
+      home: userState.value?.user == null
+          ? const LoginView(key: Key('loginView'))
+          : const HomeView(key: Key('homeView')),
       routes: {
-        '/welcome': (context) => current.user == null
-            ? LoginView(
-                key: const Key('loginView'),
-                userViewModel: UserViewModel(Provider.of<UserState>(context)),
-              )
-            : WelcomeView(
-                key: const Key('welcomeView'),
-                userViewModel: UserViewModel(Provider.of<UserState>(context)),
-              ),
-        '/home': (context) => current.user == null
-            ? LoginView(
-                key: const Key('loginView'),
-                userViewModel: UserViewModel(Provider.of<UserState>(context)),
-              )
-            : HomeView(
-                key: const Key('homeView'),
-                userViewModel: UserViewModel(Provider.of<UserState>(context)),
-              ),
+        '/welcome': (context) => userState.value?.user == null
+            ? const LoginView(key: Key('loginView'))
+            : const WelcomeView(key: Key('welcomeView')),
+        '/home': (context) => userState.value?.user == null
+            ? const LoginView(key: Key('loginView'))
+            : const HomeView(key: Key('homeView')),
       },
     );
   }
diff --git a/lib/model/user_model.dart b/lib/model/user_model.dart
index 20955e06..6a3e9042 100644
--- a/lib/model/user_model.dart
+++ b/lib/model/user_model.dart
@@ -1,30 +1,37 @@
-import 'package:flutter/foundation.dart';
-
 // ignore_for_file: always_put_required_named_parameters_first
-class UserState with ChangeNotifier {
+class UserState {
   UserState({
     required this.isLoading,
-    required this.user,
+    this.user,
+    // Placeholder for future helpers (e.g. error handling)
     required this.errorMessage,
   });
 
+  // Default constructor
+  UserState.defaultConstructor()
+      : isLoading = false,
+        errorMessage = '',
+        user = null;
+
   bool isLoading;
   User? user;
   String errorMessage;
 
-  void setUser(User? newUser) {
+  void setUser(User newUser) {
+    print("User set to: ${newUser.name}");
     user = newUser;
-    notifyListeners();
   }
 
   void removeUser() {
     user = null;
-    notifyListeners();
   }
 
   void setIsLoading(bool isLoading) {
     this.isLoading = isLoading;
-    notifyListeners();
+  }
+
+  void toggleIsLoading() {
+    isLoading = !isLoading;
   }
 }
 
diff --git a/lib/viewModels/user_viewmodel.dart b/lib/viewModels/user_viewmodel.dart
index 9093a98a..57c669c5 100644
--- a/lib/viewModels/user_viewmodel.dart
+++ b/lib/viewModels/user_viewmodel.dart
@@ -2,27 +2,35 @@ import 'package:flutter/material.dart';
 import 'package:gocast_mobile/base/networking/apis/auth_handler.dart';
 import 'package:gocast_mobile/model/user_model.dart';
 import 'package:shared_preferences/shared_preferences.dart';
+import 'package:rxdart/rxdart.dart';
 
-class UserViewModel with ChangeNotifier {
-  UserViewModel(this.current);
-  final UserState current;
+class UserViewModel {
+  BehaviorSubject<UserState> current =
+      BehaviorSubject.seeded(UserState.defaultConstructor());
 
   // Sign in user and store cookie
   Future<void> basicAuth(String email, String password) async {
-    await AuthHandler.basicAuth(email, password)
-        .then((value) => AuthHandler.fetchUser().then(current.setUser));
-    notifyListeners();
+    await AuthHandler.basicAuth(email, password).then(
+      (value) => AuthHandler.fetchUser().then(
+        (value) => current.value.setUser(value),
+        onError: (error) => current.addError(error),
+      ),
+    );
   }
 
   Future<void> ssoAuth(BuildContext context) async {
-    await AuthHandler.ssoAuth(context)
-        .then((value) => AuthHandler.fetchUser().then(current.setUser));
-    notifyListeners();
+    await AuthHandler.ssoAuth(context).then(
+      (value) => AuthHandler.fetchUser().then(
+        (value) => current.value.setUser(value),
+        onError: (error) => current.addError(error),
+      ),
+    );
   }
 
   Future<void> logout() async {
-    current.removeUser();
-    notifyListeners();
+    current.value.removeUser();
+    current.value = UserState.defaultConstructor();
+
     SharedPreferences prefs = await SharedPreferences.getInstance();
     prefs.remove('jwt');
     print('Logged out user and cleared tokens.');
diff --git a/lib/views/home_view.dart b/lib/views/home_view.dart
index ee07b43b..eb1a02e0 100644
--- a/lib/views/home_view.dart
+++ b/lib/views/home_view.dart
@@ -1,20 +1,20 @@
 import 'package:flutter/material.dart';
-import 'package:gocast_mobile/viewModels/user_viewmodel.dart';
+import 'package:gocast_mobile/main.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
 
-class HomeView extends StatelessWidget {
-  const HomeView({required this.userViewModel, super.key});
-
-  final UserViewModel userViewModel;
+class HomeView extends ConsumerWidget {
+  const HomeView({super.key});
 
   @override
-  Widget build(BuildContext context) {
+  Widget build(BuildContext context, WidgetRef ref) {
     return Scaffold(
       appBar: AppBar(
+        automaticallyImplyLeading: false,
         title: const Text('Home'),
         actions: [
           IconButton(
             icon: const Icon(Icons.logout),
-            onPressed: userViewModel.logout,
+            onPressed: () => ref.read(userViewModel).logout(),
           ),
         ],
       ),
diff --git a/lib/views/login_view.dart b/lib/views/login_view.dart
index 3676470d..01db5f02 100644
--- a/lib/views/login_view.dart
+++ b/lib/views/login_view.dart
@@ -1,42 +1,42 @@
 import 'package:flutter/material.dart';
-import 'package:gocast_mobile/viewModels/user_viewmodel.dart';
+import 'package:gocast_mobile/main.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
 
-class LoginView extends StatelessWidget {
-  LoginView({required this.userViewModel, super.key});
+class LoginView extends ConsumerWidget {
+  const LoginView({super.key});
 
-  final UserViewModel userViewModel;
-
-  final TextEditingController usernameController = TextEditingController();
-  final TextEditingController passwordController = TextEditingController();
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final TextEditingController usernameController = TextEditingController();
+    final TextEditingController passwordController = TextEditingController();
 
-  Future<void> _handleSSOLogin(BuildContext context) async {
-    // Call the SSO authentication function from /base/api/auth
-    await userViewModel.ssoAuth(context);
-    // Navigate to the home screen after successful authentication
-    if (userViewModel.current.user != null) {
-      // ignore: use_build_context_synchronously
-      await Navigator.pushNamed(context, '/welcome');
+    Future<void> handleSSOLogin(BuildContext context) async {
+      // Call the SSO authentication function from /base/api/auth
+      await ref.read(userViewModel).ssoAuth(context);
+      // Navigate to the home screen after successful authentication
+      if (ref.read(userViewModel).current.value.user != null) {
+        // ignore: use_build_context_synchronously
+        await Navigator.pushNamed(context, '/welcome');
+      }
     }
-  }
 
-  Future<void> _handleBasicLogin(BuildContext context) async {
-    // Call the basic authentication function from /base/api/auth
-    await userViewModel
-        .basicAuth(usernameController.text, passwordController.text)
-        .then(
-          (value) => {
-            if (userViewModel.current.user != null)
-              {Navigator.pushNamed(context, '/welcome')},
-          },
-        );
-  }
+    Future<void> handleBasicLogin(BuildContext context) async {
+      // Call the basic authentication function from /base/api/auth
+      await ref
+          .read(userViewModel)
+          .basicAuth(usernameController.text, passwordController.text)
+          .then(
+            (value) => {
+              if (ref.read(userViewModel).current.value.user != null)
+                {Navigator.pushNamed(context, '/welcome')},
+            },
+          );
+    }
 
-  @override
-  Widget build(BuildContext context) {
     return Scaffold(
       backgroundColor: Colors.white,
       body: SafeArea(
-        child: userViewModel.current.isLoading
+        child: ref.read(userViewModel).current.value.isLoading
             ? const Center(child: CircularProgressIndicator())
             : SingleChildScrollView(
                 child: Padding(
@@ -52,7 +52,7 @@ class LoginView extends StatelessWidget {
                       ),
                       const SizedBox(height: 32),
                       ElevatedButton(
-                        onPressed: () => _handleSSOLogin(context),
+                        onPressed: () => handleSSOLogin(context),
                         style: ElevatedButton.styleFrom(
                           backgroundColor: Colors.blue,
                           shape: RoundedRectangleBorder(
@@ -106,7 +106,7 @@ class LoginView extends StatelessWidget {
                       ),
                       const SizedBox(height: 32),
                       ElevatedButton(
-                        onPressed: () => _handleBasicLogin(context),
+                        onPressed: () => handleBasicLogin(context),
                         style: ElevatedButton.styleFrom(
                           backgroundColor: Colors.blue,
                           shape: RoundedRectangleBorder(
diff --git a/lib/views/welcome_view.dart b/lib/views/welcome_view.dart
index f21c1282..84c161f6 100644
--- a/lib/views/welcome_view.dart
+++ b/lib/views/welcome_view.dart
@@ -1,21 +1,26 @@
 import 'package:flutter/material.dart';
-import 'package:gocast_mobile/viewModels/user_viewmodel.dart';
+import 'package:gocast_mobile/main.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
 
-class WelcomeView extends StatelessWidget {
-  const WelcomeView({required this.userViewModel, super.key});
-
-  final UserViewModel userViewModel;
+class WelcomeView extends ConsumerWidget {
+  const WelcomeView({super.key});
 
   @override
-  Widget build(BuildContext context) {
-    return Scaffold(
-      appBar: AppBar(
-        title: const Text('Welcome to GoCast'),
-      ),
-      body: Center(
-        child: Text(
-          'Servus, ${userViewModel.current.user?.name ?? 'Guest'}!',
-          style: const TextStyle(fontSize: 24),
+  Widget build(BuildContext context, WidgetRef ref) {
+    return WillPopScope(
+      onWillPop: () async {
+        Navigator.pushReplacementNamed(context, '/home');
+        return false;
+      },
+      child: Scaffold(
+        appBar: AppBar(
+          title: const Text('Welcome to GoCast'),
+        ),
+        body: Center(
+          child: Text(
+            'Servus, ${ref.read(userViewModel).current.value.user?.name ?? 'Guest'}!',
+            style: const TextStyle(fontSize: 24),
+          ),
         ),
       ),
     );
diff --git a/pubspec.lock b/pubspec.lock
index 33f4ed4c..9e36b54d 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -118,6 +118,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "3.0.1"
+  flutter_riverpod:
+    dependency: "direct main"
+    description:
+      name: flutter_riverpod
+      sha256: "49b55e8a467229eedb801bd0864baa7f891c39cc00f790189ba8479e9ad0fa06"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.4.6"
   flutter_test:
     dependency: "direct dev"
     description: flutter
@@ -232,6 +240,22 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "6.1.1"
+  riverpod:
+    dependency: transitive
+    description:
+      name: riverpod
+      sha256: "01fa385aa5d6db42fd602d8c400c28ae1c83d1fd6fbae1cbf0f4c78bac58d4b2"
+      url: "https://pub.dev"
+    source: hosted
+    version: "2.4.6"
+  rxdart:
+    dependency: "direct main"
+    description:
+      name: rxdart
+      sha256: "0c7c0cedd93788d996e33041ffecda924cc54389199cde4e6a34b440f50044cb"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.27.7"
   shared_preferences:
     dependency: "direct main"
     description:
@@ -309,6 +333,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.11.1"
+  state_notifier:
+    dependency: transitive
+    description:
+      name: state_notifier
+      sha256: b8677376aa54f2d7c58280d5a007f9e8774f1968d1fb1c096adcb4792fba29bb
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.0.0"
   stream_channel:
     dependency: transitive
     description:
diff --git a/pubspec.yaml b/pubspec.yaml
index 4508386f..491c8c3d 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -16,7 +16,9 @@ dependencies:
   provider: ^6.1.1
   shared_preferences: ^2.2.2
   uni_links: ^0.5.1
-
+  flutter_riverpod: ^2.4.6
+  rxdart: ^0.27.7
+  
 dev_dependencies:
   flutter_test:
     sdk: flutter

From f909a82bc4c5047af06b4732a0a2efc6e4d613ca Mon Sep 17 00:00:00 2001
From: carlobortolan <carlobortolan@gmail.com>
Date: Sat, 18 Nov 2023 21:54:24 +0100
Subject: [PATCH 7/9] Refactor code to improve readability

---
 lib/base/networking/apis/auth_handler.dart |  31 ++---
 lib/model/token_model.dart                 |  23 ++++
 lib/views/login_view.dart                  | 138 +++++++++++++--------
 3 files changed, 120 insertions(+), 72 deletions(-)
 create mode 100644 lib/model/token_model.dart

diff --git a/lib/base/networking/apis/auth_handler.dart b/lib/base/networking/apis/auth_handler.dart
index 411ab90f..e814ed22 100644
--- a/lib/base/networking/apis/auth_handler.dart
+++ b/lib/base/networking/apis/auth_handler.dart
@@ -4,12 +4,13 @@ import 'package:dio_cookie_manager/dio_cookie_manager.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_inappwebview/flutter_inappwebview.dart' as webview;
 import 'package:gocast_mobile/base/helpers/model_generator.dart';
+import 'package:gocast_mobile/model/token_model.dart';
 import 'package:gocast_mobile/model/user_model.dart';
 import 'package:gocast_mobile/routes.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 
 class AuthHandler {
-  static Future<void> saveToken(List<Cookie> cookies) async {
+  /* static Future<void> saveToken(List<Cookie> cookies) async {
     for (var cookie in cookies) {
       if (cookie.name == 'jwt') {
         SharedPreferences prefs = await SharedPreferences.getInstance();
@@ -17,15 +18,15 @@ class AuthHandler {
 
         // DEBUG: Check cookie
         String? jwt = prefs.getString('jwt');
-        print('Current jwt: $jwt');
+        debugPrint('Current jwt: $jwt');
         return;
       }
     }
 
     // TODO: Handle error when no jwt cookie is found
-    print('No JWT cookie found');
+    debugPrint('No JWT cookie found');
   }
-
+*/
   static Future<void> basicAuth(
     String username,
     String password,
@@ -54,20 +55,20 @@ class AuthHandler {
       );
     } catch (e) {
       // TODO: Handle network errors
-      print('Request error: $e');
+      debugPrint('Request error: $e');
       return;
     }
 
     List<Cookie> cookies = await cookieJar.loadForRequest(Uri.parse(url));
 
     // Save jwt token
-    await saveToken(cookies);
+    await Token.saveToken(cookies);
   }
 
   static Future<void> ssoAuth(BuildContext context) async {
-    print('ssoAuth started');
+    debugPrint('ssoAuth started');
     // Redirect the user to the Shibboleth login page
-    print('Login URL: $Routes.ssoLogin');
+    debugPrint('Login URL: $Routes.ssoLogin');
 
     // Open the login page in a web view
     await Navigator.push(
@@ -76,31 +77,25 @@ class AuthHandler {
         builder: (context) => webview.InAppWebView(
           initialUrlRequest:
               webview.URLRequest(url: Uri.parse(Routes.ssoLogin)),
-          onWebViewCreated: (webview.InAppWebViewController controller) {
-            print('Web view created');
-          },
-          onLoadStart: (webview.InAppWebViewController controller, Uri? url) {
-            print('Page load started: $url');
-          },
           onLoadStop:
               (webview.InAppWebViewController controller, Uri? url) async {
-            print('Page load stopped: $url');
+            debugPrint('Page load stopped: $url');
 
             final cookieManager = webview.CookieManager.instance();
             List<webview.Cookie> cookies =
                 await cookieManager.getCookies(url: url!);
 
             // Save jwt token
-            await saveToken(
+            await Token.saveToken(
               cookies.map((c) => Cookie(c.name, c.value)).toList(),
             );
 
             // Redirect back to app
             if (url.toString().startsWith(Routes.ssoRedirect)) {
-              print('Redirect URL detected: $url');
+              debugPrint('Redirect URL detected: $url');
 
               // Close the web view and go back to the app
-              print('Closing web view and returning to app');
+              debugPrint('Closing web view and returning to app');
               Navigator.pop(context);
             }
           },
diff --git a/lib/model/token_model.dart b/lib/model/token_model.dart
new file mode 100644
index 00000000..89056d4a
--- /dev/null
+++ b/lib/model/token_model.dart
@@ -0,0 +1,23 @@
+import 'dart:io';
+import 'package:shared_preferences/shared_preferences.dart';
+import 'package:flutter/foundation.dart';
+
+// This class will be extended once the API/v2 is implemented
+class Token {
+  static Future<void> saveToken(List<Cookie> cookies) async {
+    for (var cookie in cookies) {
+      if (cookie.name == 'jwt') {
+        SharedPreferences prefs = await SharedPreferences.getInstance();
+        await prefs.setString('jwt', cookie.value);
+
+        // DEBUG: Check cookie
+        String? jwt = prefs.getString('jwt');
+        debugPrint('Current jwt: $jwt');
+        return;
+      }
+    }
+
+    // Handle error when no jwt cookie is found
+    throw Exception('No JWT cookie found');
+  }
+}
diff --git a/lib/views/login_view.dart b/lib/views/login_view.dart
index 01db5f02..ffc073a8 100644
--- a/lib/views/login_view.dart
+++ b/lib/views/login_view.dart
@@ -5,34 +5,44 @@ import 'package:flutter_riverpod/flutter_riverpod.dart';
 class LoginView extends ConsumerWidget {
   const LoginView({super.key});
 
+  Future<void> handleSSOLogin(
+    BuildContext context,
+    WidgetRef ref,
+    TextEditingController usernameController,
+    TextEditingController passwordController,
+  ) async {
+    // Call the SSO authentication function from /base/api/auth
+    await ref.read(userViewModel).ssoAuth(context);
+    // Navigate to the home screen after successful authentication
+    if (ref.read(userViewModel).current.value.user != null) {
+      // ignore: use_build_context_synchronously
+      await Navigator.pushNamed(context, '/welcome');
+    }
+  }
+
+  Future<void> handleBasicLogin(
+    BuildContext context,
+    WidgetRef ref,
+    TextEditingController usernameController,
+    TextEditingController passwordController,
+  ) async {
+    // Call the basic authentication function from /base/api/auth
+    await ref
+        .read(userViewModel)
+        .basicAuth(usernameController.text, passwordController.text)
+        .then(
+          (value) => {
+            if (ref.read(userViewModel).current.value.user != null)
+              {Navigator.pushNamed(context, '/welcome')},
+          },
+        );
+  }
+
   @override
   Widget build(BuildContext context, WidgetRef ref) {
     final TextEditingController usernameController = TextEditingController();
     final TextEditingController passwordController = TextEditingController();
 
-    Future<void> handleSSOLogin(BuildContext context) async {
-      // Call the SSO authentication function from /base/api/auth
-      await ref.read(userViewModel).ssoAuth(context);
-      // Navigate to the home screen after successful authentication
-      if (ref.read(userViewModel).current.value.user != null) {
-        // ignore: use_build_context_synchronously
-        await Navigator.pushNamed(context, '/welcome');
-      }
-    }
-
-    Future<void> handleBasicLogin(BuildContext context) async {
-      // Call the basic authentication function from /base/api/auth
-      await ref
-          .read(userViewModel)
-          .basicAuth(usernameController.text, passwordController.text)
-          .then(
-            (value) => {
-              if (ref.read(userViewModel).current.value.user != null)
-                {Navigator.pushNamed(context, '/welcome')},
-            },
-          );
-    }
-
     return Scaffold(
       backgroundColor: Colors.white,
       body: SafeArea(
@@ -45,25 +55,13 @@ class LoginView extends ConsumerWidget {
                     crossAxisAlignment: CrossAxisAlignment.stretch,
                     children: [
                       const SizedBox(height: 32),
-                      Image.asset(
-                        'assets/images/logos/tum-logo-blue.png',
-                        fit: BoxFit.contain,
-                        height: 64,
-                      ),
+                      LogoImage(),
                       const SizedBox(height: 32),
-                      ElevatedButton(
-                        onPressed: () => handleSSOLogin(context),
-                        style: ElevatedButton.styleFrom(
-                          backgroundColor: Colors.blue,
-                          shape: RoundedRectangleBorder(
-                            borderRadius: BorderRadius.circular(8),
-                          ),
-                          padding: const EdgeInsets.symmetric(vertical: 16),
-                        ),
-                        child: const Text(
-                          'Sign in using TUM SSO',
-                          style: TextStyle(color: Colors.white),
-                        ),
+                      LoginButton(
+                        onPressed: () => handleSSOLogin(context, ref,
+                            usernameController, passwordController),
+                        label: 'Sign in using TUM SSO',
+                        key: const Key('basicSSOButton'),
                       ),
                       const SizedBox(height: 32),
                       const Divider(
@@ -105,19 +103,11 @@ class LoginView extends ConsumerWidget {
                         style: const TextStyle(color: Colors.blue),
                       ),
                       const SizedBox(height: 32),
-                      ElevatedButton(
-                        onPressed: () => handleBasicLogin(context),
-                        style: ElevatedButton.styleFrom(
-                          backgroundColor: Colors.blue,
-                          shape: RoundedRectangleBorder(
-                            borderRadius: BorderRadius.circular(8),
-                          ),
-                          padding: const EdgeInsets.symmetric(vertical: 16),
-                        ),
-                        child: const Text(
-                          'Login',
-                          style: TextStyle(color: Colors.white),
-                        ),
+                      LoginButton(
+                        onPressed: () => handleBasicLogin(context, ref,
+                            usernameController, passwordController),
+                        label: 'Login',
+                        key: const Key('basicLoginButton'),
                       ),
                     ],
                   ),
@@ -127,3 +117,43 @@ class LoginView extends ConsumerWidget {
     );
   }
 }
+
+class LogoImage extends StatelessWidget {
+  @override
+  Widget build(BuildContext context) {
+    return Image.asset(
+      'assets/images/logos/tum-logo-blue.png',
+      fit: BoxFit.contain,
+      height: 64,
+    );
+  }
+}
+
+class LoginButton extends StatelessWidget {
+  const LoginButton({
+    required Key key,
+    required this.onPressed,
+    required this.label,
+  }) : super(key: key);
+
+  final VoidCallback onPressed;
+  final String label;
+
+  @override
+  Widget build(BuildContext context) {
+    return ElevatedButton(
+      onPressed: onPressed,
+      style: ElevatedButton.styleFrom(
+        backgroundColor: Colors.blue,
+        shape: RoundedRectangleBorder(
+          borderRadius: BorderRadius.circular(8),
+        ),
+        padding: const EdgeInsets.symmetric(vertical: 16),
+      ),
+      child: Text(
+        label,
+        style: const TextStyle(color: Colors.white),
+      ),
+    );
+  }
+}

From 556f884669af157ee6b71838ef8d8224ff75e0cd Mon Sep 17 00:00:00 2001
From: carlobortolan <carlobortolan@gmail.com>
Date: Sat, 18 Nov 2023 21:59:42 +0100
Subject: [PATCH 8/9] Remove unused import

---
 lib/base/networking/apis/auth_handler.dart |  1 -
 lib/views/login_view.dart                  | 20 +++++++++++++++-----
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/lib/base/networking/apis/auth_handler.dart b/lib/base/networking/apis/auth_handler.dart
index e814ed22..206bcdee 100644
--- a/lib/base/networking/apis/auth_handler.dart
+++ b/lib/base/networking/apis/auth_handler.dart
@@ -7,7 +7,6 @@ import 'package:gocast_mobile/base/helpers/model_generator.dart';
 import 'package:gocast_mobile/model/token_model.dart';
 import 'package:gocast_mobile/model/user_model.dart';
 import 'package:gocast_mobile/routes.dart';
-import 'package:shared_preferences/shared_preferences.dart';
 
 class AuthHandler {
   /* static Future<void> saveToken(List<Cookie> cookies) async {
diff --git a/lib/views/login_view.dart b/lib/views/login_view.dart
index ffc073a8..962338f5 100644
--- a/lib/views/login_view.dart
+++ b/lib/views/login_view.dart
@@ -55,11 +55,15 @@ class LoginView extends ConsumerWidget {
                     crossAxisAlignment: CrossAxisAlignment.stretch,
                     children: [
                       const SizedBox(height: 32),
-                      LogoImage(),
+                      const LogoImage(),
                       const SizedBox(height: 32),
                       LoginButton(
-                        onPressed: () => handleSSOLogin(context, ref,
-                            usernameController, passwordController),
+                        onPressed: () => handleSSOLogin(
+                          context,
+                          ref,
+                          usernameController,
+                          passwordController,
+                        ),
                         label: 'Sign in using TUM SSO',
                         key: const Key('basicSSOButton'),
                       ),
@@ -104,8 +108,12 @@ class LoginView extends ConsumerWidget {
                       ),
                       const SizedBox(height: 32),
                       LoginButton(
-                        onPressed: () => handleBasicLogin(context, ref,
-                            usernameController, passwordController),
+                        onPressed: () => handleBasicLogin(
+                          context,
+                          ref,
+                          usernameController,
+                          passwordController,
+                        ),
                         label: 'Login',
                         key: const Key('basicLoginButton'),
                       ),
@@ -119,6 +127,8 @@ class LoginView extends ConsumerWidget {
 }
 
 class LogoImage extends StatelessWidget {
+  const LogoImage({super.key});
+
   @override
   Widget build(BuildContext context) {
     return Image.asset(

From dc0326ad77a4375d9e34fb68c41334149ce24038 Mon Sep 17 00:00:00 2001
From: carlobortolan <carlobortolan@gmail.com>
Date: Sun, 19 Nov 2023 03:22:44 +0100
Subject: [PATCH 9/9] Clean up code, refactor models, update error-handling

---
 lib/base/helpers/model_generator.dart      |   5 +-
 lib/base/networking/apis/auth_handler.dart |  55 ++++------
 lib/main.dart                              |  13 ++-
 lib/model/course/bookmark_model.dart       |  13 +++
 lib/model/course/course_model.dart         |   9 ++
 lib/model/user/user_model.dart             |  35 +++++++
 lib/model/user/user_settings_model.dart    |  19 ++++
 lib/model/user/user_state_model.dart       |  39 +++++++
 lib/model/user_model.dart                  | 112 ---------------------
 lib/viewModels/user_viewmodel.dart         |   9 +-
 10 files changed, 159 insertions(+), 150 deletions(-)
 create mode 100644 lib/model/course/bookmark_model.dart
 create mode 100644 lib/model/course/course_model.dart
 create mode 100644 lib/model/user/user_model.dart
 create mode 100644 lib/model/user/user_settings_model.dart
 create mode 100644 lib/model/user/user_state_model.dart
 delete mode 100644 lib/model/user_model.dart

diff --git a/lib/base/helpers/model_generator.dart b/lib/base/helpers/model_generator.dart
index 0cc9ebb2..25c64464 100644
--- a/lib/base/helpers/model_generator.dart
+++ b/lib/base/helpers/model_generator.dart
@@ -1,5 +1,8 @@
 import 'dart:math';
-import 'package:gocast_mobile/model/user_model.dart';
+import 'package:gocast_mobile/model/course/bookmark_model.dart';
+import 'package:gocast_mobile/model/course/course_model.dart';
+import 'package:gocast_mobile/model/user/user_model.dart';
+import 'package:gocast_mobile/model/user/user_settings_model.dart';
 
 class ModelGenerator {
   static User generateRandomUser() {
diff --git a/lib/base/networking/apis/auth_handler.dart b/lib/base/networking/apis/auth_handler.dart
index 206bcdee..ab49d38c 100644
--- a/lib/base/networking/apis/auth_handler.dart
+++ b/lib/base/networking/apis/auth_handler.dart
@@ -5,27 +5,10 @@ import 'package:flutter/material.dart';
 import 'package:flutter_inappwebview/flutter_inappwebview.dart' as webview;
 import 'package:gocast_mobile/base/helpers/model_generator.dart';
 import 'package:gocast_mobile/model/token_model.dart';
-import 'package:gocast_mobile/model/user_model.dart';
+import 'package:gocast_mobile/model/user/user_model.dart';
 import 'package:gocast_mobile/routes.dart';
 
 class AuthHandler {
-  /* static Future<void> saveToken(List<Cookie> cookies) async {
-    for (var cookie in cookies) {
-      if (cookie.name == 'jwt') {
-        SharedPreferences prefs = await SharedPreferences.getInstance();
-        await prefs.setString('jwt', cookie.value);
-
-        // DEBUG: Check cookie
-        String? jwt = prefs.getString('jwt');
-        debugPrint('Current jwt: $jwt');
-        return;
-      }
-    }
-
-    // TODO: Handle error when no jwt cookie is found
-    debugPrint('No JWT cookie found');
-  }
-*/
   static Future<void> basicAuth(
     String username,
     String password,
@@ -53,9 +36,8 @@ class AuthHandler {
         data: formData,
       );
     } catch (e) {
-      // TODO: Handle network errors
-      debugPrint('Request error: $e');
-      return;
+      // Throw the error so it can be caught and handled in the signIn method
+      throw Exception('Request error: $e');
     }
 
     List<Cookie> cookies = await cookieJar.loadForRequest(Uri.parse(url));
@@ -80,22 +62,27 @@ class AuthHandler {
               (webview.InAppWebViewController controller, Uri? url) async {
             debugPrint('Page load stopped: $url');
 
-            final cookieManager = webview.CookieManager.instance();
-            List<webview.Cookie> cookies =
-                await cookieManager.getCookies(url: url!);
+            try {
+              final cookieManager = webview.CookieManager.instance();
+              List<webview.Cookie> cookies =
+                  await cookieManager.getCookies(url: url!);
 
-            // Save jwt token
-            await Token.saveToken(
-              cookies.map((c) => Cookie(c.name, c.value)).toList(),
-            );
+              // Save jwt token
+              await Token.saveToken(
+                cookies.map((c) => Cookie(c.name, c.value)).toList(),
+              );
 
-            // Redirect back to app
-            if (url.toString().startsWith(Routes.ssoRedirect)) {
-              debugPrint('Redirect URL detected: $url');
+              // Redirect back to app
+              if (url.toString().startsWith(Routes.ssoRedirect)) {
+                debugPrint('Redirect URL detected: $url');
 
-              // Close the web view and go back to the app
-              debugPrint('Closing web view and returning to app');
-              Navigator.pop(context);
+                // Close the web view and go back to the app
+                debugPrint('Closing web view and returning to app');
+                Navigator.pop(context);
+              }
+            } catch (e) {
+              // Throw the error so it can be caught and handled by the caller of ssoAuth
+              throw Exception('Error in ssoAuth: $e');
             }
           },
         ),
diff --git a/lib/main.dart b/lib/main.dart
index 9a6331fd..d1d7104e 100644
--- a/lib/main.dart
+++ b/lib/main.dart
@@ -1,6 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:gocast_mobile/model/user_model.dart';
+import 'package:gocast_mobile/model/user/user_state_model.dart';
 import 'package:gocast_mobile/viewModels/user_viewmodel.dart';
 import 'package:gocast_mobile/views/home_view.dart';
 import 'package:gocast_mobile/views/login_view.dart';
@@ -20,6 +20,8 @@ void main() {
   );
 }
 
+final scaffoldMessengerKey = GlobalKey<ScaffoldMessengerState>();
+
 class App extends ConsumerWidget {
   const App({super.key});
 
@@ -27,7 +29,16 @@ class App extends ConsumerWidget {
   Widget build(BuildContext context, WidgetRef ref) {
     final userState = ref.watch(userStateProvider);
 
+    if (userState.error != null) {
+      WidgetsBinding.instance.addPostFrameCallback((_) {
+        scaffoldMessengerKey.currentState!.showSnackBar(
+          SnackBar(content: Text('Error: ${userState.error}')),
+        );
+      });
+    }
+
     return MaterialApp(
+      scaffoldMessengerKey: scaffoldMessengerKey,
       title: 'gocast',
       debugShowCheckedModeBanner: false,
       theme: ThemeData(
diff --git a/lib/model/course/bookmark_model.dart b/lib/model/course/bookmark_model.dart
new file mode 100644
index 00000000..06cd1519
--- /dev/null
+++ b/lib/model/course/bookmark_model.dart
@@ -0,0 +1,13 @@
+class Bookmark {
+  Bookmark({
+    required this.id,
+    required this.userId,
+    required this.title,
+    required this.url,
+  });
+
+  int id;
+  int userId;
+  String title;
+  String url;
+}
diff --git a/lib/model/course/course_model.dart b/lib/model/course/course_model.dart
new file mode 100644
index 00000000..09ba7c00
--- /dev/null
+++ b/lib/model/course/course_model.dart
@@ -0,0 +1,9 @@
+class Course {
+  Course({
+    required this.id,
+    required this.name,
+  });
+
+  int id;
+  String name;
+}
diff --git a/lib/model/user/user_model.dart b/lib/model/user/user_model.dart
new file mode 100644
index 00000000..82bb859f
--- /dev/null
+++ b/lib/model/user/user_model.dart
@@ -0,0 +1,35 @@
+import 'package:gocast_mobile/model/course/bookmark_model.dart';
+import 'package:gocast_mobile/model/course/course_model.dart';
+import 'package:gocast_mobile/model/user/user_settings_model.dart';
+
+class User {
+  User({
+    required this.id,
+    required this.name,
+    required this.lastName,
+    this.email = '',
+    this.matriculationNumber = '',
+    this.lrzId = '',
+    this.role = 3,
+    this.password = '',
+    required this.courses,
+    required this.administeredCourses,
+    required this.pinnedCourses,
+    required this.settings,
+    required this.bookmarks,
+  });
+
+  int id;
+  String name;
+  String lastName;
+  String email;
+  String matriculationNumber;
+  String lrzId;
+  int role;
+  String password;
+  List<Course> courses;
+  List<Course> administeredCourses;
+  List<Course> pinnedCourses;
+  List<UserSetting> settings;
+  List<Bookmark> bookmarks;
+}
diff --git a/lib/model/user/user_settings_model.dart b/lib/model/user/user_settings_model.dart
new file mode 100644
index 00000000..bcfb1b3a
--- /dev/null
+++ b/lib/model/user/user_settings_model.dart
@@ -0,0 +1,19 @@
+class UserSetting {
+  UserSetting({
+    required this.id,
+    required this.userId,
+    required this.type,
+    required this.value,
+  });
+
+  int id;
+  int userId;
+  UserSettingType type;
+  String value;
+}
+
+enum UserSettingType {
+  preferredName,
+  greeting,
+  customPlaybackSpeeds,
+}
diff --git a/lib/model/user/user_state_model.dart b/lib/model/user/user_state_model.dart
new file mode 100644
index 00000000..51e83a12
--- /dev/null
+++ b/lib/model/user/user_state_model.dart
@@ -0,0 +1,39 @@
+// ignore_for_file: always_put_required_named_parameters_first
+import 'package:flutter/material.dart';
+import 'package:gocast_mobile/model/user/user_model.dart';
+
+class UserState {
+  UserState({
+    required this.isLoading,
+    this.user,
+    // Placeholder for future helpers (e.g. error handling)
+    required this.errorMessage,
+  });
+
+  // Default constructor
+  UserState.defaultConstructor()
+      : isLoading = false,
+        errorMessage = '',
+        user = null;
+
+  bool isLoading;
+  User? user;
+  String errorMessage;
+
+  void setUser(User newUser) {
+    debugPrint("User set to: ${newUser.name}");
+    user = newUser;
+  }
+
+  void removeUser() {
+    user = null;
+  }
+
+  void setIsLoading(bool isLoading) {
+    this.isLoading = isLoading;
+  }
+
+  void toggleIsLoading() {
+    isLoading = !isLoading;
+  }
+}
diff --git a/lib/model/user_model.dart b/lib/model/user_model.dart
deleted file mode 100644
index 6a3e9042..00000000
--- a/lib/model/user_model.dart
+++ /dev/null
@@ -1,112 +0,0 @@
-// ignore_for_file: always_put_required_named_parameters_first
-class UserState {
-  UserState({
-    required this.isLoading,
-    this.user,
-    // Placeholder for future helpers (e.g. error handling)
-    required this.errorMessage,
-  });
-
-  // Default constructor
-  UserState.defaultConstructor()
-      : isLoading = false,
-        errorMessage = '',
-        user = null;
-
-  bool isLoading;
-  User? user;
-  String errorMessage;
-
-  void setUser(User newUser) {
-    print("User set to: ${newUser.name}");
-    user = newUser;
-  }
-
-  void removeUser() {
-    user = null;
-  }
-
-  void setIsLoading(bool isLoading) {
-    this.isLoading = isLoading;
-  }
-
-  void toggleIsLoading() {
-    isLoading = !isLoading;
-  }
-}
-
-class User {
-  User({
-    required this.id,
-    required this.name,
-    required this.lastName,
-    this.email = '',
-    this.matriculationNumber = '',
-    this.lrzId = '',
-    this.role = 3,
-    this.password = '',
-    required this.courses,
-    required this.administeredCourses,
-    required this.pinnedCourses,
-    required this.settings,
-    required this.bookmarks,
-  });
-
-  int id;
-  String name;
-  String lastName;
-  String email;
-  String matriculationNumber;
-  String lrzId;
-  int role;
-  String password;
-  List<Course> courses;
-  List<Course> administeredCourses;
-  List<Course> pinnedCourses;
-  List<UserSetting> settings;
-  List<Bookmark> bookmarks;
-}
-
-class Course {
-  Course({
-    required this.id,
-    required this.name,
-  });
-
-  int id;
-  String name;
-}
-
-class UserSetting {
-  UserSetting({
-    required this.id,
-    required this.userId,
-    required this.type,
-    required this.value,
-  });
-
-  int id;
-  int userId;
-  UserSettingType type;
-  String value;
-}
-
-enum UserSettingType {
-  preferredName,
-  greeting,
-  customPlaybackSpeeds,
-}
-
-class Bookmark {
-  Bookmark({
-    required this.id,
-    required this.userId,
-    required this.title,
-    required this.url,
-  });
-
-  int id;
-  int userId;
-  String title;
-  String url;
-}
diff --git a/lib/viewModels/user_viewmodel.dart b/lib/viewModels/user_viewmodel.dart
index 57c669c5..41df35cf 100644
--- a/lib/viewModels/user_viewmodel.dart
+++ b/lib/viewModels/user_viewmodel.dart
@@ -1,6 +1,9 @@
+// ignore_for_file: unused_import
+
 import 'package:flutter/material.dart';
 import 'package:gocast_mobile/base/networking/apis/auth_handler.dart';
-import 'package:gocast_mobile/model/user_model.dart';
+import 'package:gocast_mobile/model/user/user_model.dart';
+import 'package:gocast_mobile/model/user/user_state_model.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 import 'package:rxdart/rxdart.dart';
 
@@ -15,6 +18,7 @@ class UserViewModel {
         (value) => current.value.setUser(value),
         onError: (error) => current.addError(error),
       ),
+      onError: (error) => current.addError(error),
     );
   }
 
@@ -24,6 +28,7 @@ class UserViewModel {
         (value) => current.value.setUser(value),
         onError: (error) => current.addError(error),
       ),
+      onError: (error) => current.addError(error),
     );
   }
 
@@ -33,6 +38,6 @@ class UserViewModel {
 
     SharedPreferences prefs = await SharedPreferences.getInstance();
     prefs.remove('jwt');
-    print('Logged out user and cleared tokens.');
+    debugPrint('Logged out user and cleared tokens.');
   }
 }