Onboarding: shorten setup menubar message (so that displayed for all …

…users), fix logout check Only log out if accesstoken fails to decode & decoding into error works & and the code given is 401: unauthorized This fixes onboarding messages popping up for logged in users!!!
aviwad · Sep 24, 2024 · d8dd501 · d8dd501
1 parent fd66326
commit d8dd501
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 3 deletions.
diff --git a/SpotifyLyricsInMenubar/SpotifyLyricsInMenubarApp.swift b/SpotifyLyricsInMenubar/SpotifyLyricsInMenubarApp.swift
@@ -359,7 +359,7 @@ struct SpotifyLyricsInMenubarApp: App {
             return nil
         } else {
             // Hasn't onboarded
-            return "⚠️ Please Complete Onboarding Process (Click Settings)".trunc(length: truncationLength)
+            return "⚠️ Complete Setup (Click Settings)".trunc(length: truncationLength)
         }
 
     }

diff --git a/SpotifyLyricsInMenubar/lyricJsonStruct.swift b/SpotifyLyricsInMenubar/lyricJsonStruct.swift
@@ -60,3 +60,13 @@ struct Item: Codable {
     let type: String
     let id: String
 }
+
+struct ErrorWrapper: Codable {
+    struct Error: Codable {
+        let code: Int
+        let message: String
+    }
+
+    let error: Error
+}
+
diff --git a/SpotifyLyricsInMenubar/viewModel.swift b/SpotifyLyricsInMenubar/viewModel.swift
@@ -273,7 +273,14 @@ import WebKit
                     accessToken = try JSONDecoder().decode(accessTokenJSON.self, from: accessTokenData.0)
                     print("ACCESS TOKEN IS SAVED")
                 } catch {
-                    UserDefaults().set(false, forKey: "hasOnboarded")
+                    do {
+                        let errorWrap = try JSONDecoder().decode(ErrorWrapper.self, from: accessTokenData.0)
+                        if errorWrap.error.code == 401 {
+                            UserDefaults().set(false, forKey: "hasOnboarded")
+                        }
+                    } catch {
+                        // silently fail
+                    }
                     print("json error decoding the access token, therefore bad cookie therefore un-onboard")
                 }
 
@@ -380,7 +387,14 @@ extension viewModel {
                     accessToken = try JSONDecoder().decode(accessTokenJSON.self, from: accessTokenData.0)
                     print("ACCESS TOKEN IS SAVED")
                 } catch {
-                    UserDefaults().set(false, forKey: "hasOnboarded")
+                    do {
+                        let errorWrap = try JSONDecoder().decode(ErrorWrapper.self, from: accessTokenData.0)
+                        if errorWrap.error.code == 401 {
+                            UserDefaults().set(false, forKey: "hasOnboarded")
+                        }
+                    } catch {
+                        // silently fail
+                    }
                     print("json error decoding the access token, therefore bad cookie therefore un-onboard")
                 }
             }