Remove OpenSesame OSF information

Author: dschreij

QOpenScienceFramework/connection.py

@@ -69,6 +69,7 @@ def create_session():
 		scope=scope,
 		redirect_uri=redirect_uri,
 	)
+	return session
 
 # Generate correct URLs
 auth_url = base_url + "oauth2/authorize"
@@ -101,8 +102,16 @@ def api_call(command, *args):
 	"""
 	return api_base_url + api_calls[command].format(*args)
 
+def check_for_active_session():
+	""" Checks if a session object has been created and returns an Error otherwise."""
+	if session is None:
+		raise RuntimeError("Session is not yet initialized, use connection."
+			"session = connection.create_session()")
+		
+
 #%%--------------------------- Oauth communiucation ----------------------------
 
+
 def get_authorization_url():
 	""" Generate the URL at which an OAuth2 token for the OSF can be requested
 	with which OpenSesame can be allowed access to the user's account.
@@ -111,23 +120,28 @@ def get_authorization_url():
 	-------
 	string : The complete uri for the api endpoint
 	"""
+	check_for_active_session()
 	return session.authorization_url(auth_url)
 
 def parse_token_from_url(url):
 	""" Parse token from url fragment """
+	check_for_active_session()
 	token = session.token_from_fragment(url)
 	# Call logged_in function to notify event listeners that user is logged in
 	if is_authorized():
 		return token
 	else:
 		logging.debug("ERROR: Token received, but user not authorized")
 
+
 def is_authorized():
 	""" Convenience function simply returning OAuth2Session.authorized. """
+	check_for_active_session()
 	return session.authorized
 
 def token_valid():
 	""" Checks if OAuth token is present, and if so, if it has not expired yet. """
+	check_for_active_session()
 	if not hasattr(session,"token") or not session.token:
 		return False
 	return session.token["expires_at"] > time.time()
@@ -204,6 +218,7 @@ def func_wrapper(*args, **kwargs):
 def logout():
 	""" Logs out the user, and resets the global session object. """
 	global session
+	check_for_active_session()
 	resp = session.post(logout_url,{
 		"token": session.access_token
 	})

example.py

@@ -16,6 +16,7 @@
 import sys
 import os
 import logging
+import tempfile
 logging.basicConfig(level=logging.INFO)
 
 # Required QT classes
@@ -26,6 +27,11 @@
 # Event dispatcher and listeners
 from QOpenScienceFramework.manager import ConnectionManager
 
+####### CONFIGURE THE CLIENT ID AND REDIRECT URI HERE. REGISTER AT OSF.IO ######
+client_id = "<YOUR_CLIENT_ID_HERE>"
+redirect_uri = "<YOUR_REDIRECT_URI_HERE>"
+################################################################################
+
 class InvalidateButton(QtWidgets.QWidget):
 	""" Just a button to tamper with the OSF session and see what the app does
 	to recover from missing authentication information """
@@ -47,7 +53,25 @@ class StandAlone(object):
 	purposes. """
 
 	def __init__(self):
-		tokenfile = os.path.abspath("token.json")
+		# Check if client_id and redirect_uri have been changed
+		if client_id == "<YOUR_CLIENT_ID_HERE>":
+			raise RuntimeError("Please enter the client_id you have registered"
+				" for your app at the OSF")
+		if redirect_uri == "<YOUR_REDIRECT_URI_HERE>":
+			raise RuntimeError("Please enter the redirect uri you have registered"
+				" for your app at the OSF")
+
+		# Set OSF server settings
+		server_settings = {
+		 	"client_id"		: client_id,
+			"redirect_uri"	: redirect_uri,
+		}
+		# Add these settings to the general settings
+		osf.settings.update(server_settings)
+		osf.create_session()
+
+		tmp_dir = tempfile.gettempdir()
+		tokenfile = os.path.join(tmp_dir, u"osf_token.json")
 		# Create manager object
 		self.manager = ConnectionManager(tokenfile=tokenfile)