Commit687f946

committed

chore: sign user out if token expired

1 parent2094e9f commit687f946Copy full SHA for 687f946

File tree

+47

-11

lines changed

+47

-11

lines changed

Lines changed: 15 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -37,11 +37,21 @@ class AppDelegate: NSObject, NSApplicationDelegate {`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`func applicationDidFinishLaunching(_:Notification){`
`40`		`- menuBar=.init(menuBarExtra:FluidMenuBarExtra(title:"Coder Desktop", image:"MenuBarIcon"){`
`41`		`-VPNMenu<CoderVPNService>().frame(width:256)`
`42`		`-.environmentObject(self.vpn)`
`43`		`-.environmentObject(self.state)`
`44`		`-})`
	`40`	`+ menuBar=.init(menuBarExtra:FluidMenuBarExtra(`
	`41`	`+ title:"Coder Desktop",`
	`42`	`+ image:"MenuBarIcon",`
	`43`	`+ onAppear:{`
	`44`	`+ // If the VPN is enabled, it's likely the token isn't expired`
	`45`	`+guard case.disabled=self.vpn.state,self.state.hasSessionelse{return}`
	`46`	`+Task{@MainActorin`
	`47`	`+awaitself.state.handleTokenExpiry()`
	`48`	`+}`
	`49`	`+}, content:{`
	`50`	`+VPNMenu<CoderVPNService>().frame(width:256)`
	`51`	`+.environmentObject(self.vpn)`
	`52`	`+.environmentObject(self.state)`
	`53`	`+}`
	`54`	`+))`
`45`	`55`	`// Subscribe to system VPN updates`
`46`	`56`	`NotificationCenter.default.addObserver(`
`47`	`57`	`self,`

Lines changed: 24 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -2,9 +2,12 @@ import CoderSDK`
`2`	`2`	`import Foundation`
`3`	`3`	`import KeychainAccess`
`4`	`4`	`import NetworkExtension`
	`5`	`+import os`
`5`	`6`	`import SwiftUI`
`6`	`7`
	`8`	`+@MainActor`
`7`	`9`	`classAppState:ObservableObject{`
	`10`	`+privateletlogger=Logger(subsystem:Bundle.main.bundleIdentifier!, category:"AppState")`
`8`	`11`	`letappId=Bundle.main.bundleIdentifier!`
`9`	`12`
`10`	`13`	`// Stored in UserDefaults`
`@@ -94,6 +97,9 @@ class AppState: ObservableObject {`
`94`	`97`	`)`
`95`	`98`	`if hasSession{`
`96`	`99`	`_sessionToken=Published(initialValue:keychainGet(for:Keys.sessionToken))`
	`100`	`+if sessionToken==nil \|\| sessionToken!.isEmpty==true{`
	`101`	`+clearSession()`
	`102`	`+}`
`97`	`103`	`}`
`98`	`104`	`}`
`99`	`105`
`@@ -104,6 +110,24 @@ class AppState: ObservableObject {`
`104`	`110`	`reconfigure()`
`105`	`111`	`}`
`106`	`112`
	`113`	`+publicfunc handleTokenExpiry()async{`
	`114`	`+if hasSession{`
	`115`	`+letclient=Client(url: baseAccessURL!, token: sessionToken!)`
	`116`	`+do{`
	`117`	`+ _=tryawait client.user("me")`
	`118`	`+}catchletClientError.api(apiErr){`
	`119`	`+ // Expired token`
	`120`	`+if apiErr.statusCode==401{`
	`121`	`+clearSession()`
	`122`	`+}`
	`123`	`+}catch{`
	`124`	`+ // Some other failure, we'll show an error if they try and do something`
	`125`	`+ logger.error("failed to check token validity:\(error)")`
	`126`	`+return`
	`127`	`+}`
	`128`	`+}`
	`129`	`+}`
	`130`	`+`
`107`	`131`	`publicfunc clearSession(){`
`108`	`132`	`hasSession=false`
`109`	`133`	`sessionToken=nil`

Lines changed: 4 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -104,10 +104,10 @@ public struct Client {`
`104`	`104`	`}`
`105`	`105`
`106`	`106`	`publicstructAPIError:Decodable,Sendable{`
`107`		`-letresponse:Response`
`108`		`-letstatusCode:Int`
`109`		`-letmethod:String`
`110`		`-leturl:URL`
	`107`	`+publicletresponse:Response`
	`108`	`+publicletstatusCode:Int`
	`109`	`+publicletmethod:String`
	`110`	`+publicleturl:URL`
`111`	`111`
`112`	`112`	`vardescription:String{`
`113`	`113`	`varcomponents=["\(method)\(url.absoluteString)\nUnexpected status code\(statusCode):\n\(response.message)"]`

Lines changed: 4 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -89,10 +89,12 @@ packages:`
`89`	`89`	`url:https://github.com/SimplyDanny/SwiftLintPlugins`
`90`	`90`	`from:0.57.1`
`91`	`91`	`FluidMenuBarExtra:`
`92`		`-# Forked so we can dynamically update the menu bar icon.`
	`92`	`+# Forked to:`
	`93`	`+# - Dynamically update the menu bar icon`
	`94`	`+# - Set onAppear/disappear handlers.`
`93`	`95`	`# The upstream repo has a purposefully limited API`
`94`	`96`	`url:https://github.com/coder/fluid-menu-bar-extra`
`95`		`-revision:020be37`
	`97`	`+revision:96a861a`
`96`	`98`	`KeychainAccess:`
`97`	`99`	`url:https://github.com/kishikawakatsumi/KeychainAccess`
`98`	`100`	`branch:e0c7eebc5a4465a3c4680764f26b7a61f567cdaf`

Comments

(0)