1 files changed, 78 insertions, 39 deletions

diff --git a/lib/Travelynx/Controller/Traewelling.pm b/lib/Travelynx/Controller/Traewelling.pm
index e906b1f..3cdeff8 100644
--- a/lib/Travelynx/Controller/Traewelling.pm
+++ b/lib/Travelynx/Controller/Traewelling.pm
@@ -1,59 +1,97 @@
 package Travelynx::Controller::Traewelling;
-# Copyright (C) 2020 Daniel Friesel
+
+# Copyright (C) 2020-2023 Birte Kristina Friesel
 #
 # SPDX-License-Identifier: AGPL-3.0-or-later
 use Mojo::Base 'Mojolicious::Controller';
 use Mojo::Promise;
 
-sub settings {
+sub oauth {
 	my ($self) = @_;
 
-	my $uid = $self->current_user->{id};
-
 	if (    $self->param('action')
 		and $self->validation->csrf_protect->has_error('csrf_token') )
 	{
 		$self->render(
-			'traewelling',
-			invalid => 'csrf',
+			'bad_request',
+			csrf   => 1,
+			status => 400
 		);
 		return;
 	}
 
-	if ( $self->param('action') and $self->param('action') eq 'login' ) {
-		my $email    = $self->param('email');
-		my $password = $self->param('password');
-		$self->render_later;
-		$self->traewelling_api->login_p(
-			uid      => $uid,
-			email    => $email,
-			password => $password
-		)->then(
-			sub {
-				my $traewelling = $self->traewelling->get($uid);
-				$self->param( sync_source => 'none' );
-				$self->render(
-					'traewelling',
-					traewelling     => $traewelling,
-					new_traewelling => 1,
-				);
+	$self->render_later;
+
+	my $oa = $self->config->{traewelling}{oauth};
+
+	return $self->oauth2->get_token_p(
+		traewelling => {
+			redirect_uri =>
+			  $self->base_url_for('/oauth/traewelling')->to_abs->scheme(
+				$self->app->mode eq 'development' ? 'http' : 'https'
+			)->to_string,
+			scope => 'read-statuses write-statuses'
+		}
+	)->then(
+		sub {
+			my ($provider) = @_;
+			if ( not defined $provider ) {
+
+				# OAuth2 plugin performed a redirect, no need to render
+				return;
 			}
-		)->catch(
-			sub {
-				my ($err) = @_;
-				$self->render(
-					'traewelling',
-					traewelling     => {},
-					new_traewelling => 1,
-					login_error     => $err,
-				);
+			if ( not $provider or not $provider->{access_token} ) {
+				$self->flash( new_traewelling => 1 );
+				$self->flash( login_error     => 'no token received' );
+				$self->redirect_to('/account/traewelling');
+				return;
 			}
-		)->wait;
+			my $uid   = $self->current_user->{id};
+			my $token = $provider->{access_token};
+			$self->traewelling->link(
+				uid           => $self->current_user->{id},
+				token         => $provider->{access_token},
+				refresh_token => $provider->{refresh_token},
+				expires_in    => $provider->{expires_in},
+			);
+			return $self->traewelling_api->get_user_p( $uid, $token )->then(
+				sub {
+					$self->flash( new_traewelling => 1 );
+					$self->redirect_to('/account/traewelling');
+				}
+			);
+		}
+	)->catch(
+		sub {
+			my ($err) = @_;
+			say "error $err";
+			$self->flash( new_traewelling => 1 );
+			$self->flash( login_error     => $err );
+			$self->redirect_to('/account/traewelling');
+			return;
+		}
+	);
+}
+
+sub settings {
+	my ($self) = @_;
+
+	my $uid = $self->current_user->{id};
+
+	if (    $self->param('action')
+		and $self->validation->csrf_protect->has_error('csrf_token') )
+	{
+		$self->render(
+			'bad_request',
+			csrf   => 1,
+			status => 400
+		);
 		return;
 	}
-	elsif ( $self->param('action') and $self->param('action') eq 'logout' ) {
+
+	if ( $self->param('action') and $self->param('action') eq 'logout' ) {
 		$self->render_later;
-		my $traewelling = $self->traewelling->get($uid);
+		my $traewelling = $self->traewelling->get( uid => $uid );
 		$self->traewelling_api->logout_p(
 			uid   => $uid,
 			token => $traewelling->{token}
@@ -78,17 +116,17 @@ sub settings {
 	elsif ( $self->param('action') and $self->param('action') eq 'config' ) {
 		$self->traewelling->set_sync(
 			uid       => $uid,
-			push_sync => $self->param('sync_source') eq 'travelynx' ? 1 : 0,
+			push_sync => $self->param('sync_source') eq 'travelynx'   ? 1 : 0,
 			pull_sync => $self->param('sync_source') eq 'traewelling' ? 1 : 0,
-			toot      => $self->param('toot') ? 1 : 0,
-			tweet     => $self->param('tweet') ? 1 : 0,
+			toot      => $self->param('toot')                         ? 1 : 0,
+			tweet     => $self->param('tweet')                        ? 1 : 0,
 		);
 		$self->flash( success => 'traewelling' );
 		$self->redirect_to('account');
 		return;
 	}
 
-	my $traewelling = $self->traewelling->get($uid);
+	my $traewelling = $self->traewelling->get( uid => $uid );
 
 	if ( $traewelling->{push_sync} ) {
 		$self->param( sync_source => 'travelynx' );
@@ -106,6 +144,7 @@ sub settings {
 		$self->param( tweet => 1 );
 	}
 
+	$self->stash( title => 'travelynx × träwelling' );
 	$self->render(
 		'traewelling',
 		traewelling => $traewelling,