core/oc-front
6
0
Fork 0
Code Issues 10 Pull Requests Packages Projects Releases Wiki Activity

oauth2 state of mind

Browse Source
This commit is contained in:
mr
2026-03-06 10:26:00 +01:00
parent deaaf28a3c
commit b16104bb6a
28 changed files with 628 additions and 367 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/core/conf/conf_reader.dart
View File

@@ -3,7 +3,7 @@ import 'package:flutter/services.dart';
class AppConfig {
static final AppConfig _instance = AppConfig._internal();
Map<String, String> _config = {};
final Map<String, String> _config = {};
AppConfig._internal();
@@ -11,7 +11,9 @@ class AppConfig {
Future<void> loadConfig() async {
final response = await rootBundle.loadString('assets/config/front.json');
_config = Map<String, String>.from(json.decode(response));
for (var v in Map<String, String>.from(json.decode(response)).entries) {
_config[v.key] = v.value;
}
}
String get(String key, {String defaultValue = ''}) {

5
lib/core/services/auth.service.dart
View File

@@ -48,10 +48,11 @@ class AuthService {
return localStorage.getItem('username') ?? "unknown";
}
static Future<void> login(String username, String password) async {
static Future<void> login(String username, String password, String? challenge) async {
var token = await service!.post("/login?client_id=$_clientID", <String, dynamic> {
"username": username,
"password": password
"password": password,
"challenge": challenge
}, null);
if (token.code == 200 && token.data != null) {
localStorage.setItem('accessToken', token.data?.value['access_token']);

213
lib/core/services/oauth2.service.dart Normal file
View File

@@ -0,0 +1,213 @@
import 'package:dio/dio.dart';
import 'package:flutter/foundation.dart';
import 'package:flutter_secure_storage/flutter_secure_storage.dart';
import 'package:jwt_decoder/jwt_decoder.dart';
import 'package:localstorage/localstorage.dart';
import 'package:oc_front/core/conf/conf_reader.dart';
import 'package:oc_front/core/services/redirect_stub.dart'
if (dart.library.html) 'package:oc_front/core/services/redirect_web.dart';
class OAuthConfig {
static final clientId = AppConfig().get('CLIENT_ID', defaultValue: 'test-client');
static final host = AppConfig().get('HOST', defaultValue: 'http://localhost:8000');
static final redirectUri = kIsWeb ? host : 'ocforge://callback';
static final issuer = '$host/hydra';
static final authorizationEndpoint = '$issuer/auth';
static final tokenEndpoint = '$issuer/token';
static final endSessionEndpoint = '$issuer/sessions/logout';
static final scopes = ['openid', 'profile', 'email', 'role'];
}
class TokenStorage {
static const _accessToken = 'access_token';
static const _refreshToken = 'refresh_token';
static const _idToken = 'id_token';
final _storage = const FlutterSecureStorage();
Future<void> save({
required String accessToken,
required String refreshToken,
String? idToken,
}) async {
await _storage.write(key: _accessToken, value: accessToken);
await _storage.write(key: _refreshToken, value: refreshToken);
if (idToken != null) {
await _storage.write(key: _idToken, value: idToken);
}
}
Future<String?> getAccessToken() => _storage.read(key: _accessToken);
Future<String?> getRefreshToken() => _storage.read(key: _refreshToken);
Future<String?> getIdToken() => _storage.read(key: _idToken);
Future<void> clear() async => _storage.deleteAll();
}
class OAuth2Service {
static final OAuth2Service _instance = OAuth2Service._internal();
factory OAuth2Service() => _instance;
OAuth2Service._internal();
final TokenStorage _storage = TokenStorage();
final _dio = Dio(BaseOptions(
headers: {'Content-Type': 'application/json; charset=UTF-8'},
validateStatus: (status) => status != null && status < 500,
));
/// Initiates the Hydra headless auth flow.
///
/// - If already authenticated, returns null.
/// - If [login_challenge] is present in the URL query params (web), returns it.
/// - Otherwise redirects the browser to Hydra's authorization endpoint,
/// which will redirect back to this app with ?login_challenge=<...>.
/// Returns null in this case (page is reloading).
Future<String?> initFlow() async {
if (await isAuthenticated()) return null;
if (kIsWeb) {
final challenge = Uri.base.queryParameters['login_challenge'];
if (challenge != null) return challenge;
// No token and no challenge: kick off the OAuth2 authorization code flow.
// Hydra will redirect back to redirectUri with ?login_challenge=<...>.
final authUrl = Uri.parse(OAuthConfig.authorizationEndpoint).replace(
queryParameters: {
'client_id': OAuthConfig.clientId,
'response_type': 'code',
'scope': OAuthConfig.scopes.join(' '),
'redirect_uri': OAuthConfig.redirectUri,
},
).toString();
browserRedirect(authUrl);
}
return null;
}
/// Headless login: POSTs credentials + challenge to the backend.
///
/// The backend accepts the login with Hydra and returns tokens directly.
/// Tokens are stored in [FlutterSecureStorage] and synced to [localStorage]
/// so that the existing API service keeps sending the Bearer header.
Future<void> login(String username, String password, String challenge) async {
final response = await _dio.post(
'${OAuthConfig.host}/auth/login',
queryParameters: {'client_id': OAuthConfig.clientId},
data: {
'username': username,
'password': password,
'challenge': challenge,
},
);
if (response.statusCode != 200 || response.data == null) {
throw Exception('Login failed: ${response.statusMessage}');
}
final data = Map<String, dynamic>.from(response.data as Map);
final accessToken = data['access_token'] as String? ?? '';
final refreshToken = data['refresh_token'] as String? ?? '';
final idToken = data['id_token'] as String?;
final expiresIn = data['expires_in'] as int? ?? 3600;
await _storage.save(
accessToken: accessToken,
refreshToken: refreshToken,
idToken: idToken,
);
// Sync to localStorage so api_service.dart keeps sending the Bearer header.
localStorage.setItem('accessToken', accessToken);
localStorage.setItem('tokenType', data['token_type'] as String? ?? 'Bearer');
localStorage.setItem('username', username);
localStorage.setItem(
'expiresIn',
DateTime.now().add(Duration(seconds: expiresIn)).toIso8601String(),
);
}
/// Returns a valid access token, auto-refreshing via the Hydra token
/// endpoint if the stored one is expired.
Future<String?> getValidAccessToken() async {
final accessToken = await _storage.getAccessToken();
if (accessToken == null || accessToken.isEmpty) return null;
try {
if (!JwtDecoder.isExpired(accessToken)) return accessToken;
} catch (_) {
return accessToken; // not a JWT — trust it as-is
}
final refreshToken = await _storage.getRefreshToken();
if (refreshToken == null || refreshToken.isEmpty) {
await logout();
return null;
}
return _refresh(refreshToken);
}
/// Exchanges a refresh token for a new access token via the standard
/// OAuth2 token endpoint (grant_type=refresh_token).
Future<String?> _refresh(String refreshToken) async {
try {
final response = await _dio.post(
OAuthConfig.tokenEndpoint,
data: {
'grant_type': 'refresh_token',
'client_id': OAuthConfig.clientId,
'refresh_token': refreshToken,
'scope': OAuthConfig.scopes.join(' '),
},
options: Options(contentType: 'application/x-www-form-urlencoded'),
);
if (response.statusCode != 200 || response.data == null) {
await logout();
return null;
}
final data = Map<String, dynamic>.from(response.data as Map);
final newAccess = data['access_token'] as String? ?? '';
final newRefresh = data['refresh_token'] as String? ?? refreshToken;
final idToken = data['id_token'] as String?;
await _storage.save(
accessToken: newAccess,
refreshToken: newRefresh,
idToken: idToken,
);
localStorage.setItem('accessToken', newAccess);
return newAccess;
} catch (_) {
await logout();
return null;
}
}
/// Clears stored tokens and redirects to Hydra's end-session endpoint (web).
Future<void> logout() async {
final idToken = await _storage.getIdToken();
await _storage.clear();
localStorage.setItem('accessToken', '');
localStorage.setItem('username', '');
localStorage.setItem('expiresIn', '');
if (kIsWeb && idToken != null) {
final logoutUrl = Uri.parse(OAuthConfig.endSessionEndpoint).replace(
queryParameters: {
'id_token_hint': idToken,
'post_logout_redirect_uri': OAuthConfig.redirectUri,
},
).toString();
browserRedirect(logoutUrl);
}
}
Future<bool> isAuthenticated() async {
final token = await getValidAccessToken();
return token != null;
}
}

1
lib/core/services/perms_service.dart
View File

@@ -88,6 +88,7 @@ class PermsService {
});
}
static bool getPerm(Perms perm) {
return true;
return _perms[perm] ?? false;
}

1
lib/core/services/redirect_stub.dart Normal file
View File

@@ -0,0 +1 @@
void browserRedirect(String url) {}

4
lib/core/services/redirect_web.dart Normal file
View File

@@ -0,0 +1,4 @@
// ignore: avoid_web_libraries_in_flutter
import 'dart:html' as html;
void browserRedirect(String url) => html.window.location.href = url;

42
lib/main.dart
View File

@@ -1,19 +1,20 @@
import 'dart:async';
import 'dart:ui';
import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:go_router/go_router.dart';
import 'package:localstorage/localstorage.dart';
import 'package:oc_front/core/services/router.dart';
import 'package:oc_front/widgets/dialog/login.dart';
import 'package:oc_front/core/conf/conf_reader.dart';
import 'package:oc_front/core/sections/left_menu.dart';
import 'package:oc_front/core/sections/end_drawer.dart';
import 'package:oc_front/core/sections/header/menu.dart';
import 'package:oc_front/core/services/auth.service.dart';
import 'package:oc_front/core/services/oauth2.service.dart';
import 'package:oc_front/core/services/enum_service.dart';
import 'package:oc_front/core/models/workspace_local.dart';
import 'package:oc_front/core/sections/header/header.dart';
import 'package:oc_front/core/sections/header/menu.dart';
import 'package:oc_front/core/sections/left_menu.dart';
import 'package:oc_front/core/services/auth.service.dart';
import 'package:oc_front/core/services/enum_service.dart';
import 'package:oc_front/core/services/router.dart';
import 'package:oc_front/core/sections/end_drawer.dart';
import 'package:oc_front/widgets/dialog/login.dart';
void main() async {
WidgetsFlutterBinding.ensureInitialized();
// Run `LinuxWebViewPlugin.initialize()` first before creating a WebView.
@@ -30,6 +31,7 @@ class MyApp extends StatelessWidget {
@override
Widget build(BuildContext context) {
// Future.delayed(Duration(seconds: 2), () => AppRouter.verifyRoute(context));
AppConfig().loadConfig();
AuthService.init();
EnumService.init();
SearchConstants.clear();
@@ -56,11 +58,11 @@ class MainPage extends StatefulWidget {
State<MainPage> createState() => MainPageState();
}
var darkColor = Color.fromRGBO(26, 83, 92, 1);
var lightColor = Color.fromRGBO(78, 205, 196, 1);
var darkMidColor = Color.fromRGBO(44, 83, 100, 1);
var midColor = Colors.grey.shade300;
var redColor = Color.fromRGBO(255, 107, 107, 1);
var darkColor = const Color.fromRGBO(26, 83, 92, 1);
var lightColor = const Color.fromRGBO(78, 205, 196, 1);
var darkMidColor = const Color.fromRGBO(44, 83, 100, 1);
var midColor = Colors.grey.shade300;
var redColor = const Color.fromRGBO(255, 107, 107, 1);
double getWidth(BuildContext context) {
return MediaQuery.of(context).size.width <= 800
@@ -99,10 +101,17 @@ class MainPageState extends State<MainPage> {
// The Flutter framework has been optimized to make rerunning build methods
// fast, so that you can just rebuild anything that needs updating rather
// than having to individually change instances of widgets.i
scaffoldKey = GlobalKey<ScaffoldState>();
if (!AuthService.isConnected() && !loginIsSet) {
Future.delayed(const Duration(milliseconds: 500), () {
Future.delayed(const Duration(milliseconds: 500), () async {
loginIsSet = true;
// initFlow() returns the login_challenge from the URL if present,
// or redirects the browser to Hydra's auth endpoint (web) and
// returns null while the page reloads with ?login_challenge=<...>.
final challenge = await OAuth2Service().initFlow();
if (challenge == null) return;
// ignore: use_build_context_synchronously
showDialog(
barrierDismissible: false,
// ignore: use_build_context_synchronously
@@ -112,7 +121,7 @@ class MainPageState extends State<MainPage> {
backgroundColor: Colors.white,
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(0)),
title: LoginWidget());
title: LoginWidget(loginChallenge: challenge));
});
});
}
@@ -138,7 +147,6 @@ class MainPageState extends State<MainPage> {
onKeyEvent: (event) async {
if( (event is KeyDownEvent) && event.logicalKey == LogicalKeyboardKey.enter) {
AppRouter.currentRoute.factory.search(context, false);
node.requestFocus();
}
},
child: Column(

3
lib/models/resources/resources.dart
View File

@@ -7,6 +7,7 @@ import 'package:oc_front/models/resources/data.dart';
import 'package:oc_front/models/resources/processing.dart';
import 'package:oc_front/models/resources/storage.dart';
import 'package:oc_front/models/resources/workflow.dart';
import 'package:oc_front/models/resources/workflow_event.dart';
class Resource implements SerializerDeserializer<Resource> {
List<DataItem> datas = [];
@@ -503,6 +504,7 @@ Type? getTopicType(String topic) {
else if (topic == "compute") { return ComputeItem; }
else if (topic == "storage") { return StorageItem; }
else if (topic == "workflow") { return WorkflowItem; }
else if (topic == "event") { return WorkflowEventItem; }
else { return null; }
}
@@ -513,6 +515,7 @@ String getTopic(Type type) {
if (type == ComputeItem) { return "compute"; }
if (type == StorageItem) { return "storage"; }
if (type == WorkflowItem) { return "workflow"; }
if (type == WorkflowEventItem) { return "event"; }
return "";
}

77
lib/models/resources/workflow_event.dart Normal file
View File

@@ -0,0 +1,77 @@
import 'package:oc_front/models/resources/resources.dart';
class WorkflowEventItem extends AbstractItem<WorkflowEventPricing, WorkflowEventPartnership, WorkflowEventInstance, WorkflowEventItem> {
// workflow_execution_id: id of the workflow execution this event targets
String? workflowExecutionId;
WorkflowEventItem({
this.workflowExecutionId,
}) : super();
@override String get topic => "event";
@override WorkflowEventItem deserialize(dynamic data) {
try { data = data as Map<String, dynamic>;
} catch (e) { return WorkflowEventItem(); }
var w = WorkflowEventItem(
workflowExecutionId: data.containsKey("workflow_execution_id") && data["workflow_execution_id"] != null
? data["workflow_execution_id"] : null,
);
w.mapFromJSON(data, WorkflowEventInstance());
return w;
}
@override Map<String, dynamic> infos() {
return {
if (workflowExecutionId != null) "workflow_execution_id": workflowExecutionId,
};
}
@override Map<String, dynamic> serialize() {
var obj = <String, dynamic>{
"workflow_execution_id": workflowExecutionId,
};
obj.addAll(toJSON());
return obj;
}
}
class WorkflowEventInstance extends AbstractInstance<WorkflowEventPricing, WorkflowEventPartnership> {
WorkflowEventInstance() : super();
@override WorkflowEventInstance deserialize(dynamic json) {
try { json = json as Map<String, dynamic>;
} catch (e) { return WorkflowEventInstance(); }
var w = WorkflowEventInstance();
w.mapFromJSON(json, WorkflowEventPartnership());
return w;
}
@override Map<String, dynamic> infos() => {};
@override Map<String, dynamic> serialize() => toJSON();
}
class WorkflowEventPartnership extends AbstractPartnerShip<WorkflowEventPricing> {
WorkflowEventPartnership() : super();
@override WorkflowEventPartnership deserialize(dynamic json) {
try { json = json as Map<String, dynamic>;
} catch (e) { return WorkflowEventPartnership(); }
var w = WorkflowEventPartnership();
w.mapFromJSON(json, WorkflowEventPricing());
return w;
}
@override Map<String, dynamic> serialize() => toJSON();
}
class WorkflowEventPricing extends AbstractPricing {
@override WorkflowEventPricing deserialize(dynamic json) {
var w = WorkflowEventPricing();
w.mapFromJSON(json);
return w;
}
@override Map<String, dynamic> serialize() => toJSON();
}

29
lib/models/workflow.dart
View File

@@ -9,6 +9,7 @@ import 'package:oc_front/models/resources/processing.dart';
import 'package:oc_front/models/resources/resources.dart';
import 'package:oc_front/models/resources/storage.dart';
import 'package:oc_front/models/resources/workflow.dart';
import 'package:oc_front/models/resources/workflow_event.dart';
import 'package:oc_front/models/response.dart';
import 'package:oc_front/widgets/forms/sub_keys_forms.dart';
@@ -108,6 +109,7 @@ class Workflow extends SerializerDeserializer<Workflow> implements ShallowData
List<dynamic> storage;
List<dynamic> processing;
List<dynamic> workflows;
List<dynamic> events;
Graph? graph;
List<dynamic> shared;
@@ -119,6 +121,7 @@ class Workflow extends SerializerDeserializer<Workflow> implements ShallowData
this.storage = const [],
this.processing = const [],
this.workflows = const [],
this.events = const [],
this.graph,
this.shared = const [],
});
@@ -138,6 +141,7 @@ class Workflow extends SerializerDeserializer<Workflow> implements ShallowData
compute: json.containsKey("computes") ? json["computes"] : [],
data: json.containsKey("datas") ? json["datas"] : [],
storage: json.containsKey("storages") ? json["storages"] : [],
events: json.containsKey("events") ? json["events"] : [],
shared: json.containsKey("shared") ? json["shared"] : [],
graph: json.containsKey("graph") ? Graph().deserialize(json["graph"]) : null,
);
@@ -151,6 +155,7 @@ class Workflow extends SerializerDeserializer<Workflow> implements ShallowData
"computes" : compute,
"workflows": workflows,
"processings": processing,
"events": events,
};
if (graph != null) {
obj["graph"] = graph!.serialize();
@@ -690,6 +695,7 @@ class GraphItem extends SerializerDeserializer<GraphItem> {
StorageItem? storage;
ComputeItem? compute;
WorkflowItem? workflow;
WorkflowEventItem? event;
GraphItem({
this.id,
@@ -701,6 +707,7 @@ class GraphItem extends SerializerDeserializer<GraphItem> {
this.storage,
this.compute,
this.workflow,
this.event,
});
AbstractItem? getElement() {
@@ -709,6 +716,7 @@ class GraphItem extends SerializerDeserializer<GraphItem> {
if (storage != null) { return storage!; }
if (compute != null) { return compute!; }
if (workflow != null) { return workflow!; }
if (event != null) { return event!; }
return null;
}
@@ -720,17 +728,19 @@ class GraphItem extends SerializerDeserializer<GraphItem> {
height = j["height"];
if (j["element"] != null) {
if (j["element"]["type"] == "data") { data = DataItem().deserialize(j["element"]);
if (j["element"]["type"] == "data") { data = DataItem().deserialize(j["element"]);
} else if (j["element"]["type"] == "processing") { processing = ProcessingItem().deserialize(j["element"]);
} else if (j["element"]["type"] == "compute") { compute = ComputeItem().deserialize(j["element"]);
} else if (j["element"]["type"] == "storage") { storage = StorageItem().deserialize(j["element"]);
} else if (j["element"]["type"] == "workflow") { workflow = WorkflowItem().deserialize(j["element"]);
} else if (j["element"]["type"] == "compute") { compute = ComputeItem().deserialize(j["element"]);
} else if (j["element"]["type"] == "storage") { storage = StorageItem().deserialize(j["element"]);
} else if (j["element"]["type"] == "workflow") { workflow = WorkflowItem().deserialize(j["element"]);
} else if (j["element"]["type"] == "event") { event = WorkflowEventItem().deserialize(j["element"]);
} else {
compute = null;
data = null;
processing = null;
storage = null;
workflow = null;
event = null;
}
} else {
compute = null;
@@ -738,12 +748,13 @@ class GraphItem extends SerializerDeserializer<GraphItem> {
processing = null;
storage = null;
workflow = null;
}
event = null;
}
}
Map<String, dynamic> toDashboard() {
Map<String, dynamic> element = {};
List<AbstractItem?> items = [data, processing, storage, compute, workflow];
List<AbstractItem?> items = [data, processing, storage, compute, workflow, event];
for(var el in items) {
if (el != null && el.getID() != "") {
element = el.serialize();
@@ -762,7 +773,7 @@ class GraphItem extends SerializerDeserializer<GraphItem> {
@override deserialize(dynamic json) {
try { json = json as Map<String, dynamic>;
} catch (e) { return GraphItem(); }
} catch (e) { return GraphItem(); }
return GraphItem(
id: json.containsKey("id") ? json["id"] : null,
width: json.containsKey("width") ? double.parse(json["width"].toString()) : null,
@@ -773,9 +784,10 @@ class GraphItem extends SerializerDeserializer<GraphItem> {
storage: json.containsKey("storage") ? StorageItem().deserialize(json["storage"]) : null,
compute: json.containsKey("compute") ? ComputeItem().deserialize(json["compute"]) : null,
workflow: json.containsKey("workflow") ? WorkflowItem().deserialize(json["workflow"]) : null,
event: json.containsKey("event") ? WorkflowEventItem().deserialize(json["event"]) : null,
);
}
@override Map<String, dynamic> serialize() {
@override Map<String, dynamic> serialize() {
return {
"id": id,
"width": width,
@@ -785,6 +797,7 @@ class GraphItem extends SerializerDeserializer<GraphItem> {
"storage": storage?.serialize(),
"compute": compute?.serialize(),
"workflow": workflow?.serialize(),
"event": event?.serialize(),
"position": position?.serialize(),
};
}

2
lib/pages/catalog_item.dart
View File

@@ -37,7 +37,7 @@ class CatalogItemFactory implements AbstractFactory {
if (special) { return; } // T
var s = SearchConstants.get();
AppRouter.catalog.go(context, {});
Future.delayed(Duration(milliseconds: 10), () {
Future.delayed(const Duration(milliseconds: 10), () {
SearchConstants.set(s);
CatalogFactory().search(context, false);
});

38
lib/pages/workflow.dart
View File

@@ -12,12 +12,15 @@ import 'package:oc_front/models/resources/processing.dart';
import 'package:oc_front/models/resources/resources.dart';
import 'package:oc_front/models/resources/storage.dart';
import 'package:oc_front/models/resources/workflow.dart';
import 'package:oc_front/models/resources/workflow_event.dart';
import 'package:oc_front/models/response.dart';
import 'package:oc_front/models/workflow.dart';
import 'package:oc_front/pages/abstract_page.dart';
import 'package:oc_front/pages/shared.dart';
import 'package:flutter_svg/flutter_svg.dart';
import 'package:oc_front/widgets/dialog/shallow_creation.dart';
import 'package:oc_front/widgets/forms/resource_forms.dart';
import 'package:oc_front/widgets/forms/workflow_event_forms.dart';
import 'package:oc_front/widgets/forms/scheduler_forms.dart';
import 'package:oc_front/widgets/forms/storage_processing_link_forms.dart';
import 'package:oc_front/widgets/items/item_row.dart';
@@ -52,9 +55,15 @@ class WorkflowPageWidgetState extends State<WorkflowPageWidget> {
final WorflowService _service = WorflowService();
Widget itemBuild(Object item) {
var e = item as AbstractItem;
if (e is WorkflowEventItem) {
return Tooltip(
message: e.name ?? "Event",
child: SvgPicture.asset('assets/images/workflow_event.svg', fit: BoxFit.contain),
);
}
return Tooltip( message: item.name ?? "",
child: e.logo != null ? Image.network(e.logo ?? "", fit: BoxFit.fill)
: Image.network('https://get-picto.com/wp-content/uploads/2024/01/logo-instagram-png.webp',
child: e.logo != null ? Image.network(e.logo ?? "", fit: BoxFit.fill)
: Image.network('https://get-picto.com/wp-content/uploads/2024/01/logo-instagram-png.webp',
fit: BoxFit.fill));
}
Widget itemTooltipBuild(Object item) {
@@ -75,8 +84,13 @@ final WorflowService _service = WorflowService();
List<Widget> getForms(FlowData? obj, String id) {
var objAbs = obj as AbstractItem?;
if (objAbs == null) { return []; }
List<Widget> res = [ ResourceFormsWidget(item: objAbs, dash: dash, elementID: id) ];
return [ Wrap(
List<Widget> res;
if (objAbs is WorkflowEventItem) {
res = [ WorkflowEventFormsWidget(item: objAbs, dash: dash, elementID: id) ];
} else {
res = [ ResourceFormsWidget(item: objAbs, dash: dash, elementID: id) ];
}
return [ Wrap(
alignment: WrapAlignment.center,
children: [
Container( padding: const EdgeInsets.all(10), width: 250, height: 60,
@@ -84,7 +98,7 @@ final WorflowService _service = WorflowService();
child: const Column( mainAxisAlignment: MainAxisAlignment.center, children: [
Text("ELEMENT INFO", style: TextStyle(fontSize: 15, fontWeight: FontWeight.bold), textAlign: TextAlign.center),
Text("<general>", style: TextStyle(fontSize: 12), textAlign: TextAlign.center),
])),
])),
...res
]) ];
}
@@ -124,6 +138,8 @@ final WorflowService _service = WorflowService();
return const Icon(FontAwesomeIcons.microchip, size: 16);
} else if (objAbs.topic == "workflows" ) {
return const Icon(FontAwesomeIcons.diagramProject, size: 16);
} else if (objAbs.topic == "event" ) {
return const Icon(FontAwesomeIcons.bolt, size: 16);
}
return null;
}
@@ -167,6 +183,7 @@ final WorflowService _service = WorflowService();
var storage = dash.elements.where( (e) => e.element?.serialize()["type"] == "storage");
var processing = dash.elements.where( (e) => e.element?.serialize()["type"] == "processing");
var workflows = dash.elements.where( (e) => e.element?.serialize()["type"] == "workflow");
var events = dash.elements.where( (e) => e.element?.serialize()["type"] == "event");
var updateW = Workflow(
name: dash.name,
graph: Graph(),
@@ -175,6 +192,7 @@ final WorflowService _service = WorflowService();
storage: storage.map((e) => e.element?.getID()).toSet().toList(),
processing: processing.map((e) => e.element?.getID()).toSet().toList(),
workflows: workflows.map((e) => e.element?.getID()).toSet().toList(),
events: events.map((e) => e.element?.getID()).toSet().toList(),
);
updateW.fromDashboard(dash.serialize());
for (var item in (updateW.graph?.items.values ?? [] as List<GraphItem>)) {
@@ -210,6 +228,7 @@ final WorflowService _service = WorflowService();
if (data["type"] == "storage") { return StorageItem().deserialize(data); }
if (data["type"] == "processing") { return ProcessingItem().deserialize(data); }
if (data["type"] == "workflows") { return WorkflowItem().deserialize(data); }
if (data["type"] == "event") { return WorkflowEventItem().deserialize(data); }
return null;
}
@@ -339,8 +358,13 @@ final WorflowService _service = WorflowService();
current: widget.id,
itemWidget: itemBuild,
menuWidget: onDashboardMenu,
categories: const ["processing", "data", "compute", "storage", "workflows"],
draggableItemBuilder: (cat) => WorkspaceLocal.byTopic(cat, false),
categories: const ["processing", "data", "compute", "storage", "workflows", "event"],
draggableItemBuilder: (cat) {
if (cat == "event") {
return [ WorkflowEventItem()..name = "Event"..type = "event" ];
}
return WorkspaceLocal.byTopic(cat, false);
},
itemWidgetTooltip: itemTooltipBuild,
innerMenuWidth: 350,
width: getMainWidth(context),

17
lib/widgets/dialog/login.dart
View File

@@ -2,12 +2,14 @@ import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:flutter_spinkit/flutter_spinkit.dart';
import 'package:go_router/go_router.dart';
import 'package:oc_front/core/services/auth.service.dart';
import 'package:oc_front/core/services/oauth2.service.dart';
import 'package:oc_front/main.dart';
import 'package:oc_front/pages/workflow.dart';
// ignore: must_be_immutable
class LoginWidget extends StatefulWidget {
LoginWidget ({ Key? key }): super(key: key);
String? loginChallenge;
LoginWidget ({ super.key, required this.loginChallenge });
@override LoginWidgetState createState() => LoginWidgetState();
}
class LoginWidgetState extends State<LoginWidget> {
@@ -18,7 +20,8 @@ class LoginWidgetState extends State<LoginWidget> {
bool loading = false;
FocusNode focusNode = FocusNode();
@override Widget build(BuildContext context) {
return KeyboardListener(focusNode: focusNode,
return KeyboardListener(
focusNode: focusNode,
onKeyEvent: (value) async {
if (value is KeyDownEvent && value.logicalKey == LogicalKeyboardKey.enter) {
if (usernameCtrl.text == "" || passwordCtrl.text == "") { return; }
@@ -26,7 +29,7 @@ class LoginWidgetState extends State<LoginWidget> {
setState(() {
loading = true;
});
await AuthService.login(usernameCtrl.text, passwordCtrl.text).catchError( (e) {
await OAuth2Service().login(usernameCtrl.text, passwordCtrl.text, widget.loginChallenge ?? '').catchError( (e) {
setState(() {
loading = false;
error = "Invalid username or password";
@@ -47,8 +50,8 @@ class LoginWidgetState extends State<LoginWidget> {
},
child: Container( padding: const EdgeInsets.all(50), child: Column(children: [
getMainHeight(context) < 600 ? Container() : SizedBox( width: getMainWidth(context) / 4, height: getMainHeight(context) / 4,
child: FittedBox(
child:const Center(child: Icon(Icons.person_search, size: 150, color: Colors.grey,)))),
child: const FittedBox(
child:Center(child: Icon(Icons.person_search, size: 150, color: Colors.grey,)))),
Center(child: Padding( padding: const EdgeInsets.only(top: 5, bottom: 20),
child: Text("WELCOME ON OPENCLOUD", style: TextStyle(fontSize: 25, fontWeight: FontWeight.w600,
color: lightColor ), overflow: TextOverflow.ellipsis, ))),
@@ -107,7 +110,7 @@ class LoginWidgetState extends State<LoginWidget> {
setState(() {
loading = true;
});
await AuthService.login(usernameCtrl.text, passwordCtrl.text).catchError( (e) {
await OAuth2Service().login(usernameCtrl.text, passwordCtrl.text, widget.loginChallenge ?? '').catchError( (e) {
setState(() {
loading = false;
error = "Invalid username or password";

86
lib/widgets/forms/workflow_event_forms.dart Normal file
View File

@@ -0,0 +1,86 @@
import 'package:flutter/material.dart';
import 'package:flutter_flow_chart/flutter_flow_chart.dart';
import 'package:oc_front/core/services/specialized_services/workflow_service.dart';
import 'package:oc_front/models/resources/workflow_event.dart';
// ignore: must_be_immutable
class WorkflowEventFormsWidget extends StatefulWidget {
WorkflowEventItem item;
Dashboard dash;
String elementID;
WorkflowEventFormsWidget({
super.key,
required this.item,
required this.dash,
required this.elementID,
});
@override WorkflowEventFormsWidgetState createState() => WorkflowEventFormsWidgetState();
}
class WorkflowEventFormsWidgetState extends State<WorkflowEventFormsWidget> {
final WorflowService _service = WorflowService();
Future<List<DropdownMenuItem<String>>> _loadWorkflows() async {
List<DropdownMenuItem<String>> items = [];
await _service.all(null).then((response) {
if (response.data != null) {
for (var entry in response.data!.values) {
final id = entry["id"]?.toString() ?? "";
final name = entry["name"]?.toString() ?? id;
if (id.isEmpty) continue;
items.add(DropdownMenuItem<String>(value: id, child: Text(name, overflow: TextOverflow.ellipsis)));
}
}
});
return items;
}
@override Widget build(BuildContext context) {
return Container(
padding: const EdgeInsets.symmetric(horizontal: 25, vertical: 10),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
const Padding(
padding: EdgeInsets.only(bottom: 8),
child: Text("Workflow cible", style: TextStyle(fontSize: 12, color: Colors.grey)),
),
FutureBuilder<List<DropdownMenuItem<String>>>(
future: _loadWorkflows(),
builder: (context, snapshot) {
final items = snapshot.data ?? [];
final current = items.any((e) => e.value == widget.item.workflowExecutionId)
? widget.item.workflowExecutionId
: null;
return DropdownButtonFormField<String>(
isExpanded: true,
value: current,
hint: const Text("Sélectionner un workflow...", style: TextStyle(fontSize: 12)),
style: const TextStyle(fontSize: 12, color: Colors.black, overflow: TextOverflow.ellipsis),
decoration: const InputDecoration(
fillColor: Colors.white,
filled: true,
labelText: "workflow",
labelStyle: TextStyle(fontSize: 10),
floatingLabelBehavior: FloatingLabelBehavior.always,
enabledBorder: OutlineInputBorder(borderSide: BorderSide(color: Colors.grey)),
border: OutlineInputBorder(borderSide: BorderSide(color: Colors.grey)),
contentPadding: EdgeInsets.symmetric(horizontal: 10, vertical: 5),
),
items: items,
onChanged: (value) {
if (value == null) return;
setState(() {
widget.item.workflowExecutionId = value;
widget.item.id = value;
});
widget.dash.notifyListeners();
},
);
},
),
],
),
);
}
}