Commit0617964

committed

chore: sign user out on launch if token expired

1 parentb7ccbca commit0617964Copy full SHA for 0617964

File tree

+29

-4

lines changed

+29

-4

lines changed

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -56,6 +56,10 @@ class AppDelegate: NSObject, NSApplicationDelegate {`
`56`	`56`	`state.reconfigure()`
`57`	`57`	`}`
`58`	`58`	`}`
	`59`	`+ // Sign out if token is expired`
	`60`	`+Task{@MainActorin`
	`61`	`+await state.handleTokenExpiry()`
	`62`	`+}`
`59`	`63`	`}`
`60`	`64`
`61`	`65`	// This function MUST eventually call `NSApp.reply(toApplicationShouldTerminate: true)`

Lines changed: 21 additions & 0 deletions

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

Comments

(0)