Merge pull request #55 from drasticactions/fix-schema

Update PasswordSession Schema to include session

+semver: fix

src/FishyFlip/ATProtocol.cs

@@ -129,6 +129,21 @@ public ATProtocol(ATProtocolOptions options)
     /// </summary>
     public AuthSession? OAuthSession => this.sessionManager is OAuth2SessionManager oAuth2SessionManager ? oAuth2SessionManager.OAuthSession : null;
 
+    /// <summary>
+    /// Gets the current PasswordSession session, if any is active.
+    /// </summary>
+    public AuthSession? PasswordSession => this.sessionManager is PasswordSessionManager passwordSessionManager ? passwordSessionManager.PasswordSession : null;
+
+    /// <summary>
+    /// Gets the current AuthSession.
+    /// </summary>
+    public AuthSession? AuthSession => this.sessionManager switch
+    {
+        PasswordSessionManager passwordSessionManager => passwordSessionManager.PasswordSession,
+        OAuth2SessionManager oAuth2SessionManager => oAuth2SessionManager.OAuthSession,
+        _ => null,
+    };
+
     /// <summary>
     /// Gets or sets the internal session manager.
     /// </summary>

src/FishyFlip/PasswordSessionManager.cs

@@ -38,6 +38,7 @@ internal class PasswordSessionManager : ISessionManager
     private System.Timers.Timer? timer;
     private int refreshing;
     private ILogger? logger;
+    private AuthSession? authSession;
 
     /// <summary>
     /// Initializes a new instance of the <see cref="PasswordSessionManager"/> class.
@@ -79,6 +80,11 @@ public PasswordSessionManager(ATProtocol protocol, Session session)
     /// <inheritdoc/>
     public HttpClient Client => this.client;
 
+    /// <summary>
+    /// Gets the password Auth Session.
+    /// </summary>
+    public AuthSession? PasswordSession => this.authSession;
+
     /// <inheritdoc/>
     public Task RefreshSessionAsync(CancellationToken cancellationToken = default)
         => this.RefreshTokenAsync(cancellationToken);
@@ -140,7 +146,12 @@ public void SetSession(Session session)
 
         this.logger?.LogDebug($"Session set, {session.Did}");
 
-        this.SessionUpdated?.Invoke(this, new SessionUpdatedEventArgs(new AuthSession(session), this.protocol.Options.Url));
+        lock (this)
+        {
+            this.authSession = new AuthSession(session);
+        }
+
+        this.SessionUpdated?.Invoke(this, new SessionUpdatedEventArgs(this.authSession, this.protocol.Options.Url));
 
         if (!this.protocol.Options.AutoRenewSession)
         {