Generate code

Author: tp

modules/new_serverpod_auth/serverpod_auth_backwards_compatibility/serverpod_auth_backwards_compatibility_client/lib/src/protocol/client.dart

@@ -10,10 +10,37 @@
 
 // ignore_for_file: no_leading_underscores_for_library_prefixes
 import 'package:serverpod_client/serverpod_client.dart' as _i1;
+import 'dart:async' as _i2;
+import 'package:serverpod_auth_session_client/serverpod_auth_session_client.dart'
+    as _i3;
+
+/// Enpoint to convert legacy sessions.
+/// {@category Endpoint}
+class EndpointSessionMigration extends _i1.EndpointRef {
+  EndpointSessionMigration(_i1.EndpointCaller caller) : super(caller);
+
+  @override
+  String get name => 'serverpod_auth_backwards_compatibility.sessionMigration';
+
+  /// Converts a legacy session into a `serverpod_auth_session` one.
+  _i2.Future<_i3.AuthSuccess?> convertSession({required String sessionKey}) =>
+      caller.callServerEndpoint<_i3.AuthSuccess?>(
+        'serverpod_auth_backwards_compatibility.sessionMigration',
+        'convertSession',
+        {'sessionKey': sessionKey},
+      );
+}
 
 class Caller extends _i1.ModuleEndpointCaller {
-  Caller(_i1.ServerpodClientShared client) : super(client) {}
+  Caller(_i1.ServerpodClientShared client) : super(client) {
+    sessionMigration = EndpointSessionMigration(this);
+  }
+
+  late final EndpointSessionMigration sessionMigration;
 
   @override
-  Map<String, _i1.EndpointRef> get endpointRefLookup => {};
+  Map<String, _i1.EndpointRef> get endpointRefLookup => {
+        'serverpod_auth_backwards_compatibility.sessionMigration':
+            sessionMigration
+      };
 }

modules/new_serverpod_auth/serverpod_auth_backwards_compatibility/serverpod_auth_backwards_compatibility_client/lib/src/protocol/protocol.dart

@@ -12,8 +12,10 @@
 import 'package:serverpod_client/serverpod_client.dart' as _i1;
 import 'package:serverpod_auth_email_account_client/serverpod_auth_email_account_client.dart'
     as _i2;
-import 'package:serverpod_auth_user_client/serverpod_auth_user_client.dart'
+import 'package:serverpod_auth_session_client/serverpod_auth_session_client.dart'
     as _i3;
+import 'package:serverpod_auth_user_client/serverpod_auth_user_client.dart'
+    as _i4;
 export 'client.dart';
 
 class Protocol extends _i1.SerializationManager {
@@ -35,6 +37,9 @@ class Protocol extends _i1.SerializationManager {
     try {
       return _i3.Protocol().deserialize<T>(data, t);
     } on _i1.DeserializationTypeNotFoundException catch (_) {}
+    try {
+      return _i4.Protocol().deserialize<T>(data, t);
+    } on _i1.DeserializationTypeNotFoundException catch (_) {}
     return super.deserialize<T>(data, t);
   }
 
@@ -47,6 +52,10 @@ class Protocol extends _i1.SerializationManager {
       return 'serverpod_auth_email_account.$className';
     }
     className = _i3.Protocol().getClassNameForObject(data);
+    if (className != null) {
+      return 'serverpod_auth_session.$className';
+    }
+    className = _i4.Protocol().getClassNameForObject(data);
     if (className != null) {
       return 'serverpod_auth_user.$className';
     }
@@ -63,9 +72,13 @@ class Protocol extends _i1.SerializationManager {
       data['className'] = dataClassName.substring(29);
       return _i2.Protocol().deserializeByClassName(data);
     }
+    if (dataClassName.startsWith('serverpod_auth_session.')) {
+      data['className'] = dataClassName.substring(23);
+      return _i3.Protocol().deserializeByClassName(data);
+    }
     if (dataClassName.startsWith('serverpod_auth_user.')) {
       data['className'] = dataClassName.substring(20);
-      return _i3.Protocol().deserializeByClassName(data);
+      return _i4.Protocol().deserializeByClassName(data);
     }
     return super.deserializeByClassName(data);
   }

modules/new_serverpod_auth/serverpod_auth_backwards_compatibility/serverpod_auth_backwards_compatibility_server/lib/src/generated/endpoints.dart

@@ -10,17 +10,55 @@
 
 // ignore_for_file: no_leading_underscores_for_library_prefixes
 import 'package:serverpod/serverpod.dart' as _i1;
+import '../endpoints/session_migration_endpoint.dart' as _i2;
 import 'package:serverpod_auth_email_account_server/serverpod_auth_email_account_server.dart'
-    as _i2;
-import 'package:serverpod_auth_user_server/serverpod_auth_user_server.dart'
     as _i3;
