Skip to content
This repository has been archived by the owner on May 17, 2022. It is now read-only.

Commit

Permalink
removed locksmith requirements
Browse files Browse the repository at this point in the history
  • Loading branch information
nVisium-seth-law committed Oct 20, 2016
1 parent c333d16 commit b9ea8c3
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 120 deletions.
12 changes: 6 additions & 6 deletions Swift.nV/Environment.plist
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,18 @@
<key>externalURL</key>
<string>http://ec2-54-163-1-206.compute-1.amazonaws.com:4567/tutorial</string>
<key>TutorialURL</key>
<string>http://ec2-54-163-1-206.compute-1.amazonaws.com:4567/tutorial</string>
<string>http://localhost:4567/tutorial</string>
<key>CryptoKey</key>
<string>password</string>
<key>AuthenticateURL</key>
<string>http://ec2-54-163-1-206.compute-1.amazonaws.com:4567/users/authenticate</string>
<string>http://localhost:4567/users/authenticate</string>
<key>RegisterURL</key>
<string>http://ec2-54-163-1-206.compute-1.amazonaws.com:4567/users/register</string>
<string>http://localhost:4567/users/register</string>
<key>NewSecretURL</key>
<string>http://ec2-54-163-1-206.compute-1.amazonaws.com:4567/secret</string>
<string>http://localhost:4567/secret</string>
<key>SecretsURL</key>
<string>http://ec2-54-163-1-206.compute-1.amazonaws.com:4567/secrets</string>
<string>http://localhost:4567/secrets</string>
<key>UpdateSecretURL</key>
<string>http://ec2-54-163-1-206.compute-1.amazonaws.com:4567/secret/</string>
<string>http://localhost:4567/secret/</string>
</dict>
</plist>
3 changes: 2 additions & 1 deletion Swift.nV/ItemHelper.swift
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@

import Foundation
import Security
import Locksmith

