Merge pull request #17 from quizizz/rohit/fixing-token-types

Rohit/fixing token types

Author: ChicK00o

src/canvas.d.ts

@@ -1,6 +1,6 @@
 import { AxiosResponse } from 'axios';
 import { RequestConfig } from './types';
-import { Tokens, GetUserToken, SetUserToken, SubmissionStates } from './common';
+import { Tokens, SubmissionStates, GetAccessToken, SetAccessToken } from './common';
 
 export interface AuthURLOptions {
   state: string;
@@ -36,7 +36,7 @@ export interface CanvasOptions {
   refreshToken?: string;
   clientId: string;
   clientSecret: string;
-  fxs: { getToken: GetUserToken, setToken: SetUserToken };
+  fxs: { getToken: GetAccessToken, setToken: SetAccessToken };
   userId: string;
   canvasUserId?: string;
 }
@@ -51,8 +51,8 @@ export class Canvas {
   refreshToken?: string;
   clientId: string;
   clientSecret: string;
-  getUserToken: GetUserToken;
-  setUserToken: SetUserToken;
+  getUserToken: GetAccessToken;
+  setUserToken: SetAccessToken;
   userId: string;
   canvasUserId: string;
 

src/canvas.js

@@ -223,8 +223,8 @@ class Canvas {
             }
             try {
               await this.refreshUserToken(this.refreshToken);
-            } catch (err) {
-              console.error(err);
+            } catch (err1) {
+              console.error(err1);
             }
 
             const resp = await this.makeRequest(requestConfig, retries + 1);

src/common.d.ts

@@ -1,11 +1,15 @@
 export interface Tokens {
-  accessToken: string;
-  refreshToken: string;
-  canvasUserId: string;
+  access_token?: string,
+  access_token_secret?: string, 
+  token_type?: string, 
+  expires_in?: Number, 
+  refresh_token?: string,
+  lastRefresh?: Date,
+  info?: any,
 }
 
-export type GetUserToken = (userId: string) => Promise<Tokens>;
-export type SetUserToken = (userId: string, tokens: Tokens) => Promise<void>;
+export type GetAccessToken = (userId: string) => Promise<Tokens>;
+export type SetAccessToken = (userId: string, token: Tokens) => Promise<any>;
 
 export declare enum SubmissionStates {
   SUBMITTED = 'submitted',

src/gcl.d.ts

@@ -1,16 +1,16 @@
 /**
  * @class GCL
  */
-export = GCL
+import { GetAccessToken, SetAccessToken } from "./common";
 class GCL {
     constructor(name: any, emitter: any, opts: any, urls?: {}, fxs?: {});
     name: any;
     emitter: any;
     apiURL: any;
     authURL: any;
     tokenURL: any;
-    getUserToken: any;
-    setUserToken: any;
+    getUserToken: GetAccessToken;
+    setUserToken: SetAccessToken;
     authClient: any;
     requestClient({ refresh_token, access_token, lastRefresh }: {
         refresh_token: any;
@@ -89,4 +89,5 @@ class GCL {
         courseWorkId: any;
         subId: any;
     }): any;
-}
+}
+export = GCL

src/index.d.ts

@@ -14,12 +14,14 @@ import {
 import {
   Schoology,
   SchoologyOptions,
+  SchoologyGetAccessToken,
+  SchoologySetAccessToken,
 } from "./schoology";
 import {
   Tokens,
-  GetUserToken,
-  SetUserToken,
   SubmissionStates,
+  GetAccessToken,
+  SetAccessToken,
 } from "./common";
 import {
   RequestToken,
@@ -38,18 +40,20 @@ export {
   LMSError,
   Schoology,
   SchoologyOptions,
+  SchoologyGetAccessToken,
+  SchoologySetAccessToken,
   AuthURLOptions,
   CanvasProfile,
   CanvasOptions,
   Canvas,
+  GetAccessToken,
+  SetAccessToken,
   GradeSubmissionResponse,
   Course,
   Student,
   Submission,
   Assignment,
   Tokens,
-  GetUserToken,
-  SetUserToken,
   SubmissionStates,
   RequestToken,
   AccessToken,

src/schoology.d.ts

@@ -1,14 +1,14 @@
 import { RequestToken, AccessToken } from './oauth';
-import { GetUserToken, SetUserToken, SubmissionStates } from './common';
+import { SubmissionStates, Tokens } from './common';
 
 export interface SchoologyOptions {
   schoologyProfileId: string;
   requestToken?: RequestToken;
   accessToken?: AccessToken;
   fxs: {
-    cacheRequestToken?: (any) => Promise<any>;
-    getAccessToken?: GetUserToken;
-    setAccessToken?: SetUserToken;
+    cacheRequestToken?: (token: AccessToken) => Promise<any>;
+    getAccessToken?: SchoologyGetAccessToken;
+    setAccessToken?: SchoologySetAccessToken;
   };
   hostedUrl: string;
   redirectUri: string;
@@ -17,6 +17,10 @@ export interface SchoologyOptions {
   userId: string;
 }
 
+// The structure it works on is different, it uses the OAuth Token Structure
+export type SchoologyGetAccessToken = () => Promise<AccessToken>;
+export type SchoologySetAccessToken = (token: AccessToken) => Promise<any>;
+
 export class Schoology {
   constructor(options: SchoologyOptions);
 
@@ -27,8 +31,8 @@ export class Schoology {
   userId: string;
   schoologyProfileId: string;
   cacheRequestToken: (any) => Promise<any>;
-  getUserToken: GetUserToken; 
-  setUserToken: SetUserToken;
+  getUserToken: SchoologyGetAccessToken; 
+  setUserToken: SchoologySetAccessToken;
   oAuth: OAuth;
 
   static SUBMISSION_STATE: SubmissionStates;