Merge pull request #6 from alcheng005/main

Edited comments and fixed SessionManager
oslabs-beta · Feb 9, 2021 · ebdf3e1 · ebdf3e1
2 parents bdb4e49 + e6e83ca
commit ebdf3e1
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 89 deletions.
diff --git a/README.md b/README.md
@@ -1 +1 @@
-### Dashport
+# Dashport
diff --git a/lib/dashport.js b/lib/dashport.js
diff --git a/lib/sessionManager.ts b/lib/sessionManager.ts
@@ -15,14 +15,14 @@ import { OakContext, UserProfile } from './types.ts';
  * @param {string} framework - The name of the server framework to be used
  */
 class SessionManager {
-  logIn: Function;
-  logOut: Function;
-  isAuthenticated: Function;
+  public logIn: Function;
+  public logOut: Function;
+  public isAuthenticated: Function;
 
   constructor(framework: string): void {
-    this.logIn = _logInDecider(framework);
-    this.logOut = _logOutDecider(framework);
-    this.isAuthenticated = _isAuthenticatedDecider(framework);
+    this.logIn = this._logInDecider(framework);
+    this.logOut = this._logOutDecider(framework);
+    this.isAuthenticated = this._isAuthenticatedDecider(framework);
   }
 
   /**
@@ -39,7 +39,7 @@ class SessionManager {
   _logInDecider(framework: string): Function {
     if (framework = 'oak') {
       return function(ctx: OakContext, serializedId: string): void {
-        ctx.state.dashport.session = { userId: serializedId };
+        ctx.state._dashport.session = { userId: serializedId };
       }
     }
 
@@ -57,7 +57,7 @@ class SessionManager {
   _logOutDecider(framework: string): Function {
     if (framework = 'oak') {
       return function(ctx: OakContext): void {
-        delete ctx.state.dashport.session
+        delete ctx.state._dashport.session
       }
     }
 
@@ -78,8 +78,8 @@ class SessionManager {
   _isAuthenticatedDecider(framework: string): Function {
     if (framework = 'oak') {
       return function(ctx: OakContext, serializedId: string): boolean {
-        if (ctx.state.dashport.session) {
-          if (serializedId === ctx.state.dashport.session.userId) return true;
+        if (ctx.state._dashport.session) {
+          if (serializedId === ctx.state._dashport.session.userId) return true;
           return false;
         }
 

diff --git a/lib/types.ts b/lib/types.ts
@@ -19,8 +19,8 @@ export interface OakContext {
 
 /**
  * Different OAuths will return different user information in different
- * structures. Dashport breaks down and reconstructs the user info into the
- * standardized UserProfile below
+ * structures. Dashport strategies should break down and reconstruct the user
+ * info into the standardized UserProfile below
  */
 export interface UserProfile {
   // the ID Dashport has come up with for a user