alamin
/
go-whatsapp-multidevice-rest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

update logic to validate and construct jid server type

pull/28/head
Dimas Restu H 4 years ago
parent
7142a8a1cc
commit
0806e9c549
11 changed files with 204 additions and 40 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      .env.default
  2. 4
      .env.development
  3. 4
      .env.production
  4. 31
      docs/docs.go
  5. 31
      docs/swagger.json
  6. 19
      docs/swagger.yaml
  7. 2
      go.mod
  8. 4
      go.sum
  9. 2
      internal/route.go
  10. 27
      internal/whatsapp/whatsapp.go
  11. 116
      pkg/whatsapp/whatsapp.go

4
.env.default
View File

@ -34,8 +34,8 @@ WHATSAPP_DATASTORE_URI=file:dbs/WhatsApp.db?_foreign_keys=on
WHATSAPP_MEDIA_IMAGE_COMPRESSION=true
WHATSAPP_MEDIA_IMAGE_CONVERT_WEBP=true
# WHATSAPP_VERSION_MAJOR=2
# WHATSAPP_VERSION_MINOR=2216
# WHATSAPP_VERSION_MAJOR=2.
# WHATSAPP_VERSION_MINOR=2220
# WHATSAPP_VERSION_PATCH=8
# -----------------------------------

4
.env.development
View File

@ -34,8 +34,8 @@ WHATSAPP_DATASTORE_URI=file:dbs/WhatsApp.db?_foreign_keys=on
WHATSAPP_MEDIA_IMAGE_COMPRESSION=true
WHATSAPP_MEDIA_IMAGE_CONVERT_WEBP=true
# WHATSAPP_VERSION_MAJOR=2
# WHATSAPP_VERSION_MINOR=2216
# WHATSAPP_VERSION_MAJOR=2.
# WHATSAPP_VERSION_MINOR=2220
# WHATSAPP_VERSION_PATCH=8
# -----------------------------------

4
.env.production
View File

@ -34,8 +34,8 @@ WHATSAPP_DATASTORE_URI=file:dbs/WhatsApp.db?_foreign_keys=on
WHATSAPP_MEDIA_IMAGE_COMPRESSION=true
WHATSAPP_MEDIA_IMAGE_CONVERT_WEBP=true
# WHATSAPP_VERSION_MAJOR=2
# WHATSAPP_VERSION_MINOR=2216
# WHATSAPP_VERSION_MAJOR=2.
# WHATSAPP_VERSION_MINOR=2220
# WHATSAPP_VERSION_PATCH=8
# -----------------------------------

31
docs/docs.go
View File

