kekscloud/keksAccount
Archived
1
0
Fork 0
Code Issues 3 Pull requests Releases Wiki Activity

#12 stop auto redirect and add settings to admin gui

Browse source
This commit is contained in:
Kekskurse 2019-04-30 15:14:54 +02:00
parent 1e604ae8a3
commit 6283a205e6
3 changed files with 16 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/Http/Controllers/GUI/AdminController.php
View file

@ -102,6 +102,7 @@ class AdminController extends Controller
$app->show_on_webpage = (bool)$request->input("show_on_webpage", false); $app->show_on_webpage = (bool)$request->input("show_on_webpage", false);
$app->hidden_in_app_list = (bool)$request->input("hidden_in_app_list", false); $app->hidden_in_app_list = (bool)$request->input("hidden_in_app_list", false);
$app->user_cant_remove_app = (bool)$request->input("user_cant_remove_app", false); $app->user_cant_remove_app = (bool)$request->input("user_cant_remove_app", false);
$app->stop_auto_redirect = (bool)$request->input("stop_auto_redirect", false);
$app->saveOrFail(); $app->saveOrFail();
$app = App::query()->where("id", "=", $id)->first("*"); $app = App::query()->where("id", "=", $id)->first("*");

12
app/Http/Controllers/oAuthController.php
View file

@ -31,16 +31,18 @@ class oAuthController extends Controller
$user = Auth::user(); $user = Auth::user();
$redirect = false; $redirect = false;
if($user != null) { if($user != null) {
if($app->auto_accept == true) {
$access->status = "allowed";
$access->saveOrFail();
}
$access = AppAccess::getOrCreate($user->id, $app->id); $access = AppAccess::getOrCreate($user->id, $app->id);
if($access->status == "allowed") { if($access->status == "allowed") {
$redirect = true; $redirect = true;
} }
if($app->auto_accept == true) {
$access->status = "allowed";
$access->saveOrFail();
$redirect = true;
} }
// @ToDo: if access is already granted redirect direct without ask user again
if($app->stop_auto_redirect) {
$redirect = false;
} }
if($redirect) { if($redirect) {

7
resources/views/admin/app_details.php
View file

@ -55,6 +55,13 @@
<input name="user_cant_remove_app" type="checkbox" <?php if($app->user_cant_remove_app) { echo 'checked="checked"'; } ?>> <input name="user_cant_remove_app" type="checkbox" <?php if($app->user_cant_remove_app) { echo 'checked="checked"'; } ?>>
</td> </td>
</tr> </tr>
<tr>
<td>Disable auto redirect</td>
<td>User always have to click a button to go to the App</td>
<td>
<input name="stop_auto_redirect" type="checkbox" <?php if($app->stop_auto_redirect) { echo 'checked="checked"'; } ?>>
</td>
</tr>
</table> </table>
<input type="submit" class="btn btn-warning" value="Save"> <input type="submit" class="btn btn-warning" value="Save">
</form> </form>