Accepting Forever invitation will now work whether you have linked wi…

…th Squaretag, or not, fixes #23
kynetx · May 7, 2013 · fa2ea89 · fa2ea89
1 parent 15c1fca
commit fa2ea89
Show file tree

Hide file tree

Showing 2 changed files with 74 additions and 2 deletions.
diff --git a/app/index.html b/app/index.html
@@ -76,7 +76,7 @@
 		<div id="modalAddLink" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
 			<div class="modal-header">
 				<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-				<h3 id="myModalLabel">Add New Link</h3>
+				<h3 id="myModalLabel">Link to Your Personal Cloud</h3>
 			</div>
 			<div class="modal-body">
 				<form class="form-inline" style="text-align:center;">
@@ -199,7 +199,8 @@ <h4 class="media-heading" id="hostess-email"></h4>
 							<h4 class="media-heading" id="hostess-phone"></h4>
 						</div>
 					</div>
-					<button id="btn-invitation-accept" class="btn btn-primary btn-large btn-success btn-block" data-token="none" data-name="none">Accept</button>
+					<button id="btn-invitation-accept" class="btn btn-primary btn-large btn-success btn-block" data-token="none" data-name="none" style="display:none;">Accept</button>
+					<a href="#" id="link-invitation-accept" class="btn btn-primary btn-large btn-success btn-block" style="display:none;">Accept</a>
 					<button class="btn btn-primary btn-large btn-danger btn-block">Decline</button>
 				</div>
 			</div>  <!-- #view-invite -->

diff --git a/app/js/forever.js b/app/js/forever.js
@@ -13,6 +13,7 @@ $(document).ready(function() {
 
 	page('/', view_home);
 	page('/login*', view_login);
+	page('/signup*', view_signup);
 	page('/about', view_about);
 	page('/friends', view_friends);
 	page('/finder', view_finder);
@@ -49,6 +50,8 @@ $(document).ready(function() {
 			page("/friends")
 		else if (query.match(/login\&.+$/))
 			page("/"+query)
+		else if (query.match(/signup\&.+$/))
+			page("/"+query)
 		else if (query === "about")
 			page("/about")
 		else if (query === "finder")
@@ -145,6 +148,26 @@ $(document).ready(function() {
 		}
 	};
 
+	// --------------------------------------------
+	// View: signup
+	function view_signup() {
+		var oauthCode = getQueryVariable('code');
+		var token = getQueryVariable('token');
+		console.debug("view_signup");
+		console.debug("code: ", oauthCode);
+		console.debug("token: ", token);
+
+		CloudOS_Get_OAuth_Access_Token(oauthCode);
+
+		if (CloudOS_Authenticated_Session()) {
+				Navbar_Show_Auth();
+				acceptInvitation(token);
+		} else {
+				Navbar_Show_Anon()
+				show_view('home');
+		}
+	};
+
 	// --------------------------------------------
 	// View: about
 	function view_about() {
@@ -423,9 +446,19 @@ $(document).ready(function() {
 				console.dir(json);
 				if (json.status) {
 					var iname = json.myProfileName;
+					var OAuth_URL = CloudOS_Get_OAuth_URL("signup/"+token);
+
+					if (CloudOS_Authenticated_Session()) {
+							$('#btn-invitation-accept').show();
+							$('#link-invitation-accept').hide();
+					} else {
+							$('#link-invitation-accept').show();
+							$('#btn-invitation-accept').hide();
+					}
 
 					$('#btn-invitation-accept').attr('data-token', token);
 					$('#btn-invitation-accept').attr('data-name', iname);
+					$('#link-invitation-accept').attr('href', OAuth_URL);
 					$('#btn-invitation-accept').attr('data-photo', json.myProfilePhoto);
 					$('#hostess-photo').attr('src', json.myProfilePhoto);
 					$('#hostess-name').text(json.myProfileName);
@@ -442,6 +475,44 @@ $(document).ready(function() {
 		);
 	}
 
+	// --------------------------------------------
+	function acceptInvitation(token) {
+		CloudOS_Get_Friend_Profile(token,
+			function(json) {
+				console.dir(json);
+					$('#btn-invitation-accept').attr('data-token', token);
+					$('#btn-invitation-accept').attr('data-name', json.myProfileName);
+					$('#btn-invitation-accept').attr('data-photo', json.myProfilePhoto);
+			});
+
+			CloudOS_Create_Channel(
+					function(json) {
+							var ourName  = $('#btn-invitation-accept').attr('data-name');
+							var ourToken = $('#btn-invitation-accept').attr('data-token');
+							var ourPhoto = $('#btn-invitation-accept').attr('data-photo');
+							var myName   = $('#myProfileName').val();
+							var myPhoto  = $('#myProfilePhoto').val();
+							var myToken  = json.token;
+							var attrs  = {
+									"names"  : myName+":"+ourName,
+									"tokens" : myToken+":"+ourToken,
+									"photos" : myPhoto+";"+ourPhoto,
+									"pdsKey" : ourToken
+							};
+							CloudOS_Subscribe("Forever", "Forever Friend", "friend-friend",
+																ourToken, JSON.stringify(attrs),
+																function(json) {
+																		console.dir(json);
+																		setTimeout('page(\'/friends\')', 2000);
+																		// page("/friends");
+																}
+															 );
+					}
+			)
+			return false;
+
+	}
+
 	// --------------------------------------------
 	// Accept Forever Invitation
 	$('#btn-invitation-accept').on('click',