@ -120,6 +120,37 @@ const docTemplate = `{
}
}
},
"/api/v1/whatsapp/registered": {
"get": {
"security": [
{
"BearerAuth": []
}
],
"description": "Check Phone Number is Registered in WhatsApp",
"produces": [
"application/json"
],
"tags": [
"WhatsApp Authentication"
],
"summary": "Check If Phone Number is Registered in WhatsApp",
"parameters": [
{
"type": "string",
"description": "Phone Number to Check",
"name": "msisdn",
"in": "query",
"required": true
}
],
"responses": {
"200": {
"description": ""
}
}
}
},
"/api/v1/whatsapp/send/audio": {
"post": {
"security": [

31
docs/swagger.json
View File

@ -115,6 +115,37 @@
}
}
},
"/api/v1/whatsapp/registered": {
"get": {
"security": [
{
"BearerAuth": []
}
],
"description": "Check Phone Number is Registered in WhatsApp",
"produces": [
"application/json"
],
"tags": [
"WhatsApp Authentication"
],
"summary": "Check If Phone Number is Registered in WhatsApp",
"parameters": [
{
"type": "string",
"description": "Phone Number to Check",
"name": "msisdn",
"in": "query",
"required": true
}
],
"responses": {
"200": {
"description": ""
}
}
}
},
"/api/v1/whatsapp/send/audio": {
"post": {
"security": [

19
docs/swagger.yaml
View File

@ -70,6 +70,25 @@ paths:
summary: Logout Device from WhatsApp Multi-Device
tags:
- WhatsApp Authentication
/api/v1/whatsapp/registered:
get:
description: Check Phone Number is Registered in WhatsApp
parameters:
- description: Phone Number to Check
in: query
name: msisdn
required: true
type: string
produces:
- application/json
responses:
"200":
description: ""
security:
- BearerAuth: []
summary: Check If Phone Number is Registered in WhatsApp
tags:
- WhatsApp Authentication
/api/v1/whatsapp/send/audio:
post:
consumes:

2
go.mod
View File

@ -14,7 +14,7 @@ require (
github.com/sunshineplan/imgconv v1.0.5
github.com/swaggo/echo-swagger v1.3.2
github.com/swaggo/swag v1.8.1
go.mau.fi/whatsmeow v0.0.0-20220517205516-246a2007ca7f
go.mau.fi/whatsmeow v0.0.0-20220604174810-f28d984f1b9a
google.golang.org/protobuf v1.28.0
modernc.org/sqlite v1.17.0
)

4
go.sum
View File

@ -220,8 +220,8 @@ github.com/yuin/goldmark v1.4.0/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1
github.com/yuin/goldmark v1.4.1/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
go.mau.fi/libsignal v0.0.0-20220425070825-c40c839ee6a0 h1:3IQF2bgAyibdo77hTejwuJe4jlypj9QaE4xCQuxrThM=
go.mau.fi/libsignal v0.0.0-20220425070825-c40c839ee6a0/go.mod h1:kBOXTvYyDG/q1Ihgvd4J6WenGPh7wtEGvPKF6vmf5ak=
go.mau.fi/whatsmeow v0.0.0-20220517205516-246a2007ca7f h1:0eo1TMJBx2pv7vNh/sPAl8bXPpn+HwrVJntuOnejMfs=
go.mau.fi/whatsmeow v0.0.0-20220517205516-246a2007ca7f/go.mod h1:iUBgOLNaqShLrR17u0kIiRptIGFH+nbT1tRhaWBEX/c=
go.mau.fi/whatsmeow v0.0.0-20220604174810-f28d984f1b9a h1:kLIh5zAEvEMK8k8Qg2aU6aMDfJmrf5+XJ3t3Q3ZCV7o=
go.mau.fi/whatsmeow v0.0.0-20220604174810-f28d984f1b9a/go.mod h1:iUBgOLNaqShLrR17u0kIiRptIGFH+nbT1tRhaWBEX/c=
go.opentelemetry.io/otel v0.5.0/go.mod h1:jzBIgIzK43Iu1BpDAXwqOd6UPsSAk+ewVZ5ofSXw4Ek=
go.opentelemetry.io/otel v0.6.0/go.mod h1:jzBIgIzK43Iu1BpDAXwqOd6UPsSAk+ewVZ5ofSXw4Ek=
go.opentelemetry.io/otel v0.7.0/go.mod h1:aZMyHG5TqDOXEgH2tyLiXSUKly1jT3yqE9PmrzIeCdo=

2
internal/route.go
View File

@ -35,6 +35,8 @@ func Routes(e *echo.Echo) {
SigningKey: []byte(auth.AuthJWTSecret),
}
e.GET(router.BaseURL+"/registered", ctlWhatsApp.Registered, middleware.JWTWithConfig(authJWTConfig))
e.POST(router.BaseURL+"/login", ctlWhatsApp.Login, middleware.JWTWithConfig(authJWTConfig))
e.POST(router.BaseURL+"/send/text", ctlWhatsApp.SendText, middleware.JWTWithConfig(authJWTConfig))
e.POST(router.BaseURL+"/send/location", ctlWhatsApp.SendLocation, middleware.JWTWithConfig(authJWTConfig))

27
internal/whatsapp/whatsapp.go
View File

@ -121,6 +121,33 @@ func Logout(c echo.Context) error {
return router.ResponseSuccess(c, "Successfully Logged Out")
}
// Registered
// @Summary Check If Phone Number is Registered in WhatsApp
// @Description Check Phone Number is Registered in WhatsApp
// @Tags WhatsApp Authentication
// @Produce json
// @Param msisdn query string true "Phone Number to Check"
// @Success 200
// @Security BearerAuth
// @Router /api/v1/whatsapp/registered [get]
func Registered(c echo.Context) error {
jid := jwtPayload(c).JID
rjid := strings.TrimSpace(c.QueryParam("msisdn"))
if len(rjid) == 0 {
return router.ResponseInternalError(c, "Missing Param Value MSISDN")
}
rjid = pkgWhatsApp.WhatsAppDecomposeJID(rjid)
_, isJIDRegistered := pkgWhatsApp.WhatsAppCheckJID(jid, rjid)
if !isJIDRegistered {
return router.ResponseNotFound(c, "Phone Number is Not Registered")
}
return router.ResponseSuccess(c, "Phone Number is Registered")
}
// SendText
// @Summary Send Text Message
// @Description Send Text Message to Spesific Phone Number

116
pkg/whatsapp/whatsapp.go
View File

@ -224,39 +224,66 @@ func WhatsAppClientIsOK(jid string) error {
return nil
}
func WhatsAppComposeJID(jid string) types.JID {
// Decompose JID First Before Recomposing
jid = WhatsAppDecomposeJID(jid)
// Check if JID Contains '-' Symbol
if strings.ContainsRune(jid, '-') {
// Check if the JID is a Group ID
if len(strings.SplitN(jid, "-", 2)) == 2 {
// Return JID as Group Server (@g.us)
return types.NewJID(jid, types.GroupServer)
func WhatsAppCheckJID(jid string, phone string) (types.JID, bool) {
if WhatsAppClient[jid] != nil {
var phones []string
phones = append(phones, "+"+phone)
jidInfos, err := WhatsAppClient[jid].IsOnWhatsApp(phones)
if err == nil {
// If Phone Number is Registered in WhatsApp
if jidInfos[0].IsIn {
// Return JID Information
return jidInfos[0].JID, true
}
}
}
// Return Empty JID Information
return types.EmptyJID, false
}
func WhatsAppComposeJID(jid string, phone string) types.JID {
// Decompose Phone Number First Before Recomposing
phone = WhatsAppDecomposeJID(phone)
// Check if Phone Number is Registered in WhatsApp
jidInfo, jidOK := WhatsAppCheckJID(jid, phone)
// If Phone Number Registered Then
// Check if JID Server is in Group Server
// Or it's Default User Server
if jidOK {
// Check if JID Info is in Group Server
if jidInfo.Server == types.GroupServer {
// Return JID as Group Server (@g.us)
return types.NewJID(phone, types.GroupServer)
}
// Return JID as Default User Server (@s.whatsapp.net)
return types.NewJID(jid, types.DefaultUserServer)
return types.NewJID(phone, types.DefaultUserServer)
}
func WhatsAppDecomposeJID(jid string) string {
// Check if JID Contains '@' Symbol
if strings.ContainsRune(jid, '@') {
// Split JID Based on '@' Symbol
// Return Empty JID
return types.EmptyJID
}
func WhatsAppDecomposeJID(phone string) string {
// Check if Phone Number Contains '@' Symbol
if strings.ContainsRune(phone, '@') {
// Split Phone Number Based on '@' Symbol
// and Get Only The First Section Before The Symbol
buffers := strings.Split(jid, "@")
jid = buffers[0]
buffers := strings.Split(phone, "@")
phone = buffers[0]
}
// Check if JID First Character is '+' Symbol
if jid[0] == '+' {
// Remove '+' Symbol from JID
jid = jid[1:]
// Check if Phone Number First Character is '+' Symbol
if phone[0] == '+' {
// Remove '+' Symbol from Phone Number
phone = phone[1:]
}
return jid
return phone
}
func WhatsAppComposeStatus(jid string, rjid types.JID, isComposing bool, isAudio bool) {
@ -291,7 +318,10 @@ func WhatsAppSendText(jid string, rjid string, message string) (string, error) {
}
// Make Sure Remote JID is Proper JID Type
remoteJID := WhatsAppComposeJID(rjid)
remoteJID := WhatsAppComposeJID(jid, rjid)
if remoteJID.IsEmpty() {
return "", errors.New("Phone Number is Not Registered")
}
// Set Chat Presence
WhatsAppComposeStatus(jid, remoteJID, true, false)
@ -327,7 +357,10 @@ func WhatsAppSendLocation(jid string, rjid string, latitude float64, longitude f
}
// Make Sure Remote JID is Proper JID Type
remoteJID := WhatsAppComposeJID(rjid)
remoteJID := WhatsAppComposeJID(jid, rjid)
if remoteJID.IsEmpty() {
return "", errors.New("Phone Number is Not Registered")
}
// Set Chat Presence
WhatsAppComposeStatus(jid, remoteJID, true, false)
@ -366,7 +399,10 @@ func WhatsAppSendDocument(jid string, rjid string, fileBytes []byte, fileType st
}
// Make Sure Remote JID is Proper JID Type
remoteJID := WhatsAppComposeJID(rjid)
remoteJID := WhatsAppComposeJID(jid, rjid)
if remoteJID.IsEmpty() {
return "", errors.New("Phone Number is Not Registered")
}
// Set Chat Presence
WhatsAppComposeStatus(jid, remoteJID, true, false)
@ -418,7 +454,10 @@ func WhatsAppSendImage(jid string, rjid string, imageBytes []byte, imageType str
}
// Make Sure Remote JID is Proper JID Type
remoteJID := WhatsAppComposeJID(rjid)
remoteJID := WhatsAppComposeJID(jid, rjid)
if remoteJID.IsEmpty() {
return "", errors.New("Phone Number is Not Registered")
}
// Set Chat Presence
WhatsAppComposeStatus(jid, remoteJID, true, false)
@ -538,7 +577,10 @@ func WhatsAppSendAudio(jid string, rjid string, audioBytes []byte, audioType str
}
// Make Sure Remote JID is Proper JID Type
remoteJID := WhatsAppComposeJID(rjid)
remoteJID := WhatsAppComposeJID(jid, rjid)
if remoteJID.IsEmpty() {
return "", errors.New("Phone Number is Not Registered")
}
// Set Chat Presence
WhatsAppComposeStatus(jid, remoteJID, true, true)
@ -588,7 +630,10 @@ func WhatsAppSendVideo(jid string, rjid string, videoBytes []byte, videoType str
}
// Make Sure Remote JID is Proper JID Type
remoteJID := WhatsAppComposeJID(rjid)
remoteJID := WhatsAppComposeJID(jid, rjid)
if remoteJID.IsEmpty() {
return "", errors.New("Phone Number is Not Registered")
}
// Set Chat Presence
WhatsAppComposeStatus(jid, remoteJID, true, false)
@ -640,7 +685,10 @@ func WhatsAppSendContact(jid string, rjid string, contactName string, contactNum
}
// Make Sure Remote JID is Proper JID Type
remoteJID := WhatsAppComposeJID(rjid)
remoteJID := WhatsAppComposeJID(jid, rjid)
if remoteJID.IsEmpty() {
return "", errors.New("Phone Number is Not Registered")
}
// Set Chat Presence
WhatsAppComposeStatus(jid, remoteJID, true, false)
@ -681,7 +729,10 @@ func WhatsAppSendLink(jid string, rjid string, linkCaption string, linkURL strin
}
// Make Sure Remote JID is Proper JID Type
remoteJID := WhatsAppComposeJID(rjid)
remoteJID := WhatsAppComposeJID(jid, rjid)
if remoteJID.IsEmpty() {
return "", errors.New("Phone Number is Not Registered")
}
// Set Chat Presence
WhatsAppComposeStatus(jid, remoteJID, true, false)
@ -734,7 +785,10 @@ func WhatsAppSendSticker(jid string, rjid string, stickerBytes []byte) (string,
}
// Make Sure Remote JID is Proper JID Type
remoteJID := WhatsAppComposeJID(rjid)
remoteJID := WhatsAppComposeJID(jid, rjid)
if remoteJID.IsEmpty() {
return "", errors.New("Phone Number is Not Registered")
}
// Set Chat Presence
WhatsAppComposeStatus(jid, remoteJID, true, false)

Write Preview
Loading…
Cancel
Save