Upstream/bitwarden-browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser.git synced 2024-11-07 09:31:31 +01:00
Code Issues Projects Releases Wiki Activity

storage service communicating with swift app

Browse Source
This commit is contained in:
Kyle Spearrin 2019-08-14 12:53:43 -04:00
parent e36063ff7a
commit 68593e9df2
2 changed files with 35 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/safari/app/desktop/safari/SafariExtensionViewController.swift
View File

@ -59,33 +59,52 @@ class SafariExtensionViewController: SFSafariExtensionViewController, WKScriptMe
} else {
let command = m?.command ?? "\"null\""
print(command)
replyMessage(message: m!)
if(command == "storage_get") {
let obj = UserDefaults.standard.string(forKey: m!.data!) ?? "null"
m!.data = obj
replyMessage(message: m!)
} else if(command == "storage_save") {
let data : StorageData? = jsonDeserialize(json: m!.data)
if(data?.obj == nil) {
UserDefaults.standard.removeObject(forKey: data!.key)
} else {
UserDefaults.standard.set(data?.obj, forKey: data!.key)
}
m!.data = nil
replyMessage(message: m!)
} else if(command == "storage_remove") {
UserDefaults.standard.removeObject(forKey: m!.data!)
m!.data = nil
replyMessage(message: m!)
}
}
}
}
func replyMessage(message: AppMessage) {
let json = jsonSerialize(obj: message) ?? "\"null\""
webView.evaluateJavaScript("bitwardenSafariAppMessageReceiver('\(json)');", completionHandler: nil)
webView.evaluateJavaScript("window.bitwardenSafariAppMessageReceiver('\(json)');", completionHandler: nil)
}
}
func jsonSerialize<T: Encodable>(obj: T) -> String? {
func jsonSerialize<T: Encodable>(obj: T?) -> String? {
let encoder = JSONEncoder()
encoder.outputFormatting = .prettyPrinted
do {
let data = try encoder.encode(obj)
return String(data: data, encoding: .utf8)!
return String(data: data, encoding: .utf8) ?? "null"
} catch _ {
return nil
return "null"
}
}
func jsonDeserialize<T: Decodable>(json: String) -> T? {
func jsonDeserialize<T: Decodable>(json: String?) -> T? {
if(json == nil) {
return nil;
}
let decoder = JSONDecoder()
do {
let obj = try decoder.decode(T.self, from: json.data(using: .utf8)!)
let obj = try decoder.decode(T.self, from: json!.data(using: .utf8)!)
return obj
} catch _ {
return nil
@ -95,5 +114,10 @@ func jsonDeserialize<T: Decodable>(json: String) -> T? {
class AppMessage : Decodable, Encodable {
var id: String
var command: String
var data: String
var data: String?
}
class StorageData : Decodable, Encodable {
var key: String
var obj: String?
}

4
src/services/browserStorage.service.ts
View File

@ -36,10 +36,10 @@ export default class BrowserStorageService implements StorageService {
async save(key: string, obj: any): Promise<any> {
const keyedObj = { [key]: obj };
if (this.isSafari) {
await SafariApp.sendMessageToApp('storage_save', {
await SafariApp.sendMessageToApp('storage_save', JSON.stringify({
key: key,
obj: JSON.stringify(obj),
});
}));
} else {
return new Promise((resolve) => {
this.chromeStorageApi.set(keyedObj, () => {