+oauth2 through cloud api

Author: rudiedirkx

accounts.php

@@ -15,8 +15,8 @@
 	}
 
 	// Save credentials to cookie
-	$auth = $username . ':' . $_POST['pass'];
-	do_login($url, $auth);
+	$auth = 'Basic ' . base64_encode($username . ':' . $_POST['pass']);
+	do_login($url, $auth, $username);
 
 	// Save user to local db for preferences
 	try {
@@ -45,7 +45,7 @@
 	unset($accounts[$index]);
 	array_unshift($accounts, $account);
 
-	do_login('', '', $accounts);
+	do_session($accounts);
 
 	return do_redirect('accounts');
 }
@@ -59,7 +59,7 @@
 	}
 
 	unset($accounts[$index]);
-	do_login('', '', $accounts);
+	do_session($accounts);
 
 	return do_redirect('accounts');
 }
@@ -88,7 +88,7 @@
 }
 
 // Reset cookies
-do_login('', '');
+do_session(get_accounts());
 
 $_title = 'Accounts';
 include 'tpl.header.php';
@@ -108,10 +108,9 @@
 
 <ul>
 	<?foreach ($accounts as $i => $account):
-		$_url = parse_url($account->url);
 		?>
 		<li class="<?if ($account->active):?>active-account<?endif?>">
-			<?= $account->user ?> @ <?= $_url['host'] ?>
+			<?= html($account->getLabel()) ?>
 			<?if (!$account->active):?>
 				(<a href="?switch=<?= $i ?>">switch</a>)
 				(<a href="?unlink=<?= $i ?>">x</a>)
@@ -191,7 +190,6 @@
 <h2>Add account</h2>
 
 <?php
-$_COOKIE['JIRA_URL'] = '';
 include 'tpl.login.php';
 ?>
 

auth.php

@@ -10,9 +10,14 @@
 	echo '<p>You are:</p>';
 	echo '<pre>';
 
+	$info = ['unauth_ok' => true];
 	$account = jira_get('/rest/api/3/myself', null, $error, $info);
 	print_r($account);
-	$error and print_r($info['error']);
+	if ($error) {
+		echo $info['response'] . "\n";
+		print_r($info);
+		exit;
+	}
 
 	print_r($user);
 
@@ -59,7 +64,7 @@
 	// $db->update('users', array('jira_timezone' => $jiraUsername->timeZone), array('id' => $user->id));
 
 	// Save credentials to cookie
-	do_login($url, $info['JIRA_AUTH']);
+	do_login($url, $info['JIRA_AUTH'], $username);
 
 	return do_redirect('index');
 }
@@ -73,3 +78,5 @@
 <? include 'tpl.login.php' ?>
 
 <p>Make a <em>Personal API token</em> on <a href="https://id.atlassian.com/manage/api-tokens">https://id.atlassian.com/manage/api-tokens</a>.</p>
+
+<p><a href="oauth2-start.php">Or try the brandnew Cloud OAuth2 experience!</a></p>

env.php.dist

@@ -5,3 +5,6 @@ const DB_PATH = 'db/jira.sqlite3';
 const SECRET = "Don't tell anyone, but my favorite color is PINK! Also known as #FFC0CB.";
 
 const DEBUG = false;
+
+const OAUTH_CLENT_ID = 'askjdhkdfjhsldasddffdsdfjlasdjfh';
+const OAUTH_CLENT_SECRET = 'kjghJHGJHFHgfjhhlKJLKJkjgjhfgjhFGKUJHkjhLKJlkjKJGBjhgfJHgkjHLJtt';

inc.account.php

@@ -0,0 +1,41 @@
+<?php
+
+class Account {
+
+	public function __construct(
+		public string $apiUrl,
+		public string $auth,
+		public string $username,
+		public string $server,
+		public bool $active,
+	) {}
+
+	public function getServerLabel() : string {
+		return parse_url($this->server, PHP_URL_HOST);
+	}
+
+	public function getLabel() : string {
+		return $this->username . ' @ ' . $this->getServerLabel();
+	}
+
+	public function pack() : array {
+		return [$this->apiUrl, $this->auth, $this->username, $this->server];
+	}
+
+	static public function unpackAll( array $infos ) : array {
+		$accounts = [];
+		foreach ( $infos AS $i => $info ) {
+			$accounts[] = static::unpackOne($info, $i == 0);
+		}
+		return $accounts;
+	}
+
+	static public function fromLogin( string $apiUrl, string $auth, string $username, string $server ) : self {
+		return new static($apiUrl, $auth, $username, $server);
+	}
+
+	static public function unpackOne( array $info, bool $active ) : self {
+		return new static($info[0], $info[1], $info[2], $info[3], $active);
+	}
+
+}

inc.bootstrap.php

@@ -5,6 +5,8 @@
 // Always. UTF-8. Everywhere. Always.
 header('Content-type: text/html; charset=utf-8');
 
+const JIRA_COOKIE_NAME = 'JIRA_AUTH_2';
+
 // Some app constants
 define('FORCE_JIRA_USER_SYNC', 600); // 10m
 define('FORCE_AUTO_VARS_SYNC', 14400); // 4h
@@ -23,6 +25,7 @@
 $db->ensureSchema(require 'inc.schema.php');
 
 // Classes
+require 'inc.account.php';
 require 'inc.user.php';
 require 'inc.issue.php';
 
@@ -35,24 +38,27 @@
 // Request constants
 define('IS_AJAX', strtolower(@$_SERVER['HTTP_X_REQUESTED_WITH']) == 'xmlhttprequest');
 
+define('OAUTH_REDIRECT_URL', 'https://' . $_SERVER['HTTP_HOST'] . '/oauth2-callback.php');
+
 // Init Jira request history
 $jira_history = array();
 
 // Current session
 $user = null;
-if ( isset($_COOKIE['JIRA_URL'], $_COOKIE['JIRA_AUTH']) && ($accounts = get_accounts()) ) {
+if ( isset($_COOKIE[JIRA_COOKIE_NAME]) && count($accounts = get_accounts()) ) {
 	$account = $accounts[0];
 
-	define('JIRA_URL', $account->url);
-	define('JIRA_USER', $account->user);
+	define('JIRA_URL', $account->apiUrl);
 	define('JIRA_AUTH', $account->auth);
+	define('JIRA_USER', $account->username);
+	define('JIRA_SERVER', $account->server);
 
 	define('XSRF_TOKEN', md5(date('Y-m-d H') . ':' . JIRA_URL . ':' . JIRA_AUTH));
 
-	$url = parse_url(JIRA_URL);
+	$url = parse_url(JIRA_SERVER);
 	define('JIRA_ORIGIN', $url['scheme'] . '://' . $url['host']);
 
-	$user = User::load(JIRA_URL, JIRA_USER);
+	$user = User::load(JIRA_SERVER, JIRA_USER);
 	if ( $user && $user->jira_timezone ) {
 		date_default_timezone_set($user->jira_timezone);
 	}