Skip to content

Implement new token exchange #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
menzow wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Implement new token exchange #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Polyglot/Polyglot.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ open class Polyglot {
}
let toLanguageComponent = "&to=\(self.toLanguage.rawValue.urlEncoded!)"
let fromLanguageComponent = (self.fromLanguage != nil) ? "&from=\(self.fromLanguage!.rawValue.urlEncoded!)" : ""
let urlString = "http://api.microsofttranslator.com/v2/Http.svc/Translate?text=\(text.urlEncoded!)\(toLanguageComponent)\(fromLanguageComponent)"
let urlString = "https://api.microsofttranslator.com/v2/Http.svc/Translate?text=\(text.urlEncoded!)\(toLanguageComponent)\(fromLanguageComponent)"

var request = URLRequest(url: URL(string: urlString)!)
request.httpMethod = "GET"
Expand All @@ -161,7 +161,7 @@ open class Polyglot {
let translation: String
guard
let data = data,
let xmlString = NSString(data: data, encoding: String.Encoding.utf8.rawValue) as? String
let xmlString = String.init(data: data, encoding: .utf8)
else {
translation = ""
return
Expand Down
23 changes: 12 additions & 11 deletions Polyglot/Session.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,29 +37,30 @@ class Session {

func getAccessToken(_ callback: @escaping ((_ token: String) -> (Void))) {
if (accessToken == nil || isExpired) {
let url = URL(string: "https://datamarket.accesscontrol.windows.net/v2/OAuth2-13")
let url = URL(string: "https://api.cognitive.microsoft.com/sts/v1.0/issueToken")

var request = URLRequest(url: url!)
request.httpMethod = "POST"

let bodyString = "client_id=\(clientId.urlEncoded!)&client_secret=\(clientSecret.urlEncoded!)&scope=http://api.microsofttranslator.com&grant_type=client_credentials"
request.httpBody = bodyString.data(using: String.Encoding.utf8)
request.addValue(clientSecret, forHTTPHeaderField: "Ocp-Apim-Subscription-Key")

let task = URLSession.shared.dataTask(with: request, completionHandler: {(data, response, error) in
guard
let data = data,
let resultsDict = try? JSONSerialization.jsonObject(with: data, options: JSONSerialization.ReadingOptions.mutableContainers) as? [String: Any],
let expiresIn = resultsDict?["expires_in"] as? NSString
let token = String(data: data, encoding: String.Encoding.utf8)
else {
callback("")
return
}
self.expirationTime = Date(timeIntervalSinceNow: expiresIn.doubleValue)

let token = resultsDict?["access_token"] as! String
self.accessToken = token

// API only returns JSON when there's a error
if let _ = try? JSONSerialization.jsonObject(with: data, options: JSONSerialization.ReadingOptions.mutableContainers) as? [String: Any] {
callback("")
} else {
self.expirationTime = Date(timeIntervalSinceNow: 600)
self.accessToken = token
callback(token)
}

callback(token)
})

task.resume()
Expand Down