+import 'package:serverpod_auth_session_server/serverpod_auth_session_server.dart'
+    as _i4;
+import 'package:serverpod_auth_user_server/serverpod_auth_user_server.dart'
+    as _i5;
 
 class Endpoints extends _i1.EndpointDispatch {
   @override
   void initializeEndpoints(_i1.Server server) {
-    modules['serverpod_auth_email_account'] = _i2.Endpoints()
+    var endpoints = <String, _i1.Endpoint>{
+      'sessionMigration': _i2.SessionMigrationEndpoint()
+        ..initialize(
+          server,
+          'sessionMigration',
+          'serverpod_auth_backwards_compatibility',
+        )
+    };
+    connectors['sessionMigration'] = _i1.EndpointConnector(
+      name: 'sessionMigration',
+      endpoint: endpoints['sessionMigration']!,
+      methodConnectors: {
+        'convertSession': _i1.MethodConnector(
+          name: 'convertSession',
+          params: {
+            'sessionKey': _i1.ParameterDescription(
+              name: 'sessionKey',
+              type: _i1.getType<String>(),
+              nullable: false,
+            )
+          },
+          call: (
+            _i1.Session session,
+            Map<String, dynamic> params,
+          ) async =>
+              (endpoints['sessionMigration'] as _i2.SessionMigrationEndpoint)
+                  .convertSession(
+            session,
+            sessionKey: params['sessionKey'],
+          ),
+        )
+      },
+    );
+    modules['serverpod_auth_email_account'] = _i3.Endpoints()
+      ..initializeEndpoints(server);
+    modules['serverpod_auth_session'] = _i4.Endpoints()
       ..initializeEndpoints(server);
-    modules['serverpod_auth_user'] = _i3.Endpoints()
+    modules['serverpod_auth_user'] = _i5.Endpoints()
       ..initializeEndpoints(server);
   }
 }

modules/new_serverpod_auth/serverpod_auth_backwards_compatibility/serverpod_auth_backwards_compatibility_server/lib/src/generated/legacy_session.dart

@@ -22,7 +22,6 @@ abstract class LegacySession
     required this.authUserId,
     this.authUser,
     required this.scopeNames,
-    this.lastUsed,
     required this.hash,
     required this.method,
   });
@@ -32,7 +31,6 @@ abstract class LegacySession
     required _i1.UuidValue authUserId,
     _i2.AuthUser? authUser,
     required Set<String> scopeNames,
-    DateTime? lastUsed,
     required String hash,
     required String method,
   }) = _LegacySessionImpl;
@@ -49,9 +47,6 @@ abstract class LegacySession
       scopeNames: _i1.SetJsonExtension.fromJson(
           (jsonSerialization['scopeNames'] as List),
           itemFromJson: (e) => e as String)!,
-      lastUsed: jsonSerialization['lastUsed'] == null
-          ? null
-          : _i1.DateTimeJsonExtension.fromJson(jsonSerialization['lastUsed']),
       hash: jsonSerialization['hash'] as String,
       method: jsonSerialization['method'] as String,
     );
@@ -72,13 +67,6 @@ abstract class LegacySession
   /// The scopes this session provides access to.
   Set<String> scopeNames;
 
-  /// The time when this access session was last used by a client.
-  ///
-  /// Operates only with minute resolution, to avoid excessive writes to the database.
-  ///
-  /// Unused sessions will have a value of `null`.
-  DateTime? lastUsed;
-
   /// The hashed version of the key (as the legacy `AuthKey`)
   String hash;
 
@@ -98,7 +86,6 @@ abstract class LegacySession
     _i1.UuidValue? authUserId,
     _i2.AuthUser? authUser,
     Set<String>? scopeNames,
-    DateTime? lastUsed,
     String? hash,
     String? method,
   });
@@ -109,7 +96,6 @@ abstract class LegacySession
       'authUserId': authUserId.toJson(),
       if (authUser != null) 'authUser': authUser?.toJson(),
       'scopeNames': scopeNames.toJson(),
-      if (lastUsed != null) 'lastUsed': lastUsed?.toJson(),
       'hash': hash,
       'method': method,
     };
@@ -158,15 +144,13 @@ class _LegacySessionImpl extends LegacySession {
     required _i1.UuidValue authUserId,
     _i2.AuthUser? authUser,
     required Set<String> scopeNames,
-    DateTime? lastUsed,
     required String hash,
     required String method,
   }) : super._(
           id: id,
           authUserId: authUserId,
           authUser: authUser,
           scopeNames: scopeNames,
-          lastUsed: lastUsed,
           hash: hash,
           method: method,
         );
@@ -180,7 +164,6 @@ class _LegacySessionImpl extends LegacySession {
     _i1.UuidValue? authUserId,
     Object? authUser = _Undefined,
     Set<String>? scopeNames,
-    Object? lastUsed = _Undefined,
     String? hash,
     String? method,
   }) {
@@ -190,7 +173,6 @@ class _LegacySessionImpl extends LegacySession {
       authUser:
           authUser is _i2.AuthUser? ? authUser : this.authUser?.copyWith(),
       scopeNames: scopeNames ?? this.scopeNames.map((e0) => e0).toSet(),
-      lastUsed: lastUsed is DateTime? ? lastUsed : this.lastUsed,
       hash: hash ?? this.hash,
       method: method ?? this.method,
     );
@@ -208,10 +190,6 @@ class LegacySessionTable extends _i1.Table<int?> {
       'scopeNames',
       this,
     );
-    lastUsed = _i1.ColumnDateTime(
-      'lastUsed',
-      this,
-    );
     hash = _i1.ColumnString(
       'hash',
       this,
@@ -230,13 +208,6 @@ class LegacySessionTable extends _i1.Table<int?> {
   /// The scopes this session provides access to.
   late final _i1.ColumnSerializable scopeNames;
 
-  /// The time when this access session was last used by a client.
-  ///
-  /// Operates only with minute resolution, to avoid excessive writes to the database.
-  ///
-  /// Unused sessions will have a value of `null`.
-  late final _i1.ColumnDateTime lastUsed;
-
   /// The hashed version of the key (as the legacy `AuthKey`)
   late final _i1.ColumnString hash;
 
@@ -263,7 +234,6 @@ class LegacySessionTable extends _i1.Table<int?> {
         id,
         authUserId,
         scopeNames,
-        lastUsed,
         hash,
         method,
       ];