func encryptString(toEncrypt: String) -> String {

Expand Down Expand Up @@ -47,6 +46,7 @@ func generateChecksum(myItem: Item) -> String {
return crypto.sha256HashFor("\(myItem.name)\(myItem.value)\(myItem.notes)")
}

/* Example of using keychain for storing data
func saveToKeychain(key: String, data: String) {
do {
try Locksmith.saveData([key:data], forUserAccount: "swift-nv")
Expand All @@ -66,3 +66,4 @@ func loadFromKeychain(key: String) -> String? {
}
return nil
}
*/
2 changes: 1 addition & 1 deletion Swift.nV/NVLoginViewController.swift
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ class NVLoginViewController: UIViewController, NSURLConnectionDataDelegate {
defaults.synchronize()
NSLog("Setting email key in NSUserDefaults to \(self.username.text)")

saveToKeychain("email", data: self.username.text!)
//saveToKeychain("email", data: self.username.text!)

self.data.setData(NSData())
self.performSegueWithIdentifier("Home", sender: self)
Expand Down
111 changes: 0 additions & 111 deletions swift.nV.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -28,51 +28,6 @@
8133383319828AD1004F1C31 /* Crypto.m in Sources */ = {isa = PBXBuildFile; fileRef = 8133383219828AD1004F1C31 /* Crypto.m */; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
5D2B81F91D99D5FC00315E5D /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 5D2B81F01D99D5FC00315E5D /* Locksmith.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 0EC25C591BA385AA004191AF;
remoteInfo = "Locksmith iOS";
};
5D2B81FB1D99D5FC00315E5D /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 5D2B81F01D99D5FC00315E5D /* Locksmith.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 0EC25C621BA385AB004191AF;
remoteInfo = "Locksmith iOS Tests";
};
5D2B81FD1D99D5FC00315E5D /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 5D2B81F01D99D5FC00315E5D /* Locksmith.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 0EC25C751BA385F6004191AF;
remoteInfo = "Locksmith OS X";
};
5D2B81FF1D99D5FC00315E5D /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 5D2B81F01D99D5FC00315E5D /* Locksmith.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 0EC25C7E1BA385F6004191AF;
remoteInfo = "Locksmith OS X Tests";
};
5D2B82011D99D5FC00315E5D /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 5D2B81F01D99D5FC00315E5D /* Locksmith.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = 0EC25CA71BA39C9F004191AF;
remoteInfo = "Locksmith watchOS";
};
5D2B82031D99D5FC00315E5D /* PBXContainerItemProxy */ = {
isa = PBXContainerItemProxy;
containerPortal = 5D2B81F01D99D5FC00315E5D /* Locksmith.xcodeproj */;
proxyType = 2;
remoteGlobalIDString = FBD0C9491C1866BE00291F2A;
remoteInfo = "Locksmith tvOS";
};
/* End PBXContainerItemProxy section */

/* Begin PBXCopyFilesBuildPhase section */
5D2E37DE1D97381C00DD168C /* CopyFiles */ = {
isa = PBXCopyFilesBuildPhase;
Expand All @@ -87,7 +42,6 @@

/* Begin PBXFileReference section */
5D23C055196323BE00053E65 /* NVHomeViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NVHomeViewController.swift; sourceTree = "<group>"; };
5D2B81F01D99D5FC00315E5D /* Locksmith.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Locksmith.xcodeproj; path = Locksmith/Locksmith.xcodeproj; sourceTree = "<group>"; };
5D41359619632DF800DAC6C5 /* NVSettingsViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NVSettingsViewController.swift; sourceTree = "<group>"; };
5D41359A19635A5200DAC6C5 /* Item.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Item.swift; sourceTree = "<group>"; };
5D41359C1963651900DAC6C5 /* NVAddItemViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = NVAddItemViewController.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -124,23 +78,9 @@
/* End PBXFrameworksBuildPhase section */

/* Begin PBXGroup section */
5D2B81F11D99D5FC00315E5D /* Products */ = {
isa = PBXGroup;
children = (
5D2B81FA1D99D5FC00315E5D /* Locksmith.framework */,
5D2B81FC1D99D5FC00315E5D /* Locksmith iOS Tests.xctest */,
5D2B81FE1D99D5FC00315E5D /* Locksmith.framework */,
5D2B82001D99D5FC00315E5D /* Locksmith OS X Tests.xctest */,
5D2B82021D99D5FC00315E5D /* Locksmith.framework */,
5D2B82041D99D5FC00315E5D /* Locksmith.framework */,
);
name = Products;
sourceTree = "<group>";
};
5D8BE0051958C25B0030428C = {
isa = PBXGroup;
children = (
5D2B81F01D99D5FC00315E5D /* Locksmith.xcodeproj */,
5DE870731D932717002DABE4 /* swift.nV.entitlements */,
5D8BE0101958C25B0030428C /* swift.nV */,
5D8BE00F1958C25B0030428C /* Products */,
Expand Down Expand Up @@ -246,64 +186,13 @@
mainGroup = 5D8BE0051958C25B0030428C;
productRefGroup = 5D8BE00F1958C25B0030428C /* Products */;
projectDirPath = "";
projectReferences = (
{
ProductGroup = 5D2B81F11D99D5FC00315E5D /* Products */;
ProjectRef = 5D2B81F01D99D5FC00315E5D /* Locksmith.xcodeproj */;
},
);
projectRoot = "";
targets = (
5D8BE00D1958C25B0030428C /* Swift.nV */,
);
};
/* End PBXProject section */

/* Begin PBXReferenceProxy section */
5D2B81FA1D99D5FC00315E5D /* Locksmith.framework */ = {
isa = PBXReferenceProxy;
fileType = wrapper.framework;
path = Locksmith.framework;
remoteRef = 5D2B81F91D99D5FC00315E5D /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
5D2B81FC1D99D5FC00315E5D /* Locksmith iOS Tests.xctest */ = {
isa = PBXReferenceProxy;
fileType = wrapper.cfbundle;
path = "Locksmith iOS Tests.xctest";
remoteRef = 5D2B81FB1D99D5FC00315E5D /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
5D2B81FE1D99D5FC00315E5D /* Locksmith.framework */ = {
isa = PBXReferenceProxy;
fileType = wrapper.framework;
path = Locksmith.framework;
remoteRef = 5D2B81FD1D99D5FC00315E5D /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
5D2B82001D99D5FC00315E5D /* Locksmith OS X Tests.xctest */ = {
isa = PBXReferenceProxy;
fileType = wrapper.cfbundle;
path = "Locksmith OS X Tests.xctest";
remoteRef = 5D2B81FF1D99D5FC00315E5D /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
5D2B82021D99D5FC00315E5D /* Locksmith.framework */ = {
isa = PBXReferenceProxy;
fileType = wrapper.framework;
path = Locksmith.framework;
remoteRef = 5D2B82011D99D5FC00315E5D /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
5D2B82041D99D5FC00315E5D /* Locksmith.framework */ = {
isa = PBXReferenceProxy;
fileType = wrapper.framework;
path = Locksmith.framework;
remoteRef = 5D2B82031D99D5FC00315E5D /* PBXContainerItemProxy */;
sourceTree = BUILT_PRODUCTS_DIR;
};
/* End PBXReferenceProxy section */

/* Begin PBXResourcesBuildPhase section */
5D8BE00C1958C25B0030428C /* Resources */ = {
isa = PBXResourcesBuildPhase;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"DVTSourceControlWorkspaceBlueprintWorkingCopyPathsKey" : {
"AFADF01AFBA46DFD7A5AFD980110E89E8E63AACD" : "KeychainAccess\/",
"8B27742E93FC1682D786B54C3194B2FD3E688A76" : "swift.nv\/",
"4E8FE33026C73951A712CD33348204351A71B278" : "Locksmith\/"
"4E8FE33026C73951A712CD33348204351A71B278" : "swift.nv\/Locksmith\/"
},
"DVTSourceControlWorkspaceBlueprintNameKey" : "swift.nV",
"DVTSourceControlWorkspaceBlueprintVersion" : 204,
Expand Down

0 comments on commit b9ea8c3

Please sign in to comment.