Merge pull request #126 from piny940/userinfo-claim

Userinfoを作成
piny940 · Nov 30, 2024 · 24032a8 · 24032a8
2 parents a594e2f + d1cf76d
commit 24032a8
Show file tree

Hide file tree

Showing 28 changed files with 768 additions and 320 deletions.
diff --git a/docs/token.md b/docs/token.md
@@ -14,7 +14,8 @@
   "sub": "id:{userID};name:{username}",
   "iat": 0000000000,
   "jti": "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", // 32字のランダム文字列
-  "scope": "openid profile email" // スペース区切り
+  "scope": "openid profile email", // スペース区切り
+  "auth_time": 0000000000, // 認証日時
 }
 ```
 
@@ -33,5 +34,6 @@
   "exp": 0000000000,
   "iat": 0000000000, // トークン発行日時
   "jti": "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx", // 32字のランダム文字列
+  "auth_time": 0000000000, // 認証日時
 }
 ```
diff --git a/frontend/src/utils/api.d.ts b/frontend/src/utils/api.d.ts
@@ -163,6 +163,23 @@ export interface paths {
     patch?: never
     trace?: never
   }
+  '/userinfo': {
+    parameters: {
+      query?: never
+      header?: never
+      path?: never
+      cookie?: never
+    }
+    /** Get userinfo */
+    get: operations['Userinfo_getUserinfo']
+    put?: never
+    post?: never
+    delete?: never
+    options?: never
+    head?: never
+    patch?: never
+    trace?: never
+  }
   '/users/signup': {
     parameters: {
       query?: never
@@ -278,6 +295,10 @@ export interface components {
       id: number
       name: string
     }
+    'Userinfo.UserinfoRes': {
+      sub: string
+      name?: string
+    }
     'Users.ReqSignup': {
       name: string
       password: string
@@ -735,7 +756,6 @@ export interface operations {
       /** @description There is no content to send for this request, but the headers may be useful.  */
       204: {
         headers: {
-          'set-cookie': string
           [name: string]: unknown
         }
         content?: never
@@ -766,13 +786,32 @@ export interface operations {
       /** @description There is no content to send for this request, but the headers may be useful.  */
       204: {
         headers: {
-          'set-cookie': string
           [name: string]: unknown
         }
         content?: never
       }
     }
   }
+  Userinfo_getUserinfo: {
+    parameters: {
+      query?: never
+      header?: never
+      path?: never
+      cookie?: never
+    }
+    requestBody?: never
+    responses: {
+      /** @description The request has succeeded. */
+      200: {
+        headers: {
+          [name: string]: unknown
+        }
+        content: {
+          'application/json': components['schemas']['Userinfo.UserinfoRes']
+        }
+      }
+    }
+  }
   UsersInterface_signup: {
     parameters: {
       query?: never

diff --git a/internal/api/approval.go b/internal/api/approval.go
@@ -8,7 +8,7 @@ import (
 )
 
 func (s *Server) ApprovalsInterfaceApprove(ctx context.Context, request ApprovalsInterfaceApproveRequestObject) (ApprovalsInterfaceApproveResponseObject, error) {
-	session, err := CurrentUser(ctx)
+	session, err := s.Auth.CurrentUser(ctx)
 	if err != nil {
 		s.logger.Errorf("failed to get current user: %v", err)
 		return nil, err

diff --git a/internal/api/client.go b/internal/api/client.go
@@ -32,7 +32,7 @@ func (s *Server) ClientsInterfaceGetClient(ctx context.Context, request ClientsI
 // ----------------------------------- private api -------------------------------
 
 func (s *Server) AccountClientsCreateClient(ctx context.Context, request AccountClientsCreateClientRequestObject) (AccountClientsCreateClientResponseObject, error) {
-	session, err := CurrentUser(ctx)
+	session, err := s.Auth.CurrentUser(ctx)
 	if err != nil {
 		s.logger.Errorf("failed to get current user: %v", err)
 		return nil, err
@@ -55,7 +55,7 @@ func (s *Server) AccountClientsCreateClient(ctx context.Context, request Account
 }
 
 func (s *Server) AccountClientsDeleteClient(ctx context.Context, request AccountClientsDeleteClientRequestObject) (AccountClientsDeleteClientResponseObject, error) {
-	session, err := CurrentUser(ctx)
+	session, err := s.Auth.CurrentUser(ctx)
 	if err != nil {
 		s.logger.Errorf("failed to get current user: %v", err)
 		return nil, err
@@ -68,7 +68,7 @@ func (s *Server) AccountClientsDeleteClient(ctx context.Context, request Account
 }
 
 func (s *Server) AccountClientsListClients(ctx context.Context, request AccountClientsListClientsRequestObject) (AccountClientsListClientsResponseObject, error) {
-	session, err := CurrentUser(ctx)
+	session, err := s.Auth.CurrentUser(ctx)
 	if err != nil {
 		s.logger.Errorf("failed to get current user: %v", err)
 		return nil, err
@@ -92,7 +92,7 @@ func (s *Server) AccountClientsListClients(ctx context.Context, request AccountC
 }
 
 func (s *Server) AccountClientsGetClient(ctx context.Context, request AccountClientsGetClientRequestObject) (AccountClientsGetClientResponseObject, error) {
-	session, err := CurrentUser(ctx)
+	session, err := s.Auth.CurrentUser(ctx)
 	if err != nil {
 		s.logger.Errorf("failed to get current user: %v", err)
 		return nil, err
@@ -114,7 +114,7 @@ func (s *Server) AccountClientsGetClient(ctx context.Context, request AccountCli
 }
 
 func (s *Server) AccountClientsUpdateClient(ctx context.Context, request AccountClientsUpdateClientRequestObject) (AccountClientsUpdateClientResponseObject, error) {
-	session, err := CurrentUser(ctx)
+	session, err := s.Auth.CurrentUser(ctx)
 	if err != nil {
 		s.logger.Errorf("failed to get current user: %v", err)
 		return nil, err

diff --git a/internal/api/gen.go b/internal/api/gen.go
diff --git a/internal/api/init.go b/internal/api/init.go
@@ -3,12 +3,8 @@ package api
 import (
 	"auth/internal/domain"
 	"encoding/gob"
-	"os"
-
-	"github.com/gorilla/sessions"
 )
 
 func Init() {
 	gob.Register(&domain.User{})
-	store = sessions.NewCookieStore([]byte(os.Getenv("SESSION_SECRET")))
 }