shadowfacts
/
Tusker
2
10
Fork 2
Code Issues 71 Pull Requests Releases Wiki Activity

Fix password auth

This commit is contained in:
Shadowfacts 2018-08-16 20:11:56 -04:00
parent fcfc169416
commit 7ad6f65891
Signed by: shadowfacts
GPG Key ID: 94A5AB95422746E5
2 changed files with 37 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Tusker.xcodeproj/xcuserdata/shadowfacts.xcuserdatad/xcschemes/xcschememanagement.plist
View File

@ -7,7 +7,7 @@
<key>Tusker.xcscheme</key> <key>Tusker.xcscheme</key>
<dict> <dict>
<key>orderHint</key> <key>orderHint</key>
<integer>3</integer> <integer>0</integer>
</dict> </dict>
</dict> </dict>
<key>SuppressBuildableAutocreation</key> <key>SuppressBuildableAutocreation</key>

63
Tusker/Controllers/MastodonController.swift
View File

@ -17,48 +17,57 @@ class MastodonController {
var client: Client! var client: Client!
var clientID: String! lazy var clientID: String? = self.userDefaults.string(forKey: "clientID")
var clientSecret: String! lazy var clientSecret: String? = self.userDefaults.string(forKey: "clientSecret")
lazy var accessToken: String? = self.userDefaults.string(forKey: "accessToken")
private init() { private init() {
} }
func connect() { func connect() {
// TODO: OAuth
let url = ProcessInfo.processInfo.environment["mastodon_url"]! let url = ProcessInfo.processInfo.environment["mastodon_url"]!
let username = ProcessInfo.processInfo.environment["mastodon_username"]!
let password = ProcessInfo.processInfo.environment["mastodon_password"]!
client = Client(baseURL: url) if let accessToken = accessToken {
client = Client(baseURL: url, accessToken: accessToken)
register() { } else {
let loginReq = Login.silent(clientID: self.clientID, clientSecret: self.clientSecret, scopes: [.read, .write, .follow], username: username, password: password) client = Client(baseURL: url)
self.client.run(loginReq) { result in login()
guard case let .success(loginSettings, _) = result else { fatalError() }
print("access token: \(loginSettings.accessToken)")
}
} }
} }
private func register(completion: @escaping () -> Void) { private func register(completion: @escaping () -> Void) {
if let clientId = userDefaults.string(forKey: "clientID"), if clientID != nil,
let clientSecret = userDefaults.string(forKey: "clientSecret") { clientSecret != nil {
self.clientID = clientId
self.clientSecret = clientSecret
completion() completion()
return } else {
let registerRequest = Clients.register(clientName: "Tusker", scopes: [.read, .write, .follow])
client.run(registerRequest) { result in
guard case let .success(application, _) = result else { fatalError() }
self.clientID = application.clientID
self.clientSecret = application.clientSecret
self.userDefaults.set(self.clientID, forKey: "clientID")
self.userDefaults.set(self.clientSecret, forKey: "clientSecret")
completion()
}
} }
}
private func login() {
// TODO: OAuth
let username = ProcessInfo.processInfo.environment["mastodon_username"]!
let password = ProcessInfo.processInfo.environment["mastodon_password"]!
let registerRequest = Clients.register(clientName: "Tusker", scopes: [.read, .write, .follow]) register() {
let loginReq = Login.silent(clientID: self.clientID!, clientSecret: self.clientSecret!, scopes: [.read, .write, .follow], username: username, password: password)
client.run(registerRequest) { result in
guard case let .success(application, _) = result else { fatalError() } self.client.run(loginReq) { result in
self.clientID = application.clientID guard case let .success(loginSettings, _) = result else { fatalError() }
self.clientSecret = application.clientSecret self.accessToken = loginSettings.accessToken
self.userDefaults.set(self.clientID, forKey: "clientID") self.userDefaults.set(self.accessToken, forKey: "accessToken")
self.userDefaults.set(self.clientSecret, forKey: "clientSecret") }
completion()
} }
} }