계정 제재 개선

config_template.json

@@ -1,7 +1,9 @@
 {
     "maingate_mongodb_url": "mongodb://...",
+    "session_storage": "",
+    "session_ttl" : 3600,
+
     "autologin_ttl": 604800,
-    "acc_del_ttl": 7776000,
     "maximum_num_link_account": 10,    
     "redirect_base_url": "",
     "google_client_id" : "",

core/api.go

@@ -160,37 +160,46 @@ func (caller apiCaller) uploadAPI(w http.ResponseWriter, r *http.Request) error
 
 func (caller apiCaller) blockAPI(w http.ResponseWriter, r *http.Request) error {
 	mg := caller.mg
+	logger.Println("blockAPI :", r.Method)
 	if r.Method == "GET" {
+		target, ok := gocommon.ReadObjectIDFormValue(r.Form, "accid")
+		logger.Println("Get :", target, ok)
+		if !ok {
+			// 페이지네이션 해야할 듯
 			json.NewEncoder(w).Encode(mg.bl.all())
+		} else if !target.IsZero() {
+			if blocked, ok := mg.bl.get(target); ok && blocked != nil {
+				json.NewEncoder(w).Encode(blocked)
+			}
+		}
 	} else if r.Method == "PUT" {
-		body, _ := io.ReadAll(r.Body)
+		var targets struct {
-
+			Start    primitive.DateTime
-		var bipl blockinfoWithStringId
+			End      primitive.DateTime
-		if err := json.Unmarshal(body, &bipl); err != nil {
+			Accounts map[primitive.ObjectID]primitive.M // accid->meta
-			return err
+		}
-		}
+		if err := gocommon.MakeDecoder(r).Decode(&targets); err != nil {
-
-		accid, err := primitive.ObjectIDFromHex(bipl.StrId)
-		if err != nil {
 			return err
 		}
 
+		for accid, meta := range targets.Accounts {
 			bi := blockinfo{
-			Start:  primitive.NewDateTimeFromTime(time.Unix(bipl.StartUnix, 0)),
+				Start: targets.Start,
-			End:    primitive.NewDateTimeFromTime(time.Unix(bipl.EndUnix, 0)),
+				End:   targets.End,
-			Reason: bipl.Reason,
+				Meta:  meta,
 			}
 
-		logger.Println("bi :", accid, bi)
+			_, _, err := mg.mongoClient.Update(CollectionBlock, bson.M{
-
-		_, _, err = mg.mongoClient.Update(CollectionBlock, bson.M{
 				"_id": accid,
 			}, bson.M{
 				"$set": &bi,
 			}, options.Update().SetUpsert(true))
-
 			if err != nil {
-			return err
+				logger.Println("account is not blocked. err :", err)
+			} else {
+				logger.Println("account is blocked :", meta)
+				mg.sessionProvider.Delete(accid)
+			}
 		}
 	} else if r.Method == "DELETE" {
 		id := r.URL.Query().Get("id")
@@ -214,8 +223,6 @@ func (caller apiCaller) blockAPI(w http.ResponseWriter, r *http.Request) error {
 		if err != nil {
 			return err
 		}
-
-		mg.mongoClient.Delete(CollectionAuth, bson.M{"_id": idobj})
 	}
 	return nil
 }
@@ -232,7 +239,7 @@ func (caller apiCaller) whitelistAPI(w http.ResponseWriter, r *http.Request) err
 			return err
 		}
 		member.ExpiredAt = 0
-		member.Id = primitive.NilObjectID
+
 		_, _, err := mg.mongoClient.Update(CollectionWhitelist, bson.M{
 			"_id": primitive.NewObjectID(),
 		}, bson.M{
@@ -372,11 +379,6 @@ func (caller apiCaller) couponAPI(w http.ResponseWriter, r *http.Request) error
 			logger.Println("begin listAllCouponNames")
 			listAllCouponNames(caller.mg.mongoClient, w, r)
 		}
-
-	case "DELETE":
-		// 쿠폰 삭제
-		logger.Println("begin deleteCoupon")
-		deleteCoupon(caller.mg.mongoClient, w, r)
 	}
 	return nil
 }
@@ -401,40 +403,6 @@ func (caller apiCaller) configAPI(w http.ResponseWriter, r *http.Request) error
 	return nil
 }
 
-func (caller apiCaller) lockcreatecharAPI(w http.ResponseWriter, r *http.Request) error {
-	mg, err := caller.mg.mongoClient.FindAll(CollectionService, bson.M{})
-	if err != nil {
-		return err
-	}
-
-	haschr, _ := gocommon.ReadStringFormValue(r.Form, "haschr")
-
-	locked := make(map[string]any)
-	if haschr == "true" {
-		locked["lock"] = false
-	} else {
-		curregion, _ := gocommon.ReadStringFormValue(r.Form, "region")
-
-		for _, regioninfo := range mg {
-			region := regioninfo["divisions"].(primitive.M)
-			for idx, rl := range region {
-				if idx == curregion {
-					if rl.(primitive.M)["lockcreatechar"].(bool) {
-						locked["lock"] = true
-					} else {
-						locked["lock"] = false
-					}
-				}
-			}
-		}
-	}
-
-	create, _ := json.Marshal(locked)
-	w.Write(create)
-
-	return nil
-}
-
 type apiCaller struct {
 	userinfo     map[string]any
 	globalAdmins map[string]bool
@@ -459,28 +427,11 @@ func (mg *Maingate) api(w http.ResponseWriter, r *http.Request) {
 
 	var userinfo map[string]any
 
-	var apiTokenObj primitive.ObjectID
 	if !*devflag {
-		apiToken := r.Header.Get("MG-X-API-TOKEN")
-		if len(apiToken) > 0 {
-			if apiToken != mg.maingateConfig.ApiToken {
-				w.WriteHeader(http.StatusUnauthorized)
-				return
-			}
-
-			obj, err := primitive.ObjectIDFromHex(apiToken)
-			if err != nil {
-				logger.Error(err)
-				w.WriteHeader(http.StatusBadRequest)
-				return
-			}
-
-			apiTokenObj = obj
-		} else {
 		authheader := r.Header.Get("Authorization")
 		if len(authheader) == 0 {
 			logger.Println("Authorization header is not valid :", authheader)
-				w.WriteHeader(http.StatusUnauthorized)
+			w.WriteHeader(http.StatusBadRequest)
 			return
 		}
 
@@ -506,7 +457,6 @@ func (mg *Maingate) api(w http.ResponseWriter, r *http.Request) {
 			return
 		}
 	}
-	}
 
 	ptr := atomic.LoadPointer(&mg.admins)
 	adminsptr := (*globalAdmins)(ptr)
@@ -520,6 +470,20 @@ func (mg *Maingate) api(w http.ResponseWriter, r *http.Request) {
 		}
 	}
 
+	var apiTokenObj primitive.ObjectID
+	if !*devflag {
+		apiToken := r.Header.Get("MG-X-API-TOKEN")
+		if len(apiToken) > 0 {
+			obj, err := primitive.ObjectIDFromHex(apiToken)
+			if err != nil {
+				logger.Error(err)
+				w.WriteHeader(http.StatusBadRequest)
+				return
+			}
+			apiTokenObj = obj
+		}
+	}
+
 	logger.Println("api call :", r.URL.Path, r.Method, r.URL.Query(), userinfo)
 	caller := apiCaller{
 		userinfo:     userinfo,
@@ -545,8 +509,6 @@ func (mg *Maingate) api(w http.ResponseWriter, r *http.Request) {
 		err = caller.blockAPI(w, r)
 	} else if strings.HasSuffix(r.URL.Path, "/coupon") {
 		err = caller.couponAPI(w, r)
-	} else if strings.HasSuffix(r.URL.Path, "/lockcreatechar") {
-		err = caller.lockcreatecharAPI(w, r)
 	}
 
 	if err != nil {

core/api_coupon.go

@@ -30,7 +30,6 @@ type couponDoc struct {
 	Total   int64    `json:"total" bson:"total"`
 	Remains []string `json:"remains,omitempty" bson:"remains,omitempty"`
 	Used    []string `json:"used,omitempty" bson:"used,omitempty"`
-	Expire  int64    `json:"expire" bson:"expire"`
 }
 
 func makeCouponKey(roundnum uint32, uid []byte) string {
@@ -45,17 +44,17 @@ func makeCouponKey(roundnum uint32, uid []byte) string {
 	return fmt.Sprintf("%s-%s-%s-%s", hex.EncodeToString(final[0:2]), hex.EncodeToString(final[2:4]), hex.EncodeToString(final[4:6]), hex.EncodeToString(final[6:8]))
 }
 
+var r = rand.New(rand.NewSource(time.Now().UnixNano()))
+
 func makeCouponCodes(name string, count int) (string, map[string]string) {
 	checkunique := make(map[string]bool)
 	keys := make(map[string]string)
 	uid := make([]byte, 4)
 
 	roundHash, roundnum := coupon.MakeCouponRoundHash(name)
-	seed := time.Now().UnixNano()
 
 	for len(keys) < count {
-		rand.Seed(seed)
+		r.Read(uid)
-		rand.Read(uid)
 
 		code := makeCouponKey(roundnum, uid)
 
@@ -63,7 +62,6 @@ func makeCouponCodes(name string, count int) (string, map[string]string) {
 			checkunique[code] = true
 			keys[hex.EncodeToString(uid)] = code
 		}
-		seed = int64(binary.BigEndian.Uint32(uid))
 	}
 	return roundHash, keys
 }
@@ -73,7 +71,6 @@ func generateCoupons(mongoClient gocommon.MongoClient, w http.ResponseWriter, r
 	effect, _ := gocommon.ReadStringFormValue(r.Form, "effect")
 	count, _ := gocommon.ReadIntegerFormValue(r.Form, "count")
 	desc, _ := gocommon.ReadStringFormValue(r.Form, "desc")
-	expire, _ := gocommon.ReadIntegerFormValue(r.Form, "expire")
 
 	if count == 0 {
 		logger.Println("[generateCoupons] count == 0")
@@ -94,7 +91,6 @@ func generateCoupons(mongoClient gocommon.MongoClient, w http.ResponseWriter, r
 				Effect: effect,
 				Desc:   desc,
 				Total:  -1,
-				Expire: expire,
 			},
 		}, options.Update().SetUpsert(true)); err != nil {
 			logger.Println("[generateCoupons] Update failed :", err)
@@ -157,7 +153,6 @@ func generateCoupons(mongoClient gocommon.MongoClient, w http.ResponseWriter, r
 				Effect: effect,
 				Desc:   desc,
 				Total:  count,
-				Expire: expire,
 			},
 		}, options.Update().SetUpsert(true))
 	}
@@ -202,12 +197,7 @@ func downloadCoupons(mongoClient gocommon.MongoClient, w http.ResponseWriter, r
 	roundnum := binary.BigEndian.Uint32(roundObj[:])
 	var coupons []string
 	for _, uid := range coupon.Remains {
-		decUid, err := hex.DecodeString(uid)
+		coupons = append(coupons, makeCouponKey(roundnum, []byte(uid)))
-		if err != nil {
-			logger.Println("downloadCoupons Fail", err)
-			continue
-		}
-		coupons = append(coupons, makeCouponKey(roundnum, decUid))
 	}
 
 	enc := json.NewEncoder(w)
@@ -240,7 +230,7 @@ func queryCoupon(mongoClient gocommon.MongoClient, w http.ResponseWriter, r *htt
 	var coupon couponDoc
 	if err := mongoClient.FindOneAs(CollectionCoupon, bson.M{
 		"_id": roundObj,
-	}, &coupon, options.FindOne().SetProjection(bson.M{"effect": 1, "name": 1, "reason": 1, "total": 1, "desc": 1, "expire": 1}).SetReturnKey(false)); err != nil {
+	}, &coupon, options.FindOne().SetProjection(bson.M{"effect": 1, "name": 1, "reason": 1, "total": 1, "desc": 1}).SetReturnKey(false)); err != nil {
 		logger.Println("[queryCoupon] FindOneAs failed :", err)
 		w.WriteHeader(http.StatusInternalServerError)
 		return
@@ -284,8 +274,8 @@ func useCoupon(mongoClient gocommon.MongoClient, w http.ResponseWriter, r *http.
 		round, _ = coupon.MakeCouponRoundHash(code)
 	}
 
-	// 쿠폰 사용 유무 검사
+	// 1. 내가 이 라운드의 쿠폰을 쓴 적이 있나
-	alreadyused, err := mongoClient.Exists(CollectionCouponUse, bson.M{
+	already, err := mongoClient.Exists(CollectionCouponUse, bson.M{
 		"_id":    acc,
 		"rounds": round,
 	})
@@ -295,7 +285,7 @@ func useCoupon(mongoClient gocommon.MongoClient, w http.ResponseWriter, r *http.
 		return
 	}
 
-	if alreadyused {
+	if already {
 		// 이미 이 라운드의 쿠폰을 사용한 적이 있다.
 		w.WriteHeader(http.StatusConflict)
 		return
@@ -307,7 +297,7 @@ func useCoupon(mongoClient gocommon.MongoClient, w http.ResponseWriter, r *http.
 		// 무한 쿠폰일 수 있으므로 존재하는지 확인
 		if err := mongoClient.FindOneAs(CollectionCoupon, bson.M{
 			"_id": roundObj,
-		}, &coupon, options.FindOne().SetProjection(bson.M{"_id": 0, "effect": 1, "name": 1, "total": 1, "expire": 1})); err != nil {
+		}, &coupon, options.FindOne().SetProjection(bson.M{"_id": 0, "effect": 1, "name": 1, "reason": 1, "total": 1})); err != nil {
 			logger.Println(err)
 			w.WriteHeader(http.StatusInternalServerError)
 			return
@@ -319,10 +309,9 @@ func useCoupon(mongoClient gocommon.MongoClient, w http.ResponseWriter, r *http.
 			return
 		}
 	} else {
-		// 쿠폰을 하나 꺼냄
+		// 2. 쿠폰을 하나 꺼냄
 		matched, _, err := mongoClient.Update(CollectionCoupon, bson.M{
 			"_id": roundObj,
-			"remains": key,
 		}, bson.M{
 			"$pull": bson.M{"remains": key},
 		})
@@ -338,24 +327,18 @@ func useCoupon(mongoClient gocommon.MongoClient, w http.ResponseWriter, r *http.
 			return
 		}
 
-		// round의 효과 읽기
+		// 3. round의 효과 읽기
 		if err := mongoClient.FindOneAndUpdateAs(CollectionCoupon, bson.M{
 			"_id": roundObj,
 		}, bson.M{
 			"$push": bson.M{"used": key},
-		}, &coupon, options.FindOneAndUpdate().SetProjection(bson.M{"effect": 1, "expire": 1})); err != nil {
+		}, &coupon, options.FindOneAndUpdate().SetProjection(bson.M{"effect": 1})); err != nil {
 			logger.Println(err)
 			w.WriteHeader(http.StatusInternalServerError)
 			return
 		}
 	}
 
-	if coupon.Expire < time.Now().Unix() {
-		// 쿠폰 만료시간 경과
-		w.WriteHeader(http.StatusInternalServerError)
-		return
-	}
-
 	if len(coupon.Effect) == 0 {
 		// 쿠폰이 없네?
 		w.WriteHeader(http.StatusBadRequest)
@@ -386,22 +369,3 @@ func useCoupon(mongoClient gocommon.MongoClient, w http.ResponseWriter, r *http.
 
 	w.Write([]byte(coupon.Effect))
 }
-
-func deleteCoupon(mongoClient gocommon.MongoClient, w http.ResponseWriter, r *http.Request) {
-	code, _ := gocommon.ReadStringFormValue(r.Form, "name")
-	if len(code) == 0 {
-		logger.Println("coupon delete code error")
-		w.WriteHeader(http.StatusBadRequest)
-		return
-	}
-
-	_, err := mongoClient.Delete(CollectionCoupon, bson.M{
-		"name": code,
-	})
-
-	if err != nil {
-		logger.Println("coupon delete error")
-		w.WriteHeader(http.StatusBadRequest)
-		return
-	}
-}

core/api_test.go

@@ -1,39 +1,9 @@
 package core
 
 import (
-	"context"
-	"fmt"
 	"testing"
-	"time"
-
-	"go.mongodb.org/mongo-driver/bson"
-	"go.mongodb.org/mongo-driver/bson/primitive"
-	"go.mongodb.org/mongo-driver/mongo/options"
-	"repositories.action2quare.com/ayo/gocommon"
 )
 
 func TestMakeLocalUniqueId(t *testing.T) {
-	ts := int64(1690815600)
-	start := primitive.NewDateTimeFromTime(time.Unix(ts, 0))
-	ts = int64(1693493999)
-	end := primitive.NewDateTimeFromTime(time.Unix(ts, 0))
 
-	fmt.Println(start.Time().Format(time.RFC3339))
-	fmt.Println(end.Time().Format(time.RFC3339))
-
-	mongoClient, err := gocommon.NewMongoClient(context.Background(), "mongodb://121.134.91.160:27018/mountain-maingate?replicaSet=rs0&retrywrites=true", "maingate")
-	if err != nil {
-		t.Error(err)
-	}
-
-	bi := blockinfo{
-		Start:  start,
-		End:    end,
-		Reason: "test",
-	}
-	mongoClient.Update(CollectionBlock, bson.M{
-		"_id": primitive.NewObjectID(),
-	}, bson.M{
-		"$set": &bi,
-	}, options.Update().SetUpsert(true))
 }

core/maingate.go

@@ -9,11 +9,9 @@ import (
 	"fmt"
 	"io"
 	"math/big"
-	"math/rand"
 	"net"
 	"net/http"
 	"os"
-	"runtime/debug"
 	"strings"
 	"sync/atomic"
 	"text/template"
@@ -23,6 +21,7 @@ import (
 	"repositories.action2quare.com/ayo/gocommon"
 	"repositories.action2quare.com/ayo/gocommon/flagx"
 	"repositories.action2quare.com/ayo/gocommon/logger"
+	"repositories.action2quare.com/ayo/gocommon/session"
 
 	"github.com/golang-jwt/jwt"
 	"go.mongodb.org/mongo-driver/bson"
@@ -40,7 +39,6 @@ var noauth = flagx.Bool("noauth", false, "")
 
 var (
 	CollectionLink               = gocommon.CollectionName("link")
-	CollectionAuth               = gocommon.CollectionName("auth")
 	CollectionWhitelist          = gocommon.CollectionName("whitelist")
 	CollectionService            = gocommon.CollectionName("service")
 	CollectionAccount            = gocommon.CollectionName("account")
@@ -74,58 +72,10 @@ func SessionTTL() time.Duration {
 	return sessionTTL
 }
 
-type mongoAuthCell struct {
-	src *gocommon.Authinfo
-}
-
-func (ac *mongoAuthCell) ToAuthinfo() *gocommon.Authinfo {
-	if ac.src == nil {
-		logger.Error("mongoAuthCell ToAuthinfo failed. ac.src is nil")
-	}
-	return ac.src
-}
-
-func (ac *mongoAuthCell) ToBytes() []byte {
-	bt, _ := json.Marshal(ac.src)
-	return bt
-}
-
-func makeAuthCollection(mongoClient gocommon.MongoClient, sessionTTL time.Duration) *gocommon.AuthCollection {
-	authcoll := gocommon.MakeAuthCollection(sessionTTL)
-	authcoll.SessionRemoved = func(sk string) {
-		skid, _ := primitive.ObjectIDFromHex(sk)
-		mongoClient.Delete(CollectionAuth, bson.M{
-			"sk": skid,
-		})
-	}
-	authcoll.QuerySession = func(sk string, token string) gocommon.AuthinfoCell {
-		skid, _ := primitive.ObjectIDFromHex(sk)
-		var outcell mongoAuthCell
-		err := mongoClient.FindOneAs(CollectionAuth, bson.M{
-			"sk": skid,
-		}, &outcell.src, options.FindOne().SetHint("skonly"))
-
-		if err != nil {
-			logger.Error("QuerySession failed :", err)
-			return nil
-		}
-
-		if outcell.src == nil {
-			return nil
-		}
-
-		return &outcell
-	}
-
-	return authcoll
-}
-
 type maingateConfig struct {
+	session.SessionConfig          `json:",inline"`
 	Mongo                          string `json:"maingate_mongodb_url"`
-	SessionTTL                     int64  `json:"maingate_session_ttl"`
-	ApiToken                       string `json:"maingate_api_token"`
 	Autologin_ttl                  int64  `json:"autologin_ttl"`
-	AccDelTTL                      int64  `json:"acc_del_ttl"`
 	MaximumNumLinkAccount          int64  `json:"maximum_num_link_account"`
 	RedirectBaseUrl                string `json:"redirect_base_url"`
 	GoogleClientId                 string `json:"google_client_id"`
@@ -181,7 +131,7 @@ type Maingate struct {
 
 	mongoClient gocommon.MongoClient
 
-	auths *gocommon.AuthCollection
+	sessionProvider session.Provider
 	//services               servicelist
 	serviceptr unsafe.Pointer
 	admins     unsafe.Pointer
@@ -208,6 +158,10 @@ func New(ctx context.Context) (*Maingate, error) {
 		admins.parse()
 	}
 
+	if len(config.SessionStorage) == 0 {
+		return nil, errors.New("maingate_session_storage is missing")
+	}
+
 	if config.SessionTTL == 0 {
 		config.SessionTTL = 3600
 	}
@@ -302,110 +256,96 @@ func (mg *Maingate) discoverOpenIdConfiguration(name string, url string) error {
 
 }
 
-func makeErrorWithStack(err error) error {
-	return fmt.Errorf("%s\n%s", err.Error(), string(debug.Stack()))
-}
-
 func (mg *Maingate) prepare(context context.Context) (err error) {
 	if err := mg.discoverOpenIdConfiguration(AuthPlatformMicrosoft, "https://login.microsoftonline.com/common/v2.0/.well-known/openid-configuration"); err != nil {
-		return makeErrorWithStack(err)
+		return logger.ErrorWithCallStack(err)
 	}
 	if err := mg.discoverOpenIdConfiguration("google", "https://accounts.google.com/.well-known/openid-configuration"); err != nil {
-		return makeErrorWithStack(err)
+		return logger.ErrorWithCallStack(err)
 	}
 
 	// redis에서 env를 가져온 후에
-	mg.mongoClient, err = gocommon.NewMongoClient(context, mg.Mongo, "maingate")
+	mg.mongoClient, err = gocommon.NewMongoClient(context, mg.Mongo)
 	if err != nil {
-		return makeErrorWithStack(err)
+		return logger.ErrorWithCallStack(err)
 	}
 
 	if err = mg.mongoClient.MakeUniqueIndices(CollectionCouponUse, map[string]bson.D{
 		"idrounds": {{Key: "_id", Value: 1}, {Key: "rounds", Value: 1}},
 	}); err != nil {
-		return err
+		return logger.ErrorWithCallStack(err)
-	}
-
-	if err = mg.mongoClient.MakeUniqueIndices(CollectionAuth, map[string]bson.D{
-		"skonly": {{Key: "sk", Value: 1}},
-	}); err != nil {
-		return makeErrorWithStack(err)
 	}
 
 	if err = mg.mongoClient.MakeUniqueIndices(CollectionLink, map[string]bson.D{
 		"platformuid": {{Key: "platform", Value: 1}, {Key: "uid", Value: 1}},
 	}); err != nil {
-		return makeErrorWithStack(err)
+		return logger.ErrorWithCallStack(err)
 	}
 
 	if err = mg.mongoClient.MakeUniqueIndices(CollectionLink, map[string]bson.D{
 		"emailplatform": {{Key: "email", Value: 1}, {Key: "platform", Value: 1}},
 	}); err != nil {
-		return makeErrorWithStack(err)
+		return logger.ErrorWithCallStack(err)
 	}
 
 	if err = mg.mongoClient.MakeIndices(CollectionAccount, map[string]bson.D{
 		"accid": {{Key: "accid", Value: 1}},
 	}); err != nil {
-		return makeErrorWithStack(err)
+		return logger.ErrorWithCallStack(err)
 	}
 
 	if err = mg.mongoClient.MakeUniqueIndices(CollectionFile, map[string]bson.D{
 		"keyonly": {{Key: "key", Value: 1}},
 	}); err != nil {
-		return makeErrorWithStack(err)
+		return logger.ErrorWithCallStack(err)
-	}
-
-	if err = mg.mongoClient.MakeExpireIndex(CollectionAccount, int32(mg.AccDelTTL)); err != nil {
-		return makeErrorWithStack(err)
-	}
-
-	if err = mg.mongoClient.MakeExpireIndex(CollectionLink, int32(mg.AccDelTTL)); err != nil {
-		return makeErrorWithStack(err)
 	}
 
 	// Delete대신 _ts로 expire시킴. pipeline에 삭제 알려주기 위함
 	if err = mg.mongoClient.MakeExpireIndex(CollectionWhitelist, 10); err != nil {
-		return makeErrorWithStack(err)
+		return logger.ErrorWithCallStack(err)
 	}
 
-	if err = mg.mongoClient.MakeExpireIndex(CollectionAuth, int32(mg.SessionTTL+300)); err != nil {
+	if *devflag {
-		return makeErrorWithStack(err)
+		// 에러 체크하지 말것
+		mg.mongoClient.DropIndex(CollectionBlock, "codeaccid")
 	}
 
 	if err = mg.mongoClient.MakeExpireIndex(CollectionBlock, int32(3)); err != nil {
-		return makeErrorWithStack(err)
+		return logger.ErrorWithCallStack(err)
 	}
 
 	if err = mg.mongoClient.MakeUniqueIndices(CollectionPlatformLoginToken, map[string]bson.D{
 		"platformauthtoken": {{Key: "platform", Value: 1}, {Key: "key", Value: 1}},
 	}); err != nil {
-		return makeErrorWithStack(err)
+		return logger.ErrorWithCallStack(err)
 	}
 
 	if err = mg.mongoClient.MakeExpireIndex(CollectionPlatformLoginToken, int32(mg.SessionTTL+300)); err != nil {
-		return makeErrorWithStack(err)
+		return logger.ErrorWithCallStack(err)
 	}
 
 	if err = mg.mongoClient.MakeUniqueIndices(CollectionUserToken, map[string]bson.D{
 		"platformusertoken": {{Key: "platform", Value: 1}, {Key: "userid", Value: 1}},
 	}); err != nil {
-		return makeErrorWithStack(err)
+		return logger.ErrorWithCallStack(err)
 	}
 
 	if err = mg.mongoClient.MakeUniqueIndices(CollectionGamepotUserInfo, map[string]bson.D{
 		"gamepotuserid": {{Key: "gamepotuserid", Value: 1}},
 	}); err != nil {
-		return makeErrorWithStack(err)
+		return logger.ErrorWithCallStack(err)
 	}
 
 	if err = mg.mongoClient.MakeUniqueIndices(CollectionFirebaseUserInfo, map[string]bson.D{
 		"firebaseuserid": {{Key: "firebaseuserid", Value: 1}},
 	}); err != nil {
-		return makeErrorWithStack(err)
+		return logger.ErrorWithCallStack(err)
 	}
 
-	mg.auths = makeAuthCollection(mg.mongoClient, time.Duration(mg.SessionTTL*int64(time.Second)))
+	mg.sessionProvider, err = session.NewProviderWithConfig(context, mg.SessionConfig)
+	if err != nil {
+		return logger.ErrorWithCallStack(err)
+	}
 
 	var preall []struct {
 		Link string             `bson:"link"`
@@ -414,7 +354,7 @@ func (mg *Maingate) prepare(context context.Context) (err error) {
 	if err = mg.mongoClient.FindAllAs(CollectionFile, nil, &preall, options.Find().SetProjection(bson.M{
 		"link": 1,
 	})); err != nil {
-		return makeErrorWithStack(err)
+		return logger.ErrorWithCallStack(err)
 	}
 
 	for _, pre := range preall {
@@ -429,27 +369,28 @@ func (mg *Maingate) prepare(context context.Context) (err error) {
 			"_id": pre.Id,
 		}, &fulldoc)
 		if err != nil {
-			return makeErrorWithStack(err)
+			return logger.ErrorWithCallStack(err)
 		}
 		err = fulldoc.Save()
 		if err != nil {
-			return makeErrorWithStack(err)
+			return logger.ErrorWithCallStack(err)
 		}
 	}
 
 	var whites []*whitelistmember
 	if err := mg.mongoClient.AllAs(CollectionWhitelist, &whites, options.Find().SetReturnKey(false)); err != nil {
-		return makeErrorWithStack(err)
+		return logger.ErrorWithCallStack(err)
 	}
 	mg.wl.init(whites)
 
 	var blocks []*blockinfo
 	if err := mg.mongoClient.AllAs(CollectionBlock, &blocks); err != nil {
-		return makeErrorWithStack(err)
+		return logger.ErrorWithCallStack(err)
 	}
+
+	logger.Println("allblocks :", blocks)
 	mg.bl.init(blocks)
 
-	go watchAuthCollection(context, mg.auths, mg.mongoClient)
 	go mg.wl.watchCollection(context, CollectionWhitelist, mg.mongoClient)
 	go mg.bl.watchCollection(context, CollectionBlock, mg.mongoClient)
 
@@ -459,7 +400,7 @@ func (mg *Maingate) prepare(context context.Context) (err error) {
 func (mg *Maingate) RegisterHandlers(ctx context.Context, serveMux *http.ServeMux, prefix string) error {
 	var allServices []*serviceDescription
 	if err := mg.mongoClient.AllAs(CollectionService, &allServices, options.Find().SetReturnKey(false)); err != nil {
-		return err
+		return logger.ErrorWithCallStack(err)
 	}
 
 	if len(allServices) > 0 {
@@ -478,7 +419,7 @@ func (mg *Maingate) RegisterHandlers(ctx context.Context, serveMux *http.ServeMu
 			host, _ := os.Hostname()
 			addrs, err := net.InterfaceAddrs()
 			if err != nil {
-				return err
+				return logger.ErrorWithCallStack(err)
 			}
 			ipaddr := "127.0.0.1"
 			for _, addr := range addrs {
@@ -494,7 +435,6 @@ func (mg *Maingate) RegisterHandlers(ctx context.Context, serveMux *http.ServeMu
 					DivisionForUser: DivisionForUser{
 						Priority: 0,
 						State:    DivisionState_FullOpen,
-						LockCreateChar: false,
 					},
 
 					Url: fmt.Sprintf("http://%s/warehouse", ipaddr),
@@ -511,7 +451,7 @@ func (mg *Maingate) RegisterHandlers(ctx context.Context, serveMux *http.ServeMu
 		}, options.Update().SetUpsert(true))
 
 		if err != nil {
-			return err
+			return logger.ErrorWithCallStack(err)
 		}
 	}
 
@@ -520,12 +460,11 @@ func (mg *Maingate) RegisterHandlers(ctx context.Context, serveMux *http.ServeMu
 		mg.service().serveHTTP(w, r)
 	})
 	serveMux.HandleFunc(gocommon.MakeHttpHandlerPattern(prefix, "api/"), mg.api)
-	serveMux.HandleFunc(gocommon.MakeHttpHandlerPattern(prefix, "query/"), mg.query)
 
 	configraw, _ := json.Marshal(mg.maingateConfig)
 	var convertedConfig map[string]any
 	if err := json.Unmarshal(configraw, &convertedConfig); err != nil {
-		return err
+		return logger.ErrorWithCallStack(err)
 	}
 
 	serveMux.HandleFunc(gocommon.MakeHttpHandlerPattern(prefix, "config"), func(w http.ResponseWriter, r *http.Request) {
@@ -558,7 +497,7 @@ func (mg *Maingate) RegisterHandlers(ctx context.Context, serveMux *http.ServeMu
 
 	if err := os.MkdirAll("static", os.ModePerm); err != nil {
 		// 일반 엔드유저한테 오픈할 static 페이지
-		return err
+		return logger.ErrorWithCallStack(err)
 	}
 
 	cfsx := http.FileServer(http.Dir("console"))
@@ -609,59 +548,11 @@ func (mg *Maingate) RegisterHandlers(ctx context.Context, serveMux *http.ServeMu
 	return nil
 }
 
-func (mg *Maingate) query(w http.ResponseWriter, r *http.Request) {
-	defer func() {
-		s := recover()
-		if s != nil {
-			logger.Error(s)
-		}
-	}()
-
-	defer func() {
-		io.Copy(io.Discard, r.Body)
-		r.Body.Close()
-	}()
-
-	queryvals := r.URL.Query()
-	sk := queryvals.Get("sk")
-
-	if len(sk) == 0 {
-		w.WriteHeader(http.StatusUnauthorized)
-		return
-	}
-
-	info := mg.auths.Find(sk)
-	if info == nil {
-		logger.Println("session key is not valid :", sk)
-		w.WriteHeader(http.StatusUnauthorized)
-		return
-	}
-
-	if !*devflag {
-		apitoken := r.Header.Get("MG-X-API-TOKEN")
-		if len(apitoken) == 0 {
-			logger.Println("MG-X-API-TOKEN is missing")
-			w.WriteHeader(http.StatusBadRequest)
-			return
-		}
-
-		apitokenObj, _ := primitive.ObjectIDFromHex(apitoken)
-		if !mg.service().isValidToken(apitokenObj) {
-			logger.Println("MG-X-API-TOKEN is invalid :", apitoken)
-			w.WriteHeader(http.StatusBadRequest)
-			return
-		}
-	}
-
-	bt, _ := json.Marshal(info)
-	w.Write(bt)
-}
-
 func (mg *Maingate) GeneratePlatformLoginNonceKey() string {
 	const allowed = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
 	b := make([]byte, 52)
 	for i := range b {
-		b[i] = allowed[rand.Intn(len(allowed))]
+		b[i] = allowed[r.Intn(len(allowed))]
 	}
 	return string(b)
 }
@@ -675,7 +566,7 @@ func (mg *Maingate) GetUserBrowserInfo(r *http.Request) (string, error) {
 
 	cookie, err := r.Cookie("ActionSquareSessionExtraInfo")
 	if err != nil {
-		return "", err
+		return "", logger.ErrorWithCallStack(err)
 	}
 
 	//requestinfo := fmt.Sprintf("%s_%s", cookie.Value, host) //-- RemoteAddr체크는 로드밸런서 IP 찍히는 문제 때문에 제외한다.
@@ -697,7 +588,7 @@ func (mg *Maingate) setUserToken(info usertokeninfo) error {
 			"accesstoken_expire_time": info.accesstoken_expire_time,
 		},
 	}, options.Update().SetUpsert(true))
-	return err
+	return logger.ErrorWithCallStack(err)
 }
 
 func (mg *Maingate) getUserTokenWithCheck(platform string, userid string, brinfo string) (usertokeninfo, error) {
@@ -811,19 +702,14 @@ func (mg *Maingate) getProviderInfo(platform string, uid string) (string, string
 		if provider == "" || providerid == "" {
 			return "", "", errors.New("getProviderInfo - firebase info not found: " + provider + " / " + providerid)
 		}
-	case "":
-		//guest auth
-		providerid = uid
-		if providerid == "" {
-			return "", "", errors.New("getProviderInfo - guest provider id not found: " + provider + " / " + providerid)
-		}
 	default:
 		provider = platform
 		providerid = uid
+	}
+
 	if provider == "" || providerid == "" {
 		return "", "", errors.New("getProviderInfo - provider info not found: " + provider + " / " + providerid)
 	}
-	}
 
 	return provider, providerid, nil
 
@@ -986,15 +872,6 @@ func JWTparseCode(keyurl string, code string) (string, string, string) {
 	return claims["sub"].(string), email, nonce
 }
 
-func (mg *Maingate) google_analytics_html(w http.ResponseWriter, r *http.Request) {
-	parsedTemplate, _ := template.ParseFiles("template/track-event.html")
-	err := parsedTemplate.Execute(w, nil)
-	if err != nil {
-		logger.Error("Error executing template :", err)
-		return
-	}
-}
-
 func (mg *Maingate) google_analytics_js(w http.ResponseWriter, r *http.Request) {
 	fgaconfig := Firebase_Google_Analytics_JS_SDK_Config{
 		FGA_apiKey:            mg.FGA_apiKey,

core/member_container.go

@@ -95,7 +95,7 @@ func (p *memberContainerPtr[K, T]) contains(key K, out *T) bool {
 			return false
 		}
 		if out != nil {
-			*out = found
+			out = &found
 		}
 		return true
 	}

core/service.go

@@ -1,6 +1,7 @@
 package core
 
 import (
+	"context"
 	"encoding/hex"
 	"encoding/json"
 	"errors"
@@ -13,6 +14,7 @@ import (
 
 	"repositories.action2quare.com/ayo/gocommon"
 	"repositories.action2quare.com/ayo/gocommon/logger"
+	"repositories.action2quare.com/ayo/gocommon/session"
 
 	"go.mongodb.org/mongo-driver/bson"
 	"go.mongodb.org/mongo-driver/bson/primitive"
@@ -22,19 +24,12 @@ import (
 type blockinfo struct {
 	Start primitive.DateTime `bson:"start" json:"start"`
 	End   primitive.DateTime `bson:"_ts" json:"_ts"`
-	Reason string             `bson:"reason" json:"reason"`
 	Accid primitive.ObjectID `bson:"_id,omitempty" json:"_id,omitempty"`
-}
+	Meta  primitive.M        `bson:"meta,omitempty" json:"meta,omitempty"`
-
-type blockinfoWithStringId struct {
-	Reason    string `bson:"reason" json:"reason"`
-	StrId     string `bson:"id" json:"id"`
-	StartUnix int64  `bson:"start_unix" json:"start_unix"`
-	EndUnix   int64  `bson:"end_unix" json:"end_unix"`
 }
 
 type whitelistmember struct {
-	Id        primitive.ObjectID `bson:"_id,omitempty" json:"_id,omitempty"`
+	Id        primitive.ObjectID `bson:"_id" json:"_id"`
 	Email     string             `bson:"email" json:"email"`
 	Platform  string             `bson:"platform" json:"platform"`
 	Desc      string             `bson:"desc" json:"desc"`
@@ -90,7 +85,6 @@ type Maintenance struct {
 type DivisionForUser struct {
 	Priority    int               `bson:"priority" json:"priority"`
 	State       DivisionStateName `bson:"state" json:"state"`
-	LockCreateChar bool              `bson:"lockcreatechar" json:"lockcreatechar"`
 	Maintenance *Maintenance      `bson:"maintenance,omitempty" json:"maintenance,omitempty"`
 }
 
@@ -111,7 +105,7 @@ type serviceDescription struct {
 	MaximumNumLinkAccount     int64
 	VersionSplits             map[string]string `bson:"version_splits" json:"version_splits"`
 
-	auths       *gocommon.AuthCollection
+	sessionProvider session.Provider
 	wl              *memberContainerPtr[string, *whitelistmember]
 	bl              *memberContainerPtr[primitive.ObjectID, *blockinfo]
 	mongoClient     gocommon.MongoClient
@@ -162,6 +156,7 @@ func (sh *serviceDescription) readProfile(authtype string, id string, binfo stri
 	if err != nil {
 		return "", err
 	}
+
 	if len(userinfo.token) == 0 {
 		return "", errors.New("refreshtoken token not found")
 	}
@@ -253,7 +248,7 @@ func (sh *serviceDescription) prepare(mg *Maingate) error {
 
 	sh.MaximumNumLinkAccount = mg.maingateConfig.MaximumNumLinkAccount
 	sh.mongoClient = mg.mongoClient
-	sh.auths = mg.auths
+	sh.sessionProvider = mg.sessionProvider
 	sh.sessionTTL = time.Duration(mg.SessionTTL * int64(time.Second))
 	sh.serviceCodeBytes, _ = hex.DecodeString(sh.ServiceCode)
 	sh.getUserBrowserInfo = mg.GetUserBrowserInfo
@@ -292,11 +287,10 @@ func (sh *serviceDescription) link(w http.ResponseWriter, r *http.Request) {
 	newType := queryvals.Get("ntype")
 	newId := queryvals.Get("nid")
 
-	oldAuth := sh.auths.Find(sk)
+	oldAuth, err := sh.sessionProvider.Query(sk)
-	if oldAuth == nil {
+	if err != nil {
-		// 잘못된 세션
+		logger.Println("sessionProvider.Query return err :", err)
-		logger.Println("link failed. session key is not valid :", sk)
+		w.WriteHeader(http.StatusInternalServerError)
-		w.WriteHeader(http.StatusBadRequest)
 		return
 	}
 
@@ -311,6 +305,13 @@ func (sh *serviceDescription) link(w http.ResponseWriter, r *http.Request) {
 	// fmt.Println(oldAuth.Uid)
 	// fmt.Println("=================")
 
+	//if oldAuth.Token != oldToken || oldAuth.Uid != oldId || oldAuth.Platform != oldType {
+	if oldAuth.Uid != oldId || oldAuth.Platform != oldType {
+		logger.Println("link failed. session key is not correct :", oldAuth, queryvals)
+		w.WriteHeader(http.StatusBadRequest)
+		return
+	}
+
 	bfinfo, err := sh.getUserBrowserInfo(r)
 	if err != nil {
 		logger.Error("getUserBrowserInfo failed :", err)
@@ -318,35 +319,16 @@ func (sh *serviceDescription) link(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	guestlink := (len(oldType) == 0)
-	if !guestlink {
 	_, err = sh.readProfile(oldType, oldId, bfinfo)
 	if err != nil {
-			logger.Println("readProfile(old) failed :", err)
+		logger.Error("readProfile(old) failed :", err)
-			w.WriteHeader(http.StatusBadRequest)
-			return
-		}
-	} else {
-		logger.Println("from guest acc to real acc link : ", oldId, bfinfo, newType, newId, bfinfo)
-	}
-
-	oldType, oldId, err = sh.getProviderInfo(oldType, oldId)
-	if err != nil {
-		logger.Println("getProviderInfo failed :", err)
-		w.WriteHeader(http.StatusBadRequest)
-		return
-	}
-
-	//if oldAuth.Token != oldToken || oldAuth.Uid != oldId || oldAuth.Platform != oldType {
-	if oldAuth.Uid != oldId || oldAuth.Platform != oldType {
-		logger.Println("link failed. session key is not correct :", *oldAuth, queryvals)
 		w.WriteHeader(http.StatusBadRequest)
 		return
 	}
 
 	email, err := sh.readProfile(newType, newId, bfinfo)
 	if err != nil {
-		logger.Println("readProfile(new) failed :", err)
+		logger.Error("readProfile(new) failed :", err)
 		w.WriteHeader(http.StatusBadRequest)
 		return
 	}
@@ -359,9 +341,8 @@ func (sh *serviceDescription) link(w http.ResponseWriter, r *http.Request) {
 
 	newType, newId, err = sh.getProviderInfo(newType, newId)
 	if err != nil {
-		logger.Println("getProviderInfo failed :", err)
+		logger.Error("getProviderInfo failed :", err)
 		w.WriteHeader(http.StatusBadRequest)
-		return
 	}
 
 	createtime := primitive.NewDateTimeFromTime(time.Now().UTC())
@@ -384,13 +365,13 @@ func (sh *serviceDescription) link(w http.ResponseWriter, r *http.Request) {
 		"_id": link["_id"].(primitive.ObjectID),
 	}, bson.M{
 		"$setOnInsert": bson.M{
-			"accid":  oldAuth.Accid,
+			"accid":  oldAuth.Account,
 			"create": createtime,
 		},
 	}, options.Update().SetUpsert(true))
 	if err != nil {
 		logger.Error("link failed. Update ServiceName err :", err)
-		w.WriteHeader(http.StatusInternalServerError)
+		w.WriteHeader(http.StatusBadRequest)
 		return
 	}
 
@@ -402,20 +383,6 @@ func (sh *serviceDescription) link(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	if guestlink {
-		//기존 게스트 링크 삭제
-		link, err = sh.mongoClient.FindOneAndDelete(CollectionLink, bson.M{
-			"platform": oldType,
-			"uid":      oldId,
-		}, options.FindOneAndDelete().SetProjection(bson.M{"_id": 1}))
-
-		if err == nil {
-			sh.mongoClient.Delete(CollectionAccount, bson.M{
-				"_id": link["_id"].(primitive.ObjectID),
-			})
-		}
-	}
-
 	logger.Println("link success :", r.URL.Query())
 }
 
@@ -437,13 +404,11 @@ func (sh *serviceDescription) unlink(w http.ResponseWriter, r *http.Request) {
 	sType := queryvals.Get("stype")
 	sId := queryvals.Get("sid")
 	sk := queryvals.Get("sk")
-	targetType := queryvals.Get("ttype")
 
-	authInfo := sh.auths.Find(sk)
+	authInfo, err := sh.sessionProvider.Query(sk)
-	if authInfo == nil {
+	if err != nil {
-		// 잘못된 세션
+		logger.Println("sessionProvider.Query return err :", err)
-		logger.Println("linkinfo failed. session key is not valid :", sk)
+		w.WriteHeader(http.StatusInternalServerError)
-		w.WriteHeader(http.StatusBadRequest)
 		return
 	}
 
@@ -455,60 +420,55 @@ func (sh *serviceDescription) unlink(w http.ResponseWriter, r *http.Request) {
 	// fmt.Println(authInfo.Uid)
 	// fmt.Println("=================")
 
-	sType, sId, err := sh.getProviderInfo(sType, sId)
-	if err != nil {
-		logger.Println("getProviderInfo failed :", err)
-		w.WriteHeader(http.StatusBadRequest)
-		return
-	}
-
 	if authInfo.Uid != sId || authInfo.Platform != sType {
-		logger.Println("unlink failed. session key is not correct :", *authInfo, queryvals)
+		logger.Println("unlink failed. session key is not correct :", authInfo, queryvals)
 		w.WriteHeader(http.StatusBadRequest)
 		return
 	}
 
-	accDocs, err := sh.mongoClient.FindAll(CollectionAccount, bson.M{
+	numRecord, err := sh.mongoClient.Collection(CollectionAccount).CountDocuments(context.Background(), bson.M{
-		"accid": authInfo.Accid,
+		"accid": authInfo.Account,
-	}, options.Find().SetProjection(bson.M{
+	}, options.Count().SetLimit(2))
-		"_id": 1,
-	}))
 
 	if err != nil {
 		logger.Error("unlink failed, fail to count accounts :", err)
-		w.WriteHeader(http.StatusInternalServerError)
+		w.WriteHeader(http.StatusBadRequest)
 	}
 
-	if len(accDocs) <= 1 {
+	if numRecord <= 1 {
 		logger.Println("unlink failed. At least one link must be maintained. :", r.URL.Query())
 		w.WriteHeader(http.StatusBadRequest)
 		return
 	}
 
-	var ids primitive.A
+	sType, sId, err = sh.getProviderInfo(sType, sId)
-	for _, accDoc := range accDocs {
+	if err != nil {
-		ids = append(ids, accDoc["_id"].(primitive.ObjectID))
+		logger.Error("getProviderInfo failed :", err)
+		w.WriteHeader(http.StatusBadRequest)
 	}
 
-	link, err := sh.mongoClient.FindOneAndDelete(CollectionLink, bson.M{
+	link, err := sh.mongoClient.FindOne(CollectionLink, bson.M{
-		"platform": targetType,
+		"platform": sType,
-		"_id":      bson.M{"$in": ids},
+		"uid":      sId,
-	}, options.FindOneAndDelete().SetProjection(bson.M{"_id": 1}))
+	}, options.FindOne().SetProjection(bson.M{"_id": 1}))
 	if err != nil {
-		logger.Error("unlink failed. FindOneAndDelete link err:", err)
+		logger.Error("link failed. FindOneAndUpdate link err:", err)
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}
 
-	preid, err := sh.mongoClient.FindOneAndDelete(CollectionAccount, bson.M{
+	newid, err := sh.mongoClient.FindOneAndDelete(CollectionAccount, bson.M{
 		"_id": link["_id"].(primitive.ObjectID),
 	}, options.FindOneAndDelete().SetProjection(bson.M{"_id": 1}))
 	if err != nil {
 		logger.Error("unlink failed. Delete ServiceName err :", err)
-		w.WriteHeader(http.StatusInternalServerError)
+		w.WriteHeader(http.StatusBadRequest)
 		return
 	}
-	if preid == nil {
+
+	// newid가 있어야 한다. 그래야 기존 서비스 계정이 없는 상태이다.
+	if newid == nil {
+		// 이미 계정이 있네?
 		logger.Println("unlink failed. service account not found:", r.URL.Query())
 		w.WriteHeader(http.StatusBadRequest)
 		return
@@ -536,11 +496,10 @@ func (sh *serviceDescription) linkinfo(w http.ResponseWriter, r *http.Request) {
 	sId := queryvals.Get("sid")
 	sk := queryvals.Get("sk")
 
-	authInfo := sh.auths.Find(sk)
+	authInfo, err := sh.sessionProvider.Query(sk)
-	if authInfo == nil {
+	if err != nil {
-		// 잘못된 세션
+		logger.Println("sessionProvider.Query return err :", err)
-		logger.Println("linkinfo failed. session key is not valid :", sk)
+		w.WriteHeader(http.StatusInternalServerError)
-		w.WriteHeader(http.StatusBadRequest)
 		return
 	}
 
@@ -552,104 +511,25 @@ func (sh *serviceDescription) linkinfo(w http.ResponseWriter, r *http.Request) {
 	// fmt.Println(authInfo.Uid)
 	// fmt.Println("=================")
 
-	sType, sId, err := sh.getProviderInfo(sType, sId)
-	if err != nil {
-		logger.Println("getProviderInfo failed :", err)
-		w.WriteHeader(http.StatusBadRequest)
-		return
-	}
-
 	//if oldAuth.Token != oldToken || oldAuth.Uid != oldId || oldAuth.Platform != oldType {
 	if authInfo.Uid != sId || authInfo.Platform != sType {
-		logger.Println("linkinfo failed. session key is not correct :", *authInfo, queryvals)
+		logger.Println("linkinfo failed. session key is not correct :", authInfo, queryvals)
 		w.WriteHeader(http.StatusBadRequest)
 		return
 	}
 
-	platformName := "platform"
+	numRecord, err := sh.mongoClient.Collection(CollectionAccount).CountDocuments(context.Background(), bson.M{
-	accDocs, err := sh.mongoClient.FindAll(CollectionAccount, bson.M{
+		"accid": authInfo.Account,
-		"accid": authInfo.Accid,
+	}, options.Count().SetLimit(sh.MaximumNumLinkAccount))
-	}, options.Find().SetLimit(sh.MaximumNumLinkAccount).SetProjection(bson.M{
+
-		"_id": 1,
-	}))
 	if err != nil {
 		logger.Error("linkinfo failed. CountDocuments err :", err)
-		w.WriteHeader(http.StatusInternalServerError)
-		return
-	}
-
-	var ids primitive.A
-	for _, accDoc := range accDocs {
-		ids = append(ids, accDoc["_id"].(primitive.ObjectID))
-	}
-
-	links, err := sh.mongoClient.FindAll(CollectionLink, bson.M{
-		"_id": bson.M{"$in": ids},
-	}, options.Find().SetLimit(sh.MaximumNumLinkAccount).SetProjection(bson.M{
-		platformName: 1,
-	}))
-	if err != nil {
-		logger.Error("linkinfo failed. FindAll returns err :", err)
-		w.WriteHeader(http.StatusInternalServerError)
-		return
-	}
-
-	var linkstrs []string
-	for _, link := range links {
-		linkstrs = append(linkstrs, link[platformName].(string))
-	}
-
-	linkbytes, err := json.Marshal(linkstrs)
-	if err != nil {
-		logger.Error("linkinfo failed. json marshal fail :", err)
-		w.WriteHeader(http.StatusInternalServerError)
-		return
-	}
-
-	logger.Println("linkinfo :", linkstrs)
-	w.Write(linkbytes)
-}
-
-// == 계정 이메일 조회
-func (sh *serviceDescription) emailinfo(w http.ResponseWriter, r *http.Request) {
-	defer func() {
-		s := recover()
-		if s != nil {
-			logger.Error(s)
-		}
-	}()
-
-	if r.Method != "GET" {
 		w.WriteHeader(http.StatusBadRequest)
 		return
 	}
 
-	queryvals := r.URL.Query()
+	logger.Println("linkinfo :", numRecord)
-	sk := queryvals.Get("sk")
+	w.Write([]byte(fmt.Sprintf(`{"num_linked_account":"%d"}`, numRecord)))
-
-	authInfo := sh.auths.Find(sk)
-	if authInfo == nil {
-		logger.Println(" session key is not valid :", sk)
-		w.WriteHeader(http.StatusInternalServerError)
-		return
-	}
-
-	email := authInfo.Email
-
-	if strings.HasPrefix(email, "__dummy_") && strings.HasSuffix(email, "temp__") {
-		email = ""
-	}
-
-	if strings.HasSuffix(email, "@noauth.flag") || strings.HasSuffix(email, "@guest.flag") {
-		email = ""
-	}
-
-	// fmt.Println("=================")
-	// fmt.Println(email)
-	// fmt.Println("=================")
-	//logger.Println("Email :", email)
-
-	w.Write([]byte(fmt.Sprintf(`{"email":"%s"}`, email)))
 
 }
 
@@ -669,8 +549,26 @@ func (sh *serviceDescription) authorize(w http.ResponseWriter, r *http.Request)
 	queryvals := r.URL.Query()
 	authtype := queryvals.Get("type")
 	uid := queryvals.Get("id")
-	//accesstoken := queryvals.Get("token") //-- 이거 이제 받지마라
+	if sk := queryvals.Get("sk"); len(sk) > 0 {
-	session := queryvals.Get("sk")
+		success, err := sh.sessionProvider.Touch(sk)
+		if err != nil {
+			logger.Error("authorize failed. sessionProvider.Touch err:", err)
+			w.WriteHeader(http.StatusInternalServerError)
+			return
+		}
+
+		// !success일 때 빈 body를 보내면 클라이언트는 로그아웃 된다.
+		if success {
+			json.NewEncoder(w).Encode(map[string]any{
+				"sk":       sk,
+				"expirein": sh.sessionTTL.Seconds(),
+			})
+		} else {
+			logger.Println("sh.sessionProvider.Touch failed :", sk)
+		}
+		return
+	}
+
 	var email string
 
 	if !*noauth {
@@ -678,39 +576,41 @@ func (sh *serviceDescription) authorize(w http.ResponseWriter, r *http.Request)
 			//email, err := sh.readProfile(authtype, uid, accesstoken)
 			bfinfo, err := sh.getUserBrowserInfo(r)
 			if err != nil {
-				logger.Println("getUserBrowserInfo failed :", err)
+				logger.Error("getUserBrowserInfo failed :", err)
 				w.WriteHeader(http.StatusBadRequest)
 				return
 			}
 
 			email, err = sh.readProfile(authtype, uid, bfinfo)
 			if err != nil {
-				logger.Println("readProfile failed :", err)
+				logger.Error("readProfile failed :", err)
 				w.WriteHeader(http.StatusBadRequest)
 				return
 			}
 
 			newType, newId, err := sh.getProviderInfo(authtype, uid)
 			if err != nil {
-				logger.Println("getProviderInfo failed :", err)
+				logger.Error("getProviderInfo failed :", err)
 				w.WriteHeader(http.StatusBadRequest)
 				return
 			}
 
 			if authtype != newType || uid != newId {
-				logger.Printf("auth success ( redirect ) : %s->%s, %s->%s, %s, %s", authtype, newType, uid, newId, email, session)
 				authtype = newType
 				uid = newId
 			}
-		} else {
+		} else if *devflag {
 			email = fmt.Sprintf("%s@guest.flag", uid)
+		} else {
+			// authtype이 없으면 입장 불가
+			logger.Error("authorize failed. 'type' query parameter is missing")
+			w.WriteHeader(http.StatusBadRequest)
+			return
 		}
 	} else {
 		email = fmt.Sprintf("%s@noauth.flag", uid)
 	}
 
-	//if len(session) == 0 && len(email) > 0 {
-	if len(session) == 0 {
 	// platform + id -> account id
 	createtime := primitive.NewDateTimeFromTime(time.Now().UTC())
 	link, err := sh.mongoClient.FindOneAndUpdate(CollectionLink, bson.M{
@@ -721,15 +621,13 @@ func (sh *serviceDescription) authorize(w http.ResponseWriter, r *http.Request)
 			"create": createtime,
 			"email":  email,
 		},
-		}, options.FindOneAndUpdate().SetReturnDocument(options.After).SetUpsert(true).SetProjection(bson.M{
+	}, options.FindOneAndUpdate().SetReturnDocument(options.After).SetUpsert(true).SetProjection(bson.M{"_id": 1}))
-			"_id": 1,
-			"_ts": 1,
-		}))
 	if err != nil {
 		logger.Error("authorize failed :", err)
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}
+
 	linkid := link["_id"].(primitive.ObjectID)
 	newaccid := primitive.NewObjectID()
 	for i := 0; i < len(sh.serviceCodeBytes); i++ {
@@ -758,115 +656,33 @@ func (sh *serviceDescription) authorize(w http.ResponseWriter, r *http.Request)
 		// 블럭된 계정. 블락 정보를 알려준다.
 		w.Header().Add("MG-ACCOUNTBLOCK-START", strconv.FormatInt(bi.Start.Time().Unix(), 10))
 		w.Header().Add("MG-ACCOUNTBLOCK-END", strconv.FormatInt(bi.End.Time().Unix(), 10))
-			w.Header().Add("MG-ACCOUNTBLOCK-REASON", bi.Reason)
 		w.WriteHeader(http.StatusUnauthorized)
 		return
 	}
 
-		newsession := primitive.NewObjectID()
+	sk, err := sh.sessionProvider.New(&session.Authorization{
-		expired := primitive.NewDateTimeFromTime(time.Now().UTC().Add(sh.sessionTTL))
+		Account:  accid,
-		newauth := gocommon.Authinfo{
-			Accid:       accid,
-			ServiceCode: sh.ServiceCode,
 		Platform: authtype,
 		Uid:      uid,
 		Email:    email,
-			Sk:          newsession,
+	})
-			Expired:     expired,
-			//RefreshToken: queryvals.Get("rt"),
-		}
-
-		_, _, err = sh.mongoClient.UpsertOne(CollectionAuth, bson.M{"_id": newauth.Accid}, &newauth)
 	if err != nil {
-			logger.Error("authorize failed :", err)
+		logger.Error("authorize failed. sessionProvider.New err:", err)
 		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}
 
-		logger.Println("session created :", accid, authtype, uid, email, newsession)
-
 	output := map[string]any{
-			"sk":         newsession.Hex(),
+		"sk":         sk,
 		"expirein":   sh.sessionTTL.Seconds(),
 		"newAccount": newaccount,
-			"accid":      newauth.Accid.Hex(),
+		"accid":      accid.Hex(),
 	}
 	if *noauth {
 		output["noauth"] = true
 	}
 
-		if link["_ts"] != nil {
+	json.NewEncoder(w).Encode(output)
-			delts := link["_ts"].(primitive.DateTime)
-			if !delts.Time().IsZero() {
-				// 삭제된 계정. 삭제 되었다고 알려주자
-				w.Header().Add("MG-ACCOUNT-DELETED", "TRUE")
-			}
-		}
-		bt, _ := json.Marshal(output)
-		w.Write(bt)
-	} else if len(session) > 0 {
-		sessionobj, _ := primitive.ObjectIDFromHex(session)
-		if !sessionobj.IsZero() {
-			updated, _, err := sh.mongoClient.Update(CollectionAuth,
-				bson.M{
-					"sk": sessionobj,
-				},
-				bson.M{
-					"$currentDate": bson.M{
-						"_ts": bson.M{"$type": "date"},
-					},
-				}, options.Update().SetUpsert(false))
-			if err != nil {
-				logger.Error("update auth collection failed :", err)
-				return
-			}
-
-			if !updated {
-				// 세션이 없네?
-				logger.Println("authorize failed. session not exists in database :", session)
-				w.WriteHeader(http.StatusUnauthorized)
-				return
-			}
-
-			output := map[string]any{
-				"sk":       session,
-				"expirein": sh.sessionTTL.Seconds(),
-			}
-
-			logger.Println("session updated :", authtype, uid, session)
-
-			authInfo := sh.auths.Find(session)
-			if authInfo == nil {
-				// 잘못된 세션
-				logger.Println("authorize failed. fail to find authInfo :", session)
-				w.WriteHeader(http.StatusBadRequest)
-				return
-			}
-
-			//혹시 삭제 된 계정 아닌지 확인해본다.
-			link, err := sh.mongoClient.FindOne(CollectionLink, bson.M{
-				"platform": authtype,
-				"uid":      uid,
-			}, options.FindOne().SetProjection(bson.M{
-				"_ts": 1,
-			}))
-			if link["_ts"] != nil {
-				delts := link["_ts"].(primitive.DateTime)
-				if !delts.Time().IsZero() {
-					// 삭제된 계정. 삭제 되었다고 알려주자
-					w.Header().Add("MG-ACCOUNT-DELETED", "TRUE")
-				}
-			}
-			bt, _ := json.Marshal(output)
-			w.Write(bt)
-		} else {
-			logger.Println("authorize failed. sk is not valid hex :", session)
-			w.WriteHeader(http.StatusBadRequest)
-			return
-		}
-	} else {
-		logger.Println("authorize failed. id empty :", queryvals)
-	}
 }
 
 func (sh *serviceDescription) findVersionSplit(version string) []byte {
@@ -882,109 +698,6 @@ func (sh *serviceDescription) findVersionSplit(version string) []byte {
 	return sh.divisionsSplits["default"]
 }
 
-func (sh *serviceDescription) delacc(w http.ResponseWriter, r *http.Request) {
-	defer func() {
-		s := recover()
-		if s != nil {
-			logger.Error(s)
-		}
-	}()
-
-	if r.Method != "GET" {
-		w.WriteHeader(http.StatusBadRequest)
-		return
-	}
-
-	queryvals := r.URL.Query()
-	sType := queryvals.Get("stype")
-	sId := queryvals.Get("sid")
-	sk := queryvals.Get("sk")
-	cancel := queryvals.Has("cancel")
-
-	authInfo := sh.auths.Find(sk)
-	if authInfo == nil {
-		// 잘못된 세션
-		logger.Println("delacc failed. session key is not valid :", sk)
-		w.WriteHeader(http.StatusBadRequest)
-		return
-	}
-
-	originAuthType := sType
-	sType, sId, err := sh.getProviderInfo(sType, sId)
-	if err != nil {
-		logger.Error("delacc failed. getProviderInfo err :", err)
-		w.WriteHeader(http.StatusBadRequest)
-		return
-	}
-
-	if authInfo.Uid != sId || authInfo.Platform != sType {
-		logger.Println("delacc failed. session key is not correct :", *authInfo, queryvals)
-		w.WriteHeader(http.StatusBadRequest)
-		return
-	}
-
-	linkidMap, err := sh.mongoClient.FindAll(CollectionAccount, bson.M{
-		"accid": authInfo.Accid,
-	}, options.Find().SetProjection(bson.M{
-		"_id": 1,
-	}))
-	if err != nil {
-		logger.Error("delacc failed. FindAll account err :", err)
-		w.WriteHeader(http.StatusInternalServerError)
-		return
-	}
-
-	var linkidAry primitive.A
-	for _, linkid := range linkidMap {
-		linkidAry = append(linkidAry, linkid["_id"].(primitive.ObjectID))
-	}
-
-	delfilter := primitive.M{"_id": bson.M{"$in": linkidAry}}
-	var delop primitive.M
-	if !cancel {
-		curtime := primitive.NewDateTimeFromTime(time.Now().UTC())
-		delop = primitive.M{
-			"$set": primitive.M{"_ts": curtime},
-		}
-
-		if originAuthType == AuthPlatformFirebaseAuth {
-			sh.mongoClient.Delete(CollectionFirebaseUserInfo, bson.M{
-				"firebaseuserid": sId,
-			})
-		}
-	} else {
-		delfilter["platform"] = sType
-		targetLinkId, err := sh.mongoClient.FindAll(CollectionLink, delfilter, options.Find().SetProjection(bson.M{
-			"_id": 1,
-		}))
-		if len(targetLinkId) != 1 {
-			logger.Error("delacc failed. FindAll link err :", err)
-			w.WriteHeader(http.StatusInternalServerError)
-			return
-		}
-
-		delfilter = primitive.M{"_id": targetLinkId[0]["_id"].(primitive.ObjectID)}
-		delop = primitive.M{
-			"$unset": primitive.M{"_ts": true},
-		}
-	}
-	updated, _, err := sh.mongoClient.Update(CollectionAccount, delfilter, delop, options.Update().SetUpsert(false))
-	if !updated || err != nil {
-		logger.Error("delacc failed. Update CollectionAccount timestamp err :", err)
-		w.WriteHeader(http.StatusInternalServerError)
-		return
-	}
-
-	updated, _, err = sh.mongoClient.Update(CollectionLink, delfilter, delop, options.Update().SetUpsert(false))
-	if !updated || err != nil {
-		logger.Error("delacc failed. Update CollectionLink timestamp err :", err)
-		w.WriteHeader(http.StatusInternalServerError)
-		return
-	}
-
-	logger.Println("delacc success :", linkidMap)
-}
-
 func (sh *serviceDescription) serveHTTP(w http.ResponseWriter, r *http.Request) {
 	defer func() {
 		s := recover()
@@ -1006,10 +719,6 @@ func (sh *serviceDescription) serveHTTP(w http.ResponseWriter, r *http.Request)
 		sh.unlink(w, r)
 	} else if strings.HasSuffix(r.URL.Path, "/linkinfo") {
 		sh.linkinfo(w, r)
-	} else if strings.HasSuffix(r.URL.Path, "/emailinfo") {
-		sh.emailinfo(w, r)
-	} else if strings.HasSuffix(r.URL.Path, "/delacc") {
-		sh.delacc(w, r)
 	} else if strings.HasSuffix(r.URL.Path, "/divs") {
 		// TODO : 세션키와 authtoken을 헤더로 받아서 accid 조회
 		queryvals := r.URL.Query()
@@ -1024,7 +733,14 @@ func (sh *serviceDescription) serveHTTP(w http.ResponseWriter, r *http.Request)
 		// TODO : 각 서버에 있는 자산? 캐릭터 정보를 보여줘야 하나. 뭘 보여줄지는 프로젝트에 문의
 		// 일단 서버 종류만 내려보내자
 		// 세션키가 있는지 확인
-		if _, ok := sh.auths.IsValid(sk, ""); !ok {
+		authInfo, err := sh.sessionProvider.Query(sk)
+		if err != nil {
+			logger.Println("sessionProvider.Query return err :", err)
+			w.WriteHeader(http.StatusInternalServerError)
+			return
+		}
+
+		if authInfo.Account.IsZero() {
 			logger.Println("sessionkey is not valid :", sk)
 			w.WriteHeader(http.StatusUnauthorized)
 			return
@@ -1045,7 +761,14 @@ func (sh *serviceDescription) serveHTTP(w http.ResponseWriter, r *http.Request)
 		// TODO : 각 서버에 있는 자산? 캐릭터 정보를 보여줘야 하나. 뭘 보여줄지는 프로젝트에 문의
 		// 일단 서버 종류만 내려보내자
 		// 세션키가 있는지 확인
-		if _, ok := sh.auths.IsValid(sk, ""); !ok {
+		authInfo, err := sh.sessionProvider.Query(sk)
+		if err != nil {
+			logger.Println("sessionProvider.Query return err :", err)
+			w.WriteHeader(http.StatusInternalServerError)
+			return
+		}
+
+		if authInfo.Account.IsZero() {
 			logger.Println("sessionkey is not valid :", sk)
 			w.WriteHeader(http.StatusUnauthorized)
 			return
@@ -1061,13 +784,14 @@ func (sh *serviceDescription) serveHTTP(w http.ResponseWriter, r *http.Request)
 
 			case DivisionState_RestrictedOpen:
 				// 점검중이면 whitelist만 입장 가능
-				cell := sh.auths.QuerySession(sk, "")
+				authInfo, err := sh.sessionProvider.Query(sk)
-				if cell == nil {
+				if err != nil {
-					logger.Println("sessionkey is not valid :", sk)
+					logger.Println("sessionProvider.Query return err :", err)
-					w.WriteHeader(http.StatusBadRequest)
+					w.WriteHeader(http.StatusInternalServerError)
 					return
 				}
-				wm := &whitelistmember{Email: cell.ToAuthinfo().Email, Platform: cell.ToAuthinfo().Platform}
+
+				wm := &whitelistmember{Email: authInfo.Email, Platform: authInfo.Platform}
 				if sh.wl.contains(wm.Key(), nil) {
 					// qa 권한이면 입장 가능
 					w.Write([]byte(fmt.Sprintf(`{"service":"%s"}`, div.Url)))

core/watch.go

@@ -10,7 +10,6 @@ import (
 	"time"
 	"unsafe"
 
-	"repositories.action2quare.com/ayo/gocommon"
 	"repositories.action2quare.com/ayo/gocommon/logger"
 
 	"go.mongodb.org/mongo-driver/bson"
@@ -19,14 +18,6 @@ import (
 	"go.mongodb.org/mongo-driver/mongo/options"
 )
 
-type authPipelineDocument struct {
-	OperationType string `bson:"operationType"`
-	DocumentKey   struct {
-		Id primitive.ObjectID `bson:"_id"`
-	} `bson:"documentKey"`
-	Authinfo *gocommon.Authinfo `bson:"fullDocument"`
-}
-
 type servicePipelineDocument struct {
 	OperationType string `bson:"operationType"`
 	DocumentKey   struct {
@@ -222,87 +213,3 @@ func (mg *Maingate) watchServiceCollection(parentctx context.Context, serveMux *
 		}
 	}
 }
-
-func watchAuthCollection(parentctx context.Context, ac *gocommon.AuthCollection, mongoClient gocommon.MongoClient) {
-	defer func() {
-		s := recover()
-		if s != nil {
-			logger.Error(s)
-		}
-	}()
-
-	matchStage := bson.D{
-		{
-			Key: "$match", Value: bson.D{
-				{Key: "operationType", Value: bson.D{
-					{Key: "$in", Value: bson.A{
-						"delete",
-						"insert",
-						"update",
-					}},
-				}},
-			},
-		}}
-	projectStage := bson.D{
-		{
-			Key: "$project", Value: bson.D{
-				{Key: "documentKey", Value: 1},
-				{Key: "operationType", Value: 1},
-				{Key: "fullDocument", Value: 1},
-			},
-		},
-	}
-
-	var stream *mongo.ChangeStream
-	var err error
-	var ctx context.Context
-
-	for {
-		if stream == nil {
-			stream, err = mongoClient.Watch(CollectionAuth, mongo.Pipeline{matchStage, projectStage})
-			if err != nil {
-				logger.Error("watchAuthCollection watch failed :", err)
-				time.Sleep(time.Minute)
-				continue
-			}
-			ctx = context.TODO()
-		}
-
-		changed := stream.TryNext(ctx)
-		if ctx.Err() != nil {
-			logger.Error("watchAuthCollection stream.TryNext failed. process should be restarted! :", ctx.Err().Error())
-			break
-		}
-
-		if changed {
-			var data authPipelineDocument
-			if err := stream.Decode(&data); err == nil {
-				ot := data.OperationType
-				switch ot {
-				case "insert":
-					ac.AddRaw(&mongoAuthCell{src: data.Authinfo})
-				case "update":
-					ac.AddRaw(&mongoAuthCell{src: data.Authinfo})
-				case "delete":
-					ac.RemoveByAccId(data.DocumentKey.Id)
-				}
-			} else {
-				logger.Error("watchAuthCollection stream.Decode failed :", err)
-			}
-		} else if stream.Err() != nil || stream.ID() == 0 {
-			select {
-			case <-ctx.Done():
-				logger.Println("watchAuthCollection is done")
-				stream.Close(ctx)
-				return
-
-			case <-time.After(time.Second):
-				logger.Error("watchAuthCollection stream error :", stream.Err())
-				stream.Close(ctx)
-				stream = nil
-			}
-		} else {
-			time.Sleep(time.Second)
-		}
-	}
-}

go.mod

@@ -1,13 +1,13 @@
 module repositories.action2quare.com/ayo/maingate
 
-go 1.18
+go 1.19
 
 require (
 	firebase.google.com/go v3.13.0+incompatible
 	github.com/golang-jwt/jwt v3.2.2+incompatible
 	go.mongodb.org/mongo-driver v1.11.7
 	google.golang.org/api v0.128.0
-	repositories.action2quare.com/ayo/gocommon v0.0.0-20240205060841-c31f838ba8a9
+	repositories.action2quare.com/ayo/gocommon v0.0.0-20231128132952-e5a5240f96d8
 )
 
 require (
@@ -53,5 +53,3 @@ require (
 	google.golang.org/grpc v1.56.0 // indirect
 	google.golang.org/protobuf v1.30.0 // indirect
 )
-
-replace repositories.action2quare.com/ayo/maingate => ./

go.sum

@@ -268,7 +268,5 @@ gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
-repositories.action2quare.com/ayo/gocommon v0.0.0-20230912075917-f9a146321cdb h1:Rdf6uhBIWunRLZ2LIT1hSovYXxZoOzx9mdSK5bjWpos=
+repositories.action2quare.com/ayo/gocommon v0.0.0-20231128132952-e5a5240f96d8 h1:GbvfiscAV/gquGzC9bJ3RTNtezLcdfGOv+9JmAZYQVc=
-repositories.action2quare.com/ayo/gocommon v0.0.0-20230912075917-f9a146321cdb/go.mod h1:rn6NA28Mej+qgLNx/Bu2wsdGyIycmacqlNP6gUXX2a0=
+repositories.action2quare.com/ayo/gocommon v0.0.0-20231128132952-e5a5240f96d8/go.mod h1:XvklTTSvQX5uviivGBcZo8eIL+mV94W2e4uBBXcT5JY=
-repositories.action2quare.com/ayo/gocommon v0.0.0-20240205060841-c31f838ba8a9 h1:5cQ60XjlI7k0qld0rIpd6gy7+a9csv3ijz1EVKTzsy8=
-repositories.action2quare.com/ayo/gocommon v0.0.0-20240205060841-c31f838ba8a9/go.mod h1:rn6NA28Mej+qgLNx/Bu2wsdGyIycmacqlNP6gUXX2a0=

main.go

@@ -2,9 +2,7 @@ package main
 
 import (
 	"context"
-	"math/rand"
 	"net/http"
-	"time"
 
 	"repositories.action2quare.com/ayo/gocommon"
 	"repositories.action2quare.com/ayo/gocommon/flagx"
@@ -21,26 +19,29 @@ func main() {
 	flagx.Parse()
 
 	logger.Println("build revision =", revision)
-	rand.Seed(time.Now().UnixNano())
 
 	ctx, cancel := context.WithCancel(context.Background())
+	defer cancel()
+
 	mg, err := core.New(ctx)
 	if err != nil {
 		logger.Error("core.New failed :", err)
-		panic(err)
+		return
 	}
+	defer mg.Destructor()
 
 	serveMux := http.NewServeMux()
 	if err := mg.RegisterHandlers(ctx, serveMux, *prefix); err != nil {
 		logger.Error("RegisterHandlers failed :", err)
-		panic(err)
+		return
 	}
 
 	server := gocommon.NewHTTPServer(serveMux)
 	logger.Println("maingate is started")
+
 	if err := server.Start(); err != nil {
 		logger.Error("maingate is stopped with error :", err)
 	}
-	cancel()
+
-	mg.Destructor()
+	logger.Println("maingate is terminated")
 }

make_maingate_package.ps1

@@ -1,14 +0,0 @@
-# $ErrorActionPreference = 'SilentlyContinue'
-
-$CurBranch = git branch --show-current
-
-Remove-Item maingate.zip -Force -Recurse -ErrorAction SilentlyContinue
-
-$Env:GOOS="linux"
-$Env:GOARCH="amd64"
-go build -ldflags="-s -w" .
-
-Compress-Archive -Path maingate -Update -DestinationPath maingate.zip 
-Compress-Archive -Path *-firebase-*.json -Update -DestinationPath maingate.zip 
-Compress-Archive -Path fba -Update -DestinationPath maingate.zip 
-Compress-Archive -Path template -Update -DestinationPath maingate.zip