Merge branch 'master' into feature/decoupling-improvements

CyrexEnterprise · Mar 20, 2017 · 764b9e9 · 764b9e9
2 parents 6f22481 + 8419a87
commit 764b9e9
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/src/Cloudoki/OaStack/Controllers/OaStackViewController.php b/src/Cloudoki/OaStack/Controllers/OaStackViewController.php
@@ -156,6 +156,10 @@ public function changepassword ($token)
 
 			return view('oastack::oauth2.reset', ['error'=> $reset->message]);
 
+		if (config('oastack.redirect_url'))
+
+			return redirect()->away(config('oastack.redirect_url'));
+
 		return redirect()->route('login');
 	}
 

diff --git a/src/Cloudoki/OaStack/Views/oauth2/subscribed.blade.php b/src/Cloudoki/OaStack/Views/oauth2/subscribed.blade.php
@@ -30,9 +30,15 @@
 	@else
 
 		<p>{{ trans('oastack::oauth2.user.subscribed.info', ['account'=> $name]) }}</p>
-
-		<a class="btn btn-default" href='{{ Config::get ('app.url') }}'>{{ trans('oastack::oauth2.user.subscribed.proceed') }}</a>
-
+
+		@if ( empty ( Config::get ('oastack.redirect_url' ) ) )
+
+			<a class="btn btn-default" href='{{ Config::get ('oastack.redirect_url') }}'>{{ trans('oastack::oauth2.user.subscribed.proceed') }}</a>
+
+		@else
+
+			<a class="btn btn-default" href='{{ Config::get ('app.url') }}'>{{ trans('oastack::oauth2.user.subscribed.proceed') }}</a>
+
 	@endif
 
 	</div>

diff --git a/src/config/oastack.php b/src/config/oastack.php
@@ -19,4 +19,6 @@
 	// Optional. The `user` model of the base application.
 	// The user model must use the provided Traits\User trait.
 	'user_model' =>  env('OASTACK_USER_MODEL', null),
+	// The URL to which users should be redirected after resetting their password
+	'redirect_url' => ''